summaryrefslogtreecommitdiffstats
path: root/lib/compatibility/tdemdi
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:37 -0600
commit279764bab1514a051db18e14241e9bae62be14d6 (patch)
treec587a443a0a228897e395535e2791dbde757bb3d /lib/compatibility/tdemdi
parentee38b2862bfd887e95cf62fdf244edad40ece7b2 (diff)
downloadtdewebdev-279764bab1514a051db18e14241e9bae62be14d6.tar.gz
tdewebdev-279764bab1514a051db18e14241e9bae62be14d6.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'lib/compatibility/tdemdi')
-rw-r--r--lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp6
-rw-r--r--lib/compatibility/tdemdi/qextmdi/ktabbar.cpp4
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp4
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp4
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp4
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h2
10 files changed, 16 insertions, 16 deletions
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
index f6bed90c..ee670afb 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
@@ -34,13 +34,13 @@
#ifndef NO_KDE2
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdetoolbar.h>
#include <tdepopupmenu.h>
#include <twin.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "config.h"
#ifdef TQ_WS_X11
diff --git a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp
index 6ef95971..625fab54 100644
--- a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp
@@ -26,9 +26,9 @@
#include <tqpushbutton.h>
#include <tqtooltip.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "ktabbar.h"
#include "ktabwidget.h"
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
index 916cee5b..e1cab53e 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/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/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
index 4e6586f7..47c81c0a 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
@@ -45,7 +45,7 @@
#include <tqnamespace.h>
#include <tqimage.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
//////////////////////////////////////////////////////////////////////////////
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
index ca8c3e28..96099c69 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
@@ -38,7 +38,7 @@
#include "tdemdichildfrm.h"
#include "tdemdichildarea.h"
#include "tdemdimainfrm.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <iostream>
#ifdef TQ_WS_WIN
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
index 69b4effd..e743fc1e 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/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/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
index 86612830..a8a4dc37 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/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/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
index d3bea4c2..2e0076a1 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/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/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
index 96fdf21a..050c0256 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/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 <kiconloader.h>
#include <tdemdidockcontainer.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
index db464c9c..14996638 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
+++ b/lib/compatibility/tdemdi/qextmdi/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>