summaryrefslogtreecommitdiffstats
path: root/parts
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 /parts
parent7a392a04059bd904dab4c78910a6d34aa0b37798 (diff)
downloadtdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz
tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'parts')
-rw-r--r--parts/appwizard/appwizarddlg.cpp10
-rw-r--r--parts/appwizard/importdlg.cpp2
-rw-r--r--parts/classview/digraphview.cpp10
-rw-r--r--parts/ctags2/ctags2_part.cpp4
-rw-r--r--parts/diff/diffpart.cpp28
-rw-r--r--parts/diff/diffpart.h12
-rw-r--r--parts/distpart/distpart_widget.h2
-rw-r--r--parts/distpart/specsupport.cpp12
-rw-r--r--parts/documentation/docglobalconfigwidget.cpp6
-rw-r--r--parts/documentation/documentation_part.cpp2
-rw-r--r--parts/documentation/find_documentation.cpp32
-rw-r--r--parts/documentation/find_documentation.h14
-rw-r--r--parts/documentation/searchview.cpp20
-rw-r--r--parts/documentation/searchview.h6
-rw-r--r--parts/documentation/tools/htdig/htdigindex.cpp26
-rw-r--r--parts/documentation/tools/htdig/htdigindex.h10
-rw-r--r--parts/filecreate/fcconfigwidget.cpp8
-rw-r--r--parts/filecreate/filecreate_listitem.cpp2
-rw-r--r--parts/filecreate/filecreate_part.cpp4
-rw-r--r--parts/filecreate/filecreate_widget2.cpp2
-rw-r--r--parts/filter/shellfilterdlg.cpp20
-rw-r--r--parts/filter/shellfilterdlg.h10
-rw-r--r--parts/filter/shellinsertdlg.cpp14
-rw-r--r--parts/filter/shellinsertdlg.h8
-rw-r--r--parts/grepview/grepviewwidget.cpp4
-rw-r--r--parts/openwith/openwithpart.cpp6
-rw-r--r--parts/outputviews/appoutputviewpart.cpp4
-rw-r--r--parts/outputviews/makewidget.cpp12
-rw-r--r--parts/outputviews/makewidget.h6
-rw-r--r--parts/regexptest/regexptestdlg.cpp4
-rw-r--r--parts/tools/tools_part.cpp2
-rw-r--r--parts/valgrind/valgrind_dialog.cpp4
-rw-r--r--parts/valgrind/valgrind_part.cpp24
-rw-r--r--parts/valgrind/valgrind_part.h10
34 files changed, 170 insertions, 170 deletions
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 92632de0..67e97361 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -136,7 +136,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
ApplicationInfo *info = new ApplicationInfo;
info->propValues = new PropertyLib::PropertyList();
- info->templateFile = KGlobal::dirs()->findResource("apptemplates", *it);
+ info->templateFile = TDEGlobal::dirs()->findResource("apptemplates", *it);
info->templateName = (*it);
KConfig templateConfig(info->templateFile);
@@ -706,13 +706,13 @@ void AppWizardDialog::accept()
if (!m_pCurrentAppInfo->finishCmd.isEmpty())
{
- BlockingKProcess proc;
+ BlockingTDEProcess proc;
proc.setWorkingDirectory( m_pCurrentAppInfo->finishCmdDir );
proc.setUseShell( true );
proc << "cd" << m_pCurrentAppInfo->finishCmdDir << "&&";
proc << m_pCurrentAppInfo->finishCmd;
kdDebug(9010) << "Executing:" << proc.args() << endl;
- proc.start( KProcess::NotifyOnExit );
+ proc.start( TDEProcess::NotifyOnExit );
if( !proc.isRunning() && !proc.normalExit() )
{
kdDebug(9010) << "Couldn't execute: " << proc.args() << endl;
@@ -889,7 +889,7 @@ void AppWizardDialog::templatesTreeViewClicked(TQListViewItem *item)
TQMultiLineEdit *edit = new TQMultiLineEdit(this);
edit->setWordWrap(TQTextEdit::NoWrap);
- edit->setFont(KGlobalSettings::fixedFont());
+ edit->setFont(TDEGlobalSettings::fixedFont());
if (it == l.end())
m_lastPage = edit;
fileTemplate.edit = edit;
@@ -1281,7 +1281,7 @@ TQDict<KDevLicense> AppWizardDialog::licenses()
void AppWizardDialog::loadLicenses()
{
// kdDebug(9010) << "======================== Entering loadLicenses" << endl;
- KStandardDirs* dirs = KGlobal::dirs();
+ KStandardDirs* dirs = TDEGlobal::dirs();
dirs->addResourceType( "licenses", KStandardDirs::kde_default( "data" ) + "tdevelop/licenses/" );
TQStringList licNames = dirs->findAllResources( "licenses", TQString(), false, true );
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 9a10f6d3..75a4487f 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -67,7 +67,7 @@ ImportDialog::ImportDialog(AppWizardPart *part, TQWidget *parent, const char *na
TQStringList::ConstIterator it;
for (it = importNames.begin(); it != importNames.end(); ++it) {
- KConfig config(KGlobal::dirs()->findResource("appimports", *it));
+ KConfig config(TDEGlobal::dirs()->findResource("appimports", *it));
config.setGroup("General");
TQString type = config.readEntry("Comment");
project_combo->insertItem(type);
diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp
index 35680be9..6c9eeb88 100644
--- a/parts/classview/digraphview.cpp
+++ b/parts/classview/digraphview.cpp
@@ -223,7 +223,7 @@ void DigraphView::parseDotResults(const TQStringList &list)
void DigraphView::process( const TQString& file, const TQString& ext )
{
- TQString cmd = KGlobal::dirs()->findExe("dot");
+ TQString cmd = TDEGlobal::dirs()->findExe("dot");
if (cmd.isEmpty()) {
KMessageBox::sorry(0, i18n("You do not have 'dot' installed.\nIt can be downloaded from www.graphviz.org."));
return;
@@ -242,7 +242,7 @@ void DigraphView::process( const TQString& file, const TQString& ext )
is << "}" << endl;
ifile.close();
- KProcess proc;
+ TDEProcess proc;
if( !file.isEmpty() && !ext.isEmpty() )
{
proc << cmd << TQString("-T")+ext << ifile.name() << "-o" << file;
@@ -251,7 +251,7 @@ void DigraphView::process( const TQString& file, const TQString& ext )
{
proc << cmd << "-Tplain" << ifile.name() << "-o" << ofile.name();
}
- proc.start(KProcess::Block);
+ proc.start(TDEProcess::Block);
if( !file.isEmpty() && !ext.isEmpty() )
{
@@ -276,7 +276,7 @@ void DigraphView::drawContents(TQPainter* p, int clipx, int clipy, int clipw, in
TQRect clipRect(clipx, clipy, clipw, cliph);
p->eraseRect(clipRect);
- p->setFont(KGlobalSettings::generalFont());
+ p->setFont(TDEGlobalSettings::generalFont());
TQPtrListIterator<DigraphNode> it1(nodes);
for (; it1.current(); ++it1) {
TQRect r((*it1)->x-(*it1)->w/2, (*it1)->y-(*it1)->h/2, (*it1)->w, (*it1)->h);
@@ -343,7 +343,7 @@ TQSize DigraphView::sizeHint() const
if (width == -1)
return TQSize(100, 100); // arbitrary
- TQSize dsize = KGlobalSettings::desktopGeometry(viewport()).size();
+ TQSize dsize = TDEGlobalSettings::desktopGeometry(viewport()).size();
kdDebug(9003) << "sizehint for inheritance diagram" << dsize << " " << width << " " << height << endl;
return TQSize(width, height).boundedTo(TQSize(dsize.width()*2/3, dsize.height()*2/3));
}
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index 4f50aafe..dc0c834d 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -135,13 +135,13 @@ bool CTags2Part::createTagsFile()
bool CTags2Part::createTagsFile(const TQString& tagFile, const TQString& dir)
{
/*
- KProcess proc;
+ TDEProcess proc;
proc.setWorkingDirectory( project()->projectDirectory() );
proc << "ctags";
proc << "-R" << "--c++-types=+px" << "--excmd=pattern" << "--exclude=Makefile";
- bool success = proc.start(KProcess::Block);
+ bool success = proc.start(TDEProcess::Block);
return success;
*/
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 647a5cc5..97adaf4f 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -149,22 +149,22 @@ void DiffPart::localDiff()
resultBuffer = resultErr = TQString();
delete proc;
- proc = new KProcess();
+ proc = new TDEProcess();
*proc << "diff";
*proc << "-u" << popupFile.path() << "-";
proc->setWorkingDirectory( popupFile.directory() );
- connect( proc, TQT_SIGNAL(processExited( KProcess* )),
- this, TQT_SLOT(processExited( KProcess* )) );
- connect( proc, TQT_SIGNAL(receivedStdout( KProcess*, char*, int )),
- this, TQT_SLOT(receivedStdout( KProcess*, char*, int )) );
- connect( proc, TQT_SIGNAL(receivedStderr( KProcess*, char*, int )),
- this, TQT_SLOT(receivedStderr( KProcess*, char*, int )) );
- connect( proc, TQT_SIGNAL(wroteStdin( KProcess* )),
- this, TQT_SLOT(wroteStdin( KProcess* )) );
+ connect( proc, TQT_SIGNAL(processExited( TDEProcess* )),
+ this, TQT_SLOT(processExited( TDEProcess* )) );
+ connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )),
+ this, TQT_SLOT(receivedStdout( TDEProcess*, char*, int )) );
+ connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*, char*, int )),
+ this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) );
+ connect( proc, TQT_SIGNAL(wroteStdin( TDEProcess* )),
+ this, TQT_SLOT(wroteStdin( TDEProcess* )) );
- if ( !proc->start( KProcess::NotifyOnExit, KProcess::All ) ) {
+ if ( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
KMessageBox::error( 0, i18n( "Could not invoke the \"diff\" command." ) );
delete proc;
proc = 0;
@@ -173,7 +173,7 @@ void DiffPart::localDiff()
proc->writeStdin( buffer.data(), buffer.length() );
}
-void DiffPart::processExited( KProcess* p )
+void DiffPart::processExited( TDEProcess* p )
{
// diff has exit status 0 and 1 for success
if ( p->normalExit() && ( p->exitStatus() == 0 || p->exitStatus() == 1 ) ) {
@@ -189,18 +189,18 @@ void DiffPart::processExited( KProcess* p )
proc = 0;
}
-void DiffPart::receivedStdout( KProcess* /* p */, char* buf, int buflen )
+void DiffPart::receivedStdout( TDEProcess* /* p */, char* buf, int buflen )
{
resultBuffer += TQString::fromLocal8Bit( buf, buflen );
}
-void DiffPart::receivedStderr( KProcess* /* p */, char* buf, int buflen )
+void DiffPart::receivedStderr( TDEProcess* /* p */, char* buf, int buflen )
{
kdDebug(9033) << "received Stderr: " << TQString(TQString::fromLocal8Bit( buf, buflen )).ascii() << endl;
resultErr += TQString::fromLocal8Bit( buf, buflen );
}
-void DiffPart::wroteStdin( KProcess* p )
+void DiffPart::wroteStdin( TDEProcess* p )
{
buffer = 0L;
p->closeStdin();
diff --git a/parts/diff/diffpart.h b/parts/diff/diffpart.h
index d5e2cc92..5cf4b478 100644
--- a/parts/diff/diffpart.h
+++ b/parts/diff/diffpart.h
@@ -20,7 +20,7 @@
class TQPopupMenu;
class Context;
-class KProcess;
+class TDEProcess;
class DiffWidget;
class TQCString;
@@ -43,15 +43,15 @@ public slots:
private slots:
void contextMenu( TQPopupMenu* popup, const Context* context );
void localDiff();
- void processExited( KProcess* p );
- void receivedStdout( KProcess* p, char* buf, int buflen );
- void receivedStderr( KProcess* p, char* buf, int buflen );
- void wroteStdin( KProcess* p );
+ void processExited( TDEProcess* p );
+ void receivedStdout( TDEProcess* p, char* buf, int buflen );
+ void receivedStderr( TDEProcess* p, char* buf, int buflen );
+ void wroteStdin( TDEProcess* p );
private:
TQGuardedPtr<DiffWidget> diffWidget;
KURL popupFile;
- KProcess* proc;
+ TDEProcess* proc;
TQCString buffer;
TQString resultBuffer;
TQString resultErr;
diff --git a/parts/distpart/distpart_widget.h b/parts/distpart/distpart_widget.h
index 31aadbec..ff3d729c 100644
--- a/parts/distpart/distpart_widget.h
+++ b/parts/distpart/distpart_widget.h
@@ -35,7 +35,7 @@
class KDevProject;
class DistpartPart;
class TQUrlOperator;
-class KProcess;
+class TDEProcess;
class TQTabWidget;
class SpecSupport;
diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp
index 8a45910b..153c0c3d 100644
--- a/parts/distpart/specsupport.cpp
+++ b/parts/distpart/specsupport.cpp
@@ -80,11 +80,11 @@ void SpecSupport::slotbuildAllPushButtonPressed() {
}
else
if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
- makeFrontend->queueCommand(dir,"cd " + KProcess::quote(dir) +
- " && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.find("_sourcedir"))));
+ makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote(dir) +
+ " && cp " + TDEProcess::quote(getAppSource()) + " " + TDEProcess::quote(*(map.find("_sourcedir"))));
}
if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
- makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) +
+ makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) +
" && rpmbuild -ba " + m_part->project()->projectName() + ".spec");
}
@@ -179,11 +179,11 @@ void SpecSupport::slotsrcPackagePushButtonPressed() {
}
else
if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
- makeFrontend->queueCommand(dir,"cd " + KProcess::quote(dir) +
- " && cp " + KProcess::quote(getAppSource()) + " " + KProcess::quote(*(map.find("_sourcedir"))));
+ makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote(dir) +
+ " && cp " + TDEProcess::quote(getAppSource()) + " " + TDEProcess::quote(*(map.find("_sourcedir"))));
}
if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend"))
- makeFrontend->queueCommand(dir,"cd " + KProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) +
+ makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) +
" && rpmbuild -bs " + m_part->project()->projectName() + ".spec");
}
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index 8d524a47..712a57fa 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -105,7 +105,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part,
//font sizes and zoom levels
KHTMLPart htmlpart;
- KConfig *appConfig = KGlobal::config();
+ KConfig *appConfig = TDEGlobal::config();
appConfig->setGroup("KHTMLPart");
standardFont_combo->setCurrentText(appConfig->readEntry("StandardFont",
htmlpart.settings()->stdFontName()));
@@ -214,7 +214,7 @@ void DocGlobalConfigWidget::accept()
m_part->setAssistantUsed(useAssistant_box->isChecked());
//font sizes and zoom levels
- KConfig *appConfig = KGlobal::config();
+ KConfig *appConfig = TDEGlobal::config();
appConfig->setGroup("KHTMLPart");
appConfig->writeEntry("StandardFont", standardFont_combo->currentText());
appConfig->writeEntry("FixedFont", fixedFont_combo->currentText());
@@ -241,7 +241,7 @@ void DocGlobalConfigWidget::updateConfigForHTMLParts()
KHTMLPart *htmlPart = dynamic_cast<KHTMLPart*>(m_part->partController()->partForURL(*it));
if (htmlPart)
{
- KConfig *appConfig = KGlobal::config();
+ KConfig *appConfig = TDEGlobal::config();
appConfig->setGroup("KHTMLPart");
htmlPart->setStandardFont(appConfig->readEntry("StandardFont"));
htmlPart->setFixedFont(appConfig->readEntry("FixedFont"));
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 37bd7a40..23fd0e14 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -739,7 +739,7 @@ void DocumentationPart::loadSettings()
config->setGroup("Documentation");
m_assistantUsed = config->readBoolEntry("UseAssistant", false);
- if (TQString(KGlobal::instance()->aboutData()->appName()) == "kdevassistant")
+ if (TQString(TDEGlobal::instance()->aboutData()->appName()) == "kdevassistant")
{
int page = config->readNumEntry("LastPage", 0);
switch (page)
diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp
index ac95d878..e5068635 100644
--- a/parts/documentation/find_documentation.cpp
+++ b/parts/documentation/find_documentation.cpp
@@ -48,18 +48,18 @@ FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* na
{
TQWidget* tmp = TQT_TQWIDGET(TQApplication::desktop());
setGeometry(tmp->width()/2 - width()/2, tmp->height()/2 - height()/2, width(), height());
- proc_man = new KProcess( TQT_TQOBJECT(this) );
- proc_info = new KProcess( TQT_TQOBJECT(this) );
+ proc_man = new TDEProcess( TQT_TQOBJECT(this) );
+ proc_info = new TDEProcess( TQT_TQOBJECT(this) );
- connect( proc_man, TQT_SIGNAL(processExited( KProcess* )),
- this, TQT_SLOT(procManExited( KProcess* )) );
- connect( proc_man, TQT_SIGNAL(receivedStdout( KProcess*, char*, int)),
- this, TQT_SLOT(procManReadStdout( KProcess*, char*, int)) );
+ connect( proc_man, TQT_SIGNAL(processExited( TDEProcess* )),
+ this, TQT_SLOT(procManExited( TDEProcess* )) );
+ connect( proc_man, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int)),
+ this, TQT_SLOT(procManReadStdout( TDEProcess*, char*, int)) );
- connect( proc_info, TQT_SIGNAL(processExited( KProcess* )),
- this, TQT_SLOT(procInfoExited( KProcess* )) );
- connect( proc_info, TQT_SIGNAL(receivedStdout( KProcess*, char*, int)),
- this, TQT_SLOT(procInfoReadStdout( KProcess*, char*, int)) );
+ connect( proc_info, TQT_SIGNAL(processExited( TDEProcess* )),
+ this, TQT_SLOT(procInfoExited( TDEProcess* )) );
+ connect( proc_info, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int)),
+ this, TQT_SLOT(procInfoReadStdout( TDEProcess*, char*, int)) );
result_list->header()->hide();
result_list->setSorting(-1);
@@ -102,7 +102,7 @@ void FindDocumentation::clickOnItem( TQListViewItem * item )
m_widget->part()->partController()->showDocument(doc_item->url());
}
-void FindDocumentation::procInfoExited( KProcess* )
+void FindDocumentation::procInfoExited( TDEProcess* )
{
if (proc_info->normalExit() && proc_info->exitStatus() == 0)
{
@@ -125,7 +125,7 @@ void FindDocumentation::procInfoExited( KProcess* )
}
}
-void FindDocumentation::procManExited( KProcess* )
+void FindDocumentation::procManExited( TDEProcess* )
{
if (proc_man->normalExit() && proc_man->exitStatus() == 0)
{
@@ -145,12 +145,12 @@ void FindDocumentation::procManExited( KProcess* )
}
}
-void FindDocumentation::procInfoReadStdout( KProcess*, char* buf, int len)
+void FindDocumentation::procInfoReadStdout( TDEProcess*, char* buf, int len)
{
proc_info_out += TQString::fromLatin1( buf, len );
}
-void FindDocumentation::procManReadStdout( KProcess*, char* buf, int len)
+void FindDocumentation::procManReadStdout( TDEProcess*, char* buf, int len)
{
proc_man_out += TQString::fromLatin1( buf, len );
}
@@ -167,7 +167,7 @@ void FindDocumentation::searchInInfo()
*proc_info << "-w";
*proc_info << search_term->text();
- if ( !proc_info->start( KProcess::NotifyOnExit, KProcess::Stdout ) )
+ if ( !proc_info->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) )
{
// error handling
}
@@ -185,7 +185,7 @@ void FindDocumentation::searchInMan()
*proc_man << "-w";
*proc_man << search_term->text();
- if ( !proc_man->start( KProcess::NotifyOnExit, KProcess::Stdout ) )
+ if ( !proc_man->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) )
{
// error handling
}
diff --git a/parts/documentation/find_documentation.h b/parts/documentation/find_documentation.h
index 31b7adeb..28d867c3 100644
--- a/parts/documentation/find_documentation.h
+++ b/parts/documentation/find_documentation.h
@@ -28,7 +28,7 @@
class DocumentationWidget;
class KListViewItem;
class FindDocumentationOptions;
-class KProcess;
+class TDEProcess;
class FindDocumentation : public FindDocumentationBase
{
@@ -43,10 +43,10 @@ public slots:
/*$PUBLIC_SLOTS$*/
virtual void buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int c );
virtual void clickOnItem( TQListViewItem * item );
- virtual void procInfoExited( KProcess* );
- virtual void procManExited( KProcess* );
- virtual void procManReadStdout( KProcess*, char*, int );
- virtual void procInfoReadStdout( KProcess*, char*, int );
+ virtual void procInfoExited( TDEProcess* );
+ virtual void procManExited( TDEProcess* );
+ virtual void procManReadStdout( TDEProcess*, char*, int );
+ virtual void procInfoReadStdout( TDEProcess*, char*, int );
virtual void searchInInfo();
virtual void searchInMan();
virtual void searchInGoogle();
@@ -64,8 +64,8 @@ protected slots:
/*$PROTECTED_SLOTS$*/
private:
- KProcess* proc_man;
- KProcess* proc_info;
+ TDEProcess* proc_man;
+ TDEProcess* proc_info;
TQString proc_man_out;
TQString proc_info_out;
KListViewItem* man_item;
diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp
index aed30404..69a91a6e 100644
--- a/parts/documentation/searchview.cpp
+++ b/parts/documentation/searchview.cpp
@@ -131,9 +131,9 @@ void SearchView::updateIndex()
void SearchView::runHtdig(const TQString &arg)
{
- KProcess proc;
+ TDEProcess proc;
proc << "tdevelop-htdig" << arg;
- proc.start(KProcess::DontCare);
+ proc.start(TDEProcess::DontCare);
}
void tqt_enter_modal(TQWidget *widget);
@@ -190,19 +190,19 @@ void SearchView::search()
kdDebug(9002) << "starting kprocess" << endl;
kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query << endl;
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
TQString picdir = kapp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png");
proc->setEnvironment("PICDIR", picdir);
*proc << exe << "-c" << (indexdir + "/htdig.conf") << query;
- connect( proc, TQT_SIGNAL(receivedStdout(KProcess *,char*,int)),
- this, TQT_SLOT(htsearchStdout(KProcess *,char*,int)) );
- connect( proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(htsearchExited(KProcess *)) );
+ connect( proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)),
+ this, TQT_SLOT(htsearchStdout(TDEProcess *,char*,int)) );
+ connect( proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(htsearchExited(TDEProcess *)) );
searchResult = "";
- if (!proc->start(KProcess::NotifyOnExit, KProcess::Stdout))
+ if (!proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout))
{
KMessageBox::error(this, i18n("Cannot start the htsearch executable."));
kdDebug() << "process start failed" << endl;
@@ -247,12 +247,12 @@ void SearchView::search()
// m_part->partController()->showDocument(KURL("file://" + indexdir + "/results.html"));
}
-void SearchView::htsearchStdout(KProcess *, char *buffer, int len)
+void SearchView::htsearchStdout(TDEProcess *, char *buffer, int len)
{
searchResult += TQString::fromLocal8Bit(buffer, len);
}
-void SearchView::htsearchExited(KProcess *)
+void SearchView::htsearchExited(TDEProcess *)
{
kapp->exit_loop();
}
diff --git a/parts/documentation/searchview.h b/parts/documentation/searchview.h
index 54eca941..cf7062c7 100644
--- a/parts/documentation/searchview.h
+++ b/parts/documentation/searchview.h
@@ -27,7 +27,7 @@ class KLineEdit;
class KComboBox;
class KListView;
class KPushButton;
-class KProcess;
+class TDEProcess;
class TQListViewItem;
class SearchView: public TQWidget
@@ -47,8 +47,8 @@ protected slots:
void updateConfig();
void updateIndex();
- void htsearchStdout(KProcess *, char *buffer, int len);
- void htsearchExited(KProcess *);
+ void htsearchStdout(TDEProcess *, char *buffer, int len);
+ void htsearchExited(TDEProcess *);
void executed(TQListViewItem *item);
void itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int c);
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index 328a0387..4c0dfa99 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -210,7 +210,7 @@ void ProgressDialog::scanDirectories()
bool ProgressDialog::createConfig()
{
// locate the common dir
- TQString language = KGlobal::locale()->language();
+ TQString language = TDEGlobal::locale()->language();
if (language == "C")
language = "en";
@@ -263,13 +263,13 @@ void ProgressDialog::startHtdigProcess(bool initial)
{
kdDebug(9002) << "htdig started" << endl;
delete proc;
- proc = new KProcess();
+ proc = new TDEProcess();
*proc << exe << "-c" << (indexdir + "/htdig.conf");
if (initial) {
*proc << "-i";
}
- connect(proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(htdigExited(KProcess *)));
+ connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(htdigExited(TDEProcess *)));
htdigRunning = true;
@@ -292,7 +292,7 @@ void ProgressDialog::startHtdigProcess(bool initial)
f.close();
// execute htdig
- proc->start(KProcess::NotifyOnExit, KProcess::Stdout);
+ proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
}
bool ProgressDialog::generateIndex()
@@ -318,7 +318,7 @@ bool ProgressDialog::generateIndex()
return true;
}
-void ProgressDialog::htdigStdout(KProcess *, char *buffer, int len)
+void ProgressDialog::htdigStdout(TDEProcess *, char *buffer, int len)
{
TQString line = TQString(buffer).left(len);
@@ -335,7 +335,7 @@ void ProgressDialog::htdigStdout(KProcess *, char *buffer, int len)
setFilesDigged(filesDigged);
}
-void ProgressDialog::htdigExited(KProcess *proc)
+void ProgressDialog::htdigExited(TDEProcess *proc)
{
kdDebug(9002) << "htdig terminated" << endl;
if (!proc->normalExit())
@@ -382,20 +382,20 @@ void ProgressDialog::startHtmergeProcess()
{
kdDebug(9002) << "htmerge started" << endl;
delete proc;
- proc = new KProcess();
+ proc = new TDEProcess();
*proc << exe << "-c" << (indexdir + "/htdig.conf");
kdDebug(9002) << "Running htmerge" << endl;
- connect(proc, TQT_SIGNAL(processExited(KProcess *)),
- this, TQT_SLOT(htmergeExited(KProcess *)));
+ connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
+ this, TQT_SLOT(htmergeExited(TDEProcess *)));
htmergeRunning = true;
- proc->start(KProcess::NotifyOnExit, KProcess::Stdout);
+ proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
}
-void ProgressDialog::htmergeExited(KProcess *proc)
+void ProgressDialog::htmergeExited(TDEProcess *proc)
{
kdDebug(9002) << "htmerge terminated" << endl;
htmergeRunning = false;
@@ -458,7 +458,7 @@ int main(int argc, char *argv[])
TDEApplication app;
- KGlobal::locale()->setMainCatalogue("tdevelop");
+ TDEGlobal::locale()->setMainCatalogue("tdevelop");
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/parts/documentation/tools/htdig/htdigindex.h b/parts/documentation/tools/htdig/htdigindex.h
index 9afa4d45..5c521be1 100644
--- a/parts/documentation/tools/htdig/htdigindex.h
+++ b/parts/documentation/tools/htdig/htdigindex.h
@@ -19,7 +19,7 @@
class TQTimer;
class TQLabel;
-class KProcess;
+class TDEProcess;
class KProgress;
class ProgressDialog : public KDialogBase
@@ -36,9 +36,9 @@ public:
bool generateIndex();
private slots:
- void htdigStdout(KProcess *proc, char *buffer, int buflen);
- void htdigExited(KProcess *proc);
- void htmergeExited(KProcess *proc);
+ void htdigStdout(TDEProcess *proc, char *buffer, int buflen);
+ void htdigExited(TDEProcess *proc);
+ void htmergeExited(TDEProcess *proc);
void cancelClicked();
void okClicked();
void slotDelayedStart();
@@ -61,7 +61,7 @@ private:
TQString indexdir;
TQString exe;
TQStringList files;
- KProcess *proc;
+ TDEProcess *proc;
volatile int filesToDig, filesDigged, filesScanned;
bool htdigRunning, htmergeRunning;
};
diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp
index 8b4ca11a..d703197c 100644
--- a/parts/filecreate/fcconfigwidget.cpp
+++ b/parts/filecreate/fcconfigwidget.cpp
@@ -178,7 +178,7 @@ void FCConfigWidget::saveGlobalConfig()
saveConfiguration(globalDom, fileTypes, true);
- TQFile config( KGlobal::dirs()->saveLocation("data", "kdevfilecreate/", true) + "template-info.xml" );
+ TQFile config( TDEGlobal::dirs()->saveLocation("data", "kdevfilecreate/", true) + "template-info.xml" );
config.open(IO_WriteOnly | IO_Truncate);
TQTextStream stream(&config);
stream << "<?xml version = '1.0'?>";
@@ -291,7 +291,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element
{
TQString dest;
if (global)
- dest = KGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
+ dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
else
dest = m_part->project()->projectDirectory() + "/templates/";
if (it.current()->text(4) == "create")
@@ -318,7 +318,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element
{
TQString dest;
if (global)
- dest = KGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
+ dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
else
dest = m_part->project()->projectDirectory() + "/templates/";
if (lastChild->text(4) == "create")
@@ -683,7 +683,7 @@ void FCConfigWidget::edit_type_content_button_clicked( )
}
else
{
- TQString dest = KGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
+ TQString dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true);
TQString typePath = dest + type_name;
KURL content;
content.setPath(typePath);
diff --git a/parts/filecreate/filecreate_listitem.cpp b/parts/filecreate/filecreate_listitem.cpp
index aa02fe23..09dd0dc4 100644
--- a/parts/filecreate/filecreate_listitem.cpp
+++ b/parts/filecreate/filecreate_listitem.cpp
@@ -82,7 +82,7 @@ namespace FileCreate {
setText(0, m_filetype->ext()!="" ? TQString("." + m_filetype->ext()) : TQString("") );
setText(1, "<qt><b>"+m_filetype->name()+"</b>. " + m_filetype->descr() );
- KIconLoader * loader = KGlobal::iconLoader();
+ KIconLoader * loader = TDEGlobal::iconLoader();
TQPixmap iconPix = loader->loadIcon(m_filetype->icon(), KIcon::Desktop,
KIcon::SizeMedium,
KIcon::DefaultState, NULL,
diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index 0f33b216..2a598f36 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -120,7 +120,7 @@ void FileCreatePart::insertConfigWidget( const KDialogBase * dlg, TQWidget * pag
void FileCreatePart::slotAboutToShowNewPopupMenu()
{
- KIconLoader * m_iconLoader = KGlobal::iconLoader();
+ KIconLoader * m_iconLoader = TDEGlobal::iconLoader();
m_newPopupMenu->clear();
delete m_subPopups;
m_subPopups = NULL;
@@ -524,7 +524,7 @@ TQString FileCreatePart::findGlobalXMLFile() const
{
int version = 0;
TQString filename;
- TQStringList filenames = KGlobal::instance()->dirs()->findAllResources("data", "kdevfilecreate/template-info.xml");
+ TQStringList filenames = TDEGlobal::instance()->dirs()->findAllResources("data", "kdevfilecreate/template-info.xml");
for( TQStringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it )
{
TQDomDocument globalDom;
diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp
index d934aba0..f2d67f25 100644
--- a/parts/filecreate/filecreate_widget2.cpp
+++ b/parts/filecreate/filecreate_widget2.cpp
@@ -43,7 +43,7 @@ namespace FileCreate {
setFocusStyle(FollowStyle);
setColumnStretchable(3, true);
- m_iconLoader = KGlobal::iconLoader();
+ m_iconLoader = TDEGlobal::iconLoader();
TQWhatsThis::add(this, i18n("Use this to create new files within your project."));
diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp
index 81ed6778..59a95db0 100644
--- a/parts/filter/shellfilterdlg.cpp
+++ b/parts/filter/shellfilterdlg.cpp
@@ -81,13 +81,13 @@ void ShellFilterDialog::slotStartClicked()
delete m_proc;
m_proc = new KShellProcess("/bin/sh");
(*m_proc) << combo->currentText();
- connect( m_proc, TQT_SIGNAL(receivedStdout(KProcess*, char *, int)),
- this, TQT_SLOT(slotReceivedStdout(KProcess*, char *, int)) );
- connect( m_proc, TQT_SIGNAL(wroteStdin(KProcess*)),
- this, TQT_SLOT(slotWroteStdin(KProcess*)) );
- connect( m_proc, TQT_SIGNAL(processExited(KProcess*)),
- this, TQT_SLOT(slotProcessExited(KProcess*)) );
- m_proc->start(KProcess::NotifyOnExit, KProcess::All);
+ connect( m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char *, int)),
+ this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) );
+ connect( m_proc, TQT_SIGNAL(wroteStdin(TDEProcess*)),
+ this, TQT_SLOT(slotWroteStdin(TDEProcess*)) );
+ connect( m_proc, TQT_SIGNAL(processExited(TDEProcess*)),
+ this, TQT_SLOT(slotProcessExited(TDEProcess*)) );
+ m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::All);
m_proc->writeStdin(m_instr, m_instr.length());
}
@@ -99,21 +99,21 @@ int ShellFilterDialog::exec()
}
-void ShellFilterDialog::slotReceivedStdout(KProcess *, char *text, int len)
+void ShellFilterDialog::slotReceivedStdout(TDEProcess *, char *text, int len)
{
m_outstr += TQString::fromLocal8Bit(text, len+1);
kdDebug(9029) << "outstr " << m_outstr << endl;
}
-void ShellFilterDialog::slotWroteStdin(KProcess *)
+void ShellFilterDialog::slotWroteStdin(TDEProcess *)
{
m_proc->closeStdin();
kdDebug(9029) << "close stdin " << m_outstr << endl;
}
-void ShellFilterDialog::slotProcessExited(KProcess *)
+void ShellFilterDialog::slotProcessExited(TDEProcess *)
{
kdDebug(9029) << "process exit " << m_proc->normalExit() << endl;
if (m_proc->normalExit()) {
diff --git a/parts/filter/shellfilterdlg.h b/parts/filter/shellfilterdlg.h
index 94913fc5..14e0d20c 100644
--- a/parts/filter/shellfilterdlg.h
+++ b/parts/filter/shellfilterdlg.h
@@ -17,7 +17,7 @@
class TQComboBox;
class TQPushButton;
class KDevPlugin;
-class KProcess;
+class TDEProcess;
class ShellFilterDialog : public TQDialog
@@ -38,14 +38,14 @@ public:
private slots:
void slotStartClicked();
- void slotReceivedStdout(KProcess *, char *text, int len);
- void slotWroteStdin(KProcess *);
- void slotProcessExited(KProcess *);
+ void slotReceivedStdout(TDEProcess *, char *text, int len);
+ void slotWroteStdin(TDEProcess *);
+ void slotProcessExited(TDEProcess *);
private:
TQPushButton *start_button, *cancel_button;
TQComboBox *combo;
- KProcess *m_proc;
+ TDEProcess *m_proc;
TQCString m_instr;
TQString m_outstr;
};
diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp
index 50217226..d1799663 100644
--- a/parts/filter/shellinsertdlg.cpp
+++ b/parts/filter/shellinsertdlg.cpp
@@ -97,21 +97,21 @@ void ShellInsertDialog::slotStartClicked()
delete m_proc;
m_proc = new KShellProcess("/bin/sh");
(*m_proc) << combo->currentText();
- connect( m_proc, TQT_SIGNAL(receivedStdout(KProcess*, char *, int)),
- this, TQT_SLOT(slotReceivedStdout(KProcess*, char *, int)) );
- connect( m_proc, TQT_SIGNAL(processExited(KProcess*)),
- this, TQT_SLOT(slotProcessExited(KProcess*)) );
- m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
+ connect( m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char *, int)),
+ this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char *, int)) );
+ connect( m_proc, TQT_SIGNAL(processExited(TDEProcess*)),
+ this, TQT_SLOT(slotProcessExited(TDEProcess*)) );
+ m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
}
-void ShellInsertDialog::slotReceivedStdout(KProcess *, char *text, int len)
+void ShellInsertDialog::slotReceivedStdout(TDEProcess *, char *text, int len)
{
m_str += TQCString(text, len+1);
}
-void ShellInsertDialog::slotProcessExited(KProcess *)
+void ShellInsertDialog::slotProcessExited(TDEProcess *)
{
if (m_proc->normalExit()) {
accept();
diff --git a/parts/filter/shellinsertdlg.h b/parts/filter/shellinsertdlg.h
index 6fdde2d0..4c1a7468 100644
--- a/parts/filter/shellinsertdlg.h
+++ b/parts/filter/shellinsertdlg.h
@@ -17,7 +17,7 @@
class TQComboBox;
class TQPushButton;
class KDevPlugin;
-class KProcess;
+class TDEProcess;
class ShellInsertDialog : public TQDialog
@@ -36,14 +36,14 @@ public:
private slots:
void slotStartClicked();
- void slotReceivedStdout(KProcess *, char *text, int len);
- void slotProcessExited(KProcess *);
+ void slotReceivedStdout(TDEProcess *, char *text, int len);
+ void slotProcessExited(TDEProcess *);
void executeTextChanged( const TQString &text);
private:
TQPushButton *start_button, *cancel_button;
TQComboBox *combo;
- KProcess *m_proc;
+ TDEProcess *m_proc;
TQCString m_str;
};
diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp
index e172ff5b..43981f6d 100644
--- a/parts/grepview/grepviewwidget.cpp
+++ b/parts/grepview/grepviewwidget.cpp
@@ -138,7 +138,7 @@ GrepViewWidget::GrepViewWidget(GrepViewPart *part) : TQWidget(0, "grepview widg
grepdlg = new GrepDialog( part, this, "grep widget");
connect( grepdlg, TQT_SIGNAL(searchClicked()), this, TQT_SLOT(searchActivated()) );
- connect( m_curOutput, TQT_SIGNAL(processExited(KProcess* )), this, TQT_SLOT(slotSearchProcessExited()) );
+ connect( m_curOutput, TQT_SIGNAL(processExited(TDEProcess* )), this, TQT_SLOT(slotSearchProcessExited()) );
connect( m_tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotOutputTabChanged()) );
@@ -461,7 +461,7 @@ void GrepViewWidget::slotKeepOutput( )
connect( m_curOutput, TQT_SIGNAL(clicked(TQListBoxItem*)), this, TQT_SLOT(slotExecuted(TQListBoxItem*)) );
connect( m_curOutput, TQT_SIGNAL(returnPressed(TQListBoxItem*)), this, TQT_SLOT(slotExecuted(TQListBoxItem*)) );
- connect( m_curOutput, TQT_SIGNAL(processExited(KProcess* )), this, TQT_SLOT(slotSearchProcessExited()) );
+ connect( m_curOutput, TQT_SIGNAL(processExited(TDEProcess* )), this, TQT_SLOT(slotSearchProcessExited()) );
connect( m_curOutput, TQT_SIGNAL(contextMenuRequested( TQListBoxItem*, const TQPoint&)), this, TQT_SLOT(popupMenu(TQListBoxItem*, const TQPoint&)));
}
diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp
index c41d0ee6..85cfe9f0 100644
--- a/parts/openwith/openwithpart.cpp
+++ b/parts/openwith/openwithpart.cpp
@@ -52,7 +52,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context)
int id = popup->insertItem( i18n("Open As"), openAsPopup );
popup->setWhatsThis(id, i18n("<b>Open As</b><p>Lists all encodings that can be used to open the selected file."));
- TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames();
+ TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames();
int i = 0;
TQStringList::const_iterator it = encodings.constBegin();
@@ -108,11 +108,11 @@ void OpenWithPart::openWithDialog()
void OpenWithPart::openAsEncoding( int id )
{
- TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames();
+ TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames();
TQString encoding;
if ( id <= encodings.count() && id >= 0 )
{
- encoding = KGlobal::charsets()->encodingForName( encodings[ id ] );
+ encoding = TDEGlobal::charsets()->encodingForName( encodings[ id ] );
}
KURL::List::iterator it = m_urls.begin();
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
index 24413db6..5bdb2cd9 100644
--- a/parts/outputviews/appoutputviewpart.cpp
+++ b/parts/outputviews/appoutputviewpart.cpp
@@ -53,8 +53,8 @@ AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const T
connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
- connect(m_widget, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited()));
- connect(m_widget, TQT_SIGNAL(processExited(KProcess*)), TQT_SIGNAL(processExited()));
+ connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited()));
+ connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SIGNAL(processExited()));
}
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 4fef50c8..4dd11fa5 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -178,7 +178,7 @@ MakeWidget::MakeWidget(MakeViewPart *part)
dirstack.setAutoDelete(true);
- childproc = new KProcess(TQT_TQOBJECT(this));
+ childproc = new TDEProcess(TQT_TQOBJECT(this));
procLineMaker = new ProcessLineMaker( childproc );
connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)),
@@ -190,8 +190,8 @@ MakeWidget::MakeWidget(MakeViewPart *part)
connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)),
this, TQT_SLOT(storePartialStderrLine(const TQCString&) ));
- connect( childproc, TQT_SIGNAL(processExited(KProcess*)),
- this, TQT_SLOT(slotProcessExited(KProcess*) )) ;
+ connect( childproc, TQT_SIGNAL(processExited(TDEProcess*)),
+ this, TQT_SLOT(slotProcessExited(TDEProcess*) )) ;
connect( &m_directoryStatusFilter, TQT_SIGNAL(item(EnteringDirectoryItem*)),
this, TQT_SLOT(slotEnteredDirectory(EnteringDirectoryItem*)) );
@@ -287,7 +287,7 @@ void MakeWidget::startNextJob()
childproc->clearArguments();
*childproc << currentCommand;
childproc->setUseShell(true);
- childproc->start(KProcess::OwnGroup, KProcess::AllOutput);
+ childproc->start(TDEProcess::OwnGroup, TDEProcess::AllOutput);
dirstack.clear();
dirstack.push(new TQString(dir));
@@ -555,7 +555,7 @@ void MakeWidget::insertStderrLine( const TQCString& line )
stderrbuf.truncate(0);
}
-void MakeWidget::slotProcessExited(KProcess *)
+void MakeWidget::slotProcessExited(TDEProcess *)
{
procLineMaker->flush();
if( !stderrbuf.isEmpty() )
@@ -585,7 +585,7 @@ void MakeWidget::slotProcessExited(KProcess *)
// Defensive programming: We emit this with a single shot timer so that we go once again
// through the event loop. After that, we can be sure that the process is really finished
- // and its KProcess object can be reused.
+ // and its TDEProcess object can be reused.
if (childproc->normalExit() && !childproc->exitStatus())
{
TQTimer::singleShot(0, this, TQT_SLOT(startNextJob()));
diff --git a/parts/outputviews/makewidget.h b/parts/outputviews/makewidget.h
index 605c136e..20f9d810 100644
--- a/parts/outputviews/makewidget.h
+++ b/parts/outputviews/makewidget.h
@@ -28,7 +28,7 @@
class MakeViewPart;
class MakeItem;
-class KProcess;
+class TDEProcess;
class ProcessLineMaker;
class KURL;
@@ -64,7 +64,7 @@ private slots:
void insertStderrLine(const TQCString& line);
void storePartialStdoutLine(const TQCString& line);
void storePartialStderrLine(const TQCString& line);
- void slotProcessExited(KProcess *);
+ void slotProcessExited(TDEProcess *);
void verticScrollingOn() { m_vertScrolling = true; }
void verticScrollingOff() { m_vertScrolling = false; }
void horizScrollingOn() { m_horizScrolling = true; }
@@ -106,7 +106,7 @@ private:
TQStringList dirList;
TQString m_lastBuildDir; //stores directory of last build, for the case we don't have proper path information
TQString currentCommand;
- KProcess *childproc;
+ TDEProcess *childproc;
ProcessLineMaker* procLineMaker;
TQPtrStack<TQString> dirstack;
MakeItem* m_pendingItem;
diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp
index 3907f08c..ecc201b4 100644
--- a/parts/regexptest/regexptestdlg.cpp
+++ b/parts/regexptest/regexptestdlg.cpp
@@ -40,8 +40,8 @@ RegexpTestDialog::RegexpTestDialog(KDevPlugin *part)
: RegexpTestDialogBase(0, "regexp test dialog", false), _regexp_dialog(0)
{
pattern_edit->setFocus();
- pattern_edit->setFont(KGlobalSettings::fixedFont());
- teststring_edit->setFont(KGlobalSettings::fixedFont());
+ pattern_edit->setFont(TDEGlobalSettings::fixedFont());
+ teststring_edit->setFont(TDEGlobalSettings::fixedFont());
subgroups_listview->setSorting(0);
m_part = part;
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index 9acb8dd8..e7de47d9 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -160,7 +160,7 @@ void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName)
{
KShellProcess proc;
proc << cmdline;
- proc.start(KProcess::DontCare, KProcess::NoCommunication);
+ proc.start(TDEProcess::DontCare, TDEProcess::NoCommunication);
}
}
diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp
index 3413feff..3e936c18 100644
--- a/parts/valgrind/valgrind_dialog.cpp
+++ b/parts/valgrind/valgrind_dialog.cpp
@@ -193,10 +193,10 @@ void ValgrindDialog::setKcExecutable( const TQString& ke )
bool ValgrindDialog::isNewValgrindVersion( ) const
{
- KProcess *proc = new KProcess;
+ TDEProcess *proc = new TDEProcess;
proc->setUseShell(true);
*proc << "test \"valgrind-20\" == `valgrind --version | awk -F \\. '{print $1$2}'`";
- proc->start(KProcess::Block);
+ proc->start(TDEProcess::Block);
if (proc->normalExit())
return proc->exitStatus();
return true;
diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp
index 5aaf66aa..287dd7ec 100644
--- a/parts/valgrind/valgrind_part.cpp
+++ b/parts/valgrind/valgrind_part.cpp
@@ -33,12 +33,12 @@ ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringLi
setXMLFile( "kdevpart_valgrind.rc" );
proc = new KShellProcess();
- connect( proc, TQT_SIGNAL(receivedStdout( KProcess*, char*, int )),
- this, TQT_SLOT(receivedStdout( KProcess*, char*, int )) );
- connect( proc, TQT_SIGNAL(receivedStderr( KProcess*, char*, int )),
- this, TQT_SLOT(receivedStderr( KProcess*, char*, int )) );
- connect( proc, TQT_SIGNAL(processExited( KProcess* )),
- this, TQT_SLOT(processExited( KProcess* )) );
+ connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )),
+ this, TQT_SLOT(receivedStdout( TDEProcess*, char*, int )) );
+ connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*, char*, int )),
+ this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) );
+ connect( proc, TQT_SIGNAL(processExited( TDEProcess* )),
+ this, TQT_SLOT(processExited( TDEProcess* )) );
connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
connect( core(), TQT_SIGNAL(projectOpened()),
@@ -238,7 +238,7 @@ void ValgrindPart::runValgrind( const TQString& exec, const TQString& params, co
}
*proc << envVarList.join("") << valExec << valParams << exec << params;
- proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
+ proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
mainWindow()->raiseView( m_widget );
core()->running( this, true );
@@ -246,12 +246,12 @@ void ValgrindPart::runValgrind( const TQString& exec, const TQString& params, co
_lastParams = params;
}
-void ValgrindPart::receivedStdout( KProcess*, char* /* msg */, int /* len */ )
+void ValgrindPart::receivedStdout( TDEProcess*, char* /* msg */, int /* len */ )
{
//kdDebug() << "got StdOut: " <<TQString::fromLocal8Bit( msg, len ) << endl;
}
-void ValgrindPart::receivedStderr( KProcess*, char* msg, int len )
+void ValgrindPart::receivedStderr( TDEProcess*, char* msg, int len )
{
receivedString( TQString::fromLocal8Bit( msg, len ) );
}
@@ -299,7 +299,7 @@ void ValgrindPart::appendMessages( const TQStringList& lines )
}
}
-void ValgrindPart::processExited( KProcess* p )
+void ValgrindPart::processExited( TDEProcess* p )
{
if ( p == proc ) {
appendMessage( currentMessage + lastPiece );
@@ -309,11 +309,11 @@ void ValgrindPart::processExited( KProcess* p )
if (kcInfo.runKc)
{
- KProcess *kcProc = new KProcess;
+ TDEProcess *kcProc = new TDEProcess;
// kcProc->setWorkingDirectory(kcInfo.kcWorkDir);
*kcProc << kcInfo.kcPath;
*kcProc << TQString("callgrind.out.%1").arg(p->pid());
- kcProc->start(KProcess::DontCare);
+ kcProc->start(TDEProcess::DontCare);
}
}
}
diff --git a/parts/valgrind/valgrind_part.h b/parts/valgrind/valgrind_part.h
index ad1a22d3..8c4e66e2 100644
--- a/parts/valgrind/valgrind_part.h
+++ b/parts/valgrind/valgrind_part.h
@@ -11,7 +11,7 @@
#include <kdevplugin.h>
class ValgrindWidget;
-class KProcess;
+class TDEProcess;
class ValgrindPart : public KDevPlugin
{
@@ -32,9 +32,9 @@ private slots:
void slotExecCalltree();
void slotKillValgrind();
void slotStopButtonClicked( KDevPlugin* which );
- void receivedStdout( KProcess*, char*, int );
- void receivedStderr( KProcess*, char*, int );
- void processExited( KProcess* );
+ void receivedStdout( TDEProcess*, char*, int );
+ void receivedStderr( TDEProcess*, char*, int );
+ void processExited( TDEProcess* );
void loadOutput();
void projectOpened();
@@ -46,7 +46,7 @@ private:
void clear();
TQString _lastExec, _lastParams, _lastValExec, _lastValParams,
_lastCtExec, _lastCtParams, _lastKcExec;
- KProcess* proc;
+ TDEProcess* proc;
TQString currentMessage;
TQString lastPiece;
TQStringList activeFiles;