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

---
 src/gui/colorcombo.cpp         | 2 +-
 src/gui/contexthelp.cpp        | 2 +-
 src/gui/doublespinbox.cpp      | 4 ++--
 src/gui/itemeditor.cpp         | 2 +-
 src/gui/itemselector.cpp       | 2 +-
 src/gui/logview.cpp            | 2 +-
 src/gui/microselectwidget.cpp  | 2 +-
 src/gui/microsettingsdlg.cpp   | 4 ++--
 src/gui/newfiledlg.cpp         | 2 +-
 src/gui/oscilloscope.cpp       | 4 ++--
 src/gui/oscilloscopeview.cpp   | 4 ++--
 src/gui/outputmethoddlg.cpp    | 2 +-
 src/gui/pieditor.cpp           | 2 +-
 src/gui/programmerdlg.cpp      | 2 +-
 src/gui/projectdlgs.cpp        | 2 +-
 src/gui/propertieslistview.cpp | 2 +-
 src/gui/settingsdlg.cpp        | 4 ++--
 src/gui/symbolviewer.cpp       | 2 +-
 18 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/colorcombo.cpp b/src/gui/colorcombo.cpp
index 55b8958..e5d17dd 100644
--- a/src/gui/colorcombo.cpp
+++ b/src/gui/colorcombo.cpp
@@ -11,7 +11,7 @@
 #include "colorcombo.h"
 
 #include <kcolordialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 
 bool ColorCombo::createdPalettes = false;
diff --git a/src/gui/contexthelp.cpp b/src/gui/contexthelp.cpp
index c19105e..f12ed61 100644
--- a/src/gui/contexthelp.cpp
+++ b/src/gui/contexthelp.cpp
@@ -14,7 +14,7 @@
 #include "itemlibrary.h"
 #include "katemdi.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/src/gui/doublespinbox.cpp b/src/gui/doublespinbox.cpp
index c847ae3..d513ebd 100644
--- a/src/gui/doublespinbox.cpp
+++ b/src/gui/doublespinbox.cpp
@@ -12,8 +12,8 @@
 #include "doublespinbox.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <tqlineedit.h>
 #include <tqregexp.h>
diff --git a/src/gui/itemeditor.cpp b/src/gui/itemeditor.cpp
index f82f46e..fa37dfb 100644
--- a/src/gui/itemeditor.cpp
+++ b/src/gui/itemeditor.cpp
@@ -14,7 +14,7 @@
 #include "orientationwidget.h"
 #include "propertieslistview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqlayout.h>
diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp
index f4ba5e6..d10cd52 100644
--- a/src/gui/itemselector.cpp
+++ b/src/gui/itemselector.cpp
@@ -21,7 +21,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqdragobject.h>
 #include <tqlayout.h>
diff --git a/src/gui/logview.cpp b/src/gui/logview.cpp
index 2da75a2..9031f45 100644
--- a/src/gui/logview.cpp
+++ b/src/gui/logview.cpp
@@ -13,7 +13,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <katemdi.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpopupmenu.h>
 
 
diff --git a/src/gui/microselectwidget.cpp b/src/gui/microselectwidget.cpp
index d6c1ced..0abb83d 100644
--- a/src/gui/microselectwidget.cpp
+++ b/src/gui/microselectwidget.cpp
@@ -14,7 +14,7 @@
 #include "microselectwidget.h"
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/src/gui/microsettingsdlg.cpp b/src/gui/microsettingsdlg.cpp
index e551ebd..195aa3d 100644
--- a/src/gui/microsettingsdlg.cpp
+++ b/src/gui/microsettingsdlg.cpp
@@ -20,8 +20,8 @@
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 
 #include <tqgroupbox.h>
diff --git a/src/gui/newfiledlg.cpp b/src/gui/newfiledlg.cpp
index 4a32b00..fd929e6 100644
--- a/src/gui/newfiledlg.cpp
+++ b/src/gui/newfiledlg.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <klineedit.h>
 #include <kiconview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <tqcanvas.h>
diff --git a/src/gui/oscilloscope.cpp b/src/gui/oscilloscope.cpp
index d88924c..92c32bf 100644
--- a/src/gui/oscilloscope.cpp
+++ b/src/gui/oscilloscope.cpp
@@ -20,9 +20,9 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h> 
+#include <tdelocale.h> 
 #include <knuminput.h>
 #include <tqbutton.h>
 #include <tqlabel.h>
diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp
index e827814..5abcd3f 100644
--- a/src/gui/oscilloscopeview.cpp
+++ b/src/gui/oscilloscopeview.cpp
@@ -16,8 +16,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdepopupmenu.h>
 #include <tqcheckbox.h>
 #include <tqcursor.h>
diff --git a/src/gui/outputmethoddlg.cpp b/src/gui/outputmethoddlg.cpp
index cb53109..2162865 100644
--- a/src/gui/outputmethoddlg.cpp
+++ b/src/gui/outputmethoddlg.cpp
@@ -20,7 +20,7 @@
 #include <kcombobox.h>
 #include <tdeconfigskeleton.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurlrequester.h>
 
 #include <tqcheckbox.h>
diff --git a/src/gui/pieditor.cpp b/src/gui/pieditor.cpp
index 3b9505b..941126f 100644
--- a/src/gui/pieditor.cpp
+++ b/src/gui/pieditor.cpp
@@ -15,7 +15,7 @@
 
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kurlrequester.h>
 #include <tqlayout.h>
diff --git a/src/gui/programmerdlg.cpp b/src/gui/programmerdlg.cpp
index c8a8066..77446d8 100644
--- a/src/gui/programmerdlg.cpp
+++ b/src/gui/programmerdlg.cpp
@@ -18,7 +18,7 @@
 
 #include <kcombobox.h>
 #include <kguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 
 ProgrammerDlg::ProgrammerDlg( const TQString & picID, TQWidget *parent, const char *name )
diff --git a/src/gui/projectdlgs.cpp b/src/gui/projectdlgs.cpp
index d6f0ac6..f6e2718 100644
--- a/src/gui/projectdlgs.cpp
+++ b/src/gui/projectdlgs.cpp
@@ -22,7 +22,7 @@
 #include <tdeversion.h>
 #include <tdefiledialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/src/gui/propertieslistview.cpp b/src/gui/propertieslistview.cpp
index cf30212..560dedd 100644
--- a/src/gui/propertieslistview.cpp
+++ b/src/gui/propertieslistview.cpp
@@ -19,7 +19,7 @@
 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqevent.h>
 #include <tqheader.h>
 #include <tqpushbutton.h>
diff --git a/src/gui/settingsdlg.cpp b/src/gui/settingsdlg.cpp
index 5b113e0..e8e481d 100644
--- a/src/gui/settingsdlg.cpp
+++ b/src/gui/settingsdlg.cpp
@@ -25,8 +25,8 @@
 #include <tdeconfig.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
diff --git a/src/gui/symbolviewer.cpp b/src/gui/symbolviewer.cpp
index e887c8b..0e972e2 100644
--- a/src/gui/symbolviewer.cpp
+++ b/src/gui/symbolviewer.cpp
@@ -17,7 +17,7 @@
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-- 
cgit v1.2.1