diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:58 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:58 -0600 |
| commit | b10a61b1fd2fe561ba61a384d4a344bae2a4aa29 (patch) | |
| tree | 99dc6b2584265b2df91f7dbc1dcbf7a54efd205e /ktalkd | |
| parent | 64c3be47ff36e40035ead93f913aeeb1e4f85e4b (diff) | |
| download | tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.tar.gz tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'ktalkd')
| -rw-r--r-- | ktalkd/kcmktalkd/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ktalkd/kcmktalkd/kcmktalkd.desktop | 2 | ||||
| -rw-r--r-- | ktalkd/ktalkd/readcfg++.cpp | 2 | ||||
| -rw-r--r-- | ktalkd/ktalkdlg/ktalkdlg.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ktalkd/kcmktalkd/CMakeLists.txt b/ktalkd/kcmktalkd/CMakeLists.txt index f9f7a560..52c2681a 100644 --- a/ktalkd/kcmktalkd/CMakeLists.txt +++ b/ktalkd/kcmktalkd/CMakeLists.txt @@ -32,6 +32,6 @@ install( FILES kcmktalkd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_ktalkd AUTOMOC SOURCES main.cpp soundpage.cpp answmachpage.cpp forwmachpage.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/ktalkd/kcmktalkd/kcmktalkd.desktop b/ktalkd/kcmktalkd/kcmktalkd.desktop index 6ddbe1f7..c2ddc066 100644 --- a/ktalkd/kcmktalkd/kcmktalkd.desktop +++ b/ktalkd/kcmktalkd/kcmktalkd.desktop @@ -2,7 +2,7 @@ Icon=ktalkd Type=Application DocPath=kcontrol/kcmtalkd/index.html -Exec=kcmshell kcmktalkd +Exec=tdecmshell kcmktalkd X-TDE-ModuleType=Library X-TDE-Library=ktalkd diff --git a/ktalkd/ktalkd/readcfg++.cpp b/ktalkd/ktalkd/readcfg++.cpp index 1c0e9931..66eb1d79 100644 --- a/ktalkd/ktalkd/readcfg++.cpp +++ b/ktalkd/ktalkd/readcfg++.cpp @@ -50,7 +50,7 @@ #include <pwd.h> /* KDE & TQt includes */ -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kinstance.h> #include <tqfile.h> diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp index 6ac67cca..b3a1b28e 100644 --- a/ktalkd/ktalkdlg/ktalkdlg.cpp +++ b/ktalkd/ktalkdlg/ktalkdlg.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <kcmdlineargs.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaudioplayer.h> #include <klocale.h> |