Use Q_GLOBAL_STATIC

qgis · Nov 2, 2019 · 179fcf3 · 179fcf3
1 parent c86ed78
commit 179fcf3
Show file tree

Hide file tree

Showing 11 changed files with 215 additions and 221 deletions.
diff --git a/python/core/auto_generated/qgslogger.sip.in b/python/core/auto_generated/qgslogger.sip.in
@@ -80,7 +80,7 @@ the function returns 1 if QGISDEBUG is defined and 0 if not*
 Logs the message passed in to the logfile defined in QGIS_LOG_FILE if any. *
 %End
 
-    static const QString logFile();
+    static QString logFile();
 %Docstring
 Reads the environment variable QGIS_LOG_FILE. Returns NULL if the variable is not set,
 otherwise returns a file name for writing log messages to.*

diff --git a/python/core/auto_generated/symbology/qgscptcityarchive.sip.in b/python/core/auto_generated/symbology/qgscptcityarchive.sip.in
@@ -46,9 +46,6 @@ class QgsCptCityArchive
     QVector< QgsCptCityDataItem * > rootItems() const;
     QVector< QgsCptCityDataItem * > selectionItems() const;
 
-  protected:
-
-
   private:
     QgsCptCityArchive( const QgsCptCityArchive &rh );
 };