[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-05-29 7:42:03
Message-ID: E1WpuyR-0005G6-Tr () scm ! kde ! org
[Download RAW message or body]

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

changes basd on review

M  +4    -0    kcms/keyboard/flags.cpp
M  +2    -0    kcms/keyboard/kcmmisc.cpp
M  +2    -1    kcms/keyboard/xinput_helper.cpp

http://commits.kde.org/plasma-desktop/d3b2d17de1a127cd578d8d63511d376889bb9361

diff --cc kcms/keyboard/flags.cpp
index 5206d1d,6d25443..3fb98e5
--- a/kcms/keyboard/flags.cpp
+++ b/kcms/keyboard/flags.cpp
@@@ -18,6 -18,7 +18,10 @@@
  
  #include "flags.h"
  
++<<<<<<< HEAD
++=======
+ //#include <kdebug.h>
++>>>>>>> b756db51d8293b4a96ab851f9174e48f8ef36429
  #include <kstandarddirs.h>
  #include <kiconloader.h>
  #include <kglobalsettings.h>
diff --cc kcms/keyboard/kcmmisc.cpp
index 34cca18,d14ac2e..3327ce5
--- a/kcms/keyboard/kcmmisc.cpp
+++ b/kcms/keyboard/kcmmisc.cpp
@@@ -65,12 -65,12 +65,14 @@@ KCMiscKeyboardWidget::KCMiscKeyboardWid
    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);
    }
  
diff --cc kcms/keyboard/xinput_helper.cpp
index 4fbd658,b245e91..980338e
--- a/kcms/keyboard/xinput_helper.cpp
+++ b/kcms/keyboard/xinput_helper.cpp
@@@ -38,8 -38,8 +38,9 @@@ 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)
  {
  }
[prev in list] [next in list] [prev in thread] [next in thread]