Skip to content
Permalink
Browse files

Replace QString::null with QString()

Deprecated sind Qt 5.9
  • Loading branch information
m-kuhn committed Jun 16, 2017
1 parent a77f791 commit cb1f98f0201900bc410de23c6308e03e28f0e203
Showing with 130 additions and 130 deletions.
  1. +1 −1 python/gui/qgscredentialdialog.sip
  2. +1 −1 python/gui/qgsfilterlineedit.sip
  3. +1 −1 python/gui/qgsnewhttpconnection.sip
  4. +1 −1 python/gui/qgsnewnamedialog.sip
  5. +1 −1 python/gui/qgsnewvectorlayerdialog.sip
  6. +1 −1 src/app/composer/qgscomposer.cpp
  7. +1 −1 src/app/nodetool/qgsvertexentry.h
  8. +1 −1 src/app/ogr/qgsnewogrconnection.h
  9. +1 −1 src/app/ogr/qgsopenvectorlayerdialog.cpp
  10. +9 −9 src/app/qgisapp.cpp
  11. +1 −1 src/app/qgisapp.h
  12. +1 −1 src/app/qgscrashreport.cpp
  13. +1 −1 src/app/qgshandlebadlayers.cpp
  14. +1 −1 src/app/qgsjoindialog.cpp
  15. +5 −5 src/app/qgsmaptoolpinlabels.cpp
  16. +2 −2 src/app/qgsprojectproperties.cpp
  17. +1 −1 src/gui/auth/qgsauthimportidentitydialog.cpp
  18. +2 −2 src/gui/qgsattributeform.cpp
  19. +1 −1 src/gui/qgscredentialdialog.h
  20. +1 −1 src/gui/qgsfilterlineedit.cpp
  21. +2 −2 src/gui/qgsfilterlineedit.h
  22. +2 −2 src/gui/qgsguiutils.cpp
  23. +1 −1 src/gui/qgsguiutils.h
  24. +1 −1 src/gui/qgsmessagebar.h
  25. +1 −1 src/gui/qgsnewhttpconnection.h
  26. +1 −1 src/gui/qgsnewnamedialog.h
  27. +3 −3 src/gui/qgsnewvectorlayerdialog.cpp
  28. +1 −1 src/gui/qgsnewvectorlayerdialog.h
  29. +1 −1 src/gui/qgsprojectionselectiontreewidget.cpp
  30. +1 −1 src/gui/qgsprojectionselectiontreewidget.h
  31. +1 −1 src/providers/db2/qgsdb2dataitems.cpp
  32. +1 −1 src/providers/db2/qgsdb2geometrycolumns.cpp
  33. +1 −1 src/providers/db2/qgsdb2newconnection.h
  34. +4 −4 src/providers/db2/qgsdb2tablemodel.cpp
  35. +1 −1 src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp
  36. +2 −2 src/providers/grass/qgsgrass.cpp
  37. +3 −3 src/providers/grass/qgsgrass.h
  38. +1 −1 src/providers/grass/qgsgrassprovidermodule.h
  39. +2 −2 src/providers/mssql/qgsmssqldataitems.cpp
  40. +1 −1 src/providers/mssql/qgsmssqlnewconnection.h
  41. +2 −2 src/providers/mssql/qgsmssqlprovider.cpp
  42. +4 −4 src/providers/mssql/qgsmssqltablemodel.cpp
  43. +2 −2 src/providers/ogr/qgsogrprovider.cpp
  44. +7 −7 src/providers/oracle/qgsoracleconn.cpp
  45. +2 −2 src/providers/oracle/qgsoracledataitems.cpp
  46. +1 −1 src/providers/oracle/qgsoraclenewconnection.h
  47. +9 −9 src/providers/oracle/qgsoracleprovider.cpp
  48. +1 −1 src/providers/oracle/qgsoracleprovider.h
  49. +4 −4 src/providers/oracle/qgsoracletablemodel.cpp
  50. +1 −1 src/providers/postgres/qgspgnewconnection.h
  51. +4 −4 src/providers/postgres/qgspgtablemodel.cpp
  52. +7 −7 src/providers/postgres/qgspostgresconn.cpp
  53. +3 −3 src/providers/postgres/qgspostgresdataitems.cpp
  54. +6 −6 src/providers/postgres/qgspostgresprovider.cpp
  55. +2 −2 src/providers/spatialite/qgsspatialiteprovider.cpp
  56. +1 −1 src/providers/wcs/qgswcsprovider.cpp
  57. +1 −1 src/providers/wcs/qgswcsprovider.h
  58. +4 −4 src/providers/wms/qgswmscapabilities.cpp
  59. +1 −1 src/providers/wms/qgswmscapabilities.h
  60. +1 −1 src/providers/wms/qgswmsprovider.cpp
  61. +1 −1 src/providers/wms/qgswmsprovider.h
  62. +1 −1 src/server/services/wms/qgswmsrenderer.cpp
