Convert TranslatorManager to singleton QObject owning translators.

Author: mohsenD98

src/app/main.cpp

@@ -189,8 +189,8 @@ int main( int argc, char **argv )
   auto sentryClose = qScopeGuard( [] { sentry_wrapper::close(); } );
 #endif
 
-  QTranslator *qfieldTranslator = TranslatorManager::qfieldTranslator();
-  QTranslator *qtTranslator = TranslatorManager::qtTranslator();
+  QTranslator *qfieldTranslator = TranslatorManager::instance()->qfieldTranslator();
+  QTranslator *qtTranslator = TranslatorManager::instance()->qtTranslator();
   bool qfieldTranslatorLoaded = false;
   bool qtTranslatorLoaded = false;
   if ( !customLanguage.isEmpty() )

src/core/appinterface.cpp

@@ -240,8 +240,8 @@ void AppInterface::changeLanguage( const QString &languageCode )
     return;
   }
 
-  QTranslator *qfieldTranslator = TranslatorManager::qfieldTranslator();
-  QTranslator *qtTranslator = TranslatorManager::qtTranslator();
+  QTranslator *qfieldTranslator = TranslatorManager::instance()->qfieldTranslator();
+  QTranslator *qtTranslator = TranslatorManager::instance()->qtTranslator();
 
   QCoreApplication::removeTranslator( qtTranslator );
   QCoreApplication::removeTranslator( qfieldTranslator );

src/core/translatormanager.cpp

@@ -17,14 +17,24 @@
 
 #include <QTranslator>
 
+TranslatorManager::TranslatorManager()
+  : mQfieldTranslator( new QTranslator() )
+  , mQtTranslator( new QTranslator() )
+{
+}
+
 QTranslator *TranslatorManager::qfieldTranslator()
 {
-  static QTranslator *translator = new QTranslator();
-  return translator;
+  return mQfieldTranslator;
 }
 
 QTranslator *TranslatorManager::qtTranslator()
 {
-  static QTranslator *translator = new QTranslator();
-  return translator;
+  return mQtTranslator;
+}
+
+TranslatorManager *TranslatorManager::instance()
+{
+  static TranslatorManager *sInstance = new TranslatorManager();
+  return sInstance;
 }

src/core/translatormanager.h

@@ -29,10 +29,20 @@ class TranslatorManager
 {
   public:
     //! Returns the global QField translator instance.
-    static QTranslator *qfieldTranslator();
+    QTranslator *qfieldTranslator();
 
     //! Returns the global Qt framework translator instance.
-    static QTranslator *qtTranslator();
+    QTranslator *qtTranslator();
+
+    //! Returns the singleton instance of TranslatorManager.
+    static TranslatorManager *instance();
+
+  private:
+    TranslatorManager();
+    ~TranslatorManager() = default;
+
+    QTranslator *mQfieldTranslator = nullptr;
+    QTranslator *mQtTranslator = nullptr;
 };
 
 #endif // TRANSLATORMANAGER_H