diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
| commit | c48e769eb275917717e2b55eb869f7e559293ac8 (patch) | |
| tree | 8f650b907e21c918b826f854dbe1c8174cc2c0c6 /krfb/kinetd | |
| parent | 8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff) | |
| download | tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'krfb/kinetd')
| -rw-r--r-- | krfb/kinetd/kinetd.cpp | 4 | ||||
| -rw-r--r-- | krfb/kinetd/kinetd.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp index c05f1830..42a7f053 100644 --- a/krfb/kinetd/kinetd.cpp +++ b/krfb/kinetd/kinetd.cpp @@ -224,7 +224,7 @@ void PortListener::accepted(KSocket *sock) { m_process.clearArguments(); m_process << m_execPath << m_argument << TQString::number(sock->socket()); - if (!m_process.start(KProcess::DontCare)) { + if (!m_process.start(TDEProcess::DontCare)) { KNotifyClient::event("ProcessFailed", i18n("Call \"%1 %2 %3\" failed").arg(m_execPath) .arg(m_argument) @@ -652,7 +652,7 @@ KInetD::~KInetD() { extern "C" { KDE_EXPORT KDEDModule *create_kinetd(TQCString &name) { - KGlobal::locale()->insertCatalogue("kinetd"); + TDEGlobal::locale()->insertCatalogue("kinetd"); return new KInetD(name); } } diff --git a/krfb/kinetd/kinetd.h b/krfb/kinetd/kinetd.h index eee64e59..cb29889d 100644 --- a/krfb/kinetd/kinetd.h +++ b/krfb/kinetd/kinetd.h @@ -57,7 +57,7 @@ private: TQString m_uuid; KServerSocket *m_socket; - KProcess m_process; + TDEProcess m_process; KConfig *m_config; KServiceRegistry *m_srvreg; |