summaryrefslogtreecommitdiffstats
path: root/kmenuedit
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 /kmenuedit
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kmenuedit')
-rw-r--r--kmenuedit/basictab.cpp6
-rw-r--r--kmenuedit/kcontrol_main.cpp2
-rw-r--r--kmenuedit/kmenuedit.cpp6
-rw-r--r--kmenuedit/main.cpp2
-rw-r--r--kmenuedit/menufile.cpp4
-rw-r--r--kmenuedit/treeview.cpp6
6 files changed, 13 insertions, 13 deletions
diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp
index 45c6a1c2..8f439663 100644
--- a/kmenuedit/basictab.cpp
+++ b/kmenuedit/basictab.cpp
@@ -26,13 +26,13 @@
#include <tqhbox.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdialog.h>
#include <kkeybutton.h>
#include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kicondialog.h>
#include <kdesktopfile.h>
#include <kurlrequester.h>
diff --git a/kmenuedit/kcontrol_main.cpp b/kmenuedit/kcontrol_main.cpp
index fb50c8ff..2ec45ca6 100644
--- a/kmenuedit/kcontrol_main.cpp
+++ b/kmenuedit/kcontrol_main.cpp
@@ -22,7 +22,7 @@
#include <unistd.h>
#include <kuniqueapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
#include <kstandarddirs.h>
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp
index fc86e6d3..9e3b8209 100644
--- a/kmenuedit/kmenuedit.cpp
+++ b/kmenuedit/kmenuedit.cpp
@@ -25,9 +25,9 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kedittoolbar.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kservice.h>
#include <kstdaction.h>
#include <tdestdaccel.h>
diff --git a/kmenuedit/main.cpp b/kmenuedit/main.cpp
index 15b1e9d4..b78a71ef 100644
--- a/kmenuedit/main.cpp
+++ b/kmenuedit/main.cpp
@@ -21,7 +21,7 @@
#include <unistd.h>
#include <kuniqueapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/kmenuedit/menufile.cpp b/kmenuedit/menufile.cpp
index 38f02ddc..1109d6b7 100644
--- a/kmenuedit/menufile.cpp
+++ b/kmenuedit/menufile.cpp
@@ -21,8 +21,8 @@
#include <tqregexp.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include "menufile.h"
diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index 2fb6371b..eac0f399 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -33,16 +33,16 @@
#include <tqregexp.h>
#include <tqstringlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kdesktopfile.h>
#include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kservice.h>
#include <kservicegroup.h>