summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:47:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:47:20 -0600
commit3b0a765c47e6508ccb7eaa292f94c7c622bd8f9e (patch)
treec37b5b17a2e03a42e128e27864db6ea2bf6a77de /src
parentc2f0acf91e008293485869d28506042978a5ab7c (diff)
downloadknutclient-3b0a765c47e6508ccb7eaa292f94c7c622bd8f9e.tar.gz
knutclient-3b0a765c47e6508ccb7eaa292f94c7c622bd8f9e.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rwxr-xr-xsrc/knutdock.cpp6
-rwxr-xr-xsrc/knutfrontpanel.cpp2
-rwxr-xr-xsrc/knutinstcomms.cpp2
-rwxr-xr-xsrc/knutinstcomms.h2
-rw-r--r--src/knutmainwindow.cpp2
-rw-r--r--src/knutmessage.cpp2
-rw-r--r--src/knutnewupsdlg.cpp4
-rw-r--r--src/knutprefdlg.h2
-rw-r--r--src/knutprintupsvar.cpp4
-rwxr-xr-xsrc/knutrwvar.cpp4
-rwxr-xr-xsrc/knutrwvar.h2
-rwxr-xr-xsrc/knutvardata.cpp4
-rwxr-xr-xsrc/knutvardata.h2
-rw-r--r--src/main.cpp2
14 files changed, 20 insertions, 20 deletions
diff --git a/src/knutdock.cpp b/src/knutdock.cpp
index ad5c702..8debbb3 100755
--- a/src/knutdock.cpp
+++ b/src/knutdock.cpp
@@ -18,12 +18,12 @@
#include "knutdock.h"
#include "knutnet.h"
-//#include <kglobal.h>
+//#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kapp.h>
#include <tdeaboutapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqpainter.h>
#include <tqtooltip.h>
diff --git a/src/knutfrontpanel.cpp b/src/knutfrontpanel.cpp
index c0f0c8c..9aac1e9 100755
--- a/src/knutfrontpanel.cpp
+++ b/src/knutfrontpanel.cpp
@@ -20,7 +20,7 @@
#include "knutvardata.h"
#include "knutnet.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kapp.h>
#include <tqtooltip.h>
diff --git a/src/knutinstcomms.cpp b/src/knutinstcomms.cpp
index da88c9f..d6cdc07 100755
--- a/src/knutinstcomms.cpp
+++ b/src/knutinstcomms.cpp
@@ -20,7 +20,7 @@
#include "knutvardata.h"
#include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqlayout.h>
diff --git a/src/knutinstcomms.h b/src/knutinstcomms.h
index c5050de..5a7ce33 100755
--- a/src/knutinstcomms.h
+++ b/src/knutinstcomms.h
@@ -23,7 +23,7 @@
#include <kdialogbase.h>
#include <klineedit.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
class TQString;
diff --git a/src/knutmainwindow.cpp b/src/knutmainwindow.cpp
index c7f8854..8e09747 100644
--- a/src/knutmainwindow.cpp
+++ b/src/knutmainwindow.cpp
@@ -19,7 +19,7 @@
#include "knutmainwindow.h"
#include "knutvardata.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstdaction.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
diff --git a/src/knutmessage.cpp b/src/knutmessage.cpp
index f0b010b..40cc661 100644
--- a/src/knutmessage.cpp
+++ b/src/knutmessage.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
#include "knutmessage.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tqlayout.h>
diff --git a/src/knutnewupsdlg.cpp b/src/knutnewupsdlg.cpp
index 3c7aaf9..72a8b99 100644
--- a/src/knutnewupsdlg.cpp
+++ b/src/knutnewupsdlg.cpp
@@ -17,8 +17,8 @@
#include "knutnewupsdlg.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeactionselector.h>
#include <tqstring.h>
diff --git a/src/knutprefdlg.h b/src/knutprefdlg.h
index 0b983f9..fa8708b 100644
--- a/src/knutprefdlg.h
+++ b/src/knutprefdlg.h
@@ -27,7 +27,7 @@
#include <kdialogbase.h>
#include <kpushbutton.h>
#include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefontdialog.h>
#include <kcolorbtn.h>
#include <kcombobox.h>
diff --git a/src/knutprintupsvar.cpp b/src/knutprintupsvar.cpp
index 9ba077a..6f0b42e 100644
--- a/src/knutprintupsvar.cpp
+++ b/src/knutprintupsvar.cpp
@@ -18,8 +18,8 @@
#include "knutprintupsvar.h"
#include "knutvardata.h"
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tqgroupbox.h>
diff --git a/src/knutrwvar.cpp b/src/knutrwvar.cpp
index 7cc6659..ee5dda2 100755
--- a/src/knutrwvar.cpp
+++ b/src/knutrwvar.cpp
@@ -24,8 +24,8 @@
//#include <tdeapplication.h>
#include <kapp.h>
#include <kcombobox.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tqframe.h>
diff --git a/src/knutrwvar.h b/src/knutrwvar.h
index 9016055..67a5b4c 100755
--- a/src/knutrwvar.h
+++ b/src/knutrwvar.h
@@ -22,7 +22,7 @@
#include <kdialogbase.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
diff --git a/src/knutvardata.cpp b/src/knutvardata.cpp
index 4d57649..957866e 100755
--- a/src/knutvardata.cpp
+++ b/src/knutvardata.cpp
@@ -18,8 +18,8 @@
#include "knutvardata.h"
#include "knutnet.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqcolor.h>
diff --git a/src/knutvardata.h b/src/knutvardata.h
index bfdce66..58a2536 100755
--- a/src/knutvardata.h
+++ b/src/knutvardata.h
@@ -32,7 +32,7 @@
#define DEFAULT_FONT_COLOR TQt::black
#define DEFAULT_KICON_COLOR TQt::white
-#include <klocale.h>
+#include <tdelocale.h>
#include "knutnet.h"
#include "knutupsdata.h"
diff --git a/src/main.cpp b/src/main.cpp
index f0d027d..fcf30a9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,7 @@
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kapp.h>
#include <kuniqueapplication.h>