| author | mickeyl <mickeyl> | 2004-04-24 15:51:18 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2004-04-24 15:51:18 (UTC) |
| commit | 629ced22fc26892442be433403a9cfa9f662f08a (patch) (side-by-side diff) | |
| tree | 830973cb7ba701b0a897220e1307ad3f1243384b /inputmethods | |
| parent | f7b5905d990f374dd6cb177b7a03628cc593b7cf (diff) | |
| download | opie-629ced22fc26892442be433403a9cfa9f662f08a.zip opie-629ced22fc26892442be433403a9cfa9f662f08a.tar.gz opie-629ced22fc26892442be433403a9cfa9f662f08a.tar.bz2 | |
gcc 3.4 fixes
| -rw-r--r-- | inputmethods/dasher/SettingsStore.cpp | 5 | ||||
| -rw-r--r-- | inputmethods/dasher/SettingsStore.h | 1 | ||||
| -rw-r--r-- | inputmethods/dvorak/dvorak.cpp | 8 | ||||
| -rw-r--r-- | inputmethods/keyboard/keyboard.cpp | 10 | ||||
| -rw-r--r-- | inputmethods/multikey/keyboard.cpp | 10 |
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 @@ -17,4 +17,9 @@ 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 @@ -28,4 +28,5 @@ class CSettingsStore { public: + virtual ~CSettingsStore(); bool GetBoolOption(const std::string& Key); long GetLongOption(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 @@ -90,6 +90,6 @@ 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++) { @@ -97,6 +97,6 @@ void KeyboardConfig::generateText(const QString &s) 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 @@ -99,10 +99,10 @@ QSize KeyboardPicks::sizeHint() const -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++) { @@ -110,6 +110,6 @@ void KeyboardConfig::generateText(const QString &s) 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 @@ -144,10 +144,10 @@ 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++) { @@ -155,6 +155,6 @@ void KeyboardConfig::generateText(const QString &s) 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 |