Rename a number of libraries and executables to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent ce06c80f9a
commit 96b33d84a2

@ -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,

@ -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);
};

@ -51,7 +51,7 @@
#include <unistd.h> // for symlink() <-- unused ?
#ifdef COMPILE_TDE_SUPPORT
#include <kconfig.h>
#include <tdeconfig.h>
#include <kstddirs.h>
#endif

@ -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,

Loading…
Cancel
Save