@@ -27,7 +27,7 @@ QgsCredentialDialog constructor


protected:
virtual bool request( const QString &realm, QString &username /In,Out/, QString &password /In,Out/, const QString &message = QString::null );
virtual bool request( const QString &realm, QString &username /In,Out/, QString &password /In,Out/, const QString &message = QString() );

virtual bool requestMasterPassword( QString &password /In,Out/, bool stored = false );

@@ -41,7 +41,7 @@ class QgsFilterLineEdit : QLineEdit
ClearToDefault,
};

QgsFilterLineEdit( QWidget *parent /TransferThis/ = 0, const QString &nullValue = QString::null );
QgsFilterLineEdit( QWidget *parent /TransferThis/ = 0, const QString &nullValue = QString() );
%Docstring
Constructor for QgsFilterLineEdit.
\param parent parent widget
@@ -19,7 +19,7 @@ class QgsNewHttpConnection : QDialog
#include "qgsnewhttpconnection.h"
%End
public:
QgsNewHttpConnection( QWidget *parent /TransferThis/ = 0, const QString &baseKey = "qgis/connections-wms/", const QString &connName = QString::null, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
QgsNewHttpConnection( QWidget *parent /TransferThis/ = 0, const QString &baseKey = "qgis/connections-wms/", const QString &connName = QString(), Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
%Docstring
Constructor
%End
@@ -22,7 +22,7 @@ class QgsNewNameDialog : QgsDialog
%End
public:

QgsNewNameDialog( const QString &source = QString::null, const QString &initial = QString::null,
QgsNewNameDialog( const QString &source = QString(), const QString &initial = QString(),
const QStringList &extensions = QStringList(), const QStringList &existing = QStringList(),
const QRegExp &regexp = QRegExp(), Qt::CaseSensitivity cs = Qt::CaseSensitive,
QWidget *parent /TransferThis/ = 0, Qt::WindowFlags flags = QgsGuiUtils::ModalDialogFlags );
@@ -20,7 +20,7 @@ class QgsNewVectorLayerDialog: QDialog
static QString runAndCreateLayer( QWidget *parent = 0, QString *enc = 0, const QgsCoordinateReferenceSystem &crs = QgsCoordinateReferenceSystem() );
%Docstring
Runs the dialog and creates a layer matching the dialog parameters.
:return: fileName on success, empty string use aborted, QString.null if creation failed
:return: fileName on success, empty string use aborted, QString() if creation failed
:rtype: str
%End

@@ -1975,7 +1975,7 @@ void QgsComposer::exportCompositionAsImage( QgsComposer::OutputMode mode )
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
if ( mode == QgsComposer::Single )
{
QString outputFileName = QString::null;
QString outputFileName = QString();

if ( atlasMap->enabled() && mComposition->atlasMode() == QgsComposition::PreviewAtlas )
{
@@ -38,7 +38,7 @@ class QgsVertexEntry
QgsMapLayer *layer,
const QgsPoint &p,
QgsVertexId vertexId,
const QString &tooltip = QString::null,
const QString &tooltip = QString(),
QgsVertexMarker::IconType type = QgsVertexMarker::ICON_BOX,
int penWidth = 2 );
~QgsVertexEntry();
@@ -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 = QgsGuiUtils::ModalDialogFlags );
QgsNewOgrConnection( QWidget *parent = nullptr, const QString &connType = QString(), const QString &connName = QString(), Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );

~QgsNewOgrConnection();
//! Tests the connection using the parameters supplied
@@ -339,7 +339,7 @@ void QgsOpenVectorLayerDialog::accept()
pass = QInputDialog::getText( this,
tr( "Password for " ) + user,
tr( "Please enter your password:" ),
QLineEdit::Password, QString::null,
QLineEdit::Password, QString(),
&makeConnection );
}

@@ -536,7 +536,7 @@ void QgisApp::activeLayerChanged( QgsMapLayer *layer )
*/
void QgisApp::validateCrs( QgsCoordinateReferenceSystem &srs )
{
static QString sAuthId = QString::null;
static QString sAuthId = QString();
QgsSettings mySettings;
QString myDefaultProjectionOption = mySettings.value( QStringLiteral( "Projections/defaultBehavior" ), "prompt" ).toString();
if ( myDefaultProjectionOption == QLatin1String( "prompt" ) )
@@ -962,7 +962,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
QString caption = tr( "QGIS - %1 ('%2')" ).arg( Qgis::QGIS_VERSION, Qgis::QGIS_RELEASE_NAME );
setWindowTitle( caption );

QgsMessageLog::logMessage( tr( "QGIS starting..." ), QString::null, QgsMessageLog::INFO );
QgsMessageLog::logMessage( tr( "QGIS starting..." ), QString(), QgsMessageLog::INFO );

// set QGIS specific srs validation
connect( this, &QgisApp::customCrsValidation,
@@ -1081,9 +1081,9 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh

mSplash->showMessage( tr( "QGIS Ready!" ), Qt::AlignHCenter | Qt::AlignBottom );

QgsMessageLog::logMessage( QgsApplication::showSettings(), QString::null, QgsMessageLog::INFO );
QgsMessageLog::logMessage( QgsApplication::showSettings(), QString(), QgsMessageLog::INFO );

QgsMessageLog::logMessage( tr( "QGIS Ready!" ), QString::null, QgsMessageLog::INFO );
QgsMessageLog::logMessage( tr( "QGIS Ready!" ), QString(), QgsMessageLog::INFO );

mMapTipsVisible = false;
// This turns on the map tip if they where active in the last session
@@ -5206,7 +5206,7 @@ bool QgisApp::addProject( const QString &projectFile )
// does the project have any macros?
if ( mPythonUtils && mPythonUtils->isEnabled() )
{
if ( !QgsProject::instance()->readEntry( QStringLiteral( "Macros" ), QStringLiteral( "/pythonCode" ), QString::null ).isEmpty() )
if ( !QgsProject::instance()->readEntry( QStringLiteral( "Macros" ), QStringLiteral( "/pythonCode" ), QString() ).isEmpty() )
{
int enableMacros = settings.value( QStringLiteral( "qgis/enableMacros" ), 1 ).toInt();
// 0 = never, 1 = ask, 2 = just for this session, 3 = always
@@ -9336,7 +9336,7 @@ void QgisApp::loadPythonSupport()
// init python runner
QgsPythonRunner::setInstance( new QgsPythonRunnerImpl( mPythonUtils ) );

QgsMessageLog::logMessage( tr( "Python support ENABLED :-) " ), QString::null, QgsMessageLog::INFO );
QgsMessageLog::logMessage( tr( "Python support ENABLED :-) " ), QString(), QgsMessageLog::INFO );
}
#endif
}
@@ -11895,7 +11895,7 @@ void QgisApp::projectChanged( const QDomDocument &doc )
if ( !fi.exists() )
return;

static QString sPrevProjectDir = QString::null;
static QString sPrevProjectDir = QString();

if ( sPrevProjectDir == fi.canonicalPath() )
return;
@@ -12175,7 +12175,7 @@ void QgisApp::namAuthenticationRequired( QNetworkReply *inReply, QAuthenticator
QMutexLocker lock( QgsCredentials::instance()->mutex() );
QgsCredentials::instance()->put(
QStringLiteral( "%1 at %2" ).arg( auth->realm(), reply->url().host() ),
username, QString::null );
username, QString() );
}
}

@@ -12227,7 +12227,7 @@ void QgisApp::namProxyAuthenticationRequired( const QNetworkProxy &proxy, QAuthe
QMutexLocker lock( QgsCredentials::instance()->mutex() );
QgsCredentials::instance()->put(
QStringLiteral( "proxy %1:%2 [%3]" ).arg( proxy.hostName() ).arg( proxy.port() ).arg( auth->realm() ),
username, QString::null );
username, QString() );
}
}

