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

---
 languages/cpp/debugger/breakpoint.cpp            | 2 +-
 languages/cpp/debugger/breakpoint.h              | 2 +-
 languages/cpp/debugger/dbgpsdlg.cpp              | 6 +++---
 languages/cpp/debugger/dbgtoolbar.cpp            | 2 +-
 languages/cpp/debugger/debuggerpart.cpp          | 4 ++--
 languages/cpp/debugger/debuggertracingdialog.cpp | 2 +-
 languages/cpp/debugger/disassemblewidget.cpp     | 2 +-
 languages/cpp/debugger/framestackwidget.cpp      | 4 ++--
 languages/cpp/debugger/gdbbreakpointwidget.cpp   | 4 ++--
 languages/cpp/debugger/gdbcontroller.cpp         | 6 +++---
 languages/cpp/debugger/gdboutputwidget.cpp       | 2 +-
 languages/cpp/debugger/memviewdlg.cpp            | 6 +++---
 languages/cpp/debugger/stty.cpp                  | 2 +-
 languages/cpp/debugger/variablewidget.cpp        | 4 ++--
 14 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'languages/cpp/debugger')

diff --git a/languages/cpp/debugger/breakpoint.cpp b/languages/cpp/debugger/breakpoint.cpp
index 1b6efdaf..f0bfb48d 100644
--- a/languages/cpp/debugger/breakpoint.cpp
+++ b/languages/cpp/debugger/breakpoint.cpp
@@ -17,7 +17,7 @@
 #include "gdbcontroller.h"
 #include "gdbcommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqfileinfo.h>
diff --git a/languages/cpp/debugger/breakpoint.h b/languages/cpp/debugger/breakpoint.h
index 4927d9b9..32ba84a2 100644
--- a/languages/cpp/debugger/breakpoint.h
+++ b/languages/cpp/debugger/breakpoint.h
@@ -16,7 +16,7 @@
 #ifndef _BREAKPOINT_H_
 #define _BREAKPOINT_H_
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqobject.h>
 #include <tqstring.h>
diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp
index fd85999f..385b0c39 100644
--- a/languages/cpp/debugger/dbgpsdlg.cpp
+++ b/languages/cpp/debugger/dbgpsdlg.cpp
@@ -17,14 +17,14 @@
 
 #include <kbuttonbox.h>
 #include <kdialog.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 #include <tdelistview.h>
 #include <tdelistviewsearchline.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqframe.h>
 #include <tqlabel.h>
diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index cee864c1..42c1857f 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -19,7 +19,7 @@
 
 #include <kdockwindow.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <twin.h>
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index 3ff54246..d57b6d6f 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -25,12 +25,12 @@
 #include <tdefiledialog.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kstatusbar.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqtimer.h>
diff --git a/languages/cpp/debugger/debuggertracingdialog.cpp b/languages/cpp/debugger/debuggertracingdialog.cpp
index 6bf70f3b..90657b29 100644
--- a/languages/cpp/debugger/debuggertracingdialog.cpp
+++ b/languages/cpp/debugger/debuggertracingdialog.cpp
@@ -7,7 +7,7 @@
 #include <tqcheckbox.h>
 #include <klineedit.h>
 #include <keditlistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace GDBDebugger
 {
diff --git a/languages/cpp/debugger/disassemblewidget.cpp b/languages/cpp/debugger/disassemblewidget.cpp
index 9f6bc185..83dd9cb5 100644
--- a/languages/cpp/debugger/disassemblewidget.cpp
+++ b/languages/cpp/debugger/disassemblewidget.cpp
@@ -20,7 +20,7 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <ktextedit.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqdict.h>
 #include <tqheader.h>
diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp
index 773e6a4a..ea0fa552 100644
--- a/languages/cpp/debugger/framestackwidget.cpp
+++ b/languages/cpp/debugger/framestackwidget.cpp
@@ -17,9 +17,9 @@
 #include "gdbparser.h"
 #include "gdbcommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqheader.h>
 #include <tqlistbox.h>
diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp
index ab54deb0..2e002a7a 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -24,10 +24,10 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqvbuttongroup.h>
 #include <tqfileinfo.h>
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index 2588892c..d5207a24 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -27,9 +27,9 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <twin.h>
 
diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp
index 4a8b30d3..9bfc96dd 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -21,7 +21,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include <tqlabel.h>
diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp
index 81340ea5..e76d2820 100644
--- a/languages/cpp/debugger/memviewdlg.cpp
+++ b/languages/cpp/debugger/memviewdlg.cpp
@@ -19,8 +19,8 @@
 
 #include <kbuttonbox.h>
 #include <klineedit.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 #include <kdebug.h>
@@ -36,7 +36,7 @@
 #include <tqtoolbox.h>
 #include <tqtextedit.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <khexedit/byteseditinterface.h>
 
diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp
index bc36f191..23635bdd 100644
--- a/languages/cpp/debugger/stty.cpp
+++ b/languages/cpp/debugger/stty.cpp
@@ -64,7 +64,7 @@
 #include <tqstring.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 
diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index 7df6b64c..7906ceb5 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -33,12 +33,12 @@
 #include <tqregexp.h>
 #include <tqcursor.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqpoint.h>
 #include <tqclipboard.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <cctype>
 #include <set>
-- 
cgit v1.2.3