Replace QString::null by QString() in core (deprecated since Qt 5.9)

Author: wonder-sk

python/core/auth/qgsauthconfig.sip

@@ -218,7 +218,7 @@ class QgsPkiBundle
 
     static const QgsPkiBundle fromPemPaths( const QString &certPath,
                                             const QString &keyPath,
-                                            const QString &keyPass = QString::null,
+                                            const QString &keyPass = QString(),
                                             const QList<QSslCertificate> &caChain = QList<QSslCertificate>() );
 %Docstring
  Construct a bundle of PKI components from PEM-formatted file paths
@@ -230,7 +230,7 @@ class QgsPkiBundle
 %End
 
     static const QgsPkiBundle fromPkcs12Paths( const QString &bundlepath,
-        const QString &bundlepass = QString::null );
+        const QString &bundlepass = QString() );
 %Docstring
  Construct a bundle of PKI components from a PKCS#12 file path
  \param bundlepath Bundle file path

python/core/auth/qgsauthmanager.sip

@@ -61,7 +61,7 @@ Name of the authentication database table that stores server exceptions/configs
  :rtype: str
 %End
 
-    bool init( const QString &pluginPath = QString::null );
+    bool init( const QString &pluginPath = QString() );
 %Docstring
 Initialize QCA, prioritize qca-ossl plugin and optionally set up the authentication database
  :rtype: bool
@@ -107,7 +107,7 @@ Standard message for when QCA's qca-ossl plugin is missing and system is disable
  :rtype: bool
 %End
 
-    bool verifyMasterPassword( const QString &compare = QString::null );
+    bool verifyMasterPassword( const QString &compare = QString() );
 %Docstring
  Verify the supplied master password against any existing hash in authentication database
 .. note::

python/core/qgscredentials.sip

@@ -31,7 +31,7 @@ class QgsCredentials
 
     virtual ~QgsCredentials();
 
-    bool get( const QString &realm, QString &username /In,Out/, QString &password /In,Out/, const QString &message = QString::null );
+    bool get( const QString &realm, QString &username /In,Out/, QString &password /In,Out/, const QString &message = QString() );
 %Docstring
  :rtype: bool
 %End
@@ -72,7 +72,7 @@ retrieves instance
   protected:
     QgsCredentials();
 
-    virtual bool request( const QString &realm, QString &username /In,Out/, QString &password /In,Out/, const QString &message = QString::null ) = 0;
+    virtual bool request( const QString &realm, QString &username /In,Out/, QString &password /In,Out/, const QString &message = QString() ) = 0;
 %Docstring
 request a password
  :rtype: bool
@@ -115,7 +115,7 @@ signals that object will be destroyed and shouldn't be used anymore
 %End
 
   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 );
 };
 
@@ -143,7 +143,7 @@ signals that object will be destroyed and shouldn't be used anymore
 %End
 
   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 );
 };
 

python/core/qgsdataitem.sip

@@ -447,7 +447,7 @@ class QgsDataCollectionItem : QgsDataItem
 #include "qgsdataitem.h"
 %End
   public:
-    QgsDataCollectionItem( QgsDataItem *parent, const QString &name, const QString &path = QString::null );
+    QgsDataCollectionItem( QgsDataItem *parent, const QString &name, const QString &path = QString() );
     ~QgsDataCollectionItem();
 
     void addChild( QgsDataItem *item /Transfer/ );

python/core/qgserror.sip

@@ -28,7 +28,7 @@ class QgsErrorMessage
 
     QgsErrorMessage();
 
-    QgsErrorMessage( const QString &message, const QString &tag = QString::null, const QString &file = QString::null, const QString &function = QString::null, int line = 0 );
+    QgsErrorMessage( const QString &message, const QString &tag = QString(), const QString &file = QString(), const QString &function = QString(), int line = 0 );
 %Docstring
  Constructor.
   \param message error message string

python/core/qgsmultirenderchecker.sip

@@ -60,7 +60,7 @@ class QgsMultiRenderChecker
 
     void setRenderedImage( const QString &renderedImagePath );
 %Docstring
- Set the path to the rendered image. If this is not set or set to QString.Null, an image
+ Set the path to the rendered image. If this is not set or set to null QString, an image
  will be rendered based on the provided mapsettings
 
  \param renderedImagePath A path to the rendered image with which control images will be compared

python/core/qgsproject.sip

@@ -268,7 +268,7 @@ Returns the QgsProject singleton instance
  :rtype: list of str
 %End
 
-    QString readEntry( const QString &scope, const QString &key, const QString &def = QString::null, bool *ok = 0 ) const;
+    QString readEntry( const QString &scope, const QString &key, const QString &def = QString(), bool *ok = 0 ) const;
 %Docstring
  :rtype: str
 %End
@@ -411,7 +411,7 @@ Convenience function to query topological editing status
     QString homePath() const;
 %Docstring
  Return project's home path
-:return: home path of project (or QString.null if not set) *
+:return: home path of project (or null QString if not set) *
  :rtype: str
 %End
 

python/core/qgsproviderregistry.sip

@@ -42,7 +42,7 @@ class QgsProviderRegistry
       Manager,
     };
 
-    static QgsProviderRegistry *instance( const QString &pluginPath = QString::null );
+    static QgsProviderRegistry *instance( const QString &pluginPath = QString() );
 %Docstring
 Means of accessing canonical single instance
  :rtype: QgsProviderRegistry

python/core/qgsvectorlayer.sip

@@ -890,7 +890,7 @@ Return the provider type for this layer
     virtual QString subsetString() const;
 %Docstring
  Get the string (typically sql) used to define a subset of the layer
- :return: The subset string or QString.null if not implemented by the provider
+ :return: The subset string or null QString if not implemented by the provider
  :rtype: str
 %End
 

src/core/auth/qgsauthconfig.cpp

@@ -299,7 +299,7 @@ const QString QgsPkiBundle::certId() const
 {
   if ( mCert.isNull() )
   {
-    return QString::null;
+    return QString();
   }
   return QString( mCert.digest( QCryptographicHash::Sha1 ).toHex() );
 }