From b9e542d0c805e9adee3a67e44532d5321032e21e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:51:01 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- buildtools/ada/adaglobaloptionsdlg.cpp | 6 ++--- buildtools/ada/adaproject_part.cpp | 4 +-- buildtools/autotools/addexistingdirectoriesdlg.cpp | 4 +-- buildtools/autotools/addexistingfilesdlg.cpp | 8 +++--- buildtools/autotools/addicondlg.cpp | 4 +-- buildtools/autotools/addsubprojectdlg.cpp | 6 ++--- buildtools/autotools/autoprojectpart.cpp | 14 +++++----- buildtools/autotools/autosubprojectview.cpp | 10 ++++---- buildtools/autotools/choosetargetdialog.cpp | 2 +- buildtools/autotools/kimporticonview.cpp | 2 +- buildtools/custommakefiles/customprojectpart.cpp | 4 +-- buildtools/pascal/pascalglobaloptionsdlg.cpp | 6 ++--- buildtools/pascal/pascalproject_part.cpp | 4 +-- buildtools/qmake/qmakedefaultopts.cpp | 4 +-- buildtools/qmake/qmakedefaultopts.h | 6 ++--- buildtools/qmake/trollprojectpart.cpp | 2 +- buildtools/qmake/trollprojectwidget.cpp | 30 +++++++++++----------- 17 files changed, 58 insertions(+), 58 deletions(-) (limited to 'buildtools') diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp index 32d3f257..48493adb 100644 --- a/buildtools/ada/adaglobaloptionsdlg.cpp +++ b/buildtools/ada/adaglobaloptionsdlg.cpp @@ -98,7 +98,7 @@ void AdaGlobalOptionsDlg::readCompilerOpts( TQString compiler ) TQString settings = configCache[compiler]; if (settings.isEmpty()) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Ada Compiler"); settings = config->readPathEntry(compiler); } @@ -108,7 +108,7 @@ void AdaGlobalOptionsDlg::readCompilerOpts( TQString compiler ) void AdaGlobalOptionsDlg::readConfigCache( ) { -/* KConfig *config = KGlobal::config(); +/* KConfig *config = TDEGlobal::config(); config->setGroup("Ada Compiler"); TQMap settings = config->entryMap("Ada Compiler"); @@ -117,7 +117,7 @@ void AdaGlobalOptionsDlg::readConfigCache( ) void AdaGlobalOptionsDlg::saveConfigCache( ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Ada Compiler"); for (TQMap::iterator it = configCache.begin(); it != configCache.end(); ++it) diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index f487fcb0..02c894cd 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -346,7 +346,7 @@ void AdaProjectPart::slotBuild() cmdline += fi.fileName(); TQString dircmd = "cd "; - dircmd += KProcess::quote(buildDirectory()); + dircmd += TDEProcess::quote(buildDirectory()); dircmd += " && "; makeFrontend()->queueCommand(buildDirectory(), dircmd + cmdline); @@ -443,7 +443,7 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name) TQString AdaProjectPart::defaultOptions( const TQString compiler ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Ada Compiler"); return config->readPathEntry(compiler); } diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp index 912edc52..2dfd4c63 100644 --- a/buildtools/autotools/addexistingdirectoriesdlg.cpp +++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp @@ -170,13 +170,13 @@ void AddExistingDirectoriesDialog::slotOk() { //copy //FIXME: check this after 3.0 release and add a possibility to link, not just copy - KProcess proc; + TDEProcess proc; proc << "cp"; proc << "-r"; proc << items.current()->url().path(); proc << m_spitem->path; - proc.start(KProcess::Block); + proc.start(TDEProcess::Block); } dirs << items.current()->name(); } diff --git a/buildtools/autotools/addexistingfilesdlg.cpp b/buildtools/autotools/addexistingfilesdlg.cpp index 55533a3d..b17eb118 100644 --- a/buildtools/autotools/addexistingfilesdlg.cpp +++ b/buildtools/autotools/addexistingfilesdlg.cpp @@ -268,12 +268,12 @@ void AddExistingFilesDialog::slotOk() for ( ; it.current(); ++it ) { - KProcess proc; + TDEProcess proc; proc << "cp"; proc << ( *it )->url().path(); proc << m_spitem->path; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); progressBar->setValue ( progressBar->value() + 1 ); } @@ -285,13 +285,13 @@ void AddExistingFilesDialog::slotOk() for ( ; it.current(); ++it ) { - KProcess proc; + TDEProcess proc; proc << "ln"; proc << "-s"; proc << URLUtil::relativePathToFile( m_spitem->path, ( *it )->url().path() ); proc << m_spitem->path; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); progressBar->setValue ( progressBar->value() + 1 ); } diff --git a/buildtools/autotools/addicondlg.cpp b/buildtools/autotools/addicondlg.cpp index 639c04ce..2f1ab292 100644 --- a/buildtools/autotools/addicondlg.cpp +++ b/buildtools/autotools/addicondlg.cpp @@ -94,11 +94,11 @@ void AddIconDialog::accept() kdDebug(9020) << "Unknown: " << unknown << ", template: " << templateFileName << endl; if (!templateFileName.isEmpty()) { - KProcess proc; + TDEProcess proc; proc << "cp"; proc << templateFileName; proc << destpath; - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } FileItem *fitem = m_widget->createFileItem(name, m_subProject); diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp index e59a172b..ea3d2b7a 100644 --- a/buildtools/autotools/addsubprojectdlg.cpp +++ b/buildtools/autotools/addsubprojectdlg.cpp @@ -179,11 +179,11 @@ void AddSubprojectDialog::accept() kdDebug(9020) << "Relative makefile path: " << relmakefile << endl; TQString cmdline = "cd "; - cmdline += KProcess::quote(m_part->projectDirectory()); + cmdline += TDEProcess::quote(m_part->projectDirectory()); cmdline += " && automake "; - cmdline += KProcess::quote(relmakefile); + cmdline += TDEProcess::quote(relmakefile); cmdline += " && CONFIG_HEADERS=config.h CONFIG_FILES="; - cmdline += KProcess::quote(relmakefile); + cmdline += TDEProcess::quote(relmakefile); cmdline += " ./config.status"; m_part->makeFrontend()->queueCommand( m_part->projectDirectory(), cmdline ); diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 21df4fd8..279102e4 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -699,7 +699,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ cmdline.prepend(makeEnvironment()); TQString dircmd = "cd "; - dircmd += KProcess::quote(dir); + dircmd += TDEProcess::quote(dir); dircmd += " && "; return preCommand + dircmd + cmdline; @@ -968,13 +968,13 @@ TQString AutoProjectPart::configureCommand() const // if the build directory doesn't exist, add it's creation to the configureCommand if ( !TQFile::exists(builddir)) { dircmd = "mkdir "; - dircmd += KProcess::quote(builddir); + dircmd += TDEProcess::quote(builddir); dircmd += " && "; } // add "cd into the build directory" to the configureCommand dircmd += "cd "; - dircmd += KProcess::quote(builddir); + dircmd += TDEProcess::quote(builddir); dircmd += " && "; return dircmd + cmdline; @@ -1024,7 +1024,7 @@ TQString AutoProjectPart::makefileCvsCommand() const cmdline.prepend(makeEnvironment()); TQString dircmd = "cd "; - dircmd += KProcess::quote(topsourceDirectory()); + dircmd += TDEProcess::quote(topsourceDirectory()); dircmd += " && "; TQString admin_directory_update_command = updateAdminDirectoryCommand(); @@ -1060,7 +1060,7 @@ TQString AutoProjectPart::makefileCopySystemLibtoolCommand() const cmdline.prepend(makeEnvironment()); TQString dircmd = "cd "; - dircmd += KProcess::quote(topsourceDirectory()); + dircmd += TDEProcess::quote(topsourceDirectory()); dircmd += " && "; return dircmd + cmdline; @@ -1081,7 +1081,7 @@ TQString AutoProjectPart::updateAdminDirectoryCommand() const TQString cmdline = "rm -rf admin && tar -xzvf "; cmdline.append(source); TQString dircmd = "cd "; - dircmd += KProcess::quote(topsourceDirectory()); + dircmd += TDEProcess::quote(topsourceDirectory()); dircmd += " && "; return dircmd + cmdline; } @@ -1522,7 +1522,7 @@ void AutoProjectPart::startSimpleMakeCommand( const TQString & dir, const TQStri cmdline.prepend(makeEnvironment()); TQString dircmd = "cd "; - dircmd += KProcess::quote(dir); + dircmd += TDEProcess::quote(dir); dircmd += " && "; m_buildCommand = dircmd + cmdline; diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 35747807..29a08f0e 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -545,13 +545,13 @@ void AutoSubprojectView::slotRemoveSubproject() } TQString cmdline = "cd "; - cmdline += KProcess::quote(m_part->projectDirectory()); + cmdline += TDEProcess::quote(m_part->projectDirectory()); cmdline += " && automake "; - cmdline += KProcess::quote(relmakefile); + cmdline += TDEProcess::quote(relmakefile); cmdline += " && cd "; - cmdline += KProcess::quote(m_part->buildDirectory()); + cmdline += TDEProcess::quote(m_part->buildDirectory()); cmdline += " && CONFIG_HEADERS=config.h CONFIG_FILES="; - cmdline += KProcess::quote(relmakefile); + cmdline += TDEProcess::quote(relmakefile); cmdline += " ./config.status"; m_part->makeFrontend()->queueCommand( m_part->projectDirectory(), cmdline ); } @@ -1083,7 +1083,7 @@ void AutoSubprojectView::slotCustomBuildCommand(int val) case 5: //command as root m_part->appFrontend()->startAppCommand(m_part->buildDirectory() + relpath, "tdesu -t -c ' cd " + - KProcess::quote(m_part->buildDirectory() + relpath) + " && " + TDEProcess::quote(m_part->buildDirectory() + relpath) + " && " + cmd + "'", false); break; } diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp index ca1ddf50..48622053 100644 --- a/buildtools/autotools/choosetargetdialog.cpp +++ b/buildtools/autotools/choosetargetdialog.cpp @@ -315,7 +315,7 @@ void ChooseTargetDialog::slotOk() proc << "mv"; proc << KShellProcess::quote( d->part->projectDirectory() + "/" + directory + "/" + fileName ); proc << KShellProcess::quote( d->chosenSubproject->path + "/" + fileName ); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); } // why open the files?! diff --git a/buildtools/autotools/kimporticonview.cpp b/buildtools/autotools/kimporticonview.cpp index 3634886a..bf5296cd 100644 --- a/buildtools/autotools/kimporticonview.cpp +++ b/buildtools/autotools/kimporticonview.cpp @@ -52,7 +52,7 @@ void KImportIconView::drawContents ( TQPainter *p, int cx, int cy, int cw, int c font.setFamily ( "Helvetica [Adobe]" ); font.setPointSize ( 10 ); p->setFont ( font ); - p->setPen ( TQPen ( KGlobalSettings::highlightColor() ) ); + p->setPen ( TQPen ( TDEGlobalSettings::highlightColor() ) ); TQRect rect = frameRect(); TQFontMetrics fm ( p->font() ); diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index 7ccf8e1c..09996b05 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -934,10 +934,10 @@ void CustomProjectPart::startMakeCommand( const TQString &dir, const TQString &t cmdline += " "; if ( !target.isEmpty() ) - cmdline += KProcess::quote( target ); + cmdline += TDEProcess::quote( target ); TQString dircmd = "cd "; - dircmd += KProcess::quote( dir ); + dircmd += TDEProcess::quote( dir ); dircmd += " && "; int prio = DomUtil::readIntEntry( dom, "/kdevcustomproject/" + buildtool + "/prio" ); diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp index 79fe9167..327ecc67 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.cpp +++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp @@ -101,7 +101,7 @@ void PascalGlobalOptionsDlg::readCompilerOpts( TQString compiler ) TQString settings = configCache[compiler]; if (settings.isEmpty()) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Pascal Compiler"); settings = config->readPathEntry(compiler); } @@ -111,7 +111,7 @@ void PascalGlobalOptionsDlg::readCompilerOpts( TQString compiler ) void PascalGlobalOptionsDlg::readConfigCache( ) { -/* KConfig *config = KGlobal::config(); +/* KConfig *config = TDEGlobal::config(); config->setGroup("Pascal Compiler"); TQMap settings = config->entryMap("Pascal Compiler"); @@ -120,7 +120,7 @@ void PascalGlobalOptionsDlg::readConfigCache( ) void PascalGlobalOptionsDlg::saveConfigCache( ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Pascal Compiler"); for (TQMap::iterator it = configCache.begin(); it != configCache.end(); ++it) diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index c0d53c89..e8fd8a65 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -346,7 +346,7 @@ void PascalProjectPart::slotBuild() cmdline += fi.fileName(); TQString dircmd = "cd "; - dircmd += KProcess::quote(buildDirectory()); + dircmd += TDEProcess::quote(buildDirectory()); dircmd += " && "; makeFrontend()->queueCommand(buildDirectory(), dircmd + cmdline); @@ -471,7 +471,7 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na TQString PascalProjectPart::defaultOptions( const TQString compiler ) const { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Pascal Compiler"); return config->readPathEntry(compiler); } diff --git a/buildtools/qmake/qmakedefaultopts.cpp b/buildtools/qmake/qmakedefaultopts.cpp index 55533ef2..e0e7fa63 100644 --- a/buildtools/qmake/qmakedefaultopts.cpp +++ b/buildtools/qmake/qmakedefaultopts.cpp @@ -32,7 +32,7 @@ void TQMakeDefaultOpts::readVariables( const TQString& qmake, const TQString& pr makefile.close(); qmakefile.close(); - BlockingKProcess proc; + BlockingTDEProcess proc; kdDebug(9024) << "KProc Working dir:" << projdir << endl; proc.setWorkingDirectory( projdir ); proc << qmake; @@ -41,7 +41,7 @@ void TQMakeDefaultOpts::readVariables( const TQString& qmake, const TQString& pr proc << makefile.name(); proc << qmakefile.name(); kdDebug(9024) << "Executing:" << proc.args() << endl; - proc.start( KProcess::NotifyOnExit, KProcess::Stderr ); + proc.start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ); if( !proc.isRunning() && !proc.normalExit() ) { kdDebug(9024) << "Couldn't execute qmake: " << proc.args() << endl; diff --git a/buildtools/qmake/qmakedefaultopts.h b/buildtools/qmake/qmakedefaultopts.h index 6fee7366..1b38d80c 100644 --- a/buildtools/qmake/qmakedefaultopts.h +++ b/buildtools/qmake/qmakedefaultopts.h @@ -17,7 +17,7 @@ // #include // class KTempFile; -// class BlockingKProcess; +// class BlockingTDEProcess; class TQMakeDefaultOpts { @@ -35,8 +35,8 @@ public: // void variablesRead(); // private slots: -// void slotReadStderr( KProcess*, char*, int ); -// void slotFinished( KProcess* ); +// void slotReadStderr( TDEProcess*, char*, int ); +// void slotFinished( TDEProcess* ); private: TQMap m_variables; diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 8e672b4e..e83ed8a9 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -725,7 +725,7 @@ void TrollProjectPart::startTQMakeCommand(const TQString &dir, bool recursive) // cmdline += TQString::fromLatin1( " -o Makefile" ); TQString dircmd = "cd "; - dircmd += KProcess::quote(dir); + dircmd += TDEProcess::quote(dir); dircmd += " && "; cmdline.prepend(makeEnvironment()); diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 8a7af3b7..3c17a951 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -642,7 +642,7 @@ void TrollProjectWidget::slotDetailsExecuted( TQListViewItem *item ) // start designer in your PATH KShellProcess proc; proc << "designer" << filePath; - proc.start( KProcess::DontCare, KProcess::NoCommunication ); + proc.start( TDEProcess::DontCare, TDEProcess::NoCommunication ); } else m_part->partController() ->editDocument( KURL( filePath ) ); @@ -686,7 +686,7 @@ void TrollProjectWidget::slotExecuteTarget() } - TQString program = KProcess::quote( "." + TQString( TQChar( TQDir::separator() ) ) + getCurrentOutputFilename() ); + TQString program = TDEProcess::quote( "." + TQString( TQChar( TQDir::separator() ) ) + getCurrentOutputFilename() ); // Build environment variables to prepend to the executable path TQString runEnvVars = TQString(); @@ -726,7 +726,7 @@ void TrollProjectWidget::slotBuildProject() createMakefileIfMissing( dir, m_rootSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString dircmd = "cd " + TDEProcess::quote( dir ) + " && " ; TQString buildcmd = constructMakeCommandLine( m_rootSubproject->scope ); m_part->queueCmd( dir, dircmd + buildcmd ); } @@ -744,7 +744,7 @@ void TrollProjectWidget::slotInstallProject() createMakefileIfMissing( dir, m_rootSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString dircmd = "cd " + TDEProcess::quote( dir ) + " && " ; TQString buildcmd = constructMakeCommandLine( m_rootSubproject->scope ) + " install"; m_part->queueCmd( dir, dircmd + buildcmd ); } @@ -762,7 +762,7 @@ void TrollProjectWidget::slotBuildTarget() createMakefileIfMissing( dir, m_shownSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString dircmd = "cd " + TDEProcess::quote( dir ) + " && " ; TQString buildcmd = constructMakeCommandLine( m_shownSubproject->scope ); m_part->queueCmd( dir, dircmd + buildcmd ); } @@ -780,7 +780,7 @@ void TrollProjectWidget::slotInstallTarget() createMakefileIfMissing( dir, m_shownSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString dircmd = "cd " + TDEProcess::quote( dir ) + " && " ; TQString buildcmd = constructMakeCommandLine( m_shownSubproject->scope ) + " install"; m_part->queueCmd( dir, dircmd + buildcmd ); } @@ -796,7 +796,7 @@ void TrollProjectWidget::slotRebuildProject() createMakefileIfMissing( dir, m_rootSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString dircmd = "cd " + TDEProcess::quote( dir ) + " && " ; TQString rebuildcmd = constructMakeCommandLine( m_rootSubproject->scope ) + " clean && " + constructMakeCommandLine( m_rootSubproject->scope ); m_part->queueCmd( dir, dircmd + rebuildcmd ); } @@ -815,7 +815,7 @@ void TrollProjectWidget::slotRebuildTarget() createMakefileIfMissing( dir, m_shownSubproject ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString dircmd = "cd " + TDEProcess::quote( dir ) + " && " ; TQString rebuildcmd = constructMakeCommandLine( m_shownSubproject->scope ) + " clean && " + constructMakeCommandLine( m_shownSubproject->scope ); m_part->queueCmd( dir, dircmd + rebuildcmd ); } @@ -1301,12 +1301,12 @@ void TrollProjectWidget::slotAddFiles() case AddFilesDialog::Link: { // Link selected files to current subproject folder - KProcess *proc = new KProcess( TQT_TQOBJECT(this) ); + TDEProcess *proc = new TDEProcess( TQT_TQOBJECT(this) ); *proc << "ln"; *proc << "-s"; *proc << files[ i ]; *proc << cleanSubprojectDir; - proc->start(KProcess::Block); + proc->start(TDEProcess::Block); TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); // and add them to the filelist TQFile testExist( cleanSubprojectDir + TQString( TQChar( TQDir::separator() ) ) + filename ); @@ -1645,12 +1645,12 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it case AddFilesDialog::Link: { // Link selected files to current subproject folder - KProcess *proc = new KProcess( TQT_TQOBJECT(this) ); + TDEProcess *proc = new TDEProcess( TQT_TQOBJECT(this) ); *proc << "ln"; *proc << "-s"; *proc << files[ i ]; *proc << cleanSubprojectPath; - proc->start(KProcess::Block); + proc->start(TDEProcess::Block); TQString filename = files[ i ].right( files[ i ].length() - files[ i ].findRev( '/' ) - 1 ); // and add them to the filelist TQFile testExist( cleanSubprojectPath + TQString( TQChar( TQDir::separator() ) ) + filename ); @@ -2034,7 +2034,7 @@ void TrollProjectWidget::slotBuildOpenFile() for ( spitem = list.first(); spitem; spitem = list.next() ) { TQString buildcmd = constructMakeCommandLine( spitem->scope ); - TQString dircmd = "cd " + KProcess::quote( spitem->scope->projectDir() ) + " && " ; + TQString dircmd = "cd " + TDEProcess::quote( spitem->scope->projectDir() ) + " && " ; kdDebug( 9024 ) << "builddir " << spitem->scope->projectDir() << ", cmd " << dircmd + buildcmd + " " + target << endl; m_part->queueCmd( spitem->scope->projectDir(), dircmd + buildcmd + " " + target ); } @@ -2126,7 +2126,7 @@ void TrollProjectWidget::runClean( QMakeScopeItem* item, const TQString& cleanta createMakefileIfMissing( dir, item ); m_part->mainWindow() ->raiseView( m_part->makeFrontend() ->widget() ); - TQString dircmd = "cd " + KProcess::quote( dir ) + " && " ; + TQString dircmd = "cd " + TDEProcess::quote( dir ) + " && " ; TQString rebuildcmd = constructMakeCommandLine( item->scope ) + " "+cleantargetname; m_part->queueCmd( dir, dircmd + rebuildcmd ); } @@ -2390,7 +2390,7 @@ void TrollProjectWidget::buildFile( QMakeScopeItem* spitem, FileItem* fitem ) // m_part->startMakeCommand(buildDir, target); TQString buildcmd = constructMakeCommandLine( spitem->scope ); - TQString dircmd = "cd " + KProcess::quote( spitem->scope->projectDir() ) + " && " ; + TQString dircmd = "cd " + TDEProcess::quote( spitem->scope->projectDir() ) + " && " ; kdDebug( 9024 ) << "builddir " << spitem->scope->projectDir() << ", cmd " << dircmd + buildcmd + " " + target << endl; m_part->queueCmd( spitem->scope->projectDir(), dircmd + buildcmd + " " + target ); -- cgit v1.2.1