5 files changed, 20 insertions, 14 deletions

diff --git a/inputmethods/dasher/SettingsStore.cpp b/inputmethods/dasher/SettingsStore.cpp
index f7661bd..7e0fa58 100644
--- a/inputmethods/dasher/SettingsStore.cpp
+++ b/inputmethods/dasher/SettingsStore.cpp
@@ -15,8 +15,13 @@ using namespace std;
 
 /* TODO: Consider using Template functions to make this neater. */
 
 
+CSettingsStore::~CSettingsStore()
+{
+}
+
+
 bool CSettingsStore::GetBoolOption(const string& Key)
 {
         if (BoolMap.find(Key)==BoolMap.end()) {
                 bool Value = false;
diff --git a/inputmethods/dasher/SettingsStore.h b/inputmethods/dasher/SettingsStore.h
index 8ef9fcf..2ddf152 100644
--- a/inputmethods/dasher/SettingsStore.h
+++ b/inputmethods/dasher/SettingsStore.h
@@ -26,8 +26,9 @@
 
 class CSettingsStore
 {
 public:
+        virtual ~CSettingsStore();
         bool GetBoolOption(const std::string& Key);
         long GetLongOption(const std::string& Key);
         std::string& GetStringOption(const std::string& Key);
 
diff --git a/inputmethods/dvorak/dvorak.cpp b/inputmethods/dvorak/dvorak.cpp
index 97afa0a..2137f22 100644
--- a/inputmethods/dvorak/dvorak.cpp
+++ b/inputmethods/dvorak/dvorak.cpp
@@ -88,17 +88,17 @@ QSize KeyboardPicks::sizeHint() const
 void  KeyboardConfig::generateText(const QString &s)
 {
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     for (int i=0; i<(int)backspaces; i++) {
-        parent->emitKey( 0, Qt::Key_Backspace, 0, true, false );
-        parent->emitKey( 0, Qt::Key_Backspace, 0, false, false );
+        parent->emitKey( 0, ::Qt::Key_Backspace, 0, true, false );
+        parent->emitKey( 0, ::Qt::Key_Backspace, 0, false, false );
     }
     for (int i=0; i<(int)s.length(); i++) {
         parent->emitKey( s[i].unicode(), 0, 0, true, false );
         parent->emitKey( s[i].unicode(), 0, 0, false, false );
     }
-    parent->emitKey( 0, Qt::Key_Space, 0, true, false );
-    parent->emitKey( 0, Qt::Key_Space, 0, false, false );
+    parent->emitKey( 0, ::Qt::Key_Space, 0, true, false );
+    parent->emitKey( 0, ::Qt::Key_Space, 0, false, false );
     backspaces = 0;
 #endif
 }
 
diff --git a/inputmethods/keyboard/keyboard.cpp b/inputmethods/keyboard/keyboard.cpp
index a85a7b1..fb88f2a 100644
--- a/inputmethods/keyboard/keyboard.cpp
+++ b/inputmethods/keyboard/keyboard.cpp
@@ -97,21 +97,21 @@ QSize KeyboardPicks::sizeHint() const
     return QSize(240,fontMetrics().lineSpacing());
 }
 
 
-void  KeyboardConfig::generateText(const QString &s)
+void KeyboardConfig::generateText(const QString &s)
 {
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     for (int i=0; i<(int)backspaces; i++) {
-        parent->emitKey( 0, Qt::Key_Backspace, 0, true, false );
-        parent->emitKey( 0, Qt::Key_Backspace, 0, false, false );
+        parent->emitKey( 0, ::Qt::Key_Backspace, 0, true, false );
+        parent->emitKey( 0, ::Qt::Key_Backspace, 0, false, false );
     }
     for (int i=0; i<(int)s.length(); i++) {
         parent->emitKey( s[i].unicode(), 0, 0, true, false );
         parent->emitKey( s[i].unicode(), 0, 0, false, false );
     }
-    parent->emitKey( 0, Qt::Key_Space, 0, true, false );
-    parent->emitKey( 0, Qt::Key_Space, 0, false, false );
+    parent->emitKey( 0, ::Qt::Key_Space, 0, true, false );
+    parent->emitKey( 0, ::Qt::Key_Space, 0, false, false );
     backspaces = 0;
 #endif
 }
 
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 4f4f25f..7ddfd3e 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -142,21 +142,21 @@ QSize KeyboardPicks::sizeHint() const
 }
 
 
 /* KeyboardConfig::generateText {{{1 */
-void  KeyboardConfig::generateText(const QString &s)
+void KeyboardConfig::generateText(const QString &s)
 {
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     for (int i=0; i<(int)backspaces; i++) {
-        parent->emitKey( 0, Qt::Key_Backspace, 0, true, false );
-        parent->emitKey( 0, Qt::Key_Backspace, 0, false, false );
+        parent->emitKey( 0, ::Qt::Key_Backspace, 0, true, false );
+        parent->emitKey( 0, ::Qt::Key_Backspace, 0, false, false );
     }
     for (int i=0; i<(int)s.length(); i++) {
         parent->emitKey( s[i].unicode(), 0, 0, true, false );
         parent->emitKey( s[i].unicode(), 0, 0, false, false );
     }
-    parent->emitKey( 0, Qt::Key_Space, 0, true, false );
-    parent->emitKey( 0, Qt::Key_Space, 0, false, false );
+    parent->emitKey( 0, ::Qt::Key_Space, 0, true, false );
+    parent->emitKey( 0, ::Qt::Key_Space, 0, false, false );
     backspaces = 0;
 #endif
 }