summaryrefslogtreecommitdiffstats
path: root/kppp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:58 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:58 -0600
commitb10a61b1fd2fe561ba61a384d4a344bae2a4aa29 (patch)
tree99dc6b2584265b2df91f7dbc1dcbf7a54efd205e /kppp
parent64c3be47ff36e40035ead93f913aeeb1e4f85e4b (diff)
downloadtdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.tar.gz
tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kppp')
-rw-r--r--kppp/CMakeLists.txt2
-rw-r--r--kppp/ChangeLog2
-rw-r--r--kppp/kpppwidget.cpp2
-rw-r--r--kppp/logview/CMakeLists.txt2
-rw-r--r--kppp/logview/export.h2
-rw-r--r--kppp/modemdb.cpp2
-rw-r--r--kppp/pppdata.cpp2
7 files changed, 7 insertions, 7 deletions
diff --git a/kppp/CMakeLists.txt b/kppp/CMakeLists.txt
index 556280e7..c2ea4e64 100644
--- a/kppp/CMakeLists.txt
+++ b/kppp/CMakeLists.txt
@@ -46,6 +46,6 @@ tde_add_executable( kppp SETUID AUTOMOC
acctselect.cpp ruleset.cpp docking.cpp runtests.cpp loginterm.cpp
ppplog.cpp newwidget.cpp requester.cpp opener.cpp modemdb.cpp
utils.cpp providerdb.cpp modems.cpp KPPPIface.skel
- LINK kio-shared
+ LINK tdeio-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kppp/ChangeLog b/kppp/ChangeLog
index 6c532c03..a956c949 100644
--- a/kppp/ChangeLog
+++ b/kppp/ChangeLog
@@ -1028,7 +1028,7 @@
* some KDE style guide conformant changes
* some code cleanups
- * removed -lkfile and -lkfm from Makefile.am
+ * removed -ltdefile and -lkfm from Makefile.am
* added debug switch to pppd command line when debugging
is turned on
* Improved the response time for modem output. Modem output is
diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp
index 9894cb9b..92789fdf 100644
--- a/kppp/kpppwidget.cpp
+++ b/kppp/kpppwidget.cpp
@@ -40,7 +40,7 @@
#include <kbuttonbox.h>
#include <kglobalsettings.h>
#include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kiconloader.h> // For BarIcon
#include <klocale.h>
diff --git a/kppp/logview/CMakeLists.txt b/kppp/logview/CMakeLists.txt
index a81b833f..204beeb5 100644
--- a/kppp/logview/CMakeLists.txt
+++ b/kppp/logview/CMakeLists.txt
@@ -33,6 +33,6 @@ install( FILES
tde_add_executable( kppplogview AUTOMOC
SOURCES
main.cpp loginfo.cpp log.cpp monthly.cpp export.cpp
- LINK kio-shared
+ LINK tdeio-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kppp/logview/export.h b/kppp/logview/export.h
index d3e37030..04ed0005 100644
--- a/kppp/logview/export.h
+++ b/kppp/logview/export.h
@@ -33,7 +33,7 @@
#include <kwizard.h>
#include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
class Export;
diff --git a/kppp/modemdb.cpp b/kppp/modemdb.cpp
index 406a45c5..3213d00b 100644
--- a/kppp/modemdb.cpp
+++ b/kppp/modemdb.cpp
@@ -39,7 +39,7 @@
#include <klocale.h>
#include <tqpushbutton.h>
#include <tqlistbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kstdguiitem.h>
ModemSelector::ModemSelector(TQWidget *parent) : TQDialog(parent, 0, true) {
diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp
index 1d681352..29ccb308 100644
--- a/kppp/pppdata.cpp
+++ b/kppp/pppdata.cpp
@@ -28,7 +28,7 @@
#include "runtests.h"
#include "devices.h"
#include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kmessagebox.h>
#include <kapplication.h>
#include <kglobalsettings.h>