diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:04 -0600 |
| commit | 96b33d84a26e9fc276786992cfc755219ddbc364 (patch) | |
| tree | 822e95aa7ac98df8f38f01870e78295a90bd97c9 | |
| parent | ce06c80f9a59a53c86caeeffe1447e968d284b39 (diff) | |
| download | kvirc-96b33d84a26e9fc276786992cfc755219ddbc364.tar.gz kvirc-96b33d84a26e9fc276786992cfc755219ddbc364.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | src/kvilib/ext/kvi_dcophelper.cpp | 4 | ||||
| -rw-r--r-- | src/kvilib/tal/kvi_tal_filedialog_kde.h | 4 | ||||
| -rw-r--r-- | src/kvirc/kernel/kvi_app_setup.cpp | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_dcopinterface.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/kvilib/ext/kvi_dcophelper.cpp b/src/kvilib/ext/kvi_dcophelper.cpp index 8c7f7c04..7992d4a4 100644 --- a/src/kvilib/ext/kvi_dcophelper.cpp +++ b/src/kvilib/ext/kvi_dcophelper.cpp @@ -319,8 +319,8 @@ bool KviDCOPHelper::startApp(const TQString &szApp,int iWaitMSecs) TQDataStream arg(data, IO_WriteOnly); arg << szApp << tmp; if(!g_pApp->dcopClient()->call( - "klauncher", - "klauncher", + "tdelauncher", + "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)", data, replyType, diff --git a/src/kvilib/tal/kvi_tal_filedialog_kde.h b/src/kvilib/tal/kvi_tal_filedialog_kde.h index 111d89dc..4f33aa59 100644 --- a/src/kvilib/tal/kvi_tal_filedialog_kde.h +++ b/src/kvilib/tal/kvi_tal_filedialog_kde.h @@ -23,7 +23,7 @@ // Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqfiledialog.h> class KVILIB_API KviTalFileDialog : public KFileDialog @@ -42,7 +42,7 @@ public: static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *parent = 0) { - // TQFileDialog allows making new directories...kfiledialog not :/ + // TQFileDialog allows making new directories...tdefiledialog not :/ return TQFileDialog::getExistingDirectory(dir,parent,0,caption); //return getExistingDirectory(dir,parent,caption); }; diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index e2d05141..8b428e2f 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -51,7 +51,7 @@ #include <unistd.h> // for symlink() <-- unused ? #ifdef COMPILE_TDE_SUPPORT - #include <kconfig.h> + #include <tdeconfig.h> #include <kstddirs.h> #endif diff --git a/src/modules/mediaplayer/mp_dcopinterface.cpp b/src/modules/mediaplayer/mp_dcopinterface.cpp index d32b99f3..7b7e56d8 100644 --- a/src/modules/mediaplayer/mp_dcopinterface.cpp +++ b/src/modules/mediaplayer/mp_dcopinterface.cpp @@ -186,8 +186,8 @@ bool KviMediaPlayerDCOPInterface::startApp(const TQString &szApp,int iWaitMSecs) TQDataStream arg(data, IO_WriteOnly); arg << szApp << tmp; if(!g_pApp->dcopClient()->call( - "klauncher", - "klauncher", + "tdelauncher", + "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)", data, replyType, |