@@ -321,7 +321,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
/** Get a unique title from user for new and duplicate composers
* \param acceptEmpty whether to accept empty titles (one will be generated)
* \param currentTitle base name for initial title choice
* \returns QString::null if user cancels input dialog
* \returns QString() if user cancels input dialog
*/
bool uniqueComposerTitle( QWidget *parent, QString &composerTitle, bool acceptEmpty, const QString &currentTitle = QString() );
//! Creates a new composer and returns a pointer to it
@@ -116,7 +116,7 @@ const QString QgsCrashReport::crashID() const
if ( mStackTrace.isEmpty() )
return "ID not generated due to missing information\n\n Your version of QGIS install might not have debug information included.";

QString data = QString::null;
QString data = QString();

// Hashes the full stack.
Q_FOREACH ( const QgsStackTrace::StackLine &line, mStackTrace )
@@ -203,7 +203,7 @@ QString QgsHandleBadLayers::filename( int row )
return datasource;
}

return QString::null;
return QString();
}

void QgsHandleBadLayers::setFilename( int row, const QString &filename )
@@ -114,7 +114,7 @@ QgsVectorLayerJoinInfo QgsJoinDialog::joinInfo() const
if ( mUseCustomPrefix->isChecked() )
info.setPrefix( mCustomPrefix->text() );
else
info.setPrefix( QString::null );
info.setPrefix( QString() );

