Commit 5550ac0b authored by Andrey Butirsky's avatar Andrey Butirsky
Browse files

fixup! impr: Keyboard Layout DBus API: drop excessive method arguments

Fix compile error.
MOC got crazy: seems signal and slots can't have same names even if
they are overloaded
parent 202afbf8
...@@ -157,7 +157,7 @@ void KeyboardDaemon::registerListeners() ...@@ -157,7 +157,7 @@ void KeyboardDaemon::registerListeners()
connect(xEventNotifier, &XInputEventNotifier::newPointerDevice, this, &KeyboardDaemon::configureMouse); connect(xEventNotifier, &XInputEventNotifier::newPointerDevice, this, &KeyboardDaemon::configureMouse);
connect(xEventNotifier, &XInputEventNotifier::newKeyboardDevice, this, &KeyboardDaemon::configureKeyboard); connect(xEventNotifier, &XInputEventNotifier::newKeyboardDevice, this, &KeyboardDaemon::configureKeyboard);
connect(xEventNotifier, &XEventNotifier::layoutMapChanged, this, &KeyboardDaemon::layoutMapChanged); connect(xEventNotifier, &XEventNotifier::layoutMapChanged, this, &KeyboardDaemon::layoutMapChanged);
connect(xEventNotifier, &XEventNotifier::layoutChanged, this, &KeyboardDaemon::layoutChanged); connect(xEventNotifier, &XEventNotifier::layoutChanged, this, &KeyboardDaemon::layoutChangedSlot);
xEventNotifier->start(); xEventNotifier->start();
} }
...@@ -167,12 +167,12 @@ void KeyboardDaemon::unregisterListeners() ...@@ -167,12 +167,12 @@ void KeyboardDaemon::unregisterListeners()
xEventNotifier->stop(); xEventNotifier->stop();
disconnect(xEventNotifier, &XInputEventNotifier::newPointerDevice, this, &KeyboardDaemon::configureMouse); disconnect(xEventNotifier, &XInputEventNotifier::newPointerDevice, this, &KeyboardDaemon::configureMouse);
disconnect(xEventNotifier, &XInputEventNotifier::newKeyboardDevice, this, &KeyboardDaemon::configureKeyboard); disconnect(xEventNotifier, &XInputEventNotifier::newKeyboardDevice, this, &KeyboardDaemon::configureKeyboard);
disconnect(xEventNotifier, &XEventNotifier::layoutChanged, this, &KeyboardDaemon::layoutChanged); disconnect(xEventNotifier, &XEventNotifier::layoutChanged, this, &KeyboardDaemon::layoutChangedSlot);
disconnect(xEventNotifier, &XEventNotifier::layoutMapChanged, this, &KeyboardDaemon::layoutMapChanged); disconnect(xEventNotifier, &XEventNotifier::layoutMapChanged, this, &KeyboardDaemon::layoutMapChanged);
} }
} }
void KeyboardDaemon::layoutChanged() void KeyboardDaemon::layoutChangedSlot()
{ {
//TODO: pass newLayout into layoutTrayIcon? //TODO: pass newLayout into layoutTrayIcon?
LayoutUnit newLayout = X11Helper::getCurrentLayout(); LayoutUnit newLayout = X11Helper::getCurrentLayout();
......
...@@ -54,7 +54,7 @@ class Q_DECL_EXPORT KeyboardDaemon : public KDEDModule ...@@ -54,7 +54,7 @@ class Q_DECL_EXPORT KeyboardDaemon : public KDEDModule
private Q_SLOTS: private Q_SLOTS:
void configureKeyboard(); void configureKeyboard();
void configureMouse(); void configureMouse();
void layoutChanged(); void layoutChangedSlot();
void layoutMapChanged(); void layoutMapChanged();
bool setLayout(QAction* action); bool setLayout(QAction* action);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment