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

---
 kommander/widgets/aboutdialog.cpp    | 2 +-
 kommander/widgets/buttongroup.cpp    | 2 +-
 kommander/widgets/closebutton.cpp    | 4 ++--
 kommander/widgets/combobox.cpp       | 2 +-
 kommander/widgets/dialog.cpp         | 2 +-
 kommander/widgets/execbutton.cpp     | 4 ++--
 kommander/widgets/fontdialog.cpp     | 2 +-
 kommander/widgets/groupbox.cpp       | 2 +-
 kommander/widgets/lineedit.cpp       | 2 +-
 kommander/widgets/listbox.cpp        | 2 +-
 kommander/widgets/pixmaplabel.cpp    | 2 +-
 kommander/widgets/popupmenu.cpp      | 4 ++--
 kommander/widgets/progressbar.cpp    | 2 +-
 kommander/widgets/richtexteditor.cpp | 2 +-
 kommander/widgets/scriptobject.cpp   | 4 ++--
 kommander/widgets/table.cpp          | 6 +++---
 kommander/widgets/tabwidget.cpp      | 2 +-
 kommander/widgets/textbrowser.cpp    | 2 +-
 kommander/widgets/textedit.cpp       | 2 +-
 kommander/widgets/timer.cpp          | 4 ++--
 kommander/widgets/toolbox.cpp        | 2 +-
 kommander/widgets/treewidget.cpp     | 4 ++--
 22 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'kommander/widgets')

diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index 7804e439..3d5a1d04 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -18,7 +18,7 @@
 #include <tdeaboutdata.h>
 #include <tdeaboutapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqtextstream.h>
diff --git a/kommander/widgets/buttongroup.cpp b/kommander/widgets/buttongroup.cpp
index a110889a..3d17b042 100644
--- a/kommander/widgets/buttongroup.cpp
+++ b/kommander/widgets/buttongroup.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 /* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* QT INCLUDES */
 #include <tqobject.h>
diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp
index 4ad1c3c3..21b4edff 100644
--- a/kommander/widgets/closebutton.cpp
+++ b/kommander/widgets/closebutton.cpp
@@ -15,8 +15,8 @@
  ***************************************************************************/
 
 /* KDE INCLUDES */
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 /* QT INCLUDES */
 #include <tqdialog.h>
diff --git a/kommander/widgets/combobox.cpp b/kommander/widgets/combobox.cpp
index 16275a21..278b5141 100644
--- a/kommander/widgets/combobox.cpp
+++ b/kommander/widgets/combobox.cpp
@@ -16,7 +16,7 @@
 
 /* KDE INCLUDES */
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* QT INCLUDES */
 #include <tqobject.h>
diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp
index 21a3f7c1..4f73cedc 100644
--- a/kommander/widgets/dialog.cpp
+++ b/kommander/widgets/dialog.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 /* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* QT INCLUDES */
 #include <tqstring.h>
diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp
index f4b73ccc..0864bedd 100644
--- a/kommander/widgets/execbutton.cpp
+++ b/kommander/widgets/execbutton.cpp
@@ -16,8 +16,8 @@
 
 /* KDE INCLUDES */
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 /* QT INCLUDES */
 #include <tqcursor.h>
diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp
index d03f87d8..d4125840 100644
--- a/kommander/widgets/fontdialog.cpp
+++ b/kommander/widgets/fontdialog.cpp
@@ -16,7 +16,7 @@
 
 #include <tdefontdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 enum Functions {
   FirstFunction = 139,
diff --git a/kommander/widgets/groupbox.cpp b/kommander/widgets/groupbox.cpp
index 7d4f43e8..a90f447e 100644
--- a/kommander/widgets/groupbox.cpp
+++ b/kommander/widgets/groupbox.cpp
@@ -23,7 +23,7 @@
 #include <tqevent.h>
 #include <tqgroupbox.h>
 #include <tqobjectlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* OTHER INCLUDES */
 #include "kommanderplugin.h"