if ( mUseJoinFieldsSubset->isChecked() )
{
@@ -381,12 +381,12 @@ bool QgsMapToolPinLabels::pinUnpinCurrentLabel( bool pin )
else
{
vlayer->beginEditCommand( tr( "Unpinned label" ) + QStringLiteral( " '%1'" ).arg( labelText ) );
writeFailed = !vlayer->changeAttributeValue( fid, xCol, QVariant( QString::null ) );
if ( !vlayer->changeAttributeValue( fid, yCol, QVariant( QString::null ) ) )
writeFailed = !vlayer->changeAttributeValue( fid, xCol, QVariant( QString() ) );
if ( !vlayer->changeAttributeValue( fid, yCol, QVariant( QString() ) ) )
writeFailed = true;
if ( hasRCol && !preserveRot )
{
if ( !vlayer->changeAttributeValue( fid, rCol, QVariant( QString::null ) ) )
if ( !vlayer->changeAttributeValue( fid, rCol, QVariant( QString() ) ) )
writeFailed = true;
}
vlayer->endEditCommand();
@@ -467,8 +467,8 @@ bool QgsMapToolPinLabels::pinUnpinCurrentDiagram( bool pin )
else
{
vlayer->beginEditCommand( tr( "Unpinned diagram" ) + QStringLiteral( " '%1'" ).arg( labelText ) );
writeFailed = !vlayer->changeAttributeValue( fid, xCol, QVariant( QString::null ) );
if ( !vlayer->changeAttributeValue( fid, yCol, QVariant( QString::null ) ) )
writeFailed = !vlayer->changeAttributeValue( fid, xCol, QVariant( QString() ) );
if ( !vlayer->changeAttributeValue( fid, yCol, QVariant( QString() ) ) )
writeFailed = true;
vlayer->endEditCommand();
}
@@ -680,7 +680,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa


// Project macros
QString pythonMacros = QgsProject::instance()->readEntry( QStringLiteral( "Macros" ), QStringLiteral( "/pythonCode" ), QString::null );
QString pythonMacros = QgsProject::instance()->readEntry( QStringLiteral( "Macros" ), QStringLiteral( "/pythonCode" ), QString() );
grpPythonMacros->setChecked( !pythonMacros.isEmpty() );
if ( !pythonMacros.isEmpty() )
{
@@ -1144,7 +1144,7 @@ void QgsProjectProperties::apply()
QString pythonMacros = ptePythonMacros->text();
if ( !grpPythonMacros->isChecked() || pythonMacros.isEmpty() )
{
pythonMacros = QString::null;
pythonMacros = QString();
resetPythonMacros();
}
QgsProject::instance()->writeEntry( QStringLiteral( "Macros" ), QStringLiteral( "/pythonCode" ), pythonMacros );
@@ -367,7 +367,7 @@ bool QgsAuthImportIdentityDialog::validatePkiPkcs12()

// load the bundle
QCA::SecureArray passarray;
QString keypass = QString::null;
QString keypass = QString();
if ( !lePkiPkcs12KeyPass->text().isEmpty() )
{
passarray = QCA::SecureArray( lePkiPkcs12KeyPass->text().toUtf8() );
@@ -1569,7 +1569,7 @@ QgsAttributeForm::WidgetInfo QgsAttributeForm::createWidgetFromDef( const QgsAtt
rww->setShowLinkButton( relDef->showLinkButton() );
rww->setShowUnlinkButton( relDef->showUnlinkButton() );
mWidgets.append( rww );
newWidgetInfo.labelText = QString::null;
newWidgetInfo.labelText = QString();
newWidgetInfo.labelOnTop = true;
break;
}
@@ -1674,7 +1674,7 @@ QgsAttributeForm::WidgetInfo QgsAttributeForm::createWidgetFromDef( const QgsAtt
gbLayout->addWidget( spacer, ++row, 0 );
gbLayout->setRowStretch( row, 1 );

newWidgetInfo.labelText = QString::null;
newWidgetInfo.labelText = QString();
newWidgetInfo.labelOnTop = true;
break;
}
@@ -57,7 +57,7 @@ class GUI_EXPORT QgsCredentialDialog : public QDialog, public QgsCredentials, pr
void on_chkbxEraseAuthDb_toggled( bool checked );

protected:
virtual bool request( const QString &realm, QString &username SIP_INOUT, QString &password SIP_INOUT, const QString &message = QString::null ) override;
virtual bool request( const QString &realm, QString &username SIP_INOUT, QString &password SIP_INOUT, const QString &message = QString() ) override;

virtual bool requestMasterPassword( QString &password SIP_INOUT, bool stored = false ) override;

@@ -174,7 +174,7 @@ void QgsFilterLineEdit::onTextChanged( const QString &text )
if ( isNull() )
{
setStyleSheet( QStringLiteral( "QLineEdit { font: italic; color: gray; } %1" ).arg( mStyleSheet ) );
emit valueChanged( QString::null );
emit valueChanged( QString() );
}
else
{
@@ -68,7 +68,7 @@ class GUI_EXPORT QgsFilterLineEdit : public QLineEdit
* \param parent parent widget
* \param nullValue string for representing null values
*/
QgsFilterLineEdit( QWidget *parent SIP_TRANSFERTHIS = 0, const QString &nullValue = QString::null );
QgsFilterLineEdit( QWidget *parent SIP_TRANSFERTHIS = 0, const QString &nullValue = QString() );

/** Returns true if the widget's clear button is visible.
* \see setShowClearButton()
@@ -160,7 +160,7 @@ class GUI_EXPORT QgsFilterLineEdit : public QLineEdit
* \returns Current text (or null string if it matches the nullValue() property )
* \see setValue()
*/
QString value() const { return isNull() ? QString::null : text(); }
QString value() const { return isNull() ? QString() : text(); }

/**
* Determine if the current text represents null.
@@ -132,7 +132,7 @@ namespace QgsGuiUtils

if ( !outputFileName.isNull() )
{
ext = filterMap.value( selectedFilter, QString::null );
ext = filterMap.value( selectedFilter, QString() );
if ( !ext.isNull() )
settings.setValue( QStringLiteral( "UI/lastSaveAsImageFilter" ), selectedFilter );
settings.setValue( QStringLiteral( "UI/lastSaveAsImageDir" ), QFileInfo( outputFileName ).absolutePath() );
@@ -160,7 +160,7 @@ namespace QgsGuiUtils

selectedFilter = fileDialog->selectedFilter();
QgsDebugMsg( "Selected filter: " + selectedFilter );
ext = filterMap.value( selectedFilter, QString::null );
ext = filterMap.value( selectedFilter, QString() );

if ( !ext.isNull() )
settings.setValue( "/UI/lastSaveAsImageFilter", selectedFilter );
@@ -100,7 +100,7 @@ namespace QgsGuiUtils
* \returns QPair<QString, QString> where first is the file name and second is
* the file type
*/
QPair<QString, QString> GUI_EXPORT getSaveAsImageName( QWidget *parent, const QString &message, const QString &defaultFilename = QString::null );
QPair<QString, QString> GUI_EXPORT getSaveAsImageName( QWidget *parent, const QString &message, const QString &defaultFilename = QString() );

/**
Convenience function for readily creating file filters.
@@ -88,7 +88,7 @@ class GUI_EXPORT QgsMessageBar: public QFrame
static QgsMessageBarItem *createMessage( QWidget *widget, QWidget *parent = nullptr ) SIP_FACTORY;

//! convenience method for pushing a message to the bar
void pushMessage( const QString &text, MessageLevel level = INFO, int duration = 5 ) { return pushMessage( QString::null, text, level, duration ); }
void pushMessage( const QString &text, MessageLevel level = INFO, int duration = 5 ) { return pushMessage( QString(), text, level, duration ); }
//! convenience method for pushing a message with title to the bar
void pushMessage( const QString &title, const QString &text, MessageLevel level = INFO, int duration = 5 );

@@ -33,7 +33,7 @@ class GUI_EXPORT QgsNewHttpConnection : public QDialog, private Ui::QgsNewHttpCo

public:
//! Constructor
QgsNewHttpConnection( QWidget *parent SIP_TRANSFERTHIS = nullptr, const QString &baseKey = "qgis/connections-wms/", const QString &connName = QString::null, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
QgsNewHttpConnection( QWidget *parent SIP_TRANSFERTHIS = nullptr, const QString &baseKey = "qgis/connections-wms/", const QString &connName = QString(), Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );

public slots:
// Saves the connection to ~/.qt/qgisrc
@@ -43,7 +43,7 @@ class GUI_EXPORT QgsNewNameDialog : public QgsDialog
* \param parent
* \param flags
*/
QgsNewNameDialog( const QString &source = QString::null, const QString &initial = QString::null,
QgsNewNameDialog( const QString &source = QString(), const QString &initial = QString(),
const QStringList &extensions = QStringList(), const QStringList &existing = QStringList(),
const QRegExp &regexp = QRegExp(), Qt::CaseSensitivity cs = Qt::CaseSensitive,
QWidget *parent SIP_TRANSFERTHIS = nullptr, Qt::WindowFlags flags = QgsGuiUtils::ModalDialogFlags );
@@ -283,19 +283,19 @@ QString QgsNewVectorLayerDialog::runAndCreateLayer( QWidget *parent, QString *pE
QgsCoordinateReferenceSystem srs = geomDialog.crs();
if ( !createEmptyDataSource( fileName, fileformat, enc, geometrytype, attributes, srs ) )
{
return QString::null;
return QString();
}
}
else
{
QgsDebugMsg( "geometry type not recognised" );
return QString::null;
return QString();
}
}
else
{
QgsDebugMsg( "Resolving newEmptyDataSource(...) failed" );
return QString::null;
return QString();
}
}

@@ -35,7 +35,7 @@ class GUI_EXPORT QgsNewVectorLayerDialog: public QDialog, private Ui::QgsNewVect

/**
* Runs the dialog and creates a layer matching the dialog parameters.
* \returns fileName on success, empty string use aborted, QString::null if creation failed
* \returns fileName on success, empty string use aborted, QString() if creation failed
*/
static QString runAndCreateLayer( QWidget *parent = nullptr, QString *enc = nullptr, const QgsCoordinateReferenceSystem &crs = QgsCoordinateReferenceSystem() );

@@ -267,7 +267,7 @@ QString QgsProjectionSelectionTreeWidget::selectedName()
{
// return the selected wkt name from the list view
QTreeWidgetItem *lvi = lstCoordinateSystems->currentItem();
return lvi ? lvi->text( NameColumn ) : QString::null;
return lvi ? lvi->text( NameColumn ) : QString();
}

void QgsProjectionSelectionTreeWidget::setCrs( const QgsCoordinateReferenceSystem &crs )

0 comments on commit cb1f98f

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