Skip to content
Permalink
Browse files
Rename QgisGui to QgsGuiUtils
Better reflects what this namespace contains, and replaces the
non-standard Qgis prefix with the Qgs standard
  • Loading branch information
nyalldawson committed May 14, 2017
1 parent 436844b commit ac943453318daeb02e25b63e9d98ffa74c601224
Showing with 203 additions and 203 deletions.
  1. +1 −1 cmake/FindQGIS.cmake
  2. +1 −0 doc/api_break.dox
  3. +1 −1 python/gui/qgsbusyindicatordialog.sip
  4. +1 −1 python/gui/qgscharacterselectdialog.sip
  5. +1 −1 python/gui/qgscolordialog.sip
  6. +1 −1 python/gui/qgscredentialdialog.sip
  7. +1 −1 python/gui/qgsdialog.sip
  8. +2 −2 python/gui/qgserrordialog.sip
  9. +1 −1 python/gui/qgsgroupwmsdatadialog.sip
  10. +1 −1 python/gui/qgsludialog.sip
  11. +1 −1 python/gui/qgsmessagelogviewer.sip
  12. +1 −1 python/gui/qgsmessageviewer.sip
  13. +1 −1 python/gui/qgsnewgeopackagelayerdialog.sip
  14. +1 −1 python/gui/qgsnewhttpconnection.sip
  15. +1 −1 python/gui/qgsnewmemorylayerdialog.sip
  16. +1 −1 python/gui/qgsnewnamedialog.sip
  17. +1 −1 python/gui/qgsnewvectorlayerdialog.sip
  18. +1 −1 python/gui/qgsowssourceselect.sip
  19. +1 −1 python/gui/qgsprojectionselectiondialog.sip
  20. +1 −1 python/gui/qgsquerybuilder.sip
  21. +1 −1 python/gui/qgssearchquerybuilder.sip
  22. +1 −1 python/gui/qgstextformatwidget.sip
  23. +1 −1 python/gui/symbology-ng/qgssvgselectorwidget.sip
  24. +2 −2 src/app/composer/qgscomposer.cpp
  25. +3 −3 src/app/composer/qgscomposerattributetablewidget.cpp
  26. +2 −2 src/app/composer/qgscomposerlabelwidget.cpp
  27. +5 −5 src/app/composer/qgscomposerlegendwidget.cpp
  28. +1 −1 src/app/composer/qgscomposermapgridwidget.cpp
  29. +1 −1 src/app/composer/qgscomposermapwidget.cpp
  30. +2 −2 src/app/composer/qgscomposerscalebarwidget.cpp
  31. +2 −2 src/app/ogr/qgsnewogrconnection.h
  32. +1 −1 src/app/ogr/qgsopenvectorlayerdialog.cpp
  33. +2 −2 src/app/pluginmanager/qgspluginmanager.h
  34. +5 −5 src/app/qgisapp.cpp
  35. +3 −3 src/app/qgsaddattrdialog.h
  36. +1 −1 src/app/qgsaddtaborgroup.h
  37. +2 −2 src/app/qgsdecorationgriddialog.cpp
  38. +2 −2 src/app/qgsdiagramproperties.cpp
  39. +2 −2 src/app/qgshandlebadlayers.cpp
  40. +1 −1 src/app/qgsloadstylefromdbdialog.h
  41. +2 −2 src/app/qgsmapcanvasdockwidget.cpp
  42. +2 −2 src/app/qgsnewspatialitelayerdialog.h
  43. +2 −2 src/app/qgsoptions.cpp
  44. +2 −2 src/app/qgsoptions.h
  45. +2 −2 src/app/qgsprojectproperties.h
  46. +2 −2 src/app/qgsrasterlayerproperties.h
  47. +1 −1 src/app/qgssavestyletodbdialog.h
  48. +3 −3 src/app/qgsstatusbarmagnifierwidget.cpp
  49. +2 −2 src/app/qgsvectorlayerproperties.h
  50. +0 −1 src/core/qgscoordinatereferencesystem.h
  51. +2 −2 src/gui/CMakeLists.txt
  52. +2 −2 src/gui/qgsbusyindicatordialog.h
  53. +2 −2 src/gui/qgscharacterselectdialog.h
  54. +1 −1 src/gui/qgscolordialog.h
  55. +1 −1 src/gui/qgscompoundcolorwidget.h
  56. +2 −2 src/gui/qgscredentialdialog.h
  57. +2 −2 src/gui/qgsdialog.h
  58. +3 −3 src/gui/qgserrordialog.h
  59. +2 −2 src/gui/qgsgroupwmsdatadialog.h
  60. +3 −3 src/gui/{qgisgui.cpp → qgsguiutils.cpp}
  61. +8 −8 src/gui/{qgisgui.h → qgsguiutils.h}
  62. +2 −2 src/gui/qgsludialog.h
  63. +2 −2 src/gui/qgsmapcanvas.cpp
  64. +1 −1 src/gui/qgsmessagebar.h
  65. +2 −2 src/gui/qgsmessagelogviewer.h
  66. +2 −2 src/gui/qgsmessageviewer.h
  67. +2 −2 src/gui/qgsnewgeopackagelayerdialog.h
  68. +2 −2 src/gui/qgsnewhttpconnection.h
  69. +2 −2 src/gui/qgsnewmemorylayerdialog.h
  70. +1 −1 src/gui/qgsnewnamedialog.h
  71. +2 −2 src/gui/qgsnewvectorlayerdialog.h
  72. +1 −1 src/gui/qgsoptionsdialogbase.h
  73. +2 −2 src/gui/qgsowssourceselect.h
  74. +2 −2 src/gui/qgsprojectionselectiondialog.h
  75. +2 −2 src/gui/qgsquerybuilder.h
  76. +2 −2 src/gui/qgssearchquerybuilder.h
  77. +2 −2 src/gui/qgssqlcomposerdialog.h
  78. +2 −2 src/gui/qgstextformatwidget.h
  79. +2 −2 src/gui/raster/qgsrasterhistogramwidget.cpp
  80. +1 −1 src/gui/symbology-ng/qgspointclusterrendererwidget.cpp
  81. +2 −2 src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
  82. +2 −2 src/gui/symbology-ng/qgssvgselectorwidget.h
  83. +1 −1 src/plugins/compass/qgscompassplugin.cpp
  84. +1 −1 src/plugins/coordinate_capture/coordinatecapture.cpp
  85. +3 −3 src/plugins/evis/evis.cpp
  86. +2 −2 src/plugins/globe/globe_plugin.cpp
  87. +2 −2 src/plugins/gps_importer/qgsgpsdevicedialog.cpp
  88. +2 −2 src/plugins/gps_importer/qgsgpsplugin.cpp
  89. +3 −3 src/plugins/offline_editing/offline_editing_plugin.cpp
  90. +2 −2 src/plugins/plugin_template/plugin.cpp
  91. +1 −1 src/plugins/topology/topol.cpp
  92. +2 −2 src/providers/db2/qgsdb2newconnection.h
  93. +2 −2 src/providers/db2/qgsdb2sourceselect.h
  94. +2 −2 src/providers/delimitedtext/qgsdelimitedtextsourceselect.h
  95. +2 −2 src/providers/mssql/qgsmssqlnewconnection.h
  96. +2 −2 src/providers/mssql/qgsmssqlsourceselect.h
  97. +2 −2 src/providers/oracle/qgsoraclenewconnection.h
  98. +2 −2 src/providers/oracle/qgsoraclesourceselect.h
  99. +2 −2 src/providers/postgres/qgspgnewconnection.h
  100. +2 −2 src/providers/postgres/qgspgsourceselect.h
  101. +2 −2 src/providers/spatialite/qgsspatialitesourceselect.h
  102. +2 −2 src/providers/virtual/qgsvirtuallayersourceselect.h
  103. +2 −2 src/providers/wcs/qgswcssourceselect.h
  104. +2 −2 src/providers/wms/qgswmssourceselect.h
  105. +1 −1 src/providers/wms/qgswmtsdimensions.h
  106. +3 −3 tests/src/gui/testqgsgui.cpp
  107. +1 −1 tests/src/gui/testqgsmaptooledit.cpp
  108. +10 −10 tests/src/python/acceptable_missing_doc.py
@@ -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
@@ -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
@@ -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;
@@ -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:
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 );
@@ -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.
@@ -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 );
@@ -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();

@@ -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:
@@ -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;
@@ -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).
@@ -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;
@@ -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();

@@ -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();
@@ -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();

@@ -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();

@@ -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();

@@ -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();
@@ -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" ) );
@@ -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();
@@ -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" ) );
@@ -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" ) );
@@ -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" ) );
@@ -36,7 +36,7 @@
#include "qgsproject.h"
#include "qgsmapthemecollection.h"
#include "qgsmapthemes.h"
#include "qgisgui.h"
#include "qgsguiutils.h"
#include "qgscsexception.h"

#include <QMessageBox>
@@ -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" ) );
@@ -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
@@ -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;
}

0 comments on commit ac94345

Please sign in to comment.