Skip to content

Commit aa82141

Browse files
committed
remove deprecated QgisInterface::fileMenu
1 parent b2cbef8 commit aa82141

File tree

6 files changed

+7
-8
lines changed

6 files changed

+7
-8
lines changed

doc/api_break.dox

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,13 @@ corresponding counterparts in QgsUnitTypes should be used instead.</li>
120120
<li>featureType() has been removed. Use the equivalent QgsWkbTypes::displayString() instead.
121121
</ul>
122122

123+
124+
\subsection qgis_api_break_3_0_QgisInterface QgisInterface
125+
126+
<ul>
127+
<li>fileMenu() has been removed, use projectMenu() instead.
128+
</ul>
129+
123130
\subsection qgis_api_break_3_0_QgsAtlasComposition QgsAtlasComposition
124131

125132
<ul>

python/gui/qgisinterface.sip

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,6 @@ class QgisInterface : QObject
308308
*/
309309

310310
// Menus
311-
virtual QMenu *fileMenu() = 0 /Deprecated/;
312311
virtual QMenu *projectMenu() = 0;
313312
virtual QMenu *editMenu() = 0;
314313
virtual QMenu *viewMenu() = 0;

src/app/qgisapp.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
423423
QAction *actionShowPinnedLabels() { return mActionShowPinnedLabels; }
424424

425425
//! Menus
426-
Q_DECL_DEPRECATED QMenu *fileMenu() { return mProjectMenu; }
427426
QMenu *projectMenu() { return mProjectMenu; }
428427
QMenu *editMenu() { return mEditMenu; }
429428
QMenu *viewMenu() { return mViewMenu; }

src/app/qgisappinterface.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,6 @@ void QgisAppInterface::unregisterMapLayerConfigWidgetFactory( QgsMapLayerConfigW
486486
}
487487

488488
//! Menus
489-
Q_DECL_DEPRECATED QMenu *QgisAppInterface::fileMenu() { return qgis->projectMenu(); }
490489
QMenu *QgisAppInterface::projectMenu() { return qgis->projectMenu(); }
491490
QMenu *QgisAppInterface::editMenu() { return qgis->editMenu(); }
492491
QMenu *QgisAppInterface::viewMenu() { return qgis->viewMenu(); }

src/app/qgisappinterface.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ class APP_EXPORT QgisAppInterface : public QgisInterface
306306
*/
307307

308308
//! Menus
309-
Q_DECL_DEPRECATED virtual QMenu *fileMenu() override;
310309
virtual QMenu *projectMenu() override;
311310
virtual QMenu *editMenu() override;
312311
virtual QMenu *viewMenu() override;

src/gui/qgisinterface.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,6 @@ class GUI_EXPORT QgisInterface : public QObject
362362
*/
363363

364364
// Menus
365-
#ifndef Q_MOC_RUN
366-
Q_DECL_DEPRECATED
367-
#endif
368-
virtual QMenu *fileMenu() = 0;
369365
virtual QMenu *projectMenu() = 0;
370366
virtual QMenu *editMenu() = 0;
371367
virtual QMenu *viewMenu() = 0;

0 commit comments

Comments
 (0)