Skip to content

Commit

Permalink
revert accidental commit
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@10239 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Feb 25, 2009
1 parent 3573b90 commit bb61177
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 13 deletions.
10 changes: 0 additions & 10 deletions python/core/core.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -32,15 +25,13 @@
%Include qgsgraduatedsymbolrenderer.sip
%Include qgslabel.sip
%Include qgslabelattributes.sip
%Include qgslegendmodel.sip
%Include qgslogger.sip
%Include qgsmaplayer.sip
%Include qgsmaplayerregistry.sip
%Include qgsmaprenderer.sip
%Include qgsmaptopixel.sip
%Include qgsmarkercatalogue.sip
%Include qgsmessageoutput.sip
%Include qgspaperitem.sip
%Include qgspoint.sip
%Include qgsproject.sip
%Include qgsprovidermetadata.sip
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion python/gui/gui.sip
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
%Import core/core.sip

%Include qgisinterface.sip
%Include qgscomposerview.sip
%Include qgsencodingfiledialog.sip
%Include qgsgenericprojectionselector.sip
%Include qgsmapcanvas.sip
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgisinterface.sip
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class QgisInterface : QObject
/** 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;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgisinterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class GUI_EXPORT QgisInterface : public QObject
//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;
Expand Down

0 comments on commit bb61177

Please sign in to comment.