Skip to content
Permalink
Browse files

remove "added" notes for 1.x and 2.0 versions

  • Loading branch information
3nids committed Oct 30, 2014
1 parent ef56c53 commit a0b52412755fd1443d0d68e3b918ad84d0830b16
Showing with 391 additions and 1,255 deletions.
  1. +24 −111 python/gui/qgisinterface.sip
  2. +6 −6 src/analysis/vector/qgsgeometryanalyzer.h
  3. +1 −1 src/analysis/vector/qgsoverlayanalyzer.h
  4. +1 −13 src/app/composer/qgscomposer.h
  5. +0 −2 src/app/composer/qgscomposeritemwidget.h
  6. +6 −17 src/app/composer/qgscomposermanager.h
  7. +2 −6 src/app/composer/qgscomposerpicturewidget.h
  8. +1 −2 src/app/qgisapp.cpp
  9. +35 −96 src/app/qgisapp.h
  10. +11 −41 src/app/qgisappinterface.h
  11. +1 −2 src/app/qgsdecorationgrid.h
  12. +0 −1 src/app/qgslabelengineconfigdialog.h
  13. +3 −14 src/app/qgslabelpropertydialog.h
  14. +2 −4 src/app/qgsmaptooledit.h
  15. +4 −4 src/app/qgsmaptoollabel.h
  16. +0 −1 src/app/qgsmeasuretool.h
  17. +23 −72 src/app/qgsoptions.h
  18. +5 −15 src/app/qgsprojectproperties.h
  19. +2 −5 src/app/qgsrasterlayerproperties.h
  20. +1 −4 src/app/qgsundowidget.h
  21. +1 −3 src/app/qgsvectorlayerproperties.h
  22. +1 −3 src/core/composer/qgscomposerarrow.h
  23. +1 −1 src/core/composer/qgscomposerattributetable.h
  24. +6 −15 src/core/composer/qgscomposeritem.h
  25. +1 −1 src/core/composer/qgscomposeritemgroup.h
  26. +4 −5 src/core/composer/qgscomposerlabel.h
  27. +1 −1 src/core/composer/qgscomposerlegend.h
  28. +21 −27 src/core/composer/qgscomposermap.h
  29. +0 −1 src/core/composer/qgscomposermultiframe.h
  30. +1 −1 src/core/composer/qgscomposerpicture.h
  31. +3 −9 src/core/composer/qgscomposerscalebar.h
  32. +1 −1 src/core/composer/qgscomposershape.h
  33. +1 −1 src/core/composer/qgscomposertable.h
  34. +1 −1 src/core/composer/qgscomposertexttable.h
  35. +3 −10 src/core/composer/qgscomposition.h
  36. +1 −1 src/core/composer/qgspaperitem.h
  37. +2 −6 src/core/qgis.h
  38. +2 −7 src/core/qgsapplication.cpp
  39. +13 −33 src/core/qgsapplication.h
  40. +0 −4 src/core/qgsattributeaction.h
  41. +0 −7 src/core/qgscoordinatereferencesystem.h
  42. +0 −1 src/core/qgsdatadefined.h
  43. +1 −6 src/core/qgsdataprovider.h
  44. +0 −21 src/core/qgsdatasourceuri.h
  45. +1 −4 src/core/qgsexpression.h
  46. +0 −8 src/core/qgsfeature.h
  47. +19 −47 src/core/qgsgeometry.h
  48. +1 −3 src/core/qgsgeometryvalidator.h
  49. +0 −2 src/core/qgshttptransaction.h
  50. +1 −2 src/core/qgslabel.h
  51. +1 −4 src/core/qgslabelattributes.h
  52. +13 −27 src/core/qgsmaplayer.h
  53. +0 −9 src/core/qgsmaplayerregistry.h
  54. +2 −15 src/core/qgsmaprenderer.h
  55. +1 −2 src/core/qgsmaptopixel.h
  56. +0 −2 src/core/qgsmessagelog.h
  57. +0 −2 src/core/qgsogcutils.h
  58. +7 −10 src/core/qgspallabeling.h
  59. +0 −2 src/core/qgspluginlayer.h
  60. +0 −4 src/core/qgspluginlayerregistry.h
  61. +2 −6 src/core/qgspoint.h
  62. +13 −27 src/core/qgsproject.h
  63. +3 −10 src/core/qgsproviderregistry.h
  64. +0 −1 src/core/qgsrectangle.cpp
  65. +0 −6 src/core/qgsrectangle.h
  66. +2 −9 src/core/qgsrendercontext.h
  67. +0 −2 src/core/qgstolerance.h
  68. +2 −10 src/core/qgsvectordataprovider.h
  69. +14 −18 src/core/qgsvectorfilewriter.h
  70. +58 −128 src/core/qgsvectorlayer.h
  71. +3 −5 src/core/qgsvectorlayereditbuffer.h
  72. +1 −1 src/core/raster/qgscolorrampshader.h
  73. +4 −11 src/core/raster/qgsrasterdataprovider.h
  74. +3 −8 src/core/raster/qgsrasterlayer.h
  75. +0 −9 src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
  76. +1 −2 src/core/symbology-ng/qgsfillsymbollayerv2.h
  77. +0 −8 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
  78. +0 −9 src/core/symbology-ng/qgsrendererv2.h
  79. +0 −6 src/core/symbology-ng/qgsrulebasedrendererv2.h
  80. +0 −8 src/core/symbology-ng/qgssinglesymbolrendererv2.h
  81. +0 −2 src/core/symbology-ng/qgsstylev2.h
  82. +0 −1 src/core/symbology-ng/qgssymbollayerv2.h
  83. +1 −3 src/core/symbology-ng/qgssymbollayerv2utils.h
  84. +0 −9 src/core/symbology-ng/qgssymbolv2.h
  85. +0 −2 src/gui/attributetable/qgsdualview.h
  86. +0 −6 src/gui/qgisgui.h
  87. +26 −115 src/gui/qgisinterface.h
  88. +0 −1 src/gui/qgsbusyindicatordialog.h
  89. +0 −14 src/gui/qgscolorbutton.h
  90. +0 −1 src/gui/qgsdatadefinedbutton.h
  91. +0 −1 src/gui/qgsexpressionbuilderdialog.h
  92. +0 −1 src/gui/qgsexpressionbuilderwidget.h
  93. +0 −1 src/gui/qgsexpressionselectiondialog.h
  94. +3 −22 src/gui/qgslegendinterface.h
  95. +5 −11 src/gui/qgsmapcanvas.h
  96. +1 −2 src/gui/qgsmapcanvasitem.h
  97. +0 −2 src/gui/qgsmaptool.h
  98. +0 −1 src/gui/qgsmessagebar.h
  99. +0 −1 src/gui/qgsmessagelogviewer.h
  100. +0 −1 src/gui/qgsoptionsdialogbase.h
  101. +0 −2 src/gui/qgsprojectbadlayerguihandler.h
  102. +3 −16 src/gui/qgsrubberband.h
  103. +0 −4 src/gui/qgsscalecombobox.cpp
  104. +0 −7 src/gui/qgsscalecombobox.h
  105. +1 −2 src/providers/mssql/qgsmssqlprovider.h
  106. +1 −2 src/providers/ogr/qgsogrprovider.h
  107. +1 −2 src/providers/postgres/qgspostgresprovider.h
  108. +1 −2 src/providers/spatialite/qgsspatialiteprovider.h
  109. +3 −11 src/providers/wms/qgswmsprovider.h
