5 files changed, 18 insertions, 12 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
@@ -11,16 +11,21 @@
 
 #include "SettingsStore.h"
 
 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;
 		LoadSetting(Key, &Value);
 		BoolMap[Key] = Value;
 	}
 	
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
@@ -22,16 +22,17 @@
 	in American English and encodable in ASCII. However,
 	string Values may contain special characters where appropriate.
 */
 
 
 class CSettingsStore
 {
 public:
+	virtual ~CSettingsStore();
 	bool GetBoolOption(const std::string& Key);
 	long GetLongOption(const std::string& Key);
 	std::string& GetStringOption(const std::string& Key);
 
 	void SetBoolOption(const std::string& Key, bool Value);
 	void SetLongOption(const std::string& Key, long Value);
 	void SetStringOption(const std::string& Key, const std::string& Value);
 	
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
@@ -84,25 +84,25 @@ QSize KeyboardPicks::sizeHint() const
     return QSize(240,fontMetrics().lineSpacing());
 }
 
 
 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
 }
 
 
 //PC keyboard layout and scancodes
 
 /*
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,25 +97,25 @@ QSize KeyboardPicks::sizeHint() const
     return QSize(240,fontMetrics().lineSpacing());
 }
 
 
 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
 }
 
 
 //PC keyboard layout and scancodes
 
 /*
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,25 +142,25 @@ QSize KeyboardPicks::sizeHint() const
 }
 
 
 /* KeyboardConfig::generateText {{{1 */
 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
 }
 
 
 
 
 /* Keyboard::paintEvent {{{1 */