remove deprecated QgisInterface::fileMenu

qgis · Aug 8, 2016 · aa82141 · aa82141
1 parent b2cbef8
commit aa82141
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -120,6 +120,13 @@ corresponding counterparts in QgsUnitTypes should be used instead.</li>
 <li>featureType() has been removed. Use the equivalent QgsWkbTypes::displayString() instead.
 </ul>
 
+
+\subsection qgis_api_break_3_0_QgisInterface QgisInterface
+
+<ul>
+<li>fileMenu() has been removed, use projectMenu() instead.
+</ul>
+
 \subsection qgis_api_break_3_0_QgsAtlasComposition QgsAtlasComposition
 
 <ul>

diff --git a/python/gui/qgisinterface.sip b/python/gui/qgisinterface.sip
@@ -308,7 +308,6 @@ class QgisInterface : QObject
      */
 
     // Menus
-    virtual QMenu *fileMenu() = 0 /Deprecated/;
     virtual QMenu *projectMenu() = 0;
     virtual QMenu *editMenu() = 0;
     virtual QMenu *viewMenu() = 0;

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -423,7 +423,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     QAction *actionShowPinnedLabels() { return mActionShowPinnedLabels; }
 
     //! Menus
-    Q_DECL_DEPRECATED QMenu *fileMenu() { return mProjectMenu; }
     QMenu *projectMenu() { return mProjectMenu; }
     QMenu *editMenu() { return mEditMenu; }
     QMenu *viewMenu() { return mViewMenu; }

diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -486,7 +486,6 @@ void QgisAppInterface::unregisterMapLayerConfigWidgetFactory( QgsMapLayerConfigW
 }
 
 //! Menus
-Q_DECL_DEPRECATED QMenu *QgisAppInterface::fileMenu() { return qgis->projectMenu(); }
 QMenu *QgisAppInterface::projectMenu() { return qgis->projectMenu(); }
 QMenu *QgisAppInterface::editMenu() { return qgis->editMenu(); }
 QMenu *QgisAppInterface::viewMenu() { return qgis->viewMenu(); }

diff --git a/src/app/qgisappinterface.h b/src/app/qgisappinterface.h
@@ -306,7 +306,6 @@ class APP_EXPORT QgisAppInterface : public QgisInterface
      */
 
     //! Menus
-    Q_DECL_DEPRECATED virtual QMenu *fileMenu() override;
     virtual QMenu *projectMenu() override;
     virtual QMenu *editMenu() override;
     virtual QMenu *viewMenu() override;

diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h
@@ -362,10 +362,6 @@ class GUI_EXPORT QgisInterface : public QObject
      */
 
     // Menus
-#ifndef Q_MOC_RUN
-    Q_DECL_DEPRECATED
-#endif
-    virtual QMenu *fileMenu() = 0;
     virtual QMenu *projectMenu() = 0;
     virtual QMenu *editMenu() = 0;
     virtual QMenu *viewMenu() = 0;