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

---
 src/knowit.cpp        | 4 ++--
 src/knowit.h          | 2 +-
 src/knowitchooser.cpp | 2 +-
 src/knowitlink.cpp    | 4 ++--
 src/knowitpref.cpp    | 4 ++--
 src/knowittray.cpp    | 2 +-
 src/knowittree.cpp    | 2 +-
 src/main.cpp          | 2 +-
 src/notes.cpp         | 4 ++--
 9 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/knowit.cpp b/src/knowit.cpp
index 3cf2c23..7089fe7 100644
--- a/src/knowit.cpp
+++ b/src/knowit.cpp
@@ -35,8 +35,8 @@
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
 #include <kkeydialog.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdepopupmenu.h>
 #include <kprinter.h>
diff --git a/src/knowit.h b/src/knowit.h
index 5bb613c..f9ebefb 100644
--- a/src/knowit.h
+++ b/src/knowit.h
@@ -25,7 +25,7 @@
 #include <tqurloperator.h>
 
 #include <keditcl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kurl.h>
 #include "knowitpref.h"
diff --git a/src/knowitchooser.cpp b/src/knowitchooser.cpp
index 450aaf3..accc039 100644
--- a/src/knowitchooser.cpp
+++ b/src/knowitchooser.cpp
@@ -23,7 +23,7 @@
 #include <tqvbox.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 KnowitChooser::KnowitChooser(int flags) 
diff --git a/src/knowitlink.cpp b/src/knowitlink.cpp
index 3c6b775..a35f84f 100644
--- a/src/knowitlink.cpp
+++ b/src/knowitlink.cpp
@@ -24,9 +24,9 @@
 #include <tqvbox.h>
 
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 
diff --git a/src/knowitpref.cpp b/src/knowitpref.cpp
index bafec7b..7e296e0 100644
--- a/src/knowitpref.cpp
+++ b/src/knowitpref.cpp
@@ -31,9 +31,9 @@
 
 #include <tdeconfig.h>
 #include <kcombobox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 #include <tdefontdialog.h>
 #include <klineedit.h>
diff --git a/src/knowittray.cpp b/src/knowittray.cpp
index f8e1419..8189605 100644
--- a/src/knowittray.cpp
+++ b/src/knowittray.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include "knowittray.h"
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
   
 KnowitTray::KnowitTray (TQWidget* parent, const char* name) :
    KSystemTray(parent, name)
diff --git a/src/knowittree.cpp b/src/knowittree.cpp
index 0d7fb4e..5b9335f 100644
--- a/src/knowittree.cpp
+++ b/src/knowittree.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqevent.h>
 #include <tqdragobject.h>
 #include <tqheader.h>
diff --git a/src/main.cpp b/src/main.cpp
index 624c144..9731aa8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,7 +17,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "knowit.h"
 #include "knowitapp.h"
 
diff --git a/src/notes.cpp b/src/notes.cpp
index 3a6d012..d0ca588 100644
--- a/src/notes.cpp
+++ b/src/notes.cpp
@@ -21,9 +21,9 @@
 #include <tqdatetime.h>
 #include <tqtextstream.h>
 #include <tqtextcodec.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <krun.h>
-- 
cgit v1.2.1