[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-desktop/amourphious/keyboard] kcms/keyboard: changes basd on review
From:       shivam makkar <amourphious1992 () gmail ! com>
Date:       2014-09-25 19:20:36
Message-ID: E1XXEai-0004lO-Iy () scm ! kde ! org
[Download RAW message or body]

Git commit 16dc451861a8613a279b4ba4be4aabcb0187ef97 by shivam makkar.
Committed on 29/05/2014 at 13:05.
Pushed by makkar into branch 'amourphious/keyboard'.

changes basd on review

M  +0    -1    kcms/keyboard/flags.cpp
M  +2    -4    kcms/keyboard/kcmmisc.cpp
M  +0    -1    kcms/keyboard/keyboard_config.cpp
M  +0    -1    kcms/keyboard/layouts_menu.cpp
M  +10   -0    kcms/keyboard/x11_helper.cpp
M  +1    -0    kcms/keyboard/x11_helper.h
M  +4    -4    kcms/keyboard/xinput_helper.cpp

http://commits.kde.org/plasma-desktop/16dc451861a8613a279b4ba4be4aabcb0187ef97

diff --git a/kcms/keyboard/flags.cpp b/kcms/keyboard/flags.cpp
index c6fec03..927a1ae 100644
--- a/kcms/keyboard/flags.cpp
+++ b/kcms/keyboard/flags.cpp
@@ -18,7 +18,6 @@
 
 #include "flags.h"
 
-//#include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kglobalsettings.h>
diff --git a/kcms/keyboard/kcmmisc.cpp b/kcms/keyboard/kcmmisc.cpp
index f0c7c25..7fdb387 100755
--- a/kcms/keyboard/kcmmisc.cpp
+++ b/kcms/keyboard/kcmmisc.cpp
@@ -63,12 +63,12 @@ KCMiscKeyboardWidget::KCMiscKeyboardWidget(QWidget *parent)
   ui.rateSlider->setTickInterval(498);
 
   QList <QAbstractButton*> btns = ui.kbRepButtonGroup->buttons();
-  for(int i = 0; i < btns.size(); i++){
+  for (int i = 0; i < btns.size(); i++) {
       ui.kbRepButtonGroup->setId(btns[i], i);
   }
 
   btns = ui.numButtonGroup->buttons();
-  for(int i = 0; i < btns.size(); i++){
+  for (int i = 0; i < btns.size(); i++) {
       ui.numButtonGroup->setId(btns[i], i);
   }
 
@@ -181,8 +181,6 @@ void KCMiscKeyboardWidget::save()
   clickVolume = getClick();
   keyboardRepeat = TriStateHelper::getTriState(ui.kbRepButtonGroup);
   numlockState = TriStateHelper::getTriState(ui.numButtonGroup);
-
-  //qDebug()<<"kb: "<<keyboardRepeat<<" nmlck: "<<numlockState;
   config.writeEntry("ClickVolume",clickVolume);
   config.writeEntry("KeyboardRepeating", TriStateHelper::getInt(keyboardRepeat));
   config.writeEntry("RepeatRate", ui.rate->value() );
diff --git a/kcms/keyboard/keyboard_config.cpp b/kcms/keyboard/keyboard_config.cpp
index 49f059c..a227a34 100644
--- a/kcms/keyboard/keyboard_config.cpp
+++ b/kcms/keyboard/keyboard_config.cpp
@@ -20,7 +20,6 @@
 
 #include <ksharedconfig.h>
 #include <kconfiggroup.h>
-//#include <kdebug.h>
 
 #include <QDebug>
 
diff --git a/kcms/keyboard/layouts_menu.cpp b/kcms/keyboard/layouts_menu.cpp
index e357c6a..7d4c4d6 100644
--- a/kcms/keyboard/layouts_menu.cpp
+++ b/kcms/keyboard/layouts_menu.cpp
@@ -18,7 +18,6 @@
 
 #include "layouts_menu.h"
 
-//#include <kmenu.h>
 #include <ktoolinvocation.h>
 #include <klocalizedstring.h>
 
diff --git a/kcms/keyboard/x11_helper.cpp b/kcms/keyboard/x11_helper.cpp
index 0e2806e..cbb2cfc 100644
--- a/kcms/keyboard/x11_helper.cpp
+++ b/kcms/keyboard/x11_helper.cpp
@@ -309,6 +309,16 @@ XEventNotifier::XEventNotifier():
 	}
 }
 
+
+XEventNotifier::XEventNotifier(QWidget* parent):
+        QObject(parent),
+        xkbOpcode(-1)
+{
+    if( QCoreApplication::instance() == NULL ) {
+        qWarning() << "Layout Widget won't work properly without QCoreApplication instance";
+    }
+}
+
 void XEventNotifier::start()
 {
 	qDebug() << "qCoreApp" << QCoreApplication::instance();
diff --git a/kcms/keyboard/x11_helper.h b/kcms/keyboard/x11_helper.h
index 719b13f..385ae28 100644
--- a/kcms/keyboard/x11_helper.h
+++ b/kcms/keyboard/x11_helper.h
@@ -112,6 +112,7 @@ Q_SIGNALS:
 
 public:
 	XEventNotifier();
+    XEventNotifier(QWidget* parent);
 	virtual ~XEventNotifier() {}
 
 	virtual void start();
diff --git a/kcms/keyboard/xinput_helper.cpp b/kcms/keyboard/xinput_helper.cpp
index b245e91..4fbd658 100644
--- a/kcms/keyboard/xinput_helper.cpp
+++ b/kcms/keyboard/xinput_helper.cpp
@@ -38,8 +38,8 @@ static int DEVICE_NONE = 0;
 static int DEVICE_KEYBOARD = 1;
 static int DEVICE_POINTER = 2;
 
-XInputEventNotifier::XInputEventNotifier(QWidget* /*parent*/):
-	XEventNotifier(), //TODO: destruct properly?
+XInputEventNotifier::XInputEventNotifier(QWidget* parent):
+    XEventNotifier(parent), //TODO: destruct properly?
 	xinputEventType(-1)
 {
 }
@@ -92,12 +92,12 @@ static bool isRealKeyboard(const char* deviceName)
 		&& strstr(deviceName, "WMI hotkeys") == NULL;
 }
 
-int XInputEventNotifier::getNewDeviceEventType(xcb_generic_event_t* /*event*/)
+int XInputEventNotifier::getNewDeviceEventType(xcb_generic_event_t* event)
 {
 	int newDeviceType = DEVICE_NONE;
 
 #if 0
-	if( xinputEventType != -1 && event->type == xinputEventType ) {
+    if( xinputEventType != -1 && event->type == xinputEventType ) {
 		XDevicePresenceNotifyEvent *xdpne = (XDevicePresenceNotifyEvent*) event;
 		if( xdpne->devchange == DeviceEnabled ) {
 			int ndevices;

[prev in list] [next in list] [prev in thread] [next in thread]