@@ -25,9 +25,7 @@ class QgisInterface : QObject
/** Virtual destructor */
virtual ~QgisInterface();

/** Get pointer to legend interface
\note added in 1.4
*/
/** Get pointer to legend interface */
virtual QgsLegendInterface* legendInterface() = 0;

virtual QgsPluginManagerInterface* pluginManagerInterface() = 0;
@@ -69,7 +67,6 @@ class QgisInterface : QObject

//! Set the active layer (layer gets selected in the legend)
//! returns true if the layer exists, false otherwise
//! added in 1.4
virtual bool setActiveLayer( QgsMapLayer * ) = 0;

//! Add an icon to the plugins toolbar
@@ -99,16 +96,12 @@ class QgisInterface : QObject
virtual QAction* addRasterToolBarWidget( QWidget* widget ) = 0;

//! Add an icon to the Raster toolbar
//! @note added in 2.0
virtual int addRasterToolBarIcon( QAction *qAction ) = 0;

//! Remove an action (icon) from the Raster toolbar
//! @note added in 2.0
virtual void removeRasterToolBarIcon( QAction *qAction ) = 0;

//! Add an icon to the Vector toolbar
//! @note added in 2.0

virtual int addVectorToolBarIcon( QAction *qAction ) = 0;

/**
@@ -122,11 +115,9 @@ class QgisInterface : QObject
virtual QAction* addVectorToolBarWidget( QWidget* widget ) = 0;

//! Remove an action (icon) from the Vector toolbar
//! @note added in 2.0
virtual void removeVectorToolBarIcon( QAction *qAction ) = 0;

//! Add an icon to the Database toolbar
//! @note added in 2.0
virtual int addDatabaseToolBarIcon( QAction *qAction ) = 0;

/**
@@ -140,11 +131,9 @@ class QgisInterface : QObject
virtual QAction* addDatabaseToolBarWidget( QWidget* widget ) = 0;

//! Remove an action (icon) from the Database toolbar
//! @note added in 2.0
virtual void removeDatabaseToolBarIcon( QAction *qAction ) = 0;

//! Add an icon to the Web toolbar
//! @note added in 2.0
virtual int addWebToolBarIcon( QAction *qAction ) = 0;

/**
@@ -158,7 +147,6 @@ class QgisInterface : QObject
virtual QAction* addWebToolBarWidget( QWidget* widget ) = 0;

//! Remove an action (icon) from the Web toolbar
//! @note added in 2.0
virtual void removeWebToolBarIcon( QAction *qAction ) = 0;

//! Add toolbar with specified name
@@ -183,42 +171,33 @@ class QgisInterface : QObject
/** Create a new composer
* @param title window title for new composer (one will be generated if empty)
* @return pointer to composer's view
* @note new composer window will be shown and activated (added in 1.9)
* @note new composer window will be shown and activated
*/
virtual QgsComposerView* createNewComposer( QString title = QString( "" ) ) = 0;

/** Duplicate an existing parent composer from composer view
* @param composerView pointer to existing composer view
* @param title window title for duplicated composer (one will be generated if empty)
* @return pointer to duplicate composer's view
* @note dupicate composer window will be hidden until loaded, then shown and activated (added in 1.9)
* @note dupicate composer window will be hidden until loaded, then shown and activated
*/
virtual QgsComposerView* duplicateComposer( QgsComposerView* composerView, QString title = QString( "" ) ) = 0;

/** Deletes parent composer of composer view, after closing composer window
* @note (added in 1.9)
*/
/** Deletes parent composer of composer view, after closing composer window */
virtual void deleteComposer( QgsComposerView* composerView ) = 0;

/** Return changeable options built from settings and/or defaults
* @note (added in 1.9)
*/
/** Return changeable options built from settings and/or defaults */
virtual QMap<QString, QVariant> defaultStyleSheetOptions() = 0;

/** Generate stylesheet
* @param opts generated default option values, or a changed copy of them
* @note added in 1.9
*/
virtual void buildStyleSheet( const QMap<QString, QVariant>& opts ) = 0;

/** Save changed default option keys/values to user settings
* @note added in 1.9
*/
/** Save changed default option keys/values to user settings */
virtual void saveStyleSheetOptions( const QMap<QString, QVariant>& opts ) = 0;

/** Get reference font for initial qApp (may not be same as QgisApp)
* @note added in 1.9
*/
/** Get reference font for initial qApp (may not be same as QgisApp) */
virtual QFont defaultStyleSheetFont() = 0;

/** Add action to the plugins menu */
@@ -227,72 +206,46 @@ class QgisInterface : QObject
/** Remove action from the plugins menu */
virtual void removePluginMenu( QString name, QAction* action ) = 0;

/** Add "add layer" action to layer menu
* @note added in 1.7
*/
/** Add "add layer" action to layer menu */
virtual void insertAddLayerAction( QAction *action ) = 0;

/** Remove "add layer" action from layer menu
* @note added in 1.7
*/
/** Remove "add layer" action from layer menu */
virtual void removeAddLayerAction( QAction *action ) = 0;

