summaryrefslogtreecommitdiffstats
path: root/twin/kcmtwin
diff options
context:
space:
mode:
authorAutomated System <[email protected]>2013-02-15 22:07:52 -0600
committerAutomated System <[email protected]>2013-02-15 22:07:52 -0600
commit0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch)
tree8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /twin/kcmtwin
parentb2502b94cf23298f676853d91188b2cacc6ab0bd (diff)
parent77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (diff)
downloadtdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.tar.gz
tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'twin/kcmtwin')
-rw-r--r--twin/kcmtwin/twindecoration/buttons.cpp4
-rw-r--r--twin/kcmtwin/twindecoration/preview.cpp4
-rw-r--r--twin/kcmtwin/twindecoration/twindecoration.cpp4
-rw-r--r--twin/kcmtwin/twinoptions/main.cpp4
-rw-r--r--twin/kcmtwin/twinoptions/mouse.cpp4
-rw-r--r--twin/kcmtwin/twinoptions/windows.cpp6
-rw-r--r--twin/kcmtwin/twinrules/detectwidget.cpp2
-rw-r--r--twin/kcmtwin/twinrules/kcm.cpp4
-rw-r--r--twin/kcmtwin/twinrules/main.cpp2
-rw-r--r--twin/kcmtwin/twinrules/ruleswidget.cpp4
10 files changed, 19 insertions, 19 deletions
diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp
index 55b5beb56..a7dc8a90d 100644
--- a/twin/kcmtwin/twindecoration/buttons.cpp
+++ b/twin/kcmtwin/twindecoration/buttons.cpp
@@ -37,8 +37,8 @@
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
#include <kdecorationfactory.h>
diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp
index ebdecca86..954ff1774 100644
--- a/twin/kcmtwin/twindecoration/preview.cpp
+++ b/twin/kcmtwin/twindecoration/preview.cpp
@@ -20,9 +20,9 @@
#include "preview.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqlabel.h>
#include <tqstyle.h>
#include <kiconloader.h>
diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp
index 67115d089..8e668e78a 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.cpp
+++ b/twin/kcmtwin/twindecoration/twindecoration.cpp
@@ -49,8 +49,8 @@
#include <kdebug.h>
#include <kdesktopfile.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <kgenericfactory.h>
#include <tdeaboutdata.h>
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index 6710208d7..e63ec54d5 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -22,8 +22,8 @@
#include <dcopclient.h>
#include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kgenericfactory.h>
#include <tdeaboutdata.h>
diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp
index 9715f4651..8778d915e 100644
--- a/twin/kcmtwin/twinoptions/mouse.cpp
+++ b/twin/kcmtwin/twinoptions/mouse.cpp
@@ -29,11 +29,11 @@
#include <tqtooltip.h>
#include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kseparator.h>
#include <X11/X.h>
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index 91a6232d2..74b8d3140 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -32,17 +32,17 @@
#include <tqradiobutton.h>
#include <tqlabel.h>
#include <tqcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kactivelabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolorbutton.h>
#include <tdeconfig.h>
#include <knuminput.h>
#include <tdeapplication.h>
#include <kdialog.h>
#include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kprocess.h>
#include <tqtabwidget.h>
diff --git a/twin/kcmtwin/twinrules/detectwidget.cpp b/twin/kcmtwin/twinrules/detectwidget.cpp
index b3646312a..f450938bc 100644
--- a/twin/kcmtwin/twinrules/detectwidget.cpp
+++ b/twin/kcmtwin/twinrules/detectwidget.cpp
@@ -19,7 +19,7 @@
#include "detectwidget.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <twin.h>
#include <tqlabel.h>
diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp
index 033967e6d..b137a7b09 100644
--- a/twin/kcmtwin/twinrules/kcm.cpp
+++ b/twin/kcmtwin/twinrules/kcm.cpp
@@ -18,9 +18,9 @@
#include "kcm.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <dcopclient.h>
#include <tdeaboutdata.h>
diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp
index cc2b4499b..21cb007ec 100644
--- a/twin/kcmtwin/twinrules/main.cpp
+++ b/twin/kcmtwin/twinrules/main.cpp
@@ -20,7 +20,7 @@
#include <tdeapplication.h>
#include <dcopclient.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <twin.h>
#include <X11/Xlib.h>
diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp
index dcf7cd358..334001bf7 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.cpp
+++ b/twin/kcmtwin/twinrules/ruleswidget.cpp
@@ -25,11 +25,11 @@
#include <kpushbutton.h>
#include <tqlabel.h>
#include <twinmodule.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqregexp.h>
#include <tqwhatsthis.h>
#include <assert.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqtabwidget.h>
#include <tqtimer.h>