summaryrefslogtreecommitdiffstats
path: root/kicker/menuext
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 /kicker/menuext
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kicker/menuext')
-rw-r--r--kicker/menuext/kate/katesessionmenu.cpp6
-rw-r--r--kicker/menuext/konq-profiles/konqy_menu.cpp4
-rw-r--r--kicker/menuext/konsole/konsole_mnu.cpp4
-rw-r--r--kicker/menuext/konsole/konsolebookmarkmenu.cpp2
-rw-r--r--kicker/menuext/prefmenu/prefmenu.cpp4
-rw-r--r--kicker/menuext/recentdocs/recentdocsmenu.cpp6
-rw-r--r--kicker/menuext/remote/remotemenu.cpp2
-rw-r--r--kicker/menuext/tdeprint/print_mnu.cpp4
-rw-r--r--kicker/menuext/tom/tom.cc6
9 files changed, 19 insertions, 19 deletions
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index 73a257388..854f4ce31 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -23,12 +23,12 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kinputdialog.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp
index ec0033282..321d9ac59 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.cpp
+++ b/kicker/menuext/konq-profiles/konqy_menu.cpp
@@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "konqy_menu.h"
#include <kiconloader.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeapplication.h>
#include <krun.h>
#include <kstandarddirs.h>
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index a99ca24e0..c9439c8db 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -31,10 +31,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqfileinfo.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tdeio/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <krun.h>
#include <kshell.h>
#include <ksimpleconfig.h>
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
index 420a17c3b..0860cc123 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
@@ -17,7 +17,7 @@
#include <tqfile.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 400baba8e..d41ca66aa 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -25,9 +25,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqtimer.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kservice.h>
#include <kservicegroup.h>
#include <kstandarddirs.h>
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index 566543f45..19adfa868 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -25,12 +25,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqstring.h>
#include <tqstringlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdesktopfile.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeapplication.h>
#include <kurldrag.h>
#include <tderecentdocument.h>
diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp
index f6b9a8a10..aeaff8e94 100644
--- a/kicker/menuext/remote/remotemenu.cpp
+++ b/kicker/menuext/remote/remotemenu.cpp
@@ -20,7 +20,7 @@
#include "remotemenu.h"
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <krun.h>
#include <kiconloader.h>
diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp
index a50a293f8..a4dbe3dfb 100644
--- a/kicker/menuext/tdeprint/print_mnu.cpp
+++ b/kicker/menuext/tdeprint/print_mnu.cpp
@@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "print_mnu.h"
#include <kiconloader.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeapplication.h>
#include <krun.h>
#include <tdeprint/kmmanager.h>
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index 761eebd51..fa8fcb385 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -37,11 +37,11 @@ using namespace std;
#include <tdeapplication.h>
#include <kcombobox.h>
#include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kiconeffect.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kmimetype.h>
#include <kpixmap.h>
#include <tderecentdocument.h>