summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:47:18 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:47:18 -0600
commit58f49dd1a1b651f336d96a92f8c7e66bcdc6a0f5 (patch)
tree861468806ac7cf2997c1476897ddb41bc37e0dd5
parent876d8b2b84c183c7e78c691bdaee9da3bb319ba2 (diff)
downloadknowit-58f49dd1a1b651f336d96a92f8c7e66bcdc6a0f5.tar.gz
knowit-58f49dd1a1b651f336d96a92f8c7e66bcdc6a0f5.zip
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--src/knowit.cpp4
-rw-r--r--src/knowit.h2
-rw-r--r--src/knowitchooser.cpp2
-rw-r--r--src/knowitlink.cpp4
-rw-r--r--src/knowitpref.cpp4
-rw-r--r--src/knowittray.cpp2
-rw-r--r--src/knowittree.cpp2
-rw-r--r--src/main.cpp2
-rw-r--r--src/notes.cpp4
9 files changed, 13 insertions, 13 deletions
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>