/** Add action to the Database menu
* @note added in 1.7
*/
/** Add action to the Database menu */
virtual void addPluginToDatabaseMenu( QString name, QAction* action ) = 0;

/** Remove action from the Database menu
* @note added in 1.7
*/
/** Remove action from the Database menu */
virtual void removePluginDatabaseMenu( QString name, QAction* action ) = 0;

/** Add action to the Raster menu
* @note added in 2.0
*/
/** Add action to the Raster menu */
virtual void addPluginToRasterMenu( QString name, QAction* action ) = 0;

/** Remove action from the Raster menu
* @note added in 2.0
*/
/** Remove action from the Raster menu */
virtual void removePluginRasterMenu( QString name, QAction* action ) = 0;

/** Add action to the Vector menu
* @note added in 2.0
*/
/** Add action to the Vector menu */
virtual void addPluginToVectorMenu( QString name, QAction* action ) = 0;

/** Remove action from the Vector menu
* @note added in 2.0
*/
/** Remove action from the Vector menu */
virtual void removePluginVectorMenu( QString name, QAction* action ) = 0;

/** Add action to the Web menu
* @note added in 2.0
*/
/** Add action to the Web menu */
virtual void addPluginToWebMenu( QString name, QAction* action ) = 0;

/** Remove action from the Web menu
* @note added in 2.0
*/
/** Remove action from the Web menu */
virtual void removePluginWebMenu( QString name, QAction* action ) = 0;

/** Add a dock widget to the main window */
virtual void addDockWidget( Qt::DockWidgetArea area, QDockWidget * dockwidget ) = 0;

/** Remove specified dock widget from main window (doesn't delete it).
* @note Added in 1.1
*/
/** Remove specified dock widget from main window (doesn't delete it). */
virtual void removeDockWidget( QDockWidget * dockwidget ) = 0;

/** open layer properties dialog
\note added in 1.5
*/
/** open layer properties dialog */
virtual void showLayerProperties( QgsMapLayer *l ) = 0;

/** open attribute table dialog
\note added in 1.7
*/
/** open attribute table dialog */
virtual void showAttributeTable( QgsVectorLayer *l ) = 0;

/** Add window to Window menu. The action title is the window title
@@ -304,12 +257,10 @@ class QgisInterface : QObject
virtual void removeWindow( QAction *action ) = 0;

/** Register action to the shortcuts manager so its shortcut can be changed in GUI
\note added in 1.2
*/
virtual bool registerMainWindowAction( QAction* action, QString defaultShortcut ) = 0;

/** Unregister a previously registered action. (e.g. when plugin is going to be unloaded)
\note added in 1.2
*/
virtual bool unregisterMainWindowAction( QAction* action ) = 0;

@@ -334,23 +285,14 @@ class QgisInterface : QObject
virtual QMenu *editMenu() = 0;
virtual QMenu *viewMenu() = 0;
virtual QMenu *layerMenu() = 0;
/** \note added in 2.0
*/
virtual QMenu *newLayerMenu() = 0;
/** \note added in 2.5
*/
/** @note added in 2.5 */
virtual QMenu *addLayerMenu() = 0;
virtual QMenu *settingsMenu() = 0;
virtual QMenu *pluginMenu() = 0;
virtual QMenu *rasterMenu() = 0;
/** \note added in 1.7
*/
virtual QMenu *databaseMenu() = 0;
/** \note added in 2.0
*/
virtual QMenu *vectorMenu() = 0;
/** \note added in 2.0
*/
virtual QMenu *webMenu() = 0;
virtual QMenu *firstRightStandardMenu() = 0;
virtual QMenu *windowMenu() = 0;
@@ -361,21 +303,13 @@ class QgisInterface : QObject
virtual QToolBar *layerToolBar() = 0;
virtual QToolBar *mapNavToolToolBar() = 0;
virtual QToolBar *digitizeToolBar() = 0;
virtual QToolBar *advancedDigitizeToolBar() = 0; // added in v1.5
virtual QToolBar *advancedDigitizeToolBar() = 0;
virtual QToolBar *attributesToolBar() = 0;
virtual QToolBar *pluginToolBar() = 0;
virtual QToolBar *helpToolBar() = 0;
/** \note added in 1.7
*/
virtual QToolBar *rasterToolBar() = 0;
/** \note added in 2.0
*/
virtual QToolBar *vectorToolBar() = 0;
/** \note added in 2.0
*/
virtual QToolBar *databaseToolBar() = 0;
/** \note added in 2.0
*/
virtual QToolBar *webToolBar() = 0;

