| author | hash <hash> | 2002-10-24 06:17:03 (UTC) |
|---|---|---|
| committer | hash <hash> | 2002-10-24 06:17:03 (UTC) |
| commit | 2183d2b20cf6eb9144a616a3f8242a7eb585c557 (patch) (side-by-side diff) | |
| 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 @@ -196,16 +196,11 @@ void FunctionKeyboard::loadDefaults() { /* FunctionKeyboardConfig {{{1 */ -<<<<<<< function_keyboard.cpp -FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) : - ProfileDialogKeyWidget(name, parent), +FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na ) + : ProfileDialogKeyWidget(name, parent, na), selectedRow(0), selectedCol(0) { -======= -FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na ) - : ProfileDialogKeyWidget(name, parent, na) { qWarning("FunctionKeyboardConfig"); ->>>>>>> 1.11 kb = new FunctionKeyboard(this); |