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 --- languages/cpp/debugger/dbgcontroller.h | 12 +++++----- languages/cpp/debugger/dbgpsdlg.cpp | 12 +++++----- languages/cpp/debugger/dbgpsdlg.h | 6 ++--- languages/cpp/debugger/disassemblewidget.cpp | 2 +- languages/cpp/debugger/framestackwidget.cpp | 6 ++--- languages/cpp/debugger/gdbcontroller.cpp | 36 ++++++++++++++-------------- languages/cpp/debugger/gdbcontroller.h | 10 ++++---- languages/cpp/debugger/variablewidget.cpp | 2 +- 8 files changed, 43 insertions(+), 43 deletions(-) (limited to 'languages/cpp/debugger') diff --git a/languages/cpp/debugger/dbgcontroller.h b/languages/cpp/debugger/dbgcontroller.h index a113bffd..2c919bc6 100644 --- a/languages/cpp/debugger/dbgcontroller.h +++ b/languages/cpp/debugger/dbgcontroller.h @@ -23,7 +23,7 @@ -class KProcess; +class TDEProcess; class TQString; class TQStrList; @@ -102,10 +102,10 @@ public slots: virtual void slotVarItemConstructed(VarItem */*item*/) {} 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; signals: void gotoSourcePosition (const TQString &fileName, int lineNum); @@ -121,7 +121,7 @@ signals: void dbgStatus (const TQString &status, int statusFlag); protected: - KProcess *dbgProcess_; + TDEProcess *dbgProcess_; }; } diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index 3f89227f..8033a993 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -71,7 +71,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) topLayout->addWidget(searchLineWidget_); topLayout->addWidget(pids_); - pids_->setFont(KGlobalSettings::fixedFont()); + pids_->setFont(TDEGlobalSettings::fixedFont()); KButtonBox *buttonbox = new KButtonBox(this, Qt::Horizontal); buttonbox->addStretch(); @@ -84,7 +84,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); // Default display to 40 chars wide, default height is okay - resize( ((KGlobalSettings::fixedFont()).pointSize())*40, height()); + resize( ((TDEGlobalSettings::fixedFont()).pointSize())*40, height()); topLayout->activate(); TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); @@ -133,15 +133,15 @@ void Dbg_PS_Dialog::slotInit() } #endif - connect( psProc_, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotProcessExited()) ); - connect( psProc_, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(KProcess *, char *, int)) ); + 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(KProcess::NotifyOnExit, KProcess::Stdout); + psProc_->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } /***************************************************************************/ -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); } diff --git a/languages/cpp/debugger/dbgpsdlg.h b/languages/cpp/debugger/dbgpsdlg.h index 2eea6800..0bf445dc 100644 --- a/languages/cpp/debugger/dbgpsdlg.h +++ b/languages/cpp/debugger/dbgpsdlg.h @@ -19,7 +19,7 @@ #include class TQListBox; -class KProcess; +class TDEProcess; class KListView; class KListViewSearchLineWidget; @@ -41,14 +41,14 @@ public: private slots: void slotInit(); - void slotReceivedOutput(KProcess *proc, char *buffer, int buflen); + void slotReceivedOutput(TDEProcess *proc, char *buffer, int buflen); void slotProcessExited(); protected: void focusIn(TQFocusEvent*); private: - KProcess* psProc_; + TDEProcess* psProc_; KListView* pids_; KListViewSearchLineWidget* searchLineWidget_; TQString pidLines_; diff --git a/languages/cpp/debugger/disassemblewidget.cpp b/languages/cpp/debugger/disassemblewidget.cpp index 705185fd..9f6bc185 100644 --- a/languages/cpp/debugger/disassemblewidget.cpp +++ b/languages/cpp/debugger/disassemblewidget.cpp @@ -42,7 +42,7 @@ DisassembleWidget::DisassembleWidget(GDBController* controller, TQWidget *parent upper_(0), address_(0) { - setFont(KGlobalSettings::fixedFont()); + setFont(TDEGlobalSettings::fixedFont()); setReadOnly(true); } diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp index d7f50778..773e6a4a 100644 --- a/languages/cpp/debugger/framestackwidget.cpp +++ b/languages/cpp/debugger/framestackwidget.cpp @@ -486,7 +486,7 @@ void FramestackWidget::drawContentsOffset( TQPainter * p, int ox, int oy, TQRect section1(s1_x, contentsHeight(), s1_w, viewport()->height()); - p->fillRect(section1, KGlobalSettings::alternateBackgroundColor()); + p->fillRect(section1, TDEGlobalSettings::alternateBackgroundColor()); } // ************************************************************************** @@ -619,7 +619,7 @@ void FrameStackItem::paintCell(TQPainter * p, const TQColorGroup & cg, if (column % 2) { cg2.setColor(TQColorGroup::Base, - KGlobalSettings::alternateBackgroundColor()); + TDEGlobalSettings::alternateBackgroundColor()); } TQListViewItem::paintCell(p, cg2, column, width, align); } @@ -631,7 +631,7 @@ void ThreadStackItem::paintCell(TQPainter * p, const TQColorGroup & cg, if (column % 2) { cg2.setColor(TQColorGroup::Base, - KGlobalSettings::alternateBackgroundColor()); + TDEGlobalSettings::alternateBackgroundColor()); } TQListViewItem::paintCell(p, cg2, column, width, align); } diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp index 15ebcdfc..a46b6d6a 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -796,19 +796,19 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en Q_ASSERT (!dbgProcess_ && !tty_); - 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*)) ); application_ = application; @@ -838,8 +838,8 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en " --interpreter=mi2 -quiet\n" ).latin1()); } - if (!dbgProcess_->start( KProcess::NotifyOnExit, - KProcess::Communication(KProcess::All))) + if (!dbgProcess_->start( TDEProcess::NotifyOnExit, + TDEProcess::Communication(TDEProcess::All))) { KMessageBox::information( 0, @@ -1126,12 +1126,12 @@ void GDBController::slotRun() TQCString tty(tty_->getSlave().latin1()); TQCString options = TQCString(">") + tty + TQCString(" 2>&1 <") + tty; - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "sh" << "-c"; *proc << config_runShellScript_ + " " + application_.latin1() + options; - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); } if (!config_runGdbScript_.isEmpty()) {// gdb script at run is requested @@ -1421,13 +1421,13 @@ void GDBController::processMICommandResponse(const GDBMI::ResultRecord& result) } // Data from gdb gets processed here. -void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen) +void GDBController::slotDbgStdout(TDEProcess *, char *buf, int buflen) { static bool parsing = false; TQCString msg(buf, buflen+1); - // Copy the data out of the KProcess buffer before it gets overwritten + // Copy the data out of the TDEProcess buffer before it gets overwritten // Append to the back of the holding zone. holdingZone_ += TQCString(buf, buflen+1); @@ -1685,7 +1685,7 @@ void GDBController::raiseEvent(event_t e) } -void GDBController::slotDbgStderr(KProcess *proc, char *buf, int buflen) +void GDBController::slotDbgStderr(TDEProcess *proc, char *buf, int buflen) { // At the moment, just drop a message out and redirect kdDebug(9012) << "STDERR: " << TQString::fromLatin1(buf, buflen+1) << endl; @@ -1694,7 +1694,7 @@ void GDBController::slotDbgStderr(KProcess *proc, char *buf, int buflen) // ************************************************************************** -void GDBController::slotDbgWroteStdin(KProcess *) +void GDBController::slotDbgWroteStdin(TDEProcess *) { commandExecutionTime.start(); @@ -1706,7 +1706,7 @@ void GDBController::slotDbgWroteStdin(KProcess *) // ************************************************************************** -void GDBController::slotDbgProcessExited(KProcess* process) +void GDBController::slotDbgProcessExited(TDEProcess* process) { Q_ASSERT(process == dbgProcess_); bool abnormal = !process->normalExit(); diff --git a/languages/cpp/debugger/gdbcontroller.h b/languages/cpp/debugger/gdbcontroller.h index 8d95139e..108e21bd 100644 --- a/languages/cpp/debugger/gdbcontroller.h +++ b/languages/cpp/debugger/gdbcontroller.h @@ -33,7 +33,7 @@ #include #include -class KProcess; +class TDEProcess; namespace GDBDebugger { @@ -254,10 +254,10 @@ public slots: 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); signals: diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index bc8b7733..62a99ad4 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -1847,7 +1847,7 @@ void VarItem::paintCell(TQPainter *p, const TQColorGroup &cg, // to easy see the diferrence between the pointers. if (column == ValueCol) { - p->setFont(KGlobalSettings::fixedFont()); + p->setFont(TDEGlobalSettings::fixedFont()); } if (!alive_) -- cgit v1.2.3