diff --git a/kommander/widgets/lineedit.cpp b/kommander/widgets/lineedit.cpp
index 884e8b16..1cc6c774 100644
--- a/kommander/widgets/lineedit.cpp
+++ b/kommander/widgets/lineedit.cpp
@@ -21,7 +21,7 @@
 /* OTHER INCLUDES */
 #include <specials.h>
 #include "lineedit.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kommanderplugin.h>
 
 enum functions {
diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp
index 618e054d..1c5892eb 100644
--- a/kommander/widgets/listbox.cpp
+++ b/kommander/widgets/listbox.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 /* KDE INCLUDES */
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 /* QT INCLUDES */
diff --git a/kommander/widgets/pixmaplabel.cpp b/kommander/widgets/pixmaplabel.cpp
index 7eab9e0d..887b8d6e 100644
--- a/kommander/widgets/pixmaplabel.cpp
+++ b/kommander/widgets/pixmaplabel.cpp
@@ -22,7 +22,7 @@
 #include <tqpixmap.h>
 
 /* KDE INCLUDES */
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 /* OTHER INCLUDES */
diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp
index cfeb1e7d..a6f0e503 100644
--- a/kommander/widgets/popupmenu.cpp
+++ b/kommander/widgets/popupmenu.cpp
@@ -14,9 +14,9 @@
 
 #include <tqcursor.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kommanderplugin.h>
 
diff --git a/kommander/widgets/progressbar.cpp b/kommander/widgets/progressbar.cpp
index 8d2a51e2..ca14d44a 100644
--- a/kommander/widgets/progressbar.cpp
+++ b/kommander/widgets/progressbar.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 /* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* QT INCLUDES */
 #include <tqobject.h>
diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp
index daafcdab..3233ea8f 100644
--- a/kommander/widgets/richtexteditor.cpp
+++ b/kommander/widgets/richtexteditor.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 /* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* QT INCLUDES */
 #include <tqlayout.h>
diff --git a/kommander/widgets/scriptobject.cpp b/kommander/widgets/scriptobject.cpp
index d1cc6951..c353949c 100644
--- a/kommander/widgets/scriptobject.cpp
+++ b/kommander/widgets/scriptobject.cpp
@@ -18,9 +18,9 @@
 #include <tqwidget.h>
 
 /* KDE INCLUDES */
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 /* OTHER INCLUDES */
diff --git a/kommander/widgets/table.cpp b/kommander/widgets/table.cpp
index 862bb17a..64aec692 100644
--- a/kommander/widgets/table.cpp
+++ b/kommander/widgets/table.cpp
@@ -15,9 +15,9 @@
 
 
 /* KDE INCLUDES */
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 
 /* QT INCLUDES */
 #include <tqmetaobject.h>
diff --git a/kommander/widgets/tabwidget.cpp b/kommander/widgets/tabwidget.cpp
index a56c9118..7180a7d0 100644
--- a/kommander/widgets/tabwidget.cpp
+++ b/kommander/widgets/tabwidget.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 /* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 /* QT INCLUDES */
diff --git a/kommander/widgets/textbrowser.cpp b/kommander/widgets/textbrowser.cpp
index 770b853b..18d6d091 100644
--- a/kommander/widgets/textbrowser.cpp
+++ b/kommander/widgets/textbrowser.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 /* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* QT INCLUDES */
 #include <tqstringlist.h>
diff --git a/kommander/widgets/textedit.cpp b/kommander/widgets/textedit.cpp
index 3279e277..65302ac5 100644
--- a/kommander/widgets/textedit.cpp
+++ b/kommander/widgets/textedit.cpp
@@ -24,7 +24,7 @@
 /* OTHER INCLUDES */
 #include <specials.h>
 #include "textedit.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kommanderplugin.h>
 
 enum Functions {
diff --git a/kommander/widgets/timer.cpp b/kommander/widgets/timer.cpp
index 44de93a5..a05c26ba 100644
--- a/kommander/widgets/timer.cpp
+++ b/kommander/widgets/timer.cpp
@@ -18,9 +18,9 @@
 #include <tqwidget.h>
 
 /* KDE INCLUDES */
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 /* OTHER INCLUDES */
diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp
index c2d37ff4..9fca3935 100644
--- a/kommander/widgets/toolbox.cpp
+++ b/kommander/widgets/toolbox.cpp
@@ -14,7 +14,7 @@
 #include "specials.h"
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define ADDWIDGET 120
 #define CURRENTWIDGET 121
diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp
index 3e62a26d..0a4b0ad9 100644
--- a/kommander/widgets/treewidget.cpp
+++ b/kommander/widgets/treewidget.cpp
@@ -17,8 +17,8 @@
  ***************************************************************************/
 
 /* KDE INCLUDES */
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
 
-- 
cgit v1.2.1