summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:12:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:12:08 -0600
commitfe573833ca08d8fdb0ea2ce036690666222b5e03 (patch)
tree7ce4904bfb4b8061f29cb24e1839412b0bbd9ff3
parent3e1b671141239f4379f2187d0e46112b644e34f7 (diff)
downloadknetstats-fe573833ca08d8fdb0ea2ce036690666222b5e03.tar.gz
knetstats-fe573833ca08d8fdb0ea2ce036690666222b5e03.zip
Rename many classes and header files to avoid conflicts with KDE4
-rw-r--r--src/src/configure.cpp2
-rw-r--r--src/src/configurebase.ui2
-rw-r--r--src/src/knetstats.cpp8
-rw-r--r--src/src/knetstatsview.cpp6
4 files changed, 9 insertions, 9 deletions
diff --git a/src/src/configure.cpp b/src/src/configure.cpp
index 948c109..6923d0c 100644
--- a/src/src/configure.cpp
+++ b/src/src/configure.cpp
@@ -33,7 +33,7 @@
#include <klocale.h>
#include <kiconloader.h>
#include <tdeconfig.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
#include <knuminput.h>
#include <kcolorbutton.h>
#include <kcombobox.h>
diff --git a/src/src/configurebase.ui b/src/src/configurebase.ui
index 1e769ac..d30eed4 100644
--- a/src/src/configurebase.ui
+++ b/src/src/configurebase.ui
@@ -673,7 +673,7 @@
<includehint>kpushbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
- <includehint>kfontrequester.h</includehint>
+ <includehint>tdefontrequester.h</includehint>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
diff --git a/src/src/knetstats.cpp b/src/src/knetstats.cpp
index 5fe3730..57fda71 100644
--- a/src/src/knetstats.cpp
+++ b/src/src/knetstats.cpp
@@ -33,13 +33,13 @@
#include <kstandarddirs.h>
#include <kmessagebox.h>
#include <kapplication.h>
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kstdaccel.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
+#include <tdestdaccel.h>
#include <kstdaction.h>
#include <khelpmenu.h>
#include <kaboutapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kiconloader.h>
#include <kpushbutton.h>
diff --git a/src/src/knetstatsview.cpp b/src/src/knetstatsview.cpp
index c1257e3..39af7c6 100644
--- a/src/src/knetstatsview.cpp
+++ b/src/src/knetstatsview.cpp
@@ -23,15 +23,15 @@
// KDE headers
#include <kapplication.h>
#include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kmessagebox.h>
#include <kaboutapplication.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <kstandarddirs.h>
-#include <kaction.h>
-#include <kstdaccel.h>
+#include <tdeaction.h>
+#include <tdestdaccel.h>
#include <kstdaction.h>
#include <khelpmenu.h>
#include <kpassivepopup.h>