diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
commit | b9e542d0c805e9adee3a67e44532d5321032e21e (patch) | |
tree | e82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /languages/ruby | |
parent | 7a392a04059bd904dab4c78910a6d34aa0b37798 (diff) | |
download | tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'languages/ruby')
-rw-r--r-- | languages/ruby/debugger/dbgcontroller.h | 12 | ||||
-rw-r--r-- | languages/ruby/debugger/dbgpsdlg.cpp | 14 | ||||
-rw-r--r-- | languages/ruby/debugger/dbgpsdlg.h | 6 | ||||
-rw-r--r-- | languages/ruby/debugger/rdbcontroller.cpp | 30 | ||||
-rw-r--r-- | languages/ruby/debugger/rdbcontroller.h | 10 |
5 files changed, 36 insertions, 36 deletions
diff --git a/languages/ruby/debugger/dbgcontroller.h b/languages/ruby/debugger/dbgcontroller.h index 67be9ef3..9559670d 100644 --- a/languages/ruby/debugger/dbgcontroller.h +++ b/languages/ruby/debugger/dbgcontroller.h @@ -25,7 +25,7 @@ #include <tqobject.h> #include <domutil.h> -class KProcess; +class TDEProcess; class TQString; class TQStrList; @@ -134,10 +134,10 @@ public slots: virtual void slotFetchGlobals(bool fetch) = 0; protected slots: - virtual void slotDbgStdout(KProcess *proc, char *buf, int buflen) = 0; - virtual void slotDbgStderr(KProcess*, char*, int) {} ; - virtual void slotDbgWroteStdin(KProcess *proc) = 0; - virtual void slotDbgProcessExited(KProcess *proc) = 0; + virtual void slotDbgStdout(TDEProcess *proc, char *buf, int buflen) = 0; + virtual void slotDbgStderr(TDEProcess*, char*, int) {} ; + virtual void slotDbgWroteStdin(TDEProcess *proc) = 0; + virtual void slotDbgProcessExited(TDEProcess *proc) = 0; virtual void slotAcceptConnection(int passive_socket) = 0; virtual void slotReadFromSocket(int socket) = 0; @@ -154,7 +154,7 @@ signals: void dbgStatus (const TQString &status, int statusFlag); protected: - KProcess *dbgProcess_; + TDEProcess *dbgProcess_; }; } diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp index 5787ba2d..e5fb76d0 100644 --- a/languages/ruby/debugger/dbgpsdlg.cpp +++ b/languages/ruby/debugger/dbgpsdlg.cpp @@ -62,14 +62,14 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) TQBoxLayout *topLayout = new TQVBoxLayout(this, 5); - heading_->setFont(KGlobalSettings::fixedFont()); + heading_->setFont(TDEGlobalSettings::fixedFont()); heading_->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); heading_->setMaximumHeight(heading_->sizeHint().height()); // heading_->setMinimumSize(heading_->sizeHint()); topLayout->addWidget(heading_, 5); topLayout->addWidget(pids_, 5); - pids_->setFont(KGlobalSettings::fixedFont()); + pids_->setFont(TDEGlobalSettings::fixedFont()); KButtonBox *buttonbox = new KButtonBox(this, Qt::Horizontal, 5); TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); @@ -106,12 +106,12 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) } #endif - connect( psProc_, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotProcessExited()) ); - connect( psProc_, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(KProcess *, char *, int)) ); - psProc_->start(KProcess::NotifyOnExit, KProcess::Stdout); + connect( psProc_, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotProcessExited()) ); + connect( psProc_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) ); + psProc_->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); // Default display to 40 chars wide, default height is okay - resize( ((KGlobalSettings::fixedFont()).pointSize())*40, height()); + resize( ((TDEGlobalSettings::fixedFont()).pointSize())*40, height()); topLayout->activate(); } @@ -135,7 +135,7 @@ int Dbg_PS_Dialog::pidSelected() /***************************************************************************/ -void Dbg_PS_Dialog::slotReceivedOutput(KProcess */*proc*/, char *buffer, int buflen) +void Dbg_PS_Dialog::slotReceivedOutput(TDEProcess */*proc*/, char *buffer, int buflen) { pidLines_ += TQString::fromLocal8Bit(buffer, buflen+1); } diff --git a/languages/ruby/debugger/dbgpsdlg.h b/languages/ruby/debugger/dbgpsdlg.h index 5bbc89af..8cf781f3 100644 --- a/languages/ruby/debugger/dbgpsdlg.h +++ b/languages/ruby/debugger/dbgpsdlg.h @@ -25,7 +25,7 @@ #include <kdialog.h> class TQListBox; -class KProcess; +class TDEProcess; class TQLabel; namespace RDBDebugger @@ -45,11 +45,11 @@ public: int pidSelected(); private slots: - void slotReceivedOutput(KProcess *proc, char *buffer, int buflen); + void slotReceivedOutput(TDEProcess *proc, char *buffer, int buflen); void slotProcessExited(); private: - KProcess* psProc_; + TDEProcess* psProc_; TQListBox* pids_; TQLabel* heading_; TQString pidLines_; diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp index 25fcd6a4..278d0ff2 100644 --- a/languages/ruby/debugger/rdbcontroller.cpp +++ b/languages/ruby/debugger/rdbcontroller.cpp @@ -714,19 +714,19 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& return; } - dbgProcess_ = new KProcess; + dbgProcess_ = new TDEProcess; - connect( dbgProcess_, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(slotDbgStdout(KProcess *, char *, int)) ); + connect( dbgProcess_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(slotDbgStderr(KProcess *, char *, int)) ); + connect( dbgProcess_, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(wroteStdin(KProcess *)), - this, TQT_SLOT(slotDbgWroteStdin(KProcess *)) ); + connect( dbgProcess_, TQT_SIGNAL(wroteStdin(TDEProcess *)), + this, TQT_SLOT(slotDbgWroteStdin(TDEProcess *)) ); - connect( dbgProcess_, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotDbgProcessExited(KProcess*)) ); + connect( dbgProcess_, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotDbgProcessExited(TDEProcess*)) ); rubyInterpreter_ = ruby_interpreter; characterCoding_ = character_coding; @@ -752,8 +752,8 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& + " -r " + debuggee_path + " " + application + " " + run_arguments ).latin1() ); - if (!dbgProcess_->start( KProcess::NotifyOnExit, - KProcess::Communication(KProcess::All)) ) + if (!dbgProcess_->start( TDEProcess::NotifyOnExit, + TDEProcess::Communication(TDEProcess::All)) ) { kdDebug(9012) << "Couldn't start ruby debugger" << endl; } @@ -1154,7 +1154,7 @@ void RDBController::slotFetchGlobals(bool fetch) // ************************************************************************** // Data from the ruby program's stdout gets processed here. -void RDBController::slotDbgStdout(KProcess *, char *buf, int buflen) +void RDBController::slotDbgStdout(TDEProcess *, char *buf, int buflen) { TQCString msg(buf, buflen+1); emit ttyStdout(msg); @@ -1163,7 +1163,7 @@ void RDBController::slotDbgStdout(KProcess *, char *buf, int buflen) // ************************************************************************** // Data from the ruby program's stderr gets processed here. -void RDBController::slotDbgStderr(KProcess *, char *buf, int buflen) +void RDBController::slotDbgStderr(TDEProcess *, char *buf, int buflen) { TQCString msg(buf, buflen+1); emit ttyStderr(msg); @@ -1171,7 +1171,7 @@ void RDBController::slotDbgStderr(KProcess *, char *buf, int buflen) // ************************************************************************** -void RDBController::slotDbgWroteStdin(KProcess *) +void RDBController::slotDbgWroteStdin(TDEProcess *) { // setStateOff(s_waitForWrite); // if (!stateIsOn(s_silent)) @@ -1279,7 +1279,7 @@ void RDBController::slotReadFromSocket(int socket) // ************************************************************************** -void RDBController::slotDbgProcessExited(KProcess*) +void RDBController::slotDbgProcessExited(TDEProcess*) { destroyCmds(); state_ = s_appNotStarted|s_programExited|(state_&(s_shuttingDown)); diff --git a/languages/ruby/debugger/rdbcontroller.h b/languages/ruby/debugger/rdbcontroller.h index 77deb1a2..755eca85 100644 --- a/languages/ruby/debugger/rdbcontroller.h +++ b/languages/ruby/debugger/rdbcontroller.h @@ -36,7 +36,7 @@ #include <tqstring.h> #include <tqsocketnotifier.h> -class KProcess; +class TDEProcess; namespace RDBDebugger { @@ -127,10 +127,10 @@ public slots: void slotUserRDBCmd(const TQString&); protected slots: - void slotDbgStdout(KProcess *proc, char *buf, int buflen); - void slotDbgStderr(KProcess *proc, char *buf, int buflen); - void slotDbgWroteStdin(KProcess *proc); - void slotDbgProcessExited(KProcess *proc); + void slotDbgStdout(TDEProcess *proc, char *buf, int buflen); + void slotDbgStderr(TDEProcess *proc, char *buf, int buflen); + void slotDbgWroteStdin(TDEProcess *proc); + void slotDbgProcessExited(TDEProcess *proc); void slotAcceptConnection(int masterSocket); void slotReadFromSocket(int socket); |