summaryrefslogtreecommitdiff
path: root/inputmethods
Side-by-side diff
Diffstat (limited to 'inputmethods') (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/dasher/SettingsStore.cpp5
-rw-r--r--inputmethods/dasher/SettingsStore.h1
-rw-r--r--inputmethods/dvorak/dvorak.cpp8
-rw-r--r--inputmethods/keyboard/keyboard.cpp10
-rw-r--r--inputmethods/multikey/keyboard.cpp10
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
@@ -18,2 +18,7 @@ using namespace std;
+CSettingsStore::~CSettingsStore()
+{
+}
+
+
bool CSettingsStore::GetBoolOption(const string& Key)
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
@@ -29,2 +29,3 @@ class CSettingsStore
public:
+ virtual ~CSettingsStore();
bool GetBoolOption(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
@@ -91,4 +91,4 @@ void KeyboardConfig::generateText(const QString &s)
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 );
}
@@ -98,4 +98,4 @@ void KeyboardConfig::generateText(const QString &s)
}
- 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;
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
@@ -100,3 +100,3 @@ QSize KeyboardPicks::sizeHint() const
-void KeyboardConfig::generateText(const QString &s)
+void KeyboardConfig::generateText(const QString &s)
{
@@ -104,4 +104,4 @@ void KeyboardConfig::generateText(const QString &s)
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 );
}
@@ -111,4 +111,4 @@ void KeyboardConfig::generateText(const QString &s)
}
- 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;
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
@@ -145,3 +145,3 @@ QSize KeyboardPicks::sizeHint() const
/* KeyboardConfig::generateText {{{1 */
-void KeyboardConfig::generateText(const QString &s)
+void KeyboardConfig::generateText(const QString &s)
{
@@ -149,4 +149,4 @@ void KeyboardConfig::generateText(const QString &s)
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 );
}
@@ -156,4 +156,4 @@ void KeyboardConfig::generateText(const QString &s)
}
- 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;