Backport konsole changes to fix memory leaks

Fixes #58

lib/ColorScheme.cpp

@@ -777,12 +777,8 @@ const ColorScheme* ColorSchemeManager::findColorScheme(const QString& name)
         return 0;
     }
 }
-
-ColorSchemeManager* ColorSchemeManager::theColorSchemeManager = 0;
-//K_GLOBAL_STATIC( ColorSchemeManager , theColorSchemeManager )
+Q_GLOBAL_STATIC(ColorSchemeManager, theColorSchemeManager)
 ColorSchemeManager* ColorSchemeManager::instance()
 {
-    if (! theColorSchemeManager)
-        theColorSchemeManager = new ColorSchemeManager();
     return theColorSchemeManager;
 }

lib/ColorScheme.h

@@ -348,8 +348,6 @@ private:
     bool _haveLoadedAll;
 
     static const ColorScheme _defaultColorScheme;
-
-    static ColorSchemeManager * theColorSchemeManager;
 };
 
 }

lib/KeyboardTranslator.cpp

@@ -884,11 +884,8 @@ bool KeyboardTranslatorManager::deleteTranslator(const QString& name)
         return false;
     }
 }
-//K_GLOBAL_STATIC( KeyboardTranslatorManager , theKeyboardTranslatorManager )
-KeyboardTranslatorManager* KeyboardTranslatorManager::theKeyboardTranslatorManager = 0;
+Q_GLOBAL_STATIC( KeyboardTranslatorManager , theKeyboardTranslatorManager )
 KeyboardTranslatorManager* KeyboardTranslatorManager::instance()
 {
-    if (! theKeyboardTranslatorManager)
-        theKeyboardTranslatorManager = new KeyboardTranslatorManager();
     return theKeyboardTranslatorManager;
 }

lib/KeyboardTranslator.h

@@ -456,6 +456,9 @@ public:
     KeyboardTranslatorManager();
     ~KeyboardTranslatorManager();
 
+    KeyboardTranslatorManager(const KeyboardTranslatorManager&) = delete;
+    KeyboardTranslatorManager& operator=(const KeyboardTranslatorManager&) = delete;
+
     /**
      * Adds a new translator.  If a translator with the same name
      * already exists, it will be replaced by the new translator.
@@ -507,8 +510,6 @@ private:
     QHash<QString,KeyboardTranslator*> _translators; // maps translator-name -> KeyboardTranslator
                                                      // instance
     bool _haveLoadedAll;
-
-    static KeyboardTranslatorManager * theKeyboardTranslatorManager;
 };
 
 inline int KeyboardTranslator::Entry::keyCode() const { return _keyCode; }