-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 | |||
@@ -193,22 +193,17 @@ void FunctionKeyboard::loadDefaults() { | |||
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 | ||