From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:57:54 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 tdemdi/tdemdi/dockcontainer.cpp  | 4 ++--
 tdemdi/tdemdi/guiclient.cpp      | 2 +-
 tdemdi/tdemdi/mainwindow.cpp     | 4 ++--
 tdemdi/tdemdi/mainwindow.h       | 2 +-
 tdemdi/tdemdichildarea.cpp       | 4 ++--
 tdemdi/tdemdichildfrm.cpp        | 2 +-
 tdemdi/tdemdichildfrmcaption.cpp | 2 +-
 tdemdi/tdemdichildview.cpp       | 2 +-
 tdemdi/tdemdidockcontainer.cpp   | 4 ++--
 tdemdi/tdemdiguiclient.cpp       | 2 +-
 tdemdi/tdemdimainfrm.cpp         | 4 ++--
 tdemdi/tdemdimainfrm.h           | 2 +-
 12 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'tdemdi')

diff --git a/tdemdi/tdemdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp
index 88bfa020d..be7c00929 100644
--- a/tdemdi/tdemdi/dockcontainer.cpp
+++ b/tdemdi/tdemdi/dockcontainer.cpp
@@ -29,13 +29,13 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 #include <tdemultitabbar.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //TODO: Well, this is already defined in tdeui/kdockwidget.cpp
 static const char* const tdemdi_not_close_xpm[]={
diff --git a/tdemdi/tdemdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp
index 255150289..9201df7b3 100644
--- a/tdemdi/tdemdi/guiclient.cpp
+++ b/tdemdi/tdemdi/guiclient.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdetoolbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tqstring.h>
 #include <kdebug.h>
diff --git a/tdemdi/tdemdi/mainwindow.cpp b/tdemdi/tdemdi/mainwindow.cpp
index 4d477fc9c..411d11771 100644
--- a/tdemdi/tdemdi/mainwindow.cpp
+++ b/tdemdi/tdemdi/mainwindow.cpp
@@ -51,12 +51,12 @@
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tqtabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kiconloader.h>
 #include "dockcontainer.h"
diff --git a/tdemdi/tdemdi/mainwindow.h b/tdemdi/tdemdi/mainwindow.h
index e8ae6e9fc..0c333a151 100644
--- a/tdemdi/tdemdi/mainwindow.h
+++ b/tdemdi/tdemdi/mainwindow.h
@@ -43,7 +43,7 @@
 #define _KMDI_MAINWINDOW_H_
 
 #include <tdeparts/dockmainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 
 #include <tqptrlist.h>
diff --git a/tdemdi/tdemdichildarea.cpp b/tdemdi/tdemdichildarea.cpp
index 9370bbbe7..29b0b3d2d 100644
--- a/tdemdi/tdemdichildarea.cpp
+++ b/tdemdi/tdemdichildarea.cpp
@@ -32,8 +32,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 
 #include <math.h>
 #include <tqpopupmenu.h>
diff --git a/tdemdi/tdemdichildfrm.cpp b/tdemdi/tdemdichildfrm.cpp
index cbc4f4b29..40ced6ffb 100644
--- a/tdemdi/tdemdichildfrm.cpp
+++ b/tdemdi/tdemdichildfrm.cpp
@@ -45,7 +45,7 @@
 #include <tqnamespace.h>
 #include <tqimage.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/tdemdi/tdemdichildfrmcaption.cpp b/tdemdi/tdemdichildfrmcaption.cpp
index cc1a4a187..e8e91ea94 100644
--- a/tdemdi/tdemdichildfrmcaption.cpp
+++ b/tdemdi/tdemdichildfrmcaption.cpp
@@ -38,7 +38,7 @@
 #include "tdemdichildfrm.h"
 #include "tdemdichildarea.h"
 #include "tdemdimainfrm.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <iostream>
 
 #ifdef Q_WS_WIN 
diff --git a/tdemdi/tdemdichildview.cpp b/tdemdi/tdemdichildview.cpp
index 1c3f521f7..4d0aa4166 100644
--- a/tdemdi/tdemdichildview.cpp
+++ b/tdemdi/tdemdichildview.cpp
@@ -39,7 +39,7 @@
 #include "tdemdichildfrm.h"
 #include "tdemdidefines.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqiconset.h>
 
 //============ KMdiChildView ============//
diff --git a/tdemdi/tdemdidockcontainer.cpp b/tdemdi/tdemdidockcontainer.cpp
index ba0ba0de0..d6771b597 100644
--- a/tdemdi/tdemdidockcontainer.cpp
+++ b/tdemdi/tdemdidockcontainer.cpp
@@ -28,13 +28,13 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 #include <tdemultitabbar.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //TODO: Well, this is already defined in tdeui/kdockwidget.cpp
 static const char* const tdemdi_not_close_xpm[] =
diff --git a/tdemdi/tdemdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp
index 1c43b8039..0a66ea6ff 100644
--- a/tdemdi/tdemdiguiclient.cpp
+++ b/tdemdi/tdemdiguiclient.cpp
@@ -25,7 +25,7 @@
 #include <tdeconfig.h>
 #include <tdetoolbar.h>
 #include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tqstring.h>
 #include <assert.h>
diff --git a/tdemdi/tdemdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp
index 3c9f7c442..f21cc384b 100644
--- a/tdemdi/tdemdimainfrm.cpp
+++ b/tdemdi/tdemdimainfrm.cpp
@@ -43,12 +43,12 @@
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tqtabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdestdaccel.h>
 
 #include <kiconloader.h>
diff --git a/tdemdi/tdemdimainfrm.h b/tdemdi/tdemdimainfrm.h
index 720324ad5..c73fa5af1 100644
--- a/tdemdi/tdemdimainfrm.h
+++ b/tdemdi/tdemdimainfrm.h
@@ -32,7 +32,7 @@
 #define _KMDIMAINFRM_H_
 
 #include <tdeparts/dockmainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 
 #include <tqptrlist.h>
-- 
cgit v1.2.1