Rename QgisGui to QgsGuiUtils

Better reflects what this namespace contains, and replaces the non-standard Qgis prefix with the Qgs standard
qgis · May 14, 2017 · ac94345 · ac94345
1 parent 436844b
commit ac94345
Show file tree

Hide file tree

Showing 108 changed files with 203 additions and 203 deletions.
diff --git a/cmake/FindQGIS.cmake b/cmake/FindQGIS.cmake
@@ -142,7 +142,7 @@ ELSE(WIN32)
     # also get other frameworks' headers folders on OS X
     IF (APPLE)
       FIND_PATH(QGIS_GUI_INCLUDE_DIR
-        NAMES qgisgui.h
+        NAMES qgsguiutils.h
         PATHS
           ${QGIS_BUILD_PATH}/output/lib
           ${QGIS_MAC_PATH}/Frameworks

diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -63,6 +63,7 @@ Renamed Classes        {#qgis_api_break_3_0_renamed_classes}
 <table>
 <caption id="renamed_classes">Renamed classes</caption>
 <tr><th>API 2.x<th>API 3.X
+<tr><td>QgisGui<td>QgsGuiUtils
 <tr><td>QgsAttributeAction<td>QgsActionManager
 <tr><td>QgsAbstractGeometryV2<td>QgsAbstractGeometry
 <tr><td>QgsCategorizedSymbolRendererV2<td>QgsCategorizedSymbolRenderer

diff --git a/python/gui/qgsbusyindicatordialog.sip b/python/gui/qgsbusyindicatordialog.sip
@@ -15,7 +15,7 @@ class QgsBusyIndicatorDialog : QDialog
      * @param parent parent object (owner)
      * @param fl widget flags
      */
-    QgsBusyIndicatorDialog( const QString &message = "", QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
+    QgsBusyIndicatorDialog( const QString &message = "", QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
     ~QgsBusyIndicatorDialog();
 
     QString message() const;

diff --git a/python/gui/qgscharacterselectdialog.sip b/python/gui/qgscharacterselectdialog.sip
@@ -4,7 +4,7 @@ class QgsCharacterSelectorDialog : QDialog
 #include <qgscharacterselectdialog.h>
 %End
   public:
-    QgsCharacterSelectorDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
+    QgsCharacterSelectorDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
     ~QgsCharacterSelectorDialog();
 
   public slots:

diff --git a/python/gui/qgscolordialog.sip b/python/gui/qgscolordialog.sip
@@ -23,7 +23,7 @@ class QgsColorDialog : QDialog
 %End
   public:
 
-    QgsColorDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags,
+    QgsColorDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags,
                     const QColor &color = QColor() );
 %Docstring
  Create a new color picker dialog

diff --git a/python/gui/qgscredentialdialog.sip b/python/gui/qgscredentialdialog.sip
@@ -20,7 +20,7 @@ class QgsCredentialDialog : QDialog, QgsCredentials
 #include "qgscredentialdialog.h"
 %End
   public:
-    QgsCredentialDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
+    QgsCredentialDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
 %Docstring
 QgsCredentialDialog constructor
 %End

diff --git a/python/gui/qgsdialog.sip b/python/gui/qgsdialog.sip
@@ -21,7 +21,7 @@ class QgsDialog : QDialog
 %End
   public:
 
-    QgsDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags,
+    QgsDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags,
                QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Close,
                Qt::Orientation orientation = Qt::Horizontal );
 %Docstring

diff --git a/python/gui/qgserrordialog.sip b/python/gui/qgserrordialog.sip
@@ -17,12 +17,12 @@ class QgsErrorDialog: QDialog
 %End
   public:
 
-    QgsErrorDialog( const QgsError &error, const QString &title, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
+    QgsErrorDialog( const QgsError &error, const QString &title, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
 %Docstring
  QgsErrorDialog constructor for QgsErrorDialog
 %End
 
-    static void show( const QgsError &error, const QString &title, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
+    static void show( const QgsError &error, const QString &title, QWidget *parent = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
 %Docstring
  Show dialog with error
  \param error error

diff --git a/python/gui/qgsgroupwmsdatadialog.sip b/python/gui/qgsgroupwmsdatadialog.sip
@@ -15,7 +15,7 @@ class QgsGroupWmsDataDialog: QDialog
 #include "qgsgroupwmsdatadialog.h"
 %End
   public:
-    QgsGroupWmsDataDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
+    QgsGroupWmsDataDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
 %Docstring
 Constructor
 %End

diff --git a/python/gui/qgsludialog.sip b/python/gui/qgsludialog.sip
@@ -5,7 +5,7 @@ class QgsLUDialog: QDialog
 %End
 
   public:
-    QgsLUDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
+    QgsLUDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
     ~QgsLUDialog();
     QString lowerValue() const;
     void setLowerValue( const QString &val );

diff --git a/python/gui/qgsmessagelogviewer.sip b/python/gui/qgsmessagelogviewer.sip
@@ -21,7 +21,7 @@ class QgsMessageLogViewer: QDialog
 %End
   public:
 
-    QgsMessageLogViewer( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
+    QgsMessageLogViewer( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
 %Docstring
  Create a new message log viewer. The viewer will automatically connect to the system's
  QgsApplication.messageLog() instance.

diff --git a/python/gui/qgsmessageviewer.sip b/python/gui/qgsmessageviewer.sip
@@ -6,7 +6,7 @@ class QgsMessageViewer: QDialog, QgsMessageOutput //, Ui::QgsMessageViewer
 %End
 
   public:
-    QgsMessageViewer( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
+    QgsMessageViewer( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
     ~QgsMessageViewer();
 
     virtual void setMessage( const QString &message, MessageType msgType );

diff --git a/python/gui/qgsnewgeopackagelayerdialog.sip b/python/gui/qgsnewgeopackagelayerdialog.sip
@@ -7,7 +7,7 @@ class QgsNewGeoPackageLayerDialog : QDialog
 
   public:
     /** Constructor */
-    QgsNewGeoPackageLayerDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
+    QgsNewGeoPackageLayerDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
 
     ~QgsNewGeoPackageLayerDialog();
 

diff --git a/python/gui/qgsnewhttpconnection.sip b/python/gui/qgsnewhttpconnection.sip
@@ -6,7 +6,7 @@ class QgsNewHttpConnection : QDialog
 
   public:
     //! Constructor
-    QgsNewHttpConnection( QWidget *parent /TransferThis/ = 0, const QString &baseKey = "/Qgis/connections-wms/", const QString &connName = QString::null, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
+    QgsNewHttpConnection( QWidget *parent /TransferThis/ = 0, const QString &baseKey = "/Qgis/connections-wms/", const QString &connName = QString::null, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
     //! Destructor
     ~QgsNewHttpConnection();
   public slots:

diff --git a/python/gui/qgsnewmemorylayerdialog.sip b/python/gui/qgsnewmemorylayerdialog.sip
@@ -26,7 +26,7 @@ class QgsNewMemoryLayerDialog: QDialog
  :rtype: QgsVectorLayer
 %End
 
-    QgsNewMemoryLayerDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
+    QgsNewMemoryLayerDialog( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
     ~QgsNewMemoryLayerDialog();
 
     QgsWkbTypes::Type selectedType() const;

diff --git a/python/gui/qgsnewnamedialog.sip b/python/gui/qgsnewnamedialog.sip
@@ -23,7 +23,7 @@ class QgsNewNameDialog : QgsDialog
     QgsNewNameDialog( const QString& source = QString::null, const QString& initial = QString::null,
                       const QStringList& extensions = QStringList(), const QStringList& existing = QStringList(),
                       const QRegExp& regexp = QRegExp(), Qt::CaseSensitivity cs = Qt::CaseSensitive,
-                      QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &flags = QgisGui::ModalDialogFlags );
+                      QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &flags = QgsGuiUtils::ModalDialogFlags );
 
     /** Sets the hint string for the dialog (the text shown above the name
      * input box).

diff --git a/python/gui/qgsnewvectorlayerdialog.sip b/python/gui/qgsnewvectorlayerdialog.sip
@@ -10,7 +10,7 @@ class QgsNewVectorLayerDialog : QDialog
     // @return fileName on success, empty string use aborted, QString::null if creation failed
     static QString runAndCreateLayer( QWidget *parent = 0, QString *enc = 0 );
 
-    QgsNewVectorLayerDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
+    QgsNewVectorLayerDialog( QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
     ~QgsNewVectorLayerDialog();
     /** Returns the selected geometry type*/
     QgsWkbTypes::Type selectedType() const;

diff --git a/python/gui/qgsowssourceselect.sip b/python/gui/qgsowssourceselect.sip
@@ -23,7 +23,7 @@ class QgsOWSSourceSelect : QDialog
     };
 
     //! Constructor
-    QgsOWSSourceSelect( const QString &service, QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags, bool managerMode = false, bool embeddedMode = false );
+    QgsOWSSourceSelect( const QString &service, QWidget *parent /TransferThis/ = 0, const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags, bool managerMode = false, bool embeddedMode = false );
     //! Destructor
     ~QgsOWSSourceSelect();
 

diff --git a/python/gui/qgsprojectionselectiondialog.sip b/python/gui/qgsprojectionselectiondialog.sip
@@ -9,7 +9,7 @@ class QgsProjectionSelectionDialog : QDialog //, private Ui::QgsGenericProjectio
      * Constructor
      */
     QgsProjectionSelectionDialog( QWidget *parent /TransferThis/ = 0,
-                                  const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
+                                  const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
 
     //! Destructor
     ~QgsProjectionSelectionDialog();

diff --git a/python/gui/qgsquerybuilder.sip b/python/gui/qgsquerybuilder.sip
@@ -12,7 +12,7 @@ class QgsQueryBuilder : QDialog
      * @param fl dialog flags
      */
     QgsQueryBuilder( QgsVectorLayer *layer, QWidget *parent /TransferThis/ = 0,
-                     const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
+                     const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
 
     ~QgsQueryBuilder();
 

diff --git a/python/gui/qgssearchquerybuilder.sip b/python/gui/qgssearchquerybuilder.sip
@@ -12,7 +12,7 @@ class QgsSearchQueryBuilder : QDialog
   public:
     //! Constructor - takes pointer to vector layer as a parameter
     QgsSearchQueryBuilder( QgsVectorLayer* layer, QWidget *parent /TransferThis/ = 0,
-                           const Qt::WindowFlags &fl = QgisGui::ModalDialogFlags );
+                           const Qt::WindowFlags &fl = QgsGuiUtils::ModalDialogFlags );
 
     ~QgsSearchQueryBuilder();
 

diff --git a/python/gui/qgstextformatwidget.sip b/python/gui/qgstextformatwidget.sip
@@ -111,7 +111,7 @@ class QgsTextFormatDialog : QDialog
      * @param parent parent widget
      * @param fl window flags for dialog
      */
-    QgsTextFormatDialog( const QgsTextFormat &format, QgsMapCanvas *mapCanvas = 0, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
+    QgsTextFormatDialog( const QgsTextFormat &format, QgsMapCanvas *mapCanvas = 0, QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
 
     virtual ~QgsTextFormatDialog();
 

diff --git a/python/gui/symbology-ng/qgssvgselectorwidget.sip b/python/gui/symbology-ng/qgssvgselectorwidget.sip
@@ -51,7 +51,7 @@ class QgsSvgSelectorDialog : QDialog
 #include <qgssvgselectorwidget.h>
 %End
   public:
-    QgsSvgSelectorDialog( QWidget* parent /TransferThis/ = 0, const Qt::WindowFlags& fl = QgisGui::ModalDialogFlags,
+    QgsSvgSelectorDialog( QWidget* parent /TransferThis/ = 0, const Qt::WindowFlags& fl = QgsGuiUtils::ModalDialogFlags,
                           QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Close | QDialogButtonBox::Ok,
                           Qt::Orientation orientation = Qt::Horizontal );
     ~QgsSvgSelectorDialog();

diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -1987,7 +1987,7 @@ void QgsComposer::exportCompositionAsImage( QgsComposer::OutputMode mode )
     mQgis->activateWindow();
     this->raise();
 #endif
-    QPair<QString, QString> fileNExt = QgisGui::getSaveAsImageName( this, tr( "Save composition as" ), outputFileName );
+    QPair<QString, QString> fileNExt = QgsGuiUtils::getSaveAsImageName( this, tr( "Save composition as" ), outputFileName );
     this->activateWindow();
 
     if ( fileNExt.first.isEmpty() )
@@ -3469,7 +3469,7 @@ void QgsComposer::showAdvancedEffectsWarning()
 {
   if ( ! mComposition->printAsRaster() )
   {
-    QgsMessageViewer *m = new QgsMessageViewer( this, QgisGui::ModalDialogFlags, false );
+    QgsMessageViewer *m = new QgsMessageViewer( this, QgsGuiUtils::ModalDialogFlags, false );
     m->setWindowTitle( tr( "Project contains composition effects" ) );
     m->setMessage( tr( "Advanced composition effects such as blend modes or vector layer transparency are enabled in this project, which cannot be printed as vectors. Printing as a raster is recommended." ), QgsMessageOutput::MessageText );
     m->setCheckBoxText( tr( "Print as raster" ) );

diff --git a/src/app/composer/qgscomposerattributetablewidget.cpp b/src/app/composer/qgscomposerattributetablewidget.cpp
@@ -29,7 +29,7 @@
 #include "qgsexpressionbuilderdialog.h"
 #include "qgsproject.h"
 #include "qgsrelationmanager.h"
-#include "qgisgui.h"
+#include "qgsguiutils.h"
 #include "qgscomposertablebackgroundcolorsdialog.h"
 
 QgsComposerAttributeTableWidget::QgsComposerAttributeTableWidget( QgsComposerAttributeTableV2 *table, QgsComposerFrame *frame )
@@ -244,7 +244,7 @@ void QgsComposerAttributeTableWidget::on_mHeaderFontPushButton_clicked()
     return;
 
   bool ok;
-  QFont newFont = QgisGui::getFont( ok, mComposerTable->headerFont(), tr( "Select Font" ) );
+  QFont newFont = QgsGuiUtils::getFont( ok, mComposerTable->headerFont(), tr( "Select Font" ) );
   if ( ok )
   {
     QgsComposition *composition = mComposerTable->composition();
@@ -285,7 +285,7 @@ void QgsComposerAttributeTableWidget::on_mContentFontPushButton_clicked()
   }
 
   bool ok;
-  QFont newFont = QgisGui::getFont( ok, mComposerTable->contentFont(), tr( "Select Font" ) );
+  QFont newFont = QgsGuiUtils::getFont( ok, mComposerTable->contentFont(), tr( "Select Font" ) );
   if ( ok )
   {
     QgsComposition *composition = mComposerTable->composition();

diff --git a/src/app/composer/qgscomposerlabelwidget.cpp b/src/app/composer/qgscomposerlabelwidget.cpp
@@ -20,7 +20,7 @@
 #include "qgscomposeritemwidget.h"
 #include "qgscomposition.h"
 #include "qgsexpressionbuilderdialog.h"
-#include "qgisgui.h"
+#include "qgsguiutils.h"
 
 #include <QColorDialog>
 #include <QFontDialog>
@@ -85,7 +85,7 @@ void QgsComposerLabelWidget::on_mFontButton_clicked()
   if ( mComposerLabel )
   {
     bool ok;
-    QFont newFont = QgisGui::getFont( ok, mComposerLabel->font() );
+    QFont newFont = QgsGuiUtils::getFont( ok, mComposerLabel->font() );
     if ( ok )
     {
       mComposerLabel->beginCommand( tr( "Label font changed" ) );

diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -21,7 +21,7 @@
 #include "qgscomposeritemwidget.h"
 #include "qgscomposermap.h"
 #include "qgscomposition.h"
-#include "qgisgui.h"
+#include "qgsguiutils.h"
 
 #include "qgisapp.h"
 #include "qgsapplication.h"
@@ -357,7 +357,7 @@ void QgsComposerLegendWidget::on_mTitleFontButton_clicked()
   if ( mLegend )
   {
     bool ok;
-    QFont newFont = QgisGui::getFont( ok, mLegend->style( QgsLegendStyle::Title ).font() );
+    QFont newFont = QgsGuiUtils::getFont( ok, mLegend->style( QgsLegendStyle::Title ).font() );
     if ( ok )
     {
       mLegend->beginCommand( tr( "Title font changed" ) );
@@ -374,7 +374,7 @@ void QgsComposerLegendWidget::on_mGroupFontButton_clicked()
   if ( mLegend )
   {
     bool ok;
-    QFont newFont = QgisGui::getFont( ok, mLegend->style( QgsLegendStyle::Group ).font() );
+    QFont newFont = QgsGuiUtils::getFont( ok, mLegend->style( QgsLegendStyle::Group ).font() );
     if ( ok )
     {
       mLegend->beginCommand( tr( "Legend group font changed" ) );
@@ -391,7 +391,7 @@ void QgsComposerLegendWidget::on_mLayerFontButton_clicked()
   if ( mLegend )
   {
     bool ok;
-    QFont newFont = QgisGui::getFont( ok, mLegend->style( QgsLegendStyle::Subgroup ).font() );
+    QFont newFont = QgsGuiUtils::getFont( ok, mLegend->style( QgsLegendStyle::Subgroup ).font() );
     if ( ok )
     {
       mLegend->beginCommand( tr( "Legend layer font changed" ) );
@@ -408,7 +408,7 @@ void QgsComposerLegendWidget::on_mItemFontButton_clicked()
   if ( mLegend )
   {
     bool ok;
-    QFont newFont = QgisGui::getFont( ok, mLegend->style( QgsLegendStyle::SymbolLabel ).font() );
+    QFont newFont = QgsGuiUtils::getFont( ok, mLegend->style( QgsLegendStyle::SymbolLabel ).font() );
     if ( ok )
     {
       mLegend->beginCommand( tr( "Legend item font changed" ) );

diff --git a/src/app/composer/qgscomposermapgridwidget.cpp b/src/app/composer/qgscomposermapgridwidget.cpp
@@ -1166,7 +1166,7 @@ void QgsComposerMapGridWidget::on_mAnnotationFontButton_clicked()
   }
 
   bool ok;
-  QFont newFont = QgisGui::getFont( ok, mComposerMapGrid->annotationFont() );
+  QFont newFont = QgsGuiUtils::getFont( ok, mComposerMapGrid->annotationFont() );
   if ( ok )
   {
     mComposerMap->beginCommand( tr( "Annotation font changed" ) );

diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
@@ -36,7 +36,7 @@
 #include "qgsproject.h"
 #include "qgsmapthemecollection.h"
 #include "qgsmapthemes.h"
-#include "qgisgui.h"
+#include "qgsguiutils.h"
 #include "qgscsexception.h"
 
 #include <QMessageBox>

diff --git a/src/app/composer/qgscomposerscalebarwidget.cpp b/src/app/composer/qgscomposerscalebarwidget.cpp
@@ -19,7 +19,7 @@
 #include "qgscomposermap.h"
 #include "qgscomposerscalebar.h"
 #include "qgscomposition.h"
-#include "qgisgui.h"
+#include "qgsguiutils.h"
 #include <QColorDialog>
 #include <QFontDialog>
 #include <QWidget>
@@ -250,7 +250,7 @@ void QgsComposerScaleBarWidget::on_mFontButton_clicked()
   }
 
   bool dialogAccepted;
-  QFont newFont = QgisGui::getFont( dialogAccepted, mComposerScaleBar->font() );
+  QFont newFont = QgsGuiUtils::getFont( dialogAccepted, mComposerScaleBar->font() );
   if ( dialogAccepted )
   {
     mComposerScaleBar->beginCommand( tr( "Scalebar font changed" ) );

diff --git a/src/app/ogr/qgsnewogrconnection.h b/src/app/ogr/qgsnewogrconnection.h
@@ -18,7 +18,7 @@
 #ifndef QGSNEWOGRCONNECTION_H
 #define QGSNEWOGRCONNECTION_H
 #include "ui_qgsnewogrconnectionbase.h"
-#include "qgisgui.h"
+#include "qgsguiutils.h"
 #include "qgscontexthelp.h"
 
 /** \class QgsNewOgrConnection
@@ -31,7 +31,7 @@ class QgsNewOgrConnection : public QDialog, private Ui::QgsNewOgrConnectionBase
 
   public:
     //! Constructor
-    QgsNewOgrConnection( QWidget *parent = nullptr, const QString &connType = QString::null, const QString &connName = QString::null, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
+    QgsNewOgrConnection( QWidget *parent = nullptr, const QString &connType = QString::null, const QString &connName = QString::null, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
 
     ~QgsNewOgrConnection();
     //! Tests the connection using the parameters supplied

diff --git a/src/app/ogr/qgsopenvectorlayerdialog.cpp b/src/app/ogr/qgsopenvectorlayerdialog.cpp
@@ -104,7 +104,7 @@ QStringList QgsOpenVectorLayerDialog::openFile()
   QgsDebugMsg( "Vector file filters: " + mVectorFileFilter );
   QString enc = encoding();
   QString title = tr( "Open an OGR Supported Vector Layer" );
-  QgisGui::openFilesRememberingFilter( QStringLiteral( "lastVectorFileFilter" ), mVectorFileFilter, selectedFiles, enc, title );
+  QgsGuiUtils::openFilesRememberingFilter( QStringLiteral( "lastVectorFileFilter" ), mVectorFileFilter, selectedFiles, enc, title );
 
   return selectedFiles;
 }