diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /drkonqi | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'drkonqi')
-rw-r--r-- | drkonqi/backtrace.cpp | 18 | ||||
-rw-r--r-- | drkonqi/backtrace.h | 8 | ||||
-rw-r--r-- | drkonqi/debugger.cpp | 2 | ||||
-rw-r--r-- | drkonqi/krashconf.cpp | 2 | ||||
-rw-r--r-- | drkonqi/toplevel.cpp | 4 |
5 files changed, 17 insertions, 17 deletions
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index 2688dec5f..a76f9c9ac 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -44,7 +44,7 @@ BackTrace::BackTrace(const KrashConfig *krashconf, TQObject *parent, : TQObject(parent, name), m_krashconf(krashconf), m_temp(NULL), m_temp_cmd(NULL) { - m_proc = new KProcess; + m_proc = new TDEProcess; } BackTrace::~BackTrace() @@ -123,7 +123,7 @@ void BackTrace::start() } // start the debugger - m_proc = new KProcess; + m_proc = new TDEProcess; m_proc->setUseShell(true); if (need_root_access == false) { @@ -133,15 +133,15 @@ void BackTrace::start() *m_proc << "tdesu -t --comment \"" << i18n("Administrative access is required to generate a backtrace") << "\" -c \"" << m_temp_cmd->name() << "\""; } - connect(m_proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - TQT_SLOT(slotReadInput(KProcess*, char*, int))); - connect(m_proc, TQT_SIGNAL(processExited(KProcess*)), - TQT_SLOT(slotProcessExited(KProcess*))); + connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + TQT_SLOT(slotReadInput(TDEProcess*, char*, int))); + connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), + TQT_SLOT(slotProcessExited(TDEProcess*))); - m_proc->start ( KProcess::NotifyOnExit, KProcess::All ); + m_proc->start ( TDEProcess::NotifyOnExit, TDEProcess::All ); } -void BackTrace::slotReadInput(KProcess *, char* buf, int buflen) +void BackTrace::slotReadInput(TDEProcess *, char* buf, int buflen) { TQString newstr = TQString::fromLocal8Bit(buf, buflen); newstr.replace("\n\n", "\n"); @@ -156,7 +156,7 @@ void BackTrace::slotReadInput(KProcess *, char* buf, int buflen) } } -void BackTrace::slotProcessExited(KProcess *proc) +void BackTrace::slotProcessExited(TDEProcess *proc) { // start it again kill(m_krashconf->pid(), SIGCONT); diff --git a/drkonqi/backtrace.h b/drkonqi/backtrace.h index 661dc246d..94f5bcf9f 100644 --- a/drkonqi/backtrace.h +++ b/drkonqi/backtrace.h @@ -28,7 +28,7 @@ #ifndef BACKTRACE_H #define BACKTRACE_H -class KProcess; +class TDEProcess; class KrashConfig; class KTempFile; @@ -52,13 +52,13 @@ signals: void done(const TQString &); // replaces whole text protected slots: - void slotProcessExited(KProcess * proc); - void slotReadInput(KProcess * proc, char * buf, int buflen); + void slotProcessExited(TDEProcess * proc); + void slotReadInput(TDEProcess * proc, char * buf, int buflen); private: bool usefulBacktrace(); void processBacktrace(); - KProcess *m_proc; + TDEProcess *m_proc; const KrashConfig *m_krashconf; KTempFile *m_temp; KTempFile *m_temp_cmd; diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp index 372492c5a..e73baee75 100644 --- a/drkonqi/debugger.cpp +++ b/drkonqi/debugger.cpp @@ -55,7 +55,7 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent, m_backtrace = new KTextBrowser(this); m_backtrace->setTextFormat(TQt::PlainText); - m_backtrace->setFont(KGlobalSettings::fixedFont()); + m_backtrace->setFont(TDEGlobalSettings::fixedFont()); TQWidget *w = new TQWidget( this ); ( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true ); diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index 38e8c84cc..9bdf405e2 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -88,7 +88,7 @@ void KrashConfig :: readConfig() KStartupInfo::sendFinish( id ); } - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("drkonqi"); // maybe we should check if it's relative? diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp index ab804281f..f6ddecb94 100644 --- a/drkonqi/toplevel.cpp +++ b/drkonqi/toplevel.cpp @@ -176,10 +176,10 @@ void Toplevel :: slotUser2() TQString str = m_krashconf->debugger(); m_krashconf->expandString(str, true); - KProcess proc; + TDEProcess proc; proc.setUseShell(true); proc << str; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } void Toplevel :: slotNewDebuggingApp(const TQString& launchName) |