diff options
Diffstat (limited to 'languages')
42 files changed, 162 insertions, 162 deletions
diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index d7d8080c..9ef7ccc7 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -18,7 +18,7 @@ extern "C" { void* init_lib%{APPNAMELC}plugin() { - KGlobal::locale()->insertCatalogue("kate%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("kate%{APPNAMELC}"); return new KatePluginFactory; } } diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 43084511..c74deda0 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -22,7 +22,7 @@ extern "C" { void* init_lib%{APPNAMELC}plugin() { - KGlobal::locale()->insertCatalogue("kate%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("kate%{APPNAMELC}"); return new KatePluginFactory; } } diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp index 29ec3d1d..8db1939e 100644 --- a/languages/cpp/app_templates/kicker/applet.cpp +++ b/languages/cpp/app_templates/kicker/applet.cpp @@ -64,7 +64,7 @@ extern "C" { KPanelApplet* init( TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}(configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, parent, "%{APPNAMELC}"); diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp index 7d2d20d1..f0173476 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp @@ -15,7 +15,7 @@ extern "C" { void* init_lib%{APPNAMELC}part() { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}Factory; } }; diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index 1088f65d..1a306aee 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -149,12 +149,12 @@ void %{APPNAME}::optionsConfigureToolbars() { #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - saveMainWindowSettings(KGlobal::config() ); + saveMainWindowSettings(TDEGlobal::config() ); # endif #else - saveMainWindowSettings(KGlobal::config() ); + saveMainWindowSettings(TDEGlobal::config() ); #endif // use the standard toolbar editor @@ -168,12 +168,12 @@ void %{APPNAME}::applyNewToolbarConfig() { #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); # endif #else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); #endif } diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index 80c9f967..e46d21ca 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -193,7 +193,7 @@ extern "C" { void* init_lib%{APPNAMELC}part() { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}PartFactory; } }; diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index 1812b5e2..c5bdb434 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -99,7 +99,7 @@ extern "C" { void* init_lib%{APPNAMELC}plugin() { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}Factory; } } diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp index 6b55b671..dd297ed7 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp @@ -298,7 +298,7 @@ void %{APPNAMELC}kmdi::optionsConfigureKeys() void %{APPNAMELC}kmdi::optionsConfigureToolbars() { - //saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + //saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void %{APPNAMELC}kmdi::newToolbarConfig() @@ -306,7 +306,7 @@ void %{APPNAMELC}kmdi::newToolbarConfig() // This slot is called when user clicks "Ok" or "Apply" in the toolbar editor. // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.) //createGUI(); - //applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + //applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void %{APPNAMELC}kmdi::optionsPreferences() diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp index 2a89e471..750fd94c 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.cpp +++ b/languages/cpp/app_templates/kscons_kxt/app.cpp @@ -120,7 +120,7 @@ void %{APPNAME}::optionsConfigureKeys() void %{APPNAME}::optionsConfigureToolbars() { // use the standard toolbar editor - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void %{APPNAME}::newToolbarConfig() @@ -129,7 +129,7 @@ void %{APPNAME}::newToolbarConfig() // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.) createGUI(); - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void %{APPNAME}::optionsPreferences() diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp index efdbf40b..569c69a3 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp +++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp @@ -20,13 +20,13 @@ extern "C" %{APPNAME} *kss_create( WId id ) { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}( id ); } TQDialog *kss_setup() { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}Setup(); } } @@ -48,7 +48,7 @@ extern "C" //! read settings from config file void %{APPNAME}Setup::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); /// @todo // Add your config options here... @@ -59,7 +59,7 @@ void %{APPNAME}Setup::readSettings() //! Ok pressed - save settings and exit void %{APPNAME}Setup::slotOkPressed() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); /// @todo // Add your config options here. @@ -89,7 +89,7 @@ void %{APPNAME}Setup::slotCancelPressed() //! read configuration settings from config file void %{APPNAME}::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); /// @todo // Add your config options here... diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp index e3032dc1..81a1118c 100644 --- a/languages/cpp/app_templates/kxt/app.cpp +++ b/languages/cpp/app_templates/kxt/app.cpp @@ -115,7 +115,7 @@ void %{APPNAMELC}::optionsConfigureKeys() void %{APPNAMELC}::optionsConfigureToolbars() { // use the standard toolbar editor - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void %{APPNAMELC}::newToolbarConfig() @@ -124,7 +124,7 @@ void %{APPNAMELC}::newToolbarConfig() // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.) createGUI(); - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void %{APPNAMELC}::optionsPreferences() diff --git a/languages/cpp/app_templates/noatunui/plugin_app.cpp b/languages/cpp/app_templates/noatunui/plugin_app.cpp index 23067139..a98ab7a6 100644 --- a/languages/cpp/app_templates/noatunui/plugin_app.cpp +++ b/languages/cpp/app_templates/noatunui/plugin_app.cpp @@ -8,7 +8,7 @@ extern "C" { Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}UI; } } diff --git a/languages/cpp/app_templates/noatunvisual/plugin_app.cpp b/languages/cpp/app_templates/noatunvisual/plugin_app.cpp index 442bdefd..ae60d277 100644 --- a/languages/cpp/app_templates/noatunvisual/plugin_app.cpp +++ b/languages/cpp/app_templates/noatunvisual/plugin_app.cpp @@ -12,7 +12,7 @@ extern "C" { Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}Scope(); } } 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 <kdialog.h> 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 <memory> #include <set> -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_) diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp index 8cdeafb8..fd29416c 100644 --- a/languages/cpp/includepathresolver.cpp +++ b/languages/cpp/includepathresolver.cpp @@ -31,7 +31,7 @@ #include "tqdir.h" /* defines TQDir */ #include "tqregexp.h" /* defines TQRegExp */ #include "klocale.h" /* defines [function] i18n */ -#include "blockingkprocess.h" /* defines BlockingKProcess */ +#include "blockingkprocess.h" /* defines BlockingTDEProcess */ #include "includepathresolver.h" #include <sys/stat.h> #include <sys/time.h> @@ -377,11 +377,11 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi PathResolutionResult IncludePathResolver::getFullOutput( const TQString& command, const TQString& workingDirectory, TQString& output ) const{ if( m_continueEventLoop ) { - BlockingKProcess proc; + BlockingTDEProcess proc; proc.setWorkingDirectory( workingDirectory ); proc.setUseShell( true ); proc << command; - if ( !proc.start(KProcess::NotifyOnExit, KProcess::Stdout) ) { + if ( !proc.start(TDEProcess::NotifyOnExit, TDEProcess::Stdout) ) { return PathResolutionResult( false, i18n("Could not start the make-process") ); } diff --git a/languages/cpp/includepathresolver.h b/languages/cpp/includepathresolver.h index 8046a987..f7e32b0d 100644 --- a/languages/cpp/includepathresolver.h +++ b/languages/cpp/includepathresolver.h @@ -38,7 +38,7 @@ namespace CppTools { ///One resolution-try can issue up to 4 make-calls in worst case class IncludePathResolver { public: - ///Whether the TQt event-loop should be continued(using BlockingKProcess). This crashes if enabled in a non-foreground thread. + ///Whether the TQt event-loop should be continued(using BlockingTDEProcess). This crashes if enabled in a non-foreground thread. IncludePathResolver( bool continueEventLoop = false ); ///Same as below, but uses the directory of the file as working-directory. The argument must be absolute. PathResolutionResult resolveIncludePath( const TQString& file ); @@ -62,7 +62,7 @@ namespace CppTools { typedef TQMap<TQString, CacheEntry> Cache; Cache m_cache; - ///Executes the command, either using popen or BlockingKProcess + ///Executes the command, either using popen or BlockingTDEProcess PathResolutionResult getFullOutput( const TQString& command, const TQString& workingDirectory, TQString& output ) const; bool executeCommandPopen ( const TQString& command, const TQString& workingDirectory, TQString& result ) const; ///file should be the name of the target, without extension(because that may be different) diff --git a/languages/cpp/kdevdriver.h b/languages/cpp/kdevdriver.h index 07dc3660..8af87e0c 100644 --- a/languages/cpp/kdevdriver.h +++ b/languages/cpp/kdevdriver.h @@ -12,7 +12,7 @@ #include <unistd.h> #include <tqmap.h> -class KProcess; +class TDEProcess; namespace CppTools { class IncludePathResolver; }; diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp index 5a38e464..97066fcc 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp @@ -64,7 +64,7 @@ TQStringList KDevQt4Importer::fileList() - KProcess proc; + TDEProcess proc; proc << "cpp" << "-nostdinc" << "-xc++"; m_qtfile = new KTempFile(); @@ -81,7 +81,7 @@ TQStringList KDevQt4Importer::fileList() o += m_qtfile->name(); proc << ifile.name() << o; - proc.start(KProcess::Block); + proc.start(TDEProcess::Block); return m_qtfile->name(); } diff --git a/languages/cpp/setuphelper.cpp b/languages/cpp/setuphelper.cpp index b75723c4..d91c508f 100644 --- a/languages/cpp/setuphelper.cpp +++ b/languages/cpp/setuphelper.cpp @@ -25,10 +25,10 @@ TQString getGccIncludePath(bool *ok) { *ok = true; TQString processStdout; - BlockingKProcess proc; + BlockingTDEProcess proc; proc << "gcc" ; proc << "-print-file-name=include" ; - if ( !proc.start(KProcess::NotifyOnExit, KProcess::Stdout) ) { + if ( !proc.start(TDEProcess::NotifyOnExit, TDEProcess::Stdout) ) { kdWarning(9007) << "Couldn't start gcc" << endl; *ok = false; return TQString(); @@ -54,11 +54,11 @@ TQString getVerboseGccIncludePath(bool *ok) fwrite(fileText, strlen(fileText), 1, tempFile.fstream() ); tempFile.close(); - BlockingKProcess proc; + BlockingTDEProcess proc; proc.setUseShell(true); proc.setWorkingDirectory(pathInfo.dir(true).path()); proc << "gcc -v " + pathInfo.fileName() + " 2>&1"; - if ( !proc.start(KProcess::NotifyOnExit, KProcess::Stdout) ) { + if ( !proc.start(TDEProcess::NotifyOnExit, TDEProcess::Stdout) ) { kdWarning(9007) << "Couldn't start gcc" << endl; *ok = false; return TQString(); @@ -71,13 +71,13 @@ TQStringList getGccMacros(bool *ok) { *ok = true; TQString processStdout; - BlockingKProcess proc; + BlockingTDEProcess proc; proc << "gcc"; proc << "-E"; proc << "-dM"; proc << "-ansi" ; proc << "-"; - if ( !proc.start(KProcess::NotifyOnExit, KProcess::Stdout) ) { + if ( !proc.start(TDEProcess::NotifyOnExit, TDEProcess::Stdout) ) { kdWarning(9007) << "Couldn't start gcc" << endl; *ok = false; return TQStringList(); diff --git a/languages/csharp/csharpdoc.cpp b/languages/csharp/csharpdoc.cpp index cd32d03e..c0ee2ed5 100644 --- a/languages/csharp/csharpdoc.cpp +++ b/languages/csharp/csharpdoc.cpp @@ -37,10 +37,10 @@ void CSharpdocProtocol::get(const KURL& url) if (l[0] == "functions") { plain = true; cmd += "-t -f "; - cmd += KProcess::quote(l[1]); + cmd += TDEProcess::quote(l[1]); } else if (l[0] == "faq") { cmd += "-u -q "; - cmd += KProcess::quote(l[1]); + cmd += TDEProcess::quote(l[1]); cmd += " | pod2html"; } else { TQCString errstr(i18n("The only existing directories are functions and faq.").local8Bit()); @@ -117,7 +117,7 @@ extern "C" { int kdemain(int argc, char **argv) { TDEInstance instance( "kio_csharpdoc" ); - KGlobal::locale()->setMainCatalogue("tdevelop"); + TDEGlobal::locale()->setMainCatalogue("tdevelop"); if (argc != 4) { fprintf(stderr, "Usage: kio_csharpdoc protocol domain-socket1 domain-socket2\n"); diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index 51634f6b..44068db8 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -92,7 +92,7 @@ void FortranSupportPart::slotFtnchek() TQDomDocument &dom = *projectDom(); TQString cmdline = "cd "; - cmdline += KProcess::quote(project()->projectDirectory()); + cmdline += TDEProcess::quote(project()->projectDirectory()); cmdline += "&& ftnchek -nonovice "; if (DomUtil::readBoolEntry(dom, "/kdevfortransupport/ftnchek/division")) diff --git a/languages/perl/perldoc.cpp b/languages/perl/perldoc.cpp index b699a0f5..bbb2fa2d 100644 --- a/languages/perl/perldoc.cpp +++ b/languages/perl/perldoc.cpp @@ -37,10 +37,10 @@ void PerldocProtocol::get(const KURL& url) if (l[0] == "functions") { plain = true; cmd += "-t -f "; - cmd += KProcess::quote(l[1]); + cmd += TDEProcess::quote(l[1]); } else if (l[0] == "faq") { cmd += "-u -q "; - cmd += KProcess::quote(l[1]); + cmd += TDEProcess::quote(l[1]); cmd += " | pod2html"; } else { TQCString errstr(i18n("The only existing directories are functions and faq.").local8Bit()); @@ -117,7 +117,7 @@ extern "C" { int kdemain(int argc, char **argv) { TDEInstance instance( "kio_perldoc" ); - KGlobal::locale()->setMainCatalogue("tdevelop"); + TDEGlobal::locale()->setMainCatalogue("tdevelop"); if (argc != 4) { fprintf(stderr, "Usage: kio_perldoc protocol domain-socket1 domain-socket2\n"); diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp index 5be07acb..01cd950c 100644 --- a/languages/php/phpconfigwidget.cpp +++ b/languages/php/phpconfigwidget.cpp @@ -129,16 +129,16 @@ void PHPConfigWidget::slotAboutClicked() proc << exe_edit->text(); proc << "-m"; - connect( &proc, TQT_SIGNAL(receivedStdout (KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPInfo (KProcess*, char*, int))); - proc.start(KProcess::Block,KProcess::Stdout); + connect( &proc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedPHPInfo (TDEProcess*, char*, int))); + proc.start(TDEProcess::Block,TDEProcess::Stdout); PHPInfoDlg dlg(this,"phpinfo",true); dlg.php_edit->setText(m_phpInfo); dlg.exec(); m_phpInfo = ""; } -void PHPConfigWidget::slotReceivedPHPInfo (KProcess* /*proc*/, char* buffer, int buflen){ +void PHPConfigWidget::slotReceivedPHPInfo (TDEProcess* /*proc*/, char* buffer, int buflen){ m_phpInfo += TQCString(buffer,buflen+1); } diff --git a/languages/php/phpconfigwidget.h b/languages/php/phpconfigwidget.h index 5f1efdd6..185740fe 100644 --- a/languages/php/phpconfigwidget.h +++ b/languages/php/phpconfigwidget.h @@ -3,7 +3,7 @@ #include "phpconfigwidgetbase.h" #include <tqstring.h> -class KProcess; +class TDEProcess; class PHPConfigData; class PHPConfigWidget : public PHPConfigWidgetBase @@ -21,7 +21,7 @@ public slots: virtual void slotPHPExeButtonClicked(); virtual void slotPHPIniButtonClicked(); void accept(); - void slotReceivedPHPInfo (KProcess* proc, char* buffer, int buflen); + void slotReceivedPHPInfo (TDEProcess* proc, char* buffer, int buflen); private: TQDomDocument* dom; diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index 29c6ea9b..7a95bc98 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -44,9 +44,9 @@ PHPFile::PHPFile(PHPSupportPart *phpSupport, const TQString& fileName) /* phpCheckProc = new KShellProcess("/bin/sh"); - connect(phpCheckProc, TQT_SIGNAL(receivedStdout (KProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStdout (KProcess*, char*, int))); - connect(phpCheckProc, TQT_SIGNAL(receivedStderr (KProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStderr (KProcess*, char*, int))); - connect(phpCheckProc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPHPCheckExited(KProcess*))); + connect(phpCheckProc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStdout (TDEProcess*, char*, int))); + connect(phpCheckProc, TQT_SIGNAL(receivedStderr (TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStderr (TDEProcess*, char*, int))); + connect(phpCheckProc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPHPCheckExited(TDEProcess*))); */ } @@ -487,7 +487,7 @@ void PHPFile::PHPCheck() { *phpCheckProc << m_phpSupport->getExePath(); *phpCheckProc << "-l -f" << KShellProcess::quote(fileName()); - phpCheckProc->start(KProcess::DontCare, KProcess::All); + phpCheckProc->start(TDEProcess::DontCare, TDEProcess::All); */ /* @@ -505,17 +505,17 @@ void PHPFile::PHPCheck() { } /* -void PHPFile::slotReceivedPHPCheckStdout (KProcess* proc, char* buffer, int buflen) { +void PHPFile::slotReceivedPHPCheckStdout (TDEProcess* proc, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStdout()" << endl; m_phpCheckOutput += TQString::fromLocal8Bit(buffer,buflen+1); } -void PHPFile::slotReceivedPHPCheckStderr (KProcess* proc, char* buffer, int buflen) { +void PHPFile::slotReceivedPHPCheckStderr (TDEProcess* proc, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStderr()" << endl; m_phpCheckOutput += TQString::fromLocal8Bit(buffer,buflen+1); } -void PHPFile::slotPHPCheckExited (KProcess* proc) { +void PHPFile::slotPHPCheckExited (TDEProcess* proc) { kdDebug(v) << "slotPHPExeExited()" << endl; } */ diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h index dbf18b63..470e7159 100644 --- a/languages/php/phpfile.h +++ b/languages/php/phpfile.h @@ -67,9 +67,9 @@ public: /* private slots: - void slotReceivedPHPCheckStderr (KProcess* proc, char* buffer, int buflen); - void slotReceivedPHPCheckStdout (KProcess* proc, char* buffer, int buflen); - void slotPHPCheckExited (KProcess* proc); + void slotReceivedPHPCheckStderr (TDEProcess* proc, char* buffer, int buflen); + void slotReceivedPHPCheckStdout (TDEProcess* proc, char* buffer, int buflen); + void slotPHPCheckExited (TDEProcess* proc); */ private: TQStringList readFromEditor(); diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp index 314dfcf6..ddc3b507 100644 --- a/languages/php/phpnewclassdlg.cpp +++ b/languages/php/phpnewclassdlg.cpp @@ -37,7 +37,7 @@ PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString m_dirEdit->setText(directory); // load the class template if available - TQString templateFile = KGlobal::instance()->dirs()->findResource("data","kdevphpsupport/newclasstemplate.txt"); + TQString templateFile = TDEGlobal::instance()->dirs()->findResource("data","kdevphpsupport/newclasstemplate.txt"); if(!templateFile.isNull()){ TQFile file(templateFile); TQTextStream stream(&file); @@ -86,7 +86,7 @@ void PHPNewClassDlg::accept(){ TQString absFileName = classDir + m_fileNameEdit->text(); // save the template for the next time - TQString templateDir = KGlobal::instance()->dirs()->saveLocation("data") + "/kdevphpsupport/"; + TQString templateDir = TDEGlobal::instance()->dirs()->saveLocation("data") + "/kdevphpsupport/"; TQString templateFile = templateDir + "newclasstemplate.txt"; TQDir dir(templateDir); if(!dir.exists()){ diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 52c9f109..db3aeed7 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -107,12 +107,12 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin mainWindow()->embedOutputView(m_phpErrorView, i18n("Problems"), i18n("Problems")); phpExeProc = new KShellProcess("/bin/sh"); - connect( phpExeProc, TQT_SIGNAL(receivedStdout (KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPExeStdout (KProcess*, char*, int))); - connect( phpExeProc, TQT_SIGNAL(receivedStderr (KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPExeStderr (KProcess*, char*, int))); - connect( phpExeProc, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotPHPExeExited(KProcess*))); + connect( phpExeProc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedPHPExeStdout (TDEProcess*, char*, int))); + connect( phpExeProc, TQT_SIGNAL(receivedStderr (TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedPHPExeStderr (TDEProcess*, char*, int))); + connect( phpExeProc, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotPHPExeExited(TDEProcess*))); m_htmlView = new PHPHTMLView(this); mainWindow()->embedOutputView(m_htmlView->view(), i18n("PHP"), i18n("PHP")); @@ -343,12 +343,12 @@ void PHPSupportPart::executeInTerminal() { *phpExeProc << KShellProcess::quote(file); kdDebug(9018) << "" << file.latin1() << endl; - phpExeProc->start(KProcess::NotifyOnExit,KProcess::All); + phpExeProc->start(TDEProcess::NotifyOnExit,TDEProcess::All); // core()->gotoDocumentationFile(KURL("http://www.php.net")); } -void PHPSupportPart::slotReceivedPHPExeStdout (KProcess* /*proc*/, char* buffer, int buflen) { +void PHPSupportPart::slotReceivedPHPExeStdout (TDEProcess* /*proc*/, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStdout()" << endl; m_phpExeOutput += TQString::fromLocal8Bit(buffer,buflen+1); @@ -358,7 +358,7 @@ void PHPSupportPart::slotReceivedPHPExeStdout (KProcess* /*proc*/, char* buffer, m_htmlView->write(buf); } -void PHPSupportPart::slotReceivedPHPExeStderr (KProcess* /*proc*/, char* buffer, int buflen) { +void PHPSupportPart::slotReceivedPHPExeStderr (TDEProcess* /*proc*/, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStderr()" << endl; m_phpExeOutput += TQString::fromLocal8Bit(buffer,buflen+1); @@ -368,7 +368,7 @@ void PHPSupportPart::slotReceivedPHPExeStderr (KProcess* /*proc*/, char* buffer, m_htmlView->write(buf); } -void PHPSupportPart::slotPHPExeExited (KProcess* /*proc*/) { +void PHPSupportPart::slotPHPExeExited (TDEProcess* /*proc*/) { kdDebug(9018) << "slotPHPExeExited()" << endl; m_htmlView->end(); TQString file = getExecuteFile(); diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h index 8e403f51..d89c3277 100644 --- a/languages/php/phpsupportpart.h +++ b/languages/php/phpsupportpart.h @@ -34,7 +34,7 @@ class TQStringList; class PHPHTMLView; class KShellProcess; -class KProcess; +class TDEProcess; class PHPErrorView; class PHPConfigData; class PHPCodeCompletion; @@ -72,9 +72,9 @@ private slots: void slotRun(); void slotNewClass(); void projectConfigWidget(KDialogBase *dlg); - void slotReceivedPHPExeStderr (KProcess* proc, char* buffer, int buflen); - void slotReceivedPHPExeStdout (KProcess* proc, char* buffer, int buflen); - void slotPHPExeExited (KProcess* proc); + void slotReceivedPHPExeStderr (TDEProcess* proc, char* buffer, int buflen); + void slotReceivedPHPExeStdout (TDEProcess* proc, char* buffer, int buflen); + void slotPHPExeExited (TDEProcess* proc); void slotWebData(KIO::Job* job,const TQByteArray& data); void slotWebResult(KIO::Job* job); void slotWebJobStarted(KIO::Job* job); diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp index ef4111bb..1c07b404 100644 --- a/languages/python/pydoc.cpp +++ b/languages/python/pydoc.cpp @@ -19,7 +19,7 @@ using namespace KIO; PydocProtocol::PydocProtocol(const TQCString &pool, const TQCString &app) : SlaveBase("pydoc", pool, app), key() { - python = KGlobal::dirs()->findExe("python"); + python = TDEGlobal::dirs()->findExe("python"); script = locate("data", "kio_pydoc/kde_pydoc.py"); } @@ -33,11 +33,11 @@ void PydocProtocol::get(const KURL& url) mimeType("text/html"); key = url.path(); - TQString cmd = KProcess::quote(python); + TQString cmd = TDEProcess::quote(python); cmd += " "; - cmd += KProcess::quote(script); + cmd += TDEProcess::quote(script); cmd += " -w "; - cmd += KProcess::quote(key); + cmd += TDEProcess::quote(key); FILE *fd = popen(cmd.local8Bit().data(), "r"); char buffer[4096]; @@ -97,7 +97,7 @@ extern "C" { int kdemain(int argc, char **argv) { TDEInstance instance( "kio_pydoc" ); - KGlobal::locale()->setMainCatalogue("tdevelop"); + TDEGlobal::locale()->setMainCatalogue("tdevelop"); if (argc != 4) { fprintf(stderr, "Usage: kio_pydoc protocol domain-socket1 domain-socket2\n"); 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); |