From b9e542d0c805e9adee3a67e44532d5321032e21e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:51:01 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- parts/filter/shellfilterdlg.cpp | 20 ++++++++++---------- parts/filter/shellfilterdlg.h | 10 +++++----- parts/filter/shellinsertdlg.cpp | 14 +++++++------- parts/filter/shellinsertdlg.h | 8 ++++---- 4 files changed, 26 insertions(+), 26 deletions(-) (limited to 'parts/filter') diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp index 81ed6778..59a95db0 100644 --- a/parts/filter/shellfilterdlg.cpp +++ b/parts/filter/shellfilterdlg.cpp @@ -81,13 +81,13 @@ void ShellFilterDialog::slotStartClicked() delete m_proc; m_proc = new KShellProcess("/bin/sh"); (*m_proc) << combo->currentText(); - connect( m_proc, TQT_SIGNAL(receivedStdout(KProcess*, char *, int)), - this, TQT_SLOT(slotReceivedStdout(KProcess*, char *, int)) ); - connect( m_proc, TQT_SIGNAL(wroteStdin(KProcess*)), - this, TQT_SLOT(slotWroteStdin(KProcess*)) ); - connect( m_proc, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotProcessExited(KProcess*)) ); - m_proc->start(KProcess::NotifyOnExit, KProcess::All); + connect( m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char *, int)), + this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) ); + connect( m_proc, TQT_SIGNAL(wroteStdin(TDEProcess*)), + this, TQT_SLOT(slotWroteStdin(TDEProcess*)) ); + connect( m_proc, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::All); m_proc->writeStdin(m_instr, m_instr.length()); } @@ -99,21 +99,21 @@ int ShellFilterDialog::exec() } -void ShellFilterDialog::slotReceivedStdout(KProcess *, char *text, int len) +void ShellFilterDialog::slotReceivedStdout(TDEProcess *, char *text, int len) { m_outstr += TQString::fromLocal8Bit(text, len+1); kdDebug(9029) << "outstr " << m_outstr << endl; } -void ShellFilterDialog::slotWroteStdin(KProcess *) +void ShellFilterDialog::slotWroteStdin(TDEProcess *) { m_proc->closeStdin(); kdDebug(9029) << "close stdin " << m_outstr << endl; } -void ShellFilterDialog::slotProcessExited(KProcess *) +void ShellFilterDialog::slotProcessExited(TDEProcess *) { kdDebug(9029) << "process exit " << m_proc->normalExit() << endl; if (m_proc->normalExit()) { diff --git a/parts/filter/shellfilterdlg.h b/parts/filter/shellfilterdlg.h index 94913fc5..14e0d20c 100644 --- a/parts/filter/shellfilterdlg.h +++ b/parts/filter/shellfilterdlg.h @@ -17,7 +17,7 @@ class TQComboBox; class TQPushButton; class KDevPlugin; -class KProcess; +class TDEProcess; class ShellFilterDialog : public TQDialog @@ -38,14 +38,14 @@ public: private slots: void slotStartClicked(); - void slotReceivedStdout(KProcess *, char *text, int len); - void slotWroteStdin(KProcess *); - void slotProcessExited(KProcess *); + void slotReceivedStdout(TDEProcess *, char *text, int len); + void slotWroteStdin(TDEProcess *); + void slotProcessExited(TDEProcess *); private: TQPushButton *start_button, *cancel_button; TQComboBox *combo; - KProcess *m_proc; + TDEProcess *m_proc; TQCString m_instr; TQString m_outstr; }; diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp index 50217226..d1799663 100644 --- a/parts/filter/shellinsertdlg.cpp +++ b/parts/filter/shellinsertdlg.cpp @@ -97,21 +97,21 @@ void ShellInsertDialog::slotStartClicked() delete m_proc; m_proc = new KShellProcess("/bin/sh"); (*m_proc) << combo->currentText(); - connect( m_proc, TQT_SIGNAL(receivedStdout(KProcess*, char *, int)), - this, TQT_SLOT(slotReceivedStdout(KProcess*, char *, int)) ); - connect( m_proc, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotProcessExited(KProcess*)) ); - m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput); + connect( m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char *, int)), + this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) ); + connect( m_proc, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } -void ShellInsertDialog::slotReceivedStdout(KProcess *, char *text, int len) +void ShellInsertDialog::slotReceivedStdout(TDEProcess *, char *text, int len) { m_str += TQCString(text, len+1); } -void ShellInsertDialog::slotProcessExited(KProcess *) +void ShellInsertDialog::slotProcessExited(TDEProcess *) { if (m_proc->normalExit()) { accept(); diff --git a/parts/filter/shellinsertdlg.h b/parts/filter/shellinsertdlg.h index 6fdde2d0..4c1a7468 100644 --- a/parts/filter/shellinsertdlg.h +++ b/parts/filter/shellinsertdlg.h @@ -17,7 +17,7 @@ class TQComboBox; class TQPushButton; class KDevPlugin; -class KProcess; +class TDEProcess; class ShellInsertDialog : public TQDialog @@ -36,14 +36,14 @@ public: private slots: void slotStartClicked(); - void slotReceivedStdout(KProcess *, char *text, int len); - void slotProcessExited(KProcess *); + void slotReceivedStdout(TDEProcess *, char *text, int len); + void slotProcessExited(TDEProcess *); void executeTextChanged( const TQString &text); private: TQPushButton *start_button, *cancel_button; TQComboBox *combo; - KProcess *m_proc; + TDEProcess *m_proc; TQCString m_str; }; -- cgit v1.2.1