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

List:       kde-commits
Subject:    [plasma-desktop/amourphious/keyboard] kcms/keyboard: rebasing
From:       shivam makkar <amourphious1992 () gmail ! com>
Date:       2014-09-25 19:20:38
Message-ID: E1XXEak-0004lO-Ou () scm ! kde ! org
[Download RAW message or body]

Git commit cfb1ced8fbfb6fcfd7220818b06d18f9f1f15064 by shivam makkar.
Committed on 25/09/2014 at 19:18.
Pushed by makkar into branch 'amourphious/keyboard'.

rebasing

M  +2    -0    kcms/keyboard/keyboard_daemon.cpp
M  +1    -1    kcms/keyboard/keyboard_hardware.cpp

http://commits.kde.org/plasma-desktop/cfb1ced8fbfb6fcfd7220818b06d18f9f1f15=
064

diff --cc kcms/keyboard/keyboard_daemon.cpp
index f3ad565,0987a80..74ba1bb
--- a/kcms/keyboard/keyboard_daemon.cpp
+++ b/kcms/keyboard/keyboard_daemon.cpp
@@@ -27,9 -27,11 +27,11 @@@
  #include <kaction.h>
  #include <kactioncollection.h>
  #include <kglobalsettings.h>
 -#include <klocale.h>
 -#include <klocalizedstring.h>
 +
 +Q_LOGGING_CATEGORY(KEYBOARD_DAEMON, "keyboard_daemon")
  =

+ Q_LOGGING_CATEGORY(KEYBOARD_DAEMON, "keyboard_daemon")
+ =

  #include "x11_helper.h"
  #include "xinput_helper.h"
  #include "xkb_helper.h"
diff --cc kcms/keyboard/keyboard_hardware.cpp
index 7ab443f,2533324..e73ce58
--- a/kcms/keyboard/keyboard_hardware.cpp
+++ b/kcms/keyboard/keyboard_hardware.cpp
@@@ -23,7 -23,9 +23,7 @@@
  #include <QCursor>	// WTF? - otherwise compiler complains
  #include <QDebug>
  #include <QLoggingCategory>
--
+ #include <X11/Xlib.h>
 -
  #include <math.h>
  =

  #include "x11_helper.h"
[prev in list] [next in list] [prev in thread] [next in thread]