// Project menu actions
@@ -461,34 +395,23 @@ class QgisInterface : QObject
virtual QAction *actionAddRasterLayer() = 0;
virtual QAction *actionAddPgLayer() = 0;
virtual QAction *actionAddWmsLayer() = 0;
/** @note added in 1.9 */
virtual QAction *actionCopyLayerStyle() = 0;
/** @note added in 1.9 */
virtual QAction *actionPasteLayerStyle() = 0;
virtual QAction *actionOpenTable() = 0;
virtual QAction *actionOpenFieldCalculator() = 0;
virtual QAction *actionToggleEditing() = 0;
/** @note added in 1.9 */
virtual QAction *actionSaveActiveLayerEdits() = 0;
/** @note added in 1.9 */
virtual QAction *actionAllEdits() = 0;
/** @note added in 1.9 */
virtual QAction *actionSaveEdits() = 0;
/** @note added in 1.9 */
virtual QAction *actionSaveAllEdits() = 0;
/** @note added in 1.9 */
virtual QAction *actionRollbackEdits() = 0;
/** @note added in 1.9 */
virtual QAction *actionRollbackAllEdits() = 0;
/** @note added in 1.9 */
virtual QAction *actionCancelEdits() = 0;
/** @note added in 1.9 */
virtual QAction *actionCancelAllEdits() = 0;
virtual QAction *actionLayerSaveAs() = 0;
/** @deprecated in 2.4 - returns null pointer */
virtual QAction *actionLayerSelectionSaveAs() = 0 /Deprecated/;
virtual QAction *actionRemoveLayer() = 0;
/** @note added in 1.9 */
virtual QAction *actionDuplicateLayer() = 0;
virtual QAction *actionLayerProperties() = 0;
virtual QAction *actionAddToOverview() = 0;
@@ -521,7 +444,6 @@ class QgisInterface : QObject
* @param f feature to show/modify
* @param updateFeatureOnly only update the feature update (don't change any attributes of the layer) [UNUSED]
* @param showModal if true, will wait for the dialog to be executed (only shown otherwise)
* @note added in 1.6
*/
virtual bool openFeatureForm( QgsVectorLayer *l, QgsFeature &f, bool updateFeatureOnly = false, bool showModal = true ) = 0;

@@ -559,12 +481,10 @@ class QgisInterface : QObject

/** Return vector layers in edit mode
* @param modified whether to return only layers that have been modified
* @returns list of layers in legend order, or empty list
* @note added in 1.9 */
* @returns list of layers in legend order, or empty list */
virtual QList<QgsMapLayer *> editableLayers( bool modified = false ) const = 0;

/** Get timeout for timed messages: default of 5 seconds
* @note added in 1.9 */
/** Get timeout for timed messages: default of 5 seconds */
virtual int messageTimeout() = 0;

signals:
@@ -575,27 +495,22 @@ class QgisInterface : QObject

/**
* This signal is emitted when a new composer instance has been created
* @note added in 1.4
*/
void composerAdded( QgsComposerView* v );

/**
* This signal is emitted before a new composer instance is going to be removed
* @note added in 1.4
*/
void composerWillBeRemoved( QgsComposerView* v );
/**
* This signal is emitted when the initialization is complete
* @note added in 1.6
*/
void initializationCompleted();
/** emitted when a project file is successfully read
@note
This is useful for plug-ins that store properties with project files. A
plug-in can connect to this signal. When it is emitted, the plug-in
knows to then check the project properties for any relevant state.

Added in 1.6
*/
void projectRead();
/** emitted when starting an entirely new project
@@ -605,8 +520,6 @@ class QgisInterface : QObject
overloaded to be used in the case of new projects instead. However,
it's probably more semantically correct to have an entirely separate
signal for when this happens.

Added in 1.6
*/
void newProjectCreated();
};

0 comments on commit a0b5241

Please sign in to comment.
You can’t perform that action at this time.