summaryrefslogtreecommitdiffstats
path: root/languages/cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
commitb9e542d0c805e9adee3a67e44532d5321032e21e (patch)
treee82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /languages/cpp
parent7a392a04059bd904dab4c78910a6d34aa0b37798 (diff)
downloadtdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz
tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'languages/cpp')
-rw-r--r--languages/cpp/app_templates/kateplugin/plugin_app.cpp2
-rw-r--r--languages/cpp/app_templates/kateplugin2/plugin_app.cpp2
-rw-r--r--languages/cpp/app_templates/kicker/applet.cpp2
-rw-r--r--languages/cpp/app_templates/kofficepart/kopart_factory.cpp2
-rw-r--r--languages/cpp/app_templates/kpartapp/app.cpp12
-rw-r--r--languages/cpp/app_templates/kpartapp/app_part.cpp2
-rw-r--r--languages/cpp/app_templates/kpartplugin/plugin_app.cpp2
-rw-r--r--languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp4
-rw-r--r--languages/cpp/app_templates/kscons_kxt/app.cpp4
-rw-r--r--languages/cpp/app_templates/kscreensaver/kscreensaver.cpp10
-rw-r--r--languages/cpp/app_templates/kxt/app.cpp4
-rw-r--r--languages/cpp/app_templates/noatunui/plugin_app.cpp2
-rw-r--r--languages/cpp/app_templates/noatunvisual/plugin_app.cpp2
-rw-r--r--languages/cpp/debugger/dbgcontroller.h12
-rw-r--r--languages/cpp/debugger/dbgpsdlg.cpp12
-rw-r--r--languages/cpp/debugger/dbgpsdlg.h6
-rw-r--r--languages/cpp/debugger/disassemblewidget.cpp2
-rw-r--r--languages/cpp/debugger/framestackwidget.cpp6
-rw-r--r--languages/cpp/debugger/gdbcontroller.cpp36
-rw-r--r--languages/cpp/debugger/gdbcontroller.h10
-rw-r--r--languages/cpp/debugger/variablewidget.cpp2
-rw-r--r--languages/cpp/includepathresolver.cpp6
-rw-r--r--languages/cpp/includepathresolver.h4
-rw-r--r--languages/cpp/kdevdriver.h2
-rw-r--r--languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp4
-rw-r--r--languages/cpp/setuphelper.cpp12
26 files changed, 82 insertions, 82 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();