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 --- kopete/protocols/sms/services/gsmlib.h | 2 +- kopete/protocols/sms/services/smsclient.cpp | 14 +++++++------- kopete/protocols/sms/services/smsclient.h | 6 +++--- kopete/protocols/sms/services/smssendprovider.cpp | 14 +++++++------- kopete/protocols/sms/services/smssendprovider.h | 6 +++--- kopete/protocols/sms/smsaccount.h | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'kopete/protocols/sms') diff --git a/kopete/protocols/sms/services/gsmlib.h b/kopete/protocols/sms/services/gsmlib.h index c49e26b7..5f7b9257 100644 --- a/kopete/protocols/sms/services/gsmlib.h +++ b/kopete/protocols/sms/services/gsmlib.h @@ -40,7 +40,7 @@ class GSMLibPrefsUI; class SMSContact; class TQListViewItem; -class KProcess; +class TDEProcess; class GSMLibThread; class GSMLib : public SMSService diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 984e8435..9a1898a8 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -71,7 +71,7 @@ void SMSClient::send(const Kopete::Message& msg) if (programName.isNull()) programName = "/usr/bin/sms_client"; - KProcess* p = new KProcess; + TDEProcess* p = new TDEProcess; TQString message = msg.plainBody(); TQString nr = msg.to().first()->contactId(); @@ -80,11 +80,11 @@ void SMSClient::send(const Kopete::Message& msg) *p << provider + ":" + nr; *p << message; - TQObject::connect(p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendFinished(KProcess*))); - TQObject::connect(p, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); - TQObject::connect(p, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(KProcess*, char*, int))); + TQObject::connect(p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendFinished(TDEProcess*))); + TQObject::connect(p, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + TQObject::connect(p, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - p->start(KProcess::Block, KProcess::AllOutput); + p->start(TDEProcess::Block, TDEProcess::AllOutput); } TQWidget* SMSClient::configureWidget(TQWidget* parent) @@ -152,14 +152,14 @@ TQStringList SMSClient::providers() return p; } -void SMSClient::slotReceivedOutput(KProcess*, char *buffer, int buflen) +void SMSClient::slotReceivedOutput(TDEProcess*, char *buffer, int buflen) { TQStringList lines = TQStringList::split("\n", TQString::fromLocal8Bit(buffer, buflen)); for (TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) output.append(*it); } -void SMSClient::slotSendFinished(KProcess* p) +void SMSClient::slotSendFinished(TDEProcess* p) { if (p->exitStatus() == 0) emit messageSent(m_msg); diff --git a/kopete/protocols/sms/services/smsclient.h b/kopete/protocols/sms/services/smsclient.h index 988565b1..ffb146c6 100644 --- a/kopete/protocols/sms/services/smsclient.h +++ b/kopete/protocols/sms/services/smsclient.h @@ -26,7 +26,7 @@ class SMSClientPrefsUI; class SMSContact; class TQListViewItem; -class KProcess; +class TDEProcess; class SMSClient : public SMSService { @@ -46,8 +46,8 @@ public slots: void savePreferences(); private slots: - void slotReceivedOutput(KProcess*, char *buffer, int buflen); - void slotSendFinished(KProcess* p); + void slotReceivedOutput(TDEProcess*, char *buffer, int buflen); + void slotSendFinished(TDEProcess* p); signals: void messageSent(const Kopete::Message &); diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index 8feb94a9..e2095d25 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -237,21 +237,21 @@ void SMSSendProvider::send(const Kopete::Message& msg) values[messagePos] = message; values[telPos] = nr; - KProcess* p = new KProcess; + TDEProcess* p = new TDEProcess; kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").arg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl; *p << TQString("%1/bin/smssend").arg(prefix) << provider << values; output = ""; - connect( p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendFinished(KProcess *))); - connect( p, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(KProcess *, char *, int))); -// connect( p, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(KProcess *, char *, int))); + connect( p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendFinished(TDEProcess *))); + connect( p, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); +// connect( p, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); - p->start(KProcess::NotifyOnExit, KProcess::AllOutput); + p->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } -void SMSSendProvider::slotSendFinished(KProcess *p) +void SMSSendProvider::slotSendFinished(TDEProcess *p) { kdWarning( 14160 ) << k_funcinfo << "this = " << this << ", es = " << p->exitStatus() << ", p = " << p << " (should be non-zero!!)" << endl; if (p->exitStatus() == 0) @@ -262,7 +262,7 @@ void SMSSendProvider::slotSendFinished(KProcess *p) p->deleteLater(); } -void SMSSendProvider::slotReceivedOutput(KProcess *, char *buffer, int buflen) +void SMSSendProvider::slotReceivedOutput(TDEProcess *, char *buffer, int buflen) { // TQStringList lines = TQStringList::split("\n", TQString::fromLocal8Bit(buffer, buflen)); // for (TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) diff --git a/kopete/protocols/sms/services/smssendprovider.h b/kopete/protocols/sms/services/smssendprovider.h index 97d60542..fbe238e1 100644 --- a/kopete/protocols/sms/services/smssendprovider.h +++ b/kopete/protocols/sms/services/smssendprovider.h @@ -29,7 +29,7 @@ #include "smsaccount.h" -class KProcess; +class TDEProcess; namespace Kopete { class Account; } class SMSContact; @@ -54,8 +54,8 @@ public: int maxSize(); private slots: - void slotReceivedOutput(KProcess*, char *buffer, int buflen); - void slotSendFinished(KProcess*); + void slotReceivedOutput(TDEProcess*, char *buffer, int buflen); + void slotSendFinished(TDEProcess*); private: TQStringList names; TQStringList descriptions; diff --git a/kopete/protocols/sms/smsaccount.h b/kopete/protocols/sms/smsaccount.h index f127759f..b543d191 100644 --- a/kopete/protocols/sms/smsaccount.h +++ b/kopete/protocols/sms/smsaccount.h @@ -23,7 +23,7 @@ class KActionMenu; class SMSProtocol; class SMSContact; class SMSService; -class KProcess; +class TDEProcess; enum SMSMsgAction { ACT_ASK = 0, ACT_CANCEL, ACT_SPLIT }; -- cgit v1.2.1