[QGIS Commit] r10239 - in trunk/qgis: python/core python/gui src/gui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Feb 25 15:58:20 EST 2009
Author: jef
Date: 2009-02-25 15:58:19 -0500 (Wed, 25 Feb 2009)
New Revision: 10239
Modified:
trunk/qgis/python/core/core.sip
trunk/qgis/python/gui/gui.sip
trunk/qgis/python/gui/qgisinterface.sip
trunk/qgis/src/gui/qgisinterface.h
Log:
revert accidental commit
Modified: trunk/qgis/python/core/core.sip
===================================================================
--- trunk/qgis/python/core/core.sip 2009-02-25 20:25:46 UTC (rev 10238)
+++ trunk/qgis/python/core/core.sip 2009-02-25 20:58:19 UTC (rev 10239)
@@ -11,13 +11,6 @@
%Include qgis.sip
%Include qgsapplication.sip
-%Include qgscomposeritem.sip
-%Include qgscomposerlabel.sip
-%Include qgscomposerlegend.sip
-%Include qgscomposermap.sip
-%Include qgscomposerpicture.sip
-%Include qgscomposerscalebar.sip
-%Include qgscomposition.sip
%Include qgscontexthelp.sip
%Include qgscontinuouscolorrenderer.sip
%Include qgscontrastenhancement.sip
@@ -32,7 +25,6 @@
%Include qgsgraduatedsymbolrenderer.sip
%Include qgslabel.sip
%Include qgslabelattributes.sip
-%Include qgslegendmodel.sip
%Include qgslogger.sip
%Include qgsmaplayer.sip
%Include qgsmaplayerregistry.sip
@@ -40,7 +32,6 @@
%Include qgsmaptopixel.sip
%Include qgsmarkercatalogue.sip
%Include qgsmessageoutput.sip
-%Include qgspaperitem.sip
%Include qgspoint.sip
%Include qgsproject.sip
%Include qgsprovidermetadata.sip
@@ -56,7 +47,6 @@
%Include qgsrect.sip
%Include qgsrendercontext.sip
%Include qgsrenderer.sip
-%Include qgsscalebarstyle.sip
%Include qgsscalecalculator.sip
%Include qgssinglesymbolrenderer.sip
%Include qgssnapper.sip
Modified: trunk/qgis/python/gui/gui.sip
===================================================================
--- trunk/qgis/python/gui/gui.sip 2009-02-25 20:25:46 UTC (rev 10238)
+++ trunk/qgis/python/gui/gui.sip 2009-02-25 20:58:19 UTC (rev 10239)
@@ -8,7 +8,6 @@
%Import core/core.sip
%Include qgisinterface.sip
-%Include qgscomposerview.sip
%Include qgsencodingfiledialog.sip
%Include qgsgenericprojectionselector.sip
%Include qgsmapcanvas.sip
Modified: trunk/qgis/python/gui/qgisinterface.sip
===================================================================
--- trunk/qgis/python/gui/qgisinterface.sip 2009-02-25 20:25:46 UTC (rev 10238)
+++ trunk/qgis/python/gui/qgisinterface.sip 2009-02-25 20:58:19 UTC (rev 10239)
@@ -76,7 +76,7 @@
/** Return pointers to the composer views of the running instance (currently only one)*/
//virtual QList<QgsComposerView*> composerViews()=0;
- virtual QList< QPair<QMainWindow*, QgsComposerView*> > composerList() = 0;
+ //virtual QList< QPair<QMainWindow*, QgsComposerView*> > composerList() = 0;
/** Add action to the plugins menu */
virtual void addPluginToMenu(QString name, QAction* action)=0;
Modified: trunk/qgis/src/gui/qgisinterface.h
===================================================================
--- trunk/qgis/src/gui/qgisinterface.h 2009-02-25 20:25:46 UTC (rev 10238)
+++ trunk/qgis/src/gui/qgisinterface.h 2009-02-25 20:58:19 UTC (rev 10239)
@@ -111,7 +111,7 @@
//virtual QList<QgsComposerView*> composerViews() = 0;
/**Return mainwindows / composer views of running composer instances (currently only one)*/
- virtual QList< QPair<QMainWindow*, QgsComposerView*> > composerList() = 0;
+ //virtual QList< QPair<QMainWindow*, QgsComposerView*> > composerList() = 0;
/** Add action to the plugins menu */
virtual void addPluginToMenu( QString name, QAction* action ) = 0;
More information about the QGIS-commit
mailing list