Skip to content
Permalink
Browse files

remove deprecated QgisInterface::fileMenu

  • Loading branch information
3nids committed Aug 8, 2016
1 parent b2cbef8 commit aa82141df75534819e551c476225447abdd95332
@@ -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>
@@ -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;
@@ -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; }
@@ -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(); }
@@ -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;
@@ -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;

0 comments on commit aa82141

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