summaryrefslogtreecommitdiffstats
path: root/kpf
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 01:04:58 -0600
committerTimothy Pearson <[email protected]>2013-01-27 01:04:58 -0600
commitb10a61b1fd2fe561ba61a384d4a344bae2a4aa29 (patch)
tree99dc6b2584265b2df91f7dbc1dcbf7a54efd205e /kpf
parent64c3be47ff36e40035ead93f913aeeb1e4f85e4b (diff)
downloadtdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.tar.gz
tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kpf')
-rw-r--r--kpf/src/Applet.cpp2
-rw-r--r--kpf/src/CMakeLists.txt4
-rw-r--r--kpf/src/ConfigDialogPage.cpp2
-rw-r--r--kpf/src/ErrorMessageConfigDialog.cpp2
-rw-r--r--kpf/src/PropertiesDialogPlugin.cpp2
-rw-r--r--kpf/src/Response.cpp2
-rw-r--r--kpf/src/ServerWizard.cpp2
-rw-r--r--kpf/src/WebServer.cpp2
-rw-r--r--kpf/src/WebServerManager.cpp2
9 files changed, 10 insertions, 10 deletions
diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index 217128a5..dfe0c165 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -33,7 +33,7 @@
#include <dcopclient.h>
#include <kiconloader.h>
#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kaboutapplication.h>
#include <kaboutdata.h>
#include <klocale.h>
diff --git a/kpf/src/CMakeLists.txt b/kpf/src/CMakeLists.txt
index 1de8db4c..09280dec 100644
--- a/kpf/src/CMakeLists.txt
+++ b/kpf/src/CMakeLists.txt
@@ -35,7 +35,7 @@ tde_add_kpart( kpf_panelapplet AUTOMOC
ErrorMessageConfigDialog.cpp ActiveMonitor.cpp ActiveMonitorItem.cpp
ActiveMonitorWindow.cpp BandwidthGraph.cpp ServerWizard.cpp
AppletItem.cpp Applet.cpp Defaults.cpp Help.cpp
- LINK tdednssd-shared kio-shared
+ LINK tdednssd-shared tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
@@ -46,6 +46,6 @@ tde_add_kpart( kpfpropertiesdialog AUTOMOC
SOURCES
PropertiesDialogPlugin.cpp StartingKPFDialog.cpp WebServer.stub
WebServerManager.stub Defaults.cpp Help.cpp
- LINK tdednssd-shared kio-shared
+ LINK tdednssd-shared tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kpf/src/ConfigDialogPage.cpp b/kpf/src/ConfigDialogPage.cpp
index 657e96f0..c0191441 100644
--- a/kpf/src/ConfigDialogPage.cpp
+++ b/kpf/src/ConfigDialogPage.cpp
@@ -30,7 +30,7 @@
#include <klocale.h>
#include <kseparator.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include "Defines.h"
#include "ErrorMessageConfigDialog.h"
diff --git a/kpf/src/ErrorMessageConfigDialog.cpp b/kpf/src/ErrorMessageConfigDialog.cpp
index 05a082bb..20367f30 100644
--- a/kpf/src/ErrorMessageConfigDialog.cpp
+++ b/kpf/src/ErrorMessageConfigDialog.cpp
@@ -29,7 +29,7 @@
#include <tqlayout.h>
#include <kurlrequester.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include <kdialog.h>
diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp
index 929bd2a9..5696e2c9 100644
--- a/kpf/src/PropertiesDialogPlugin.cpp
+++ b/kpf/src/PropertiesDialogPlugin.cpp
@@ -39,7 +39,7 @@
#include <kdialogbase.h>
#include <kmessagebox.h>
#include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include <kseparator.h>
#include <kgenericfactory.h>
diff --git a/kpf/src/Response.cpp b/kpf/src/Response.cpp
index 7802df5f..bfacf03b 100644
--- a/kpf/src/Response.cpp
+++ b/kpf/src/Response.cpp
@@ -25,7 +25,7 @@
#include <tqtextstream.h>
#include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include "Defines.h"
#include "Utils.h"
diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp
index 3c2e78f9..139d863b 100644
--- a/kpf/src/ServerWizard.cpp
+++ b/kpf/src/ServerWizard.cpp
@@ -33,7 +33,7 @@
#include <kdialog.h>
#include <klocale.h>
#include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include "Defines.h"
#include "ServerWizard.h"
diff --git a/kpf/src/WebServer.cpp b/kpf/src/WebServer.cpp
index e12ebcd2..e114dd0e 100644
--- a/kpf/src/WebServer.cpp
+++ b/kpf/src/WebServer.cpp
@@ -33,7 +33,7 @@
// KDE includes
#include "config.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobal.h>
#include <kmessagebox.h>
#include <klocale.h>
diff --git a/kpf/src/WebServerManager.cpp b/kpf/src/WebServerManager.cpp
index 1fa58b63..fbb55439 100644
--- a/kpf/src/WebServerManager.cpp
+++ b/kpf/src/WebServerManager.cpp
@@ -22,7 +22,7 @@
*/
// KDE includes
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobal.h>
#include <kapplication.h>