author | hash <hash> | 2002-10-24 06:17:03 (UTC) |
---|---|---|
committer | hash <hash> | 2002-10-24 06:17:03 (UTC) |
commit | 2183d2b20cf6eb9144a616a3f8242a7eb585c557 (patch) (unidiff) | |
tree | 58cb46e892c243bfbf0c39cd0ffd62f2beedb339 | |
parent | bdd884e37dc1ee1969d317b29e926768ea5a14df (diff) | |
download | opie-2183d2b20cf6eb9144a616a3f8242a7eb585c557.zip opie-2183d2b20cf6eb9144a616a3f8242a7eb585c557.tar.gz opie-2183d2b20cf6eb9144a616a3f8242a7eb585c557.tar.bz2 |
didnt merge with previous updates properly
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp index 71cdea8..9d58383 100644 --- a/noncore/apps/opie-console/function_keyboard.cpp +++ b/noncore/apps/opie-console/function_keyboard.cpp | |||
@@ -191,26 +191,21 @@ void FunctionKeyboard::loadDefaults() { | |||
191 | keys.insert( "r1c9", FKey ("PU", 0, 4118, 0)); | 191 | keys.insert( "r1c9", FKey ("PU", 0, 4118, 0)); |
192 | keys.insert( "r1c10", FKey ("PD", 0, 4119, 0)); | 192 | keys.insert( "r1c10", FKey ("PD", 0, 4119, 0)); |
193 | */ | 193 | */ |
194 | 194 | ||
195 | } | 195 | } |
196 | 196 | ||
197 | /* FunctionKeyboardConfig {{{1 */ | 197 | /* FunctionKeyboardConfig {{{1 */ |
198 | 198 | ||
199 | <<<<<<< function_keyboard.cpp | 199 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na ) |
200 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) : | 200 | : ProfileDialogKeyWidget(name, parent, na), |
201 | ProfileDialogKeyWidget(name, parent), | ||
202 | selectedRow(0), selectedCol(0) | 201 | selectedRow(0), selectedCol(0) |
203 | { | 202 | { |
204 | ======= | ||
205 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na ) | ||
206 | : ProfileDialogKeyWidget(name, parent, na) { | ||
207 | qWarning("FunctionKeyboardConfig"); | 203 | qWarning("FunctionKeyboardConfig"); |
208 | >>>>>>> 1.11 | ||
209 | 204 | ||
210 | 205 | ||
211 | kb = new FunctionKeyboard(this); | 206 | kb = new FunctionKeyboard(this); |
212 | connect (kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)), | 207 | connect (kb, SIGNAL(keyPressed(FKey, ushort, ushort, bool)), |
213 | this, SLOT(slotKeyPressed(FKey, ushort, ushort, bool))); | 208 | this, SLOT(slotKeyPressed(FKey, ushort, ushort, bool))); |
214 | 209 | ||
215 | QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimentions"), this); | 210 | QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimentions"), this); |
216 | QLabel *l = new QLabel("Rows", dimentions); | 211 | QLabel *l = new QLabel("Rows", dimentions); |