Move QgsReadWriteContext::DefaultTranslator to cpp file

The nested class appears to cause sip to stumble with undefined references to vtable (observed cross-compiling from Fedora to MinGW)
qgis · Jul 16, 2019 · 68c94dd · 68c94dd
1 parent 1e4114a
commit 68c94dd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/python/core/auto_generated/qgsreadwritecontext.sip.in b/python/core/auto_generated/qgsreadwritecontext.sip.in
@@ -131,7 +131,6 @@ Sets data coordinate transform context to ``transformContext``
 .. versionadded:: 3.8
 %End
 
-      public:
 };
 
 

diff --git a/src/core/qgsreadwritecontext.cpp b/src/core/qgsreadwritecontext.cpp
@@ -14,8 +14,23 @@
  ***************************************************************************/
 #include "qgsreadwritecontext.h"
 
+class DefaultTranslator : public QgsProjectTranslator
+{
+    // QgsProjectTranslator interface
+  public:
+    QString translate( const QString &context, const QString &sourceText, const char *disambiguation, int n ) const override
+    {
+      Q_UNUSED( context );
+      Q_UNUSED( disambiguation );
+      Q_UNUSED( n );
+      return sourceText;
+    }
+};
+
+static DefaultTranslator sDefaultTranslator;
+
 QgsReadWriteContext::QgsReadWriteContext()
-  : mProjectTranslator( &mDefaultTranslator )
+  : mProjectTranslator( &sDefaultTranslator )
 {
 
 }
@@ -78,11 +93,3 @@ QList<QgsReadWriteContext::ReadWriteMessage > QgsReadWriteContext::takeMessages(
   mMessages.clear();
   return messages;
 }
-
-QString QgsReadWriteContext::DefaultTranslator::translate( const QString &context, const QString &sourceText, const char *disambiguation, int n ) const
-{
-  Q_UNUSED( context )
-  Q_UNUSED( disambiguation )
-  Q_UNUSED( n )
-  return sourceText;
-}
diff --git a/src/core/qgsreadwritecontext.h b/src/core/qgsreadwritecontext.h
@@ -135,13 +135,6 @@ class CORE_EXPORT QgsReadWriteContext
 
   private:
 
-    class DefaultTranslator : public QgsProjectTranslator
-    {
-        // QgsProjectTranslator interface
-      public:
-        QString translate( const QString &context, const QString &sourceText, const char *disambiguation, int n ) const;
-    };
-
     //! Pop the last category
     void leaveCategory();
 
@@ -150,7 +143,6 @@ class CORE_EXPORT QgsReadWriteContext
     QStringList mCategories = QStringList();
     QgsProjectTranslator *mProjectTranslator = nullptr;
     friend class QgsReadWriteContextCategoryPopper;
-    DefaultTranslator mDefaultTranslator;
     QgsCoordinateTransformContext mCoordinateTransformContext = QgsCoordinateTransformContext();
 };