From c48e769eb275917717e2b55eb869f7e559293ac8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:48:31 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- ksirc/ksircprocess.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ksirc/ksircprocess.cpp') diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp index 8d2a0f0c..6d46bdba 100644 --- a/ksirc/ksircprocess.cpp +++ b/ksirc/ksircprocess.cpp @@ -67,7 +67,7 @@ KSircReceivers under control of this server, and includes such items as "!all" and "!default". All !name are control windows. - 2. Forks off a KProcess for sirc and passes it over to IOController + 2. Forks off a TDEProcess for sirc and passes it over to IOController which grabs and control's it's IO. 3. It then opens a "!default" window. This will receive all @@ -121,7 +121,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa : TQObject(parent, name), m_kss(kss), m_serverid(server_id) { - proc = new KProcess(); + proc = new TDEProcess(); #ifndef NDEBUG if(getuid() != 0) @@ -165,7 +165,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa kdDebug(5008) << "Set SIRCUSER to: " << qsUserID << endl; } - proc->setEnvironment("SIRCLIB", KGlobal::dirs()->findResourceDir("appdata", "ksirc.pl")); + proc->setEnvironment("SIRCLIB", TDEGlobal::dirs()->findResourceDir("appdata", "ksirc.pl")); proc->setEnvironment("SIRCWAIT", "1"); TQString env = locate("appdata", "ksircrc"); @@ -190,7 +190,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa TQString sslopt; if(kss.usessl()) sslopt = "-S"; - *proc << "perl" << KGlobal::dirs()->findExe("dsirc") << "-8" << "-r" << sslopt; + *proc << "perl" << TDEGlobal::dirs()->findExe("dsirc") << "-8" << "-r" << sslopt; // Finally start the iocontroller. @@ -236,7 +236,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa // Now that all windows are up, start sirc. - proc->start(KProcess::NotifyOnExit, KProcess::All); + proc->start(TDEProcess::NotifyOnExit, TDEProcess::All); // Intial commands to load ASAP. // turn on sirc ssfe mode TQCString command = "/eval $ssfe=1\n"; -- cgit v1.2.3