summaryrefslogtreecommitdiffstats
path: root/tdm/kfrontend
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
commit77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch)
treea1cce95474892add7cb970b8e9fbdb16e12bc2d7 /tdm/kfrontend
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdm/kfrontend')
-rw-r--r--tdm/kfrontend/kchooser.cpp2
-rw-r--r--tdm/kfrontend/kconsole.cpp2
-rw-r--r--tdm/kfrontend/kfdialog.cpp4
-rw-r--r--tdm/kfrontend/kgapp.cpp2
-rw-r--r--tdm/kfrontend/kgdialog.cpp2
-rw-r--r--tdm/kfrontend/kgreeter.cpp2
-rw-r--r--tdm/kfrontend/kgverify.cpp2
-rw-r--r--tdm/kfrontend/krootimage.cpp2
-rw-r--r--tdm/kfrontend/sakdlg.cc6
-rw-r--r--tdm/kfrontend/tdmadmindialog.cpp2
-rw-r--r--tdm/kfrontend/tdmconfig.cpp2
-rw-r--r--tdm/kfrontend/tdmshutdown.cpp2
-rw-r--r--tdm/kfrontend/themer/tdmitem.cpp2
-rw-r--r--tdm/kfrontend/themer/tdmlabel.cpp4
-rw-r--r--tdm/kfrontend/themer/tdmthemer.cpp2
15 files changed, 19 insertions, 19 deletions
diff --git a/tdm/kfrontend/kchooser.cpp b/tdm/kfrontend/kchooser.cpp
index 00b08cd3..9f0c714c 100644
--- a/tdm/kfrontend/kchooser.cpp
+++ b/tdm/kfrontend/kchooser.cpp
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "tdmconfig.h"
#include "tdm_greet.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/tdm/kfrontend/kconsole.cpp b/tdm/kfrontend/kconsole.cpp
index 834507bd..bf1560ae 100644
--- a/tdm/kfrontend/kconsole.cpp
+++ b/tdm/kfrontend/kconsole.cpp
@@ -56,7 +56,7 @@ extern "C" {
#include "tdmconfig.h"
#include "tdm_greet.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpty.h>
#include <tqsocketnotifier.h>
diff --git a/tdm/kfrontend/kfdialog.cpp b/tdm/kfrontend/kfdialog.cpp
index 4b3af723..ba05b029 100644
--- a/tdm/kfrontend/kfdialog.cpp
+++ b/tdm/kfrontend/kfdialog.cpp
@@ -25,10 +25,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "kfdialog.h"
#include "tdmconfig.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index 19007407..37c8130c 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kcrash.h>
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#ifdef WITH_XRANDR
#include <libtderandr/libtderandr.h>
diff --git a/tdm/kfrontend/kgdialog.cpp b/tdm/kfrontend/kgdialog.cpp
index 667eca8e..5d5d2a18 100644
--- a/tdm/kfrontend/kgdialog.cpp
+++ b/tdm/kfrontend/kgdialog.cpp
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "tdmshutdown.h"
#include "tdm_greet.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tqaccel.h>
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index bc906d6d..173b7def 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "themer/tdmlabel.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kseparator.h>
#include <tdelistview.h>
diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp
index 6cca0886..c78d20b9 100644
--- a/tdm/kfrontend/kgverify.cpp
+++ b/tdm/kfrontend/kgverify.cpp
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "themer/tdmitem.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klibloader.h>
#include <kseparator.h>
#include <kstdguiitem.h>
diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp
index 63c7cc41..7145eb18 100644
--- a/tdm/kfrontend/krootimage.cpp
+++ b/tdm/kfrontend/krootimage.cpp
@@ -23,7 +23,7 @@ Boston, MA 02110-1301, USA.
#include <tdecmdlineargs.h>
#include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfile.h>
diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cc
index a73d349b..d9f1a1e4 100644
--- a/tdm/kfrontend/sakdlg.cc
+++ b/tdm/kfrontend/sakdlg.cc
@@ -11,11 +11,11 @@
#include <dmctl.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <kseparator.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <tdesu/defaults.h>
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <kuser.h>
#include <dcopref.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdialog.h>
#include <tqlayout.h>
diff --git a/tdm/kfrontend/tdmadmindialog.cpp b/tdm/kfrontend/tdmadmindialog.cpp
index 5c3c87bc..7c792c08 100644
--- a/tdm/kfrontend/tdmadmindialog.cpp
+++ b/tdm/kfrontend/tdmadmindialog.cpp
@@ -30,7 +30,7 @@
#include <tdeapplication.h>
#include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
diff --git a/tdm/kfrontend/tdmconfig.cpp b/tdm/kfrontend/tdmconfig.cpp
index 2b7b5ab2..2d68bf8e 100644
--- a/tdm/kfrontend/tdmconfig.cpp
+++ b/tdm/kfrontend/tdmconfig.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "tdm_greet.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp
index 0e53ffe2..d8ab1635 100644
--- a/tdm/kfrontend/tdmshutdown.cpp
+++ b/tdm/kfrontend/tdmshutdown.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <tdeapplication.h>
#include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
#include <kprocio.h>
diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp
index 13969c4b..91ab5efd 100644
--- a/tdm/kfrontend/themer/tdmitem.cpp
+++ b/tdm/kfrontend/themer/tdmitem.cpp
@@ -29,7 +29,7 @@
#include "tdmlayout.h"
#include "tdmconfig.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <tqframe.h>
diff --git a/tdm/kfrontend/themer/tdmlabel.cpp b/tdm/kfrontend/themer/tdmlabel.cpp
index 8841eb22..f2fae90a 100644
--- a/tdm/kfrontend/themer/tdmlabel.cpp
+++ b/tdm/kfrontend/themer/tdmlabel.cpp
@@ -24,8 +24,8 @@
#include "tdmconfig.h"
#include "../kgreeter.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kmacroexpander.h>
#include <kdebug.h>
diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp
index da758027..d485ab1e 100644
--- a/tdm/kfrontend/themer/tdmthemer.cpp
+++ b/tdm/kfrontend/themer/tdmthemer.cpp
@@ -30,7 +30,7 @@
#include <kiconloader.h>
#include <kimageeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kdebug.h>