summaryrefslogtreecommitdiff
path: root/core
Side-by-side diff
Diffstat (limited to 'core') (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/launcher.cpp20
-rw-r--r--core/launcher/launcher.h3
-rw-r--r--core/launcher/taskbar.cpp2
3 files changed, 1 insertions, 24 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 87a54bf..aa357ca 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -475,7 +475,2 @@ void Launcher::createGUI()
-
- connect( qApp, SIGNAL(symbol()), this, SLOT(toggleSymbolInput()) );
- connect( qApp, SIGNAL(numLockStateToggle()), this, SLOT(toggleNumLockState()) );
- connect( qApp, SIGNAL(capsLockStateToggle()), this, SLOT(toggleCapsLockState()) );
-
connect( tb, SIGNAL(tabSelected(const QString&)),
@@ -556,17 +551,2 @@ bool Launcher::eventFilter( QObject*, QEvent *ev )
-void Launcher::toggleSymbolInput()
-{
- tb->toggleSymbolInput();
-}
-
-void Launcher::toggleNumLockState()
-{
- tb->toggleNumLockState();
-}
-
-void Launcher::toggleCapsLockState()
-{
- tb->toggleCapsLockState();
-}
-
static bool isVisibleWindow(int wid)
diff --git a/core/launcher/launcher.h b/core/launcher/launcher.h
index 29bd7db..2eaf77c 100644
--- a/core/launcher/launcher.h
+++ b/core/launcher/launcher.h
@@ -138,5 +138,2 @@ private slots:
void systemMessage( const QCString &, const QByteArray &);
- void toggleSymbolInput();
- void toggleNumLockState();
- void toggleCapsLockState();
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index 86e0d0d..abe238f 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -209,3 +209,3 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
// ## make customizable in some way?
-#ifdef QT_QWS_CUSTOM
+#ifdef OPIE_TASKBAR_LOCK_KEY_STATE
lockState = new LockKeyState( this );