diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
| commit | b9e542d0c805e9adee3a67e44532d5321032e21e (patch) | |
| tree | e82d85b9035cc2ca322911e8a6e38a3bd8b1d431 | |
| parent | 7a392a04059bd904dab4c78910a6d34aa0b37798 (diff) | |
| download | tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
128 files changed, 523 insertions, 523 deletions
@@ -259,7 +259,7 @@ updated on program pause. * A configuration option was added to enable/disable the debugger floating toolbar. * The debugger backend is written in pure ruby using the code from the 'debug.rb', - source included with the ruby distribution. It is started via KProcess which handles + source included with the ruby distribution. It is started via TDEProcess which handles redirection of stdout and stderr. The idea came from the way Laurent Julliard implemented the FreeRIDE ruby debugger - it uses Distributed Ruby (like DCOP) for messaging. DRuby is ruby-specific and couldn't be used though. 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<TQString, TQString> 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<TQString, TQString>::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<TQString, TQString> 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<TQString, TQString>::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 <tqobject.h> // 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<TQString, TQStringList> 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 ); diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook index f288f588..a3579f9d 100644 --- a/doc/kdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -161,7 +161,7 @@ Access to <literal>.desktop</literal> files. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:tdecore/KGlobalSettings">KGlobalSettings</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDEGlobalSettings">TDEGlobalSettings</ulink></title> <para> Convenient access to not application-specific settings. </para> @@ -201,7 +201,7 @@ Interprocess communication - DCOP helper classes and subprocess invocation. <itemizedlist> -<listitem><formalpara><title><ulink url="kdeapi:tdecore/KProcess">KProcess</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDEProcess">TDEProcess</ulink></title> <para> Invokes and controls child processes. </para> @@ -297,7 +297,7 @@ Easy access to the common keyboard shortcut keys. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:tdecore/KGlobalAccel"></ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDEGlobalAccel"></ulink></title> <para> Collection of system-wide keyboard shortcuts. </para> @@ -3121,7 +3121,7 @@ int kdemain(int argc, char **argv) { KLocale::setMainCatalogue("tdelibs"); TDEInstance instance("kio_ftp"); - (void) KGlobal::locale(); + (void) TDEGlobal::locale(); if (argc != 4) { fprintf(stderr, "Usage: kio_ftp protocol " diff --git a/kdevdesigner/src/kdevdesigner.cpp b/kdevdesigner/src/kdevdesigner.cpp index ebcabad1..26ee9ccf 100644 --- a/kdevdesigner/src/kdevdesigner.cpp +++ b/kdevdesigner/src/kdevdesigner.cpp @@ -170,7 +170,7 @@ void KDevDesigner::optionsConfigureKeys() void KDevDesigner::optionsConfigureToolbars() { - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); // use the standard toolbar editor KEditToolbar dlg(factory()); @@ -181,7 +181,7 @@ void KDevDesigner::optionsConfigureToolbars() void KDevDesigner::applyNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void KDevDesigner::fileOpen() diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index d7d8080c..9ef7ccc7 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -18,7 +18,7 @@ extern "C" { void* init_lib%{APPNAMELC}plugin() { - KGlobal::locale()->insertCatalogue("kate%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("kate%{APPNAMELC}"); return new KatePluginFactory; } } diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 43084511..c74deda0 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -22,7 +22,7 @@ extern "C" { void* init_lib%{APPNAMELC}plugin() { - KGlobal::locale()->insertCatalogue("kate%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("kate%{APPNAMELC}"); return new KatePluginFactory; } } diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp index 29ec3d1d..8db1939e 100644 --- a/languages/cpp/app_templates/kicker/applet.cpp +++ b/languages/cpp/app_templates/kicker/applet.cpp @@ -64,7 +64,7 @@ extern "C" { KPanelApplet* init( TQWidget *parent, const TQString& configFile) { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}(configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, parent, "%{APPNAMELC}"); diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp index 7d2d20d1..f0173476 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp @@ -15,7 +15,7 @@ extern "C" { void* init_lib%{APPNAMELC}part() { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}Factory; } }; diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index 1088f65d..1a306aee 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -149,12 +149,12 @@ void %{APPNAME}::optionsConfigureToolbars() { #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - saveMainWindowSettings(KGlobal::config() ); + saveMainWindowSettings(TDEGlobal::config() ); # endif #else - saveMainWindowSettings(KGlobal::config() ); + saveMainWindowSettings(TDEGlobal::config() ); #endif // use the standard toolbar editor @@ -168,12 +168,12 @@ void %{APPNAME}::applyNewToolbarConfig() { #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); # endif #else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); #endif } diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index 80c9f967..e46d21ca 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -193,7 +193,7 @@ extern "C" { void* init_lib%{APPNAMELC}part() { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}PartFactory; } }; diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index 1812b5e2..c5bdb434 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -99,7 +99,7 @@ extern "C" { void* init_lib%{APPNAMELC}plugin() { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}Factory; } } diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp index 6b55b671..dd297ed7 100644 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp @@ -298,7 +298,7 @@ void %{APPNAMELC}kmdi::optionsConfigureKeys() void %{APPNAMELC}kmdi::optionsConfigureToolbars() { - //saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + //saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void %{APPNAMELC}kmdi::newToolbarConfig() @@ -306,7 +306,7 @@ void %{APPNAMELC}kmdi::newToolbarConfig() // This slot is called when user clicks "Ok" or "Apply" in the toolbar editor. // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.) //createGUI(); - //applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + //applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void %{APPNAMELC}kmdi::optionsPreferences() diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp index 2a89e471..750fd94c 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.cpp +++ b/languages/cpp/app_templates/kscons_kxt/app.cpp @@ -120,7 +120,7 @@ void %{APPNAME}::optionsConfigureKeys() void %{APPNAME}::optionsConfigureToolbars() { // use the standard toolbar editor - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void %{APPNAME}::newToolbarConfig() @@ -129,7 +129,7 @@ void %{APPNAME}::newToolbarConfig() // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.) createGUI(); - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void %{APPNAME}::optionsPreferences() diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp index efdbf40b..569c69a3 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp +++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp @@ -20,13 +20,13 @@ extern "C" %{APPNAME} *kss_create( WId id ) { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}( id ); } TQDialog *kss_setup() { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}Setup(); } } @@ -48,7 +48,7 @@ extern "C" //! read settings from config file void %{APPNAME}Setup::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); /// @todo // Add your config options here... @@ -59,7 +59,7 @@ void %{APPNAME}Setup::readSettings() //! Ok pressed - save settings and exit void %{APPNAME}Setup::slotOkPressed() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); /// @todo // Add your config options here. @@ -89,7 +89,7 @@ void %{APPNAME}Setup::slotCancelPressed() //! read configuration settings from config file void %{APPNAME}::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); /// @todo // Add your config options here... diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp index e3032dc1..81a1118c 100644 --- a/languages/cpp/app_templates/kxt/app.cpp +++ b/languages/cpp/app_templates/kxt/app.cpp @@ -115,7 +115,7 @@ void %{APPNAMELC}::optionsConfigureKeys() void %{APPNAMELC}::optionsConfigureToolbars() { // use the standard toolbar editor - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void %{APPNAMELC}::newToolbarConfig() @@ -124,7 +124,7 @@ void %{APPNAMELC}::newToolbarConfig() // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.) createGUI(); - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void %{APPNAMELC}::optionsPreferences() diff --git a/languages/cpp/app_templates/noatunui/plugin_app.cpp b/languages/cpp/app_templates/noatunui/plugin_app.cpp index 23067139..a98ab7a6 100644 --- a/languages/cpp/app_templates/noatunui/plugin_app.cpp +++ b/languages/cpp/app_templates/noatunui/plugin_app.cpp @@ -8,7 +8,7 @@ extern "C" { Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}UI; } } diff --git a/languages/cpp/app_templates/noatunvisual/plugin_app.cpp b/languages/cpp/app_templates/noatunvisual/plugin_app.cpp index 442bdefd..ae60d277 100644 --- a/languages/cpp/app_templates/noatunvisual/plugin_app.cpp +++ b/languages/cpp/app_templates/noatunvisual/plugin_app.cpp @@ -12,7 +12,7 @@ extern "C" { Plugin *create_plugin() { - KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}Scope(); } } diff --git a/languages/cpp/debugger/dbgcontroller.h b/languages/cpp/debugger/dbgcontroller.h index a113bffd..2c919bc6 100644 --- a/languages/cpp/debugger/dbgcontroller.h +++ b/languages/cpp/debugger/dbgcontroller.h @@ -23,7 +23,7 @@ -class KProcess; +class TDEProcess; class TQString; class TQStrList; @@ -102,10 +102,10 @@ public slots: virtual void slotVarItemConstructed(VarItem */*item*/) {} protected slots: - virtual void slotDbgStdout(KProcess *proc, char *buf, int buflen) = 0; - virtual void slotDbgStderr(KProcess*, char*, int) {} ; - virtual void slotDbgWroteStdin(KProcess *proc) = 0; - virtual void slotDbgProcessExited(KProcess *proc) = 0; + virtual void slotDbgStdout(TDEProcess *proc, char *buf, int buflen) = 0; + virtual void slotDbgStderr(TDEProcess*, char*, int) {} ; + virtual void slotDbgWroteStdin(TDEProcess *proc) = 0; + virtual void slotDbgProcessExited(TDEProcess *proc) = 0; signals: void gotoSourcePosition (const TQString &fileName, int lineNum); @@ -121,7 +121,7 @@ signals: void dbgStatus (const TQString &status, int statusFlag); protected: - KProcess *dbgProcess_; + TDEProcess *dbgProcess_; }; } diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index 3f89227f..8033a993 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -71,7 +71,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) topLayout->addWidget(searchLineWidget_); topLayout->addWidget(pids_); - pids_->setFont(KGlobalSettings::fixedFont()); + pids_->setFont(TDEGlobalSettings::fixedFont()); KButtonBox *buttonbox = new KButtonBox(this, Qt::Horizontal); buttonbox->addStretch(); @@ -84,7 +84,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); // Default display to 40 chars wide, default height is okay - resize( ((KGlobalSettings::fixedFont()).pointSize())*40, height()); + resize( ((TDEGlobalSettings::fixedFont()).pointSize())*40, height()); topLayout->activate(); TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); @@ -133,15 +133,15 @@ void Dbg_PS_Dialog::slotInit() } #endif - connect( psProc_, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotProcessExited()) ); - connect( psProc_, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(KProcess *, char *, int)) ); + connect( psProc_, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotProcessExited()) ); + connect( psProc_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) ); - psProc_->start(KProcess::NotifyOnExit, KProcess::Stdout); + psProc_->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } /***************************************************************************/ -void Dbg_PS_Dialog::slotReceivedOutput(KProcess */*proc*/, char *buffer, int buflen) +void Dbg_PS_Dialog::slotReceivedOutput(TDEProcess */*proc*/, char *buffer, int buflen) { pidLines_ += TQString::fromLocal8Bit(buffer, buflen); } diff --git a/languages/cpp/debugger/dbgpsdlg.h b/languages/cpp/debugger/dbgpsdlg.h index 2eea6800..0bf445dc 100644 --- a/languages/cpp/debugger/dbgpsdlg.h +++ b/languages/cpp/debugger/dbgpsdlg.h @@ -19,7 +19,7 @@ #include <kdialog.h> class TQListBox; -class KProcess; +class TDEProcess; class KListView; class KListViewSearchLineWidget; @@ -41,14 +41,14 @@ public: private slots: void slotInit(); - void slotReceivedOutput(KProcess *proc, char *buffer, int buflen); + void slotReceivedOutput(TDEProcess *proc, char *buffer, int buflen); void slotProcessExited(); protected: void focusIn(TQFocusEvent*); private: - KProcess* psProc_; + TDEProcess* psProc_; KListView* pids_; KListViewSearchLineWidget* searchLineWidget_; TQString pidLines_; diff --git a/languages/cpp/debugger/disassemblewidget.cpp b/languages/cpp/debugger/disassemblewidget.cpp index 705185fd..9f6bc185 100644 --- a/languages/cpp/debugger/disassemblewidget.cpp +++ b/languages/cpp/debugger/disassemblewidget.cpp @@ -42,7 +42,7 @@ DisassembleWidget::DisassembleWidget(GDBController* controller, TQWidget *parent upper_(0), address_(0) { - setFont(KGlobalSettings::fixedFont()); + setFont(TDEGlobalSettings::fixedFont()); setReadOnly(true); } diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp index d7f50778..773e6a4a 100644 --- a/languages/cpp/debugger/framestackwidget.cpp +++ b/languages/cpp/debugger/framestackwidget.cpp @@ -486,7 +486,7 @@ void FramestackWidget::drawContentsOffset( TQPainter * p, int ox, int oy, TQRect section1(s1_x, contentsHeight(), s1_w, viewport()->height()); - p->fillRect(section1, KGlobalSettings::alternateBackgroundColor()); + p->fillRect(section1, TDEGlobalSettings::alternateBackgroundColor()); } // ************************************************************************** @@ -619,7 +619,7 @@ void FrameStackItem::paintCell(TQPainter * p, const TQColorGroup & cg, if (column % 2) { cg2.setColor(TQColorGroup::Base, - KGlobalSettings::alternateBackgroundColor()); + TDEGlobalSettings::alternateBackgroundColor()); } TQListViewItem::paintCell(p, cg2, column, width, align); } @@ -631,7 +631,7 @@ void ThreadStackItem::paintCell(TQPainter * p, const TQColorGroup & cg, if (column % 2) { cg2.setColor(TQColorGroup::Base, - KGlobalSettings::alternateBackgroundColor()); + TDEGlobalSettings::alternateBackgroundColor()); } TQListViewItem::paintCell(p, cg2, column, width, align); } diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp index 15ebcdfc..a46b6d6a 100644 --- a/languages/cpp/debugger/gdbcontroller.cpp +++ b/languages/cpp/debugger/gdbcontroller.cpp @@ -796,19 +796,19 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en Q_ASSERT (!dbgProcess_ && !tty_); - dbgProcess_ = new KProcess; + dbgProcess_ = new TDEProcess; - connect( dbgProcess_, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(slotDbgStdout(KProcess *, char *, int)) ); + connect( dbgProcess_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(slotDbgStderr(KProcess *, char *, int)) ); + connect( dbgProcess_, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(wroteStdin(KProcess *)), - this, TQT_SLOT(slotDbgWroteStdin(KProcess *)) ); + connect( dbgProcess_, TQT_SIGNAL(wroteStdin(TDEProcess *)), + this, TQT_SLOT(slotDbgWroteStdin(TDEProcess *)) ); - connect( dbgProcess_, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotDbgProcessExited(KProcess*)) ); + connect( dbgProcess_, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotDbgProcessExited(TDEProcess*)) ); application_ = application; @@ -838,8 +838,8 @@ bool GDBController::start(const TQString& shell, const DomUtil::PairList& run_en " --interpreter=mi2 -quiet\n" ).latin1()); } - if (!dbgProcess_->start( KProcess::NotifyOnExit, - KProcess::Communication(KProcess::All))) + if (!dbgProcess_->start( TDEProcess::NotifyOnExit, + TDEProcess::Communication(TDEProcess::All))) { KMessageBox::information( 0, @@ -1126,12 +1126,12 @@ void GDBController::slotRun() TQCString tty(tty_->getSlave().latin1()); TQCString options = TQCString(">") + tty + TQCString(" 2>&1 <") + tty; - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "sh" << "-c"; *proc << config_runShellScript_ + " " + application_.latin1() + options; - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); } if (!config_runGdbScript_.isEmpty()) {// gdb script at run is requested @@ -1421,13 +1421,13 @@ void GDBController::processMICommandResponse(const GDBMI::ResultRecord& result) } // Data from gdb gets processed here. -void GDBController::slotDbgStdout(KProcess *, char *buf, int buflen) +void GDBController::slotDbgStdout(TDEProcess *, char *buf, int buflen) { static bool parsing = false; TQCString msg(buf, buflen+1); - // Copy the data out of the KProcess buffer before it gets overwritten + // Copy the data out of the TDEProcess buffer before it gets overwritten // Append to the back of the holding zone. holdingZone_ += TQCString(buf, buflen+1); @@ -1685,7 +1685,7 @@ void GDBController::raiseEvent(event_t e) } -void GDBController::slotDbgStderr(KProcess *proc, char *buf, int buflen) +void GDBController::slotDbgStderr(TDEProcess *proc, char *buf, int buflen) { // At the moment, just drop a message out and redirect kdDebug(9012) << "STDERR: " << TQString::fromLatin1(buf, buflen+1) << endl; @@ -1694,7 +1694,7 @@ void GDBController::slotDbgStderr(KProcess *proc, char *buf, int buflen) // ************************************************************************** -void GDBController::slotDbgWroteStdin(KProcess *) +void GDBController::slotDbgWroteStdin(TDEProcess *) { commandExecutionTime.start(); @@ -1706,7 +1706,7 @@ void GDBController::slotDbgWroteStdin(KProcess *) // ************************************************************************** -void GDBController::slotDbgProcessExited(KProcess* process) +void GDBController::slotDbgProcessExited(TDEProcess* process) { Q_ASSERT(process == dbgProcess_); bool abnormal = !process->normalExit(); diff --git a/languages/cpp/debugger/gdbcontroller.h b/languages/cpp/debugger/gdbcontroller.h index 8d95139e..108e21bd 100644 --- a/languages/cpp/debugger/gdbcontroller.h +++ b/languages/cpp/debugger/gdbcontroller.h @@ -33,7 +33,7 @@ #include <memory> #include <set> -class KProcess; +class TDEProcess; namespace GDBDebugger { @@ -254,10 +254,10 @@ public slots: protected slots: - void slotDbgStdout(KProcess *proc, char *buf, int buflen); - void slotDbgStderr(KProcess *proc, char *buf, int buflen); - void slotDbgWroteStdin(KProcess *proc); - void slotDbgProcessExited(KProcess *proc); + void slotDbgStdout(TDEProcess *proc, char *buf, int buflen); + void slotDbgStderr(TDEProcess *proc, char *buf, int buflen); + void slotDbgWroteStdin(TDEProcess *proc); + void slotDbgProcessExited(TDEProcess *proc); signals: diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index bc8b7733..62a99ad4 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -1847,7 +1847,7 @@ void VarItem::paintCell(TQPainter *p, const TQColorGroup &cg, // to easy see the diferrence between the pointers. if (column == ValueCol) { - p->setFont(KGlobalSettings::fixedFont()); + p->setFont(TDEGlobalSettings::fixedFont()); } if (!alive_) diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp index 8cdeafb8..fd29416c 100644 --- a/languages/cpp/includepathresolver.cpp +++ b/languages/cpp/includepathresolver.cpp @@ -31,7 +31,7 @@ #include "tqdir.h" /* defines TQDir */ #include "tqregexp.h" /* defines TQRegExp */ #include "klocale.h" /* defines [function] i18n */ -#include "blockingkprocess.h" /* defines BlockingKProcess */ +#include "blockingkprocess.h" /* defines BlockingTDEProcess */ #include "includepathresolver.h" #include <sys/stat.h> #include <sys/time.h> @@ -377,11 +377,11 @@ PathResolutionResult IncludePathResolver::resolveIncludePath( const TQString& fi PathResolutionResult IncludePathResolver::getFullOutput( const TQString& command, const TQString& workingDirectory, TQString& output ) const{ if( m_continueEventLoop ) { - BlockingKProcess proc; + BlockingTDEProcess proc; proc.setWorkingDirectory( workingDirectory ); proc.setUseShell( true ); proc << command; - if ( !proc.start(KProcess::NotifyOnExit, KProcess::Stdout) ) { + if ( !proc.start(TDEProcess::NotifyOnExit, TDEProcess::Stdout) ) { return PathResolutionResult( false, i18n("Could not start the make-process") ); } diff --git a/languages/cpp/includepathresolver.h b/languages/cpp/includepathresolver.h index 8046a987..f7e32b0d 100644 --- a/languages/cpp/includepathresolver.h +++ b/languages/cpp/includepathresolver.h @@ -38,7 +38,7 @@ namespace CppTools { ///One resolution-try can issue up to 4 make-calls in worst case class IncludePathResolver { public: - ///Whether the TQt event-loop should be continued(using BlockingKProcess). This crashes if enabled in a non-foreground thread. + ///Whether the TQt event-loop should be continued(using BlockingTDEProcess). This crashes if enabled in a non-foreground thread. IncludePathResolver( bool continueEventLoop = false ); ///Same as below, but uses the directory of the file as working-directory. The argument must be absolute. PathResolutionResult resolveIncludePath( const TQString& file ); @@ -62,7 +62,7 @@ namespace CppTools { typedef TQMap<TQString, CacheEntry> Cache; Cache m_cache; - ///Executes the command, either using popen or BlockingKProcess + ///Executes the command, either using popen or BlockingTDEProcess PathResolutionResult getFullOutput( const TQString& command, const TQString& workingDirectory, TQString& output ) const; bool executeCommandPopen ( const TQString& command, const TQString& workingDirectory, TQString& result ) const; ///file should be the name of the target, without extension(because that may be different) diff --git a/languages/cpp/kdevdriver.h b/languages/cpp/kdevdriver.h index 07dc3660..8af87e0c 100644 --- a/languages/cpp/kdevdriver.h +++ b/languages/cpp/kdevdriver.h @@ -12,7 +12,7 @@ #include <unistd.h> #include <tqmap.h> -class KProcess; +class TDEProcess; namespace CppTools { class IncludePathResolver; }; diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp index 5a38e464..97066fcc 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp @@ -64,7 +64,7 @@ TQStringList KDevQt4Importer::fileList() - KProcess proc; + TDEProcess proc; proc << "cpp" << "-nostdinc" << "-xc++"; m_qtfile = new KTempFile(); @@ -81,7 +81,7 @@ TQStringList KDevQt4Importer::fileList() o += m_qtfile->name(); proc << ifile.name() << o; - proc.start(KProcess::Block); + proc.start(TDEProcess::Block); return m_qtfile->name(); } diff --git a/languages/cpp/setuphelper.cpp b/languages/cpp/setuphelper.cpp index b75723c4..d91c508f 100644 --- a/languages/cpp/setuphelper.cpp +++ b/languages/cpp/setuphelper.cpp @@ -25,10 +25,10 @@ TQString getGccIncludePath(bool *ok) { *ok = true; TQString processStdout; - BlockingKProcess proc; + BlockingTDEProcess proc; proc << "gcc" ; proc << "-print-file-name=include" ; - if ( !proc.start(KProcess::NotifyOnExit, KProcess::Stdout) ) { + if ( !proc.start(TDEProcess::NotifyOnExit, TDEProcess::Stdout) ) { kdWarning(9007) << "Couldn't start gcc" << endl; *ok = false; return TQString(); @@ -54,11 +54,11 @@ TQString getVerboseGccIncludePath(bool *ok) fwrite(fileText, strlen(fileText), 1, tempFile.fstream() ); tempFile.close(); - BlockingKProcess proc; + BlockingTDEProcess proc; proc.setUseShell(true); proc.setWorkingDirectory(pathInfo.dir(true).path()); proc << "gcc -v " + pathInfo.fileName() + " 2>&1"; - if ( !proc.start(KProcess::NotifyOnExit, KProcess::Stdout) ) { + if ( !proc.start(TDEProcess::NotifyOnExit, TDEProcess::Stdout) ) { kdWarning(9007) << "Couldn't start gcc" << endl; *ok = false; return TQString(); @@ -71,13 +71,13 @@ TQStringList getGccMacros(bool *ok) { *ok = true; TQString processStdout; - BlockingKProcess proc; + BlockingTDEProcess proc; proc << "gcc"; proc << "-E"; proc << "-dM"; proc << "-ansi" ; proc << "-"; - if ( !proc.start(KProcess::NotifyOnExit, KProcess::Stdout) ) { + if ( !proc.start(TDEProcess::NotifyOnExit, TDEProcess::Stdout) ) { kdWarning(9007) << "Couldn't start gcc" << endl; *ok = false; return TQStringList(); diff --git a/languages/csharp/csharpdoc.cpp b/languages/csharp/csharpdoc.cpp index cd32d03e..c0ee2ed5 100644 --- a/languages/csharp/csharpdoc.cpp +++ b/languages/csharp/csharpdoc.cpp @@ -37,10 +37,10 @@ void CSharpdocProtocol::get(const KURL& url) if (l[0] == "functions") { plain = true; cmd += "-t -f "; - cmd += KProcess::quote(l[1]); + cmd += TDEProcess::quote(l[1]); } else if (l[0] == "faq") { cmd += "-u -q "; - cmd += KProcess::quote(l[1]); + cmd += TDEProcess::quote(l[1]); cmd += " | pod2html"; } else { TQCString errstr(i18n("The only existing directories are functions and faq.").local8Bit()); @@ -117,7 +117,7 @@ extern "C" { int kdemain(int argc, char **argv) { TDEInstance instance( "kio_csharpdoc" ); - KGlobal::locale()->setMainCatalogue("tdevelop"); + TDEGlobal::locale()->setMainCatalogue("tdevelop"); if (argc != 4) { fprintf(stderr, "Usage: kio_csharpdoc protocol domain-socket1 domain-socket2\n"); diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index 51634f6b..44068db8 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -92,7 +92,7 @@ void FortranSupportPart::slotFtnchek() TQDomDocument &dom = *projectDom(); TQString cmdline = "cd "; - cmdline += KProcess::quote(project()->projectDirectory()); + cmdline += TDEProcess::quote(project()->projectDirectory()); cmdline += "&& ftnchek -nonovice "; if (DomUtil::readBoolEntry(dom, "/kdevfortransupport/ftnchek/division")) diff --git a/languages/perl/perldoc.cpp b/languages/perl/perldoc.cpp index b699a0f5..bbb2fa2d 100644 --- a/languages/perl/perldoc.cpp +++ b/languages/perl/perldoc.cpp @@ -37,10 +37,10 @@ void PerldocProtocol::get(const KURL& url) if (l[0] == "functions") { plain = true; cmd += "-t -f "; - cmd += KProcess::quote(l[1]); + cmd += TDEProcess::quote(l[1]); } else if (l[0] == "faq") { cmd += "-u -q "; - cmd += KProcess::quote(l[1]); + cmd += TDEProcess::quote(l[1]); cmd += " | pod2html"; } else { TQCString errstr(i18n("The only existing directories are functions and faq.").local8Bit()); @@ -117,7 +117,7 @@ extern "C" { int kdemain(int argc, char **argv) { TDEInstance instance( "kio_perldoc" ); - KGlobal::locale()->setMainCatalogue("tdevelop"); + TDEGlobal::locale()->setMainCatalogue("tdevelop"); if (argc != 4) { fprintf(stderr, "Usage: kio_perldoc protocol domain-socket1 domain-socket2\n"); diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp index 5be07acb..01cd950c 100644 --- a/languages/php/phpconfigwidget.cpp +++ b/languages/php/phpconfigwidget.cpp @@ -129,16 +129,16 @@ void PHPConfigWidget::slotAboutClicked() proc << exe_edit->text(); proc << "-m"; - connect( &proc, TQT_SIGNAL(receivedStdout (KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPInfo (KProcess*, char*, int))); - proc.start(KProcess::Block,KProcess::Stdout); + connect( &proc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedPHPInfo (TDEProcess*, char*, int))); + proc.start(TDEProcess::Block,TDEProcess::Stdout); PHPInfoDlg dlg(this,"phpinfo",true); dlg.php_edit->setText(m_phpInfo); dlg.exec(); m_phpInfo = ""; } -void PHPConfigWidget::slotReceivedPHPInfo (KProcess* /*proc*/, char* buffer, int buflen){ +void PHPConfigWidget::slotReceivedPHPInfo (TDEProcess* /*proc*/, char* buffer, int buflen){ m_phpInfo += TQCString(buffer,buflen+1); } diff --git a/languages/php/phpconfigwidget.h b/languages/php/phpconfigwidget.h index 5f1efdd6..185740fe 100644 --- a/languages/php/phpconfigwidget.h +++ b/languages/php/phpconfigwidget.h @@ -3,7 +3,7 @@ #include "phpconfigwidgetbase.h" #include <tqstring.h> -class KProcess; +class TDEProcess; class PHPConfigData; class PHPConfigWidget : public PHPConfigWidgetBase @@ -21,7 +21,7 @@ public slots: virtual void slotPHPExeButtonClicked(); virtual void slotPHPIniButtonClicked(); void accept(); - void slotReceivedPHPInfo (KProcess* proc, char* buffer, int buflen); + void slotReceivedPHPInfo (TDEProcess* proc, char* buffer, int buflen); private: TQDomDocument* dom; diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index 29c6ea9b..7a95bc98 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -44,9 +44,9 @@ PHPFile::PHPFile(PHPSupportPart *phpSupport, const TQString& fileName) /* phpCheckProc = new KShellProcess("/bin/sh"); - connect(phpCheckProc, TQT_SIGNAL(receivedStdout (KProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStdout (KProcess*, char*, int))); - connect(phpCheckProc, TQT_SIGNAL(receivedStderr (KProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStderr (KProcess*, char*, int))); - connect(phpCheckProc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPHPCheckExited(KProcess*))); + connect(phpCheckProc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStdout (TDEProcess*, char*, int))); + connect(phpCheckProc, TQT_SIGNAL(receivedStderr (TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedPHPCheckStderr (TDEProcess*, char*, int))); + connect(phpCheckProc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPHPCheckExited(TDEProcess*))); */ } @@ -487,7 +487,7 @@ void PHPFile::PHPCheck() { *phpCheckProc << m_phpSupport->getExePath(); *phpCheckProc << "-l -f" << KShellProcess::quote(fileName()); - phpCheckProc->start(KProcess::DontCare, KProcess::All); + phpCheckProc->start(TDEProcess::DontCare, TDEProcess::All); */ /* @@ -505,17 +505,17 @@ void PHPFile::PHPCheck() { } /* -void PHPFile::slotReceivedPHPCheckStdout (KProcess* proc, char* buffer, int buflen) { +void PHPFile::slotReceivedPHPCheckStdout (TDEProcess* proc, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStdout()" << endl; m_phpCheckOutput += TQString::fromLocal8Bit(buffer,buflen+1); } -void PHPFile::slotReceivedPHPCheckStderr (KProcess* proc, char* buffer, int buflen) { +void PHPFile::slotReceivedPHPCheckStderr (TDEProcess* proc, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStderr()" << endl; m_phpCheckOutput += TQString::fromLocal8Bit(buffer,buflen+1); } -void PHPFile::slotPHPCheckExited (KProcess* proc) { +void PHPFile::slotPHPCheckExited (TDEProcess* proc) { kdDebug(v) << "slotPHPExeExited()" << endl; } */ diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h index dbf18b63..470e7159 100644 --- a/languages/php/phpfile.h +++ b/languages/php/phpfile.h @@ -67,9 +67,9 @@ public: /* private slots: - void slotReceivedPHPCheckStderr (KProcess* proc, char* buffer, int buflen); - void slotReceivedPHPCheckStdout (KProcess* proc, char* buffer, int buflen); - void slotPHPCheckExited (KProcess* proc); + void slotReceivedPHPCheckStderr (TDEProcess* proc, char* buffer, int buflen); + void slotReceivedPHPCheckStdout (TDEProcess* proc, char* buffer, int buflen); + void slotPHPCheckExited (TDEProcess* proc); */ private: TQStringList readFromEditor(); diff --git a/languages/php/phpnewclassdlg.cpp b/languages/php/phpnewclassdlg.cpp index 314dfcf6..ddc3b507 100644 --- a/languages/php/phpnewclassdlg.cpp +++ b/languages/php/phpnewclassdlg.cpp @@ -37,7 +37,7 @@ PHPNewClassDlg::PHPNewClassDlg(const TQStringList& baseClassNames,const TQString m_dirEdit->setText(directory); // load the class template if available - TQString templateFile = KGlobal::instance()->dirs()->findResource("data","kdevphpsupport/newclasstemplate.txt"); + TQString templateFile = TDEGlobal::instance()->dirs()->findResource("data","kdevphpsupport/newclasstemplate.txt"); if(!templateFile.isNull()){ TQFile file(templateFile); TQTextStream stream(&file); @@ -86,7 +86,7 @@ void PHPNewClassDlg::accept(){ TQString absFileName = classDir + m_fileNameEdit->text(); // save the template for the next time - TQString templateDir = KGlobal::instance()->dirs()->saveLocation("data") + "/kdevphpsupport/"; + TQString templateDir = TDEGlobal::instance()->dirs()->saveLocation("data") + "/kdevphpsupport/"; TQString templateFile = templateDir + "newclasstemplate.txt"; TQDir dir(templateDir); if(!dir.exists()){ diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 52c9f109..db3aeed7 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -107,12 +107,12 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin mainWindow()->embedOutputView(m_phpErrorView, i18n("Problems"), i18n("Problems")); phpExeProc = new KShellProcess("/bin/sh"); - connect( phpExeProc, TQT_SIGNAL(receivedStdout (KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPExeStdout (KProcess*, char*, int))); - connect( phpExeProc, TQT_SIGNAL(receivedStderr (KProcess*, char*, int)), - this, TQT_SLOT(slotReceivedPHPExeStderr (KProcess*, char*, int))); - connect( phpExeProc, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotPHPExeExited(KProcess*))); + connect( phpExeProc, TQT_SIGNAL(receivedStdout (TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedPHPExeStdout (TDEProcess*, char*, int))); + connect( phpExeProc, TQT_SIGNAL(receivedStderr (TDEProcess*, char*, int)), + this, TQT_SLOT(slotReceivedPHPExeStderr (TDEProcess*, char*, int))); + connect( phpExeProc, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotPHPExeExited(TDEProcess*))); m_htmlView = new PHPHTMLView(this); mainWindow()->embedOutputView(m_htmlView->view(), i18n("PHP"), i18n("PHP")); @@ -343,12 +343,12 @@ void PHPSupportPart::executeInTerminal() { *phpExeProc << KShellProcess::quote(file); kdDebug(9018) << "" << file.latin1() << endl; - phpExeProc->start(KProcess::NotifyOnExit,KProcess::All); + phpExeProc->start(TDEProcess::NotifyOnExit,TDEProcess::All); // core()->gotoDocumentationFile(KURL("http://www.php.net")); } -void PHPSupportPart::slotReceivedPHPExeStdout (KProcess* /*proc*/, char* buffer, int buflen) { +void PHPSupportPart::slotReceivedPHPExeStdout (TDEProcess* /*proc*/, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStdout()" << endl; m_phpExeOutput += TQString::fromLocal8Bit(buffer,buflen+1); @@ -358,7 +358,7 @@ void PHPSupportPart::slotReceivedPHPExeStdout (KProcess* /*proc*/, char* buffer, m_htmlView->write(buf); } -void PHPSupportPart::slotReceivedPHPExeStderr (KProcess* /*proc*/, char* buffer, int buflen) { +void PHPSupportPart::slotReceivedPHPExeStderr (TDEProcess* /*proc*/, char* buffer, int buflen) { kdDebug(9018) << "slotPHPExeStderr()" << endl; m_phpExeOutput += TQString::fromLocal8Bit(buffer,buflen+1); @@ -368,7 +368,7 @@ void PHPSupportPart::slotReceivedPHPExeStderr (KProcess* /*proc*/, char* buffer, m_htmlView->write(buf); } -void PHPSupportPart::slotPHPExeExited (KProcess* /*proc*/) { +void PHPSupportPart::slotPHPExeExited (TDEProcess* /*proc*/) { kdDebug(9018) << "slotPHPExeExited()" << endl; m_htmlView->end(); TQString file = getExecuteFile(); diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h index 8e403f51..d89c3277 100644 --- a/languages/php/phpsupportpart.h +++ b/languages/php/phpsupportpart.h @@ -34,7 +34,7 @@ class TQStringList; class PHPHTMLView; class KShellProcess; -class KProcess; +class TDEProcess; class PHPErrorView; class PHPConfigData; class PHPCodeCompletion; @@ -72,9 +72,9 @@ private slots: void slotRun(); void slotNewClass(); void projectConfigWidget(KDialogBase *dlg); - void slotReceivedPHPExeStderr (KProcess* proc, char* buffer, int buflen); - void slotReceivedPHPExeStdout (KProcess* proc, char* buffer, int buflen); - void slotPHPExeExited (KProcess* proc); + void slotReceivedPHPExeStderr (TDEProcess* proc, char* buffer, int buflen); + void slotReceivedPHPExeStdout (TDEProcess* proc, char* buffer, int buflen); + void slotPHPExeExited (TDEProcess* proc); void slotWebData(KIO::Job* job,const TQByteArray& data); void slotWebResult(KIO::Job* job); void slotWebJobStarted(KIO::Job* job); diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp index ef4111bb..1c07b404 100644 --- a/languages/python/pydoc.cpp +++ b/languages/python/pydoc.cpp @@ -19,7 +19,7 @@ using namespace KIO; PydocProtocol::PydocProtocol(const TQCString &pool, const TQCString &app) : SlaveBase("pydoc", pool, app), key() { - python = KGlobal::dirs()->findExe("python"); + python = TDEGlobal::dirs()->findExe("python"); script = locate("data", "kio_pydoc/kde_pydoc.py"); } @@ -33,11 +33,11 @@ void PydocProtocol::get(const KURL& url) mimeType("text/html"); key = url.path(); - TQString cmd = KProcess::quote(python); + TQString cmd = TDEProcess::quote(python); cmd += " "; - cmd += KProcess::quote(script); + cmd += TDEProcess::quote(script); cmd += " -w "; - cmd += KProcess::quote(key); + cmd += TDEProcess::quote(key); FILE *fd = popen(cmd.local8Bit().data(), "r"); char buffer[4096]; @@ -97,7 +97,7 @@ extern "C" { int kdemain(int argc, char **argv) { TDEInstance instance( "kio_pydoc" ); - KGlobal::locale()->setMainCatalogue("tdevelop"); + TDEGlobal::locale()->setMainCatalogue("tdevelop"); if (argc != 4) { fprintf(stderr, "Usage: kio_pydoc protocol domain-socket1 domain-socket2\n"); diff --git a/languages/ruby/debugger/dbgcontroller.h b/languages/ruby/debugger/dbgcontroller.h index 67be9ef3..9559670d 100644 --- a/languages/ruby/debugger/dbgcontroller.h +++ b/languages/ruby/debugger/dbgcontroller.h @@ -25,7 +25,7 @@ #include <tqobject.h> #include <domutil.h> -class KProcess; +class TDEProcess; class TQString; class TQStrList; @@ -134,10 +134,10 @@ public slots: virtual void slotFetchGlobals(bool fetch) = 0; protected slots: - virtual void slotDbgStdout(KProcess *proc, char *buf, int buflen) = 0; - virtual void slotDbgStderr(KProcess*, char*, int) {} ; - virtual void slotDbgWroteStdin(KProcess *proc) = 0; - virtual void slotDbgProcessExited(KProcess *proc) = 0; + virtual void slotDbgStdout(TDEProcess *proc, char *buf, int buflen) = 0; + virtual void slotDbgStderr(TDEProcess*, char*, int) {} ; + virtual void slotDbgWroteStdin(TDEProcess *proc) = 0; + virtual void slotDbgProcessExited(TDEProcess *proc) = 0; virtual void slotAcceptConnection(int passive_socket) = 0; virtual void slotReadFromSocket(int socket) = 0; @@ -154,7 +154,7 @@ signals: void dbgStatus (const TQString &status, int statusFlag); protected: - KProcess *dbgProcess_; + TDEProcess *dbgProcess_; }; } diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp index 5787ba2d..e5fb76d0 100644 --- a/languages/ruby/debugger/dbgpsdlg.cpp +++ b/languages/ruby/debugger/dbgpsdlg.cpp @@ -62,14 +62,14 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) TQBoxLayout *topLayout = new TQVBoxLayout(this, 5); - heading_->setFont(KGlobalSettings::fixedFont()); + heading_->setFont(TDEGlobalSettings::fixedFont()); heading_->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); heading_->setMaximumHeight(heading_->sizeHint().height()); // heading_->setMinimumSize(heading_->sizeHint()); topLayout->addWidget(heading_, 5); topLayout->addWidget(pids_, 5); - pids_->setFont(KGlobalSettings::fixedFont()); + pids_->setFont(TDEGlobalSettings::fixedFont()); KButtonBox *buttonbox = new KButtonBox(this, Qt::Horizontal, 5); TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); @@ -106,12 +106,12 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) } #endif - connect( psProc_, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(slotProcessExited()) ); - connect( psProc_, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(KProcess *, char *, int)) ); - psProc_->start(KProcess::NotifyOnExit, KProcess::Stdout); + connect( psProc_, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotProcessExited()) ); + connect( psProc_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int)) ); + psProc_->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); // Default display to 40 chars wide, default height is okay - resize( ((KGlobalSettings::fixedFont()).pointSize())*40, height()); + resize( ((TDEGlobalSettings::fixedFont()).pointSize())*40, height()); topLayout->activate(); } @@ -135,7 +135,7 @@ int Dbg_PS_Dialog::pidSelected() /***************************************************************************/ -void Dbg_PS_Dialog::slotReceivedOutput(KProcess */*proc*/, char *buffer, int buflen) +void Dbg_PS_Dialog::slotReceivedOutput(TDEProcess */*proc*/, char *buffer, int buflen) { pidLines_ += TQString::fromLocal8Bit(buffer, buflen+1); } diff --git a/languages/ruby/debugger/dbgpsdlg.h b/languages/ruby/debugger/dbgpsdlg.h index 5bbc89af..8cf781f3 100644 --- a/languages/ruby/debugger/dbgpsdlg.h +++ b/languages/ruby/debugger/dbgpsdlg.h @@ -25,7 +25,7 @@ #include <kdialog.h> class TQListBox; -class KProcess; +class TDEProcess; class TQLabel; namespace RDBDebugger @@ -45,11 +45,11 @@ public: int pidSelected(); private slots: - void slotReceivedOutput(KProcess *proc, char *buffer, int buflen); + void slotReceivedOutput(TDEProcess *proc, char *buffer, int buflen); void slotProcessExited(); private: - KProcess* psProc_; + TDEProcess* psProc_; TQListBox* pids_; TQLabel* heading_; TQString pidLines_; diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp index 25fcd6a4..278d0ff2 100644 --- a/languages/ruby/debugger/rdbcontroller.cpp +++ b/languages/ruby/debugger/rdbcontroller.cpp @@ -714,19 +714,19 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& return; } - dbgProcess_ = new KProcess; + dbgProcess_ = new TDEProcess; - connect( dbgProcess_, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(slotDbgStdout(KProcess *, char *, int)) ); + connect( dbgProcess_, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(slotDbgStdout(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(slotDbgStderr(KProcess *, char *, int)) ); + connect( dbgProcess_, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(slotDbgStderr(TDEProcess *, char *, int)) ); - connect( dbgProcess_, TQT_SIGNAL(wroteStdin(KProcess *)), - this, TQT_SLOT(slotDbgWroteStdin(KProcess *)) ); + connect( dbgProcess_, TQT_SIGNAL(wroteStdin(TDEProcess *)), + this, TQT_SLOT(slotDbgWroteStdin(TDEProcess *)) ); - connect( dbgProcess_, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotDbgProcessExited(KProcess*)) ); + connect( dbgProcess_, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotDbgProcessExited(TDEProcess*)) ); rubyInterpreter_ = ruby_interpreter; characterCoding_ = character_coding; @@ -752,8 +752,8 @@ void RDBController::slotStart(const TQString& ruby_interpreter, const TQString& + " -r " + debuggee_path + " " + application + " " + run_arguments ).latin1() ); - if (!dbgProcess_->start( KProcess::NotifyOnExit, - KProcess::Communication(KProcess::All)) ) + if (!dbgProcess_->start( TDEProcess::NotifyOnExit, + TDEProcess::Communication(TDEProcess::All)) ) { kdDebug(9012) << "Couldn't start ruby debugger" << endl; } @@ -1154,7 +1154,7 @@ void RDBController::slotFetchGlobals(bool fetch) // ************************************************************************** // Data from the ruby program's stdout gets processed here. -void RDBController::slotDbgStdout(KProcess *, char *buf, int buflen) +void RDBController::slotDbgStdout(TDEProcess *, char *buf, int buflen) { TQCString msg(buf, buflen+1); emit ttyStdout(msg); @@ -1163,7 +1163,7 @@ void RDBController::slotDbgStdout(KProcess *, char *buf, int buflen) // ************************************************************************** // Data from the ruby program's stderr gets processed here. -void RDBController::slotDbgStderr(KProcess *, char *buf, int buflen) +void RDBController::slotDbgStderr(TDEProcess *, char *buf, int buflen) { TQCString msg(buf, buflen+1); emit ttyStderr(msg); @@ -1171,7 +1171,7 @@ void RDBController::slotDbgStderr(KProcess *, char *buf, int buflen) // ************************************************************************** -void RDBController::slotDbgWroteStdin(KProcess *) +void RDBController::slotDbgWroteStdin(TDEProcess *) { // setStateOff(s_waitForWrite); // if (!stateIsOn(s_silent)) @@ -1279,7 +1279,7 @@ void RDBController::slotReadFromSocket(int socket) // ************************************************************************** -void RDBController::slotDbgProcessExited(KProcess*) +void RDBController::slotDbgProcessExited(TDEProcess*) { destroyCmds(); state_ = s_appNotStarted|s_programExited|(state_&(s_shuttingDown)); diff --git a/languages/ruby/debugger/rdbcontroller.h b/languages/ruby/debugger/rdbcontroller.h index 77deb1a2..755eca85 100644 --- a/languages/ruby/debugger/rdbcontroller.h +++ b/languages/ruby/debugger/rdbcontroller.h @@ -36,7 +36,7 @@ #include <tqstring.h> #include <tqsocketnotifier.h> -class KProcess; +class TDEProcess; namespace RDBDebugger { @@ -127,10 +127,10 @@ public slots: void slotUserRDBCmd(const TQString&); protected slots: - void slotDbgStdout(KProcess *proc, char *buf, int buflen); - void slotDbgStderr(KProcess *proc, char *buf, int buflen); - void slotDbgWroteStdin(KProcess *proc); - void slotDbgProcessExited(KProcess *proc); + void slotDbgStdout(TDEProcess *proc, char *buf, int buflen); + void slotDbgStderr(TDEProcess *proc, char *buf, int buflen); + void slotDbgWroteStdin(TDEProcess *proc); + void slotDbgProcessExited(TDEProcess *proc); void slotAcceptConnection(int masterSocket); void slotReadFromSocket(int socket); diff --git a/lib/interfaces/kdevplugin.cpp b/lib/interfaces/kdevplugin.cpp index 8a431dc7..bca67f52 100644 --- a/lib/interfaces/kdevplugin.cpp +++ b/lib/interfaces/kdevplugin.cpp @@ -63,7 +63,7 @@ KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char actionCollection()->setHighlightingEnabled( true ); d->info = info; - KGlobal::iconLoader()->addAppDir("tdevelop"); + TDEGlobal::iconLoader()->addAppDir("tdevelop"); } KDevPlugin::~KDevPlugin() diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingkprocess.cpp index aef4fb1f..b88b0cad 100644 --- a/lib/util/blockingkprocess.cpp +++ b/lib/util/blockingkprocess.cpp @@ -14,44 +14,44 @@ #include <tqapplication.h> #include <tqtimer.h> -BlockingKProcess::BlockingKProcess(TQObject *parent, const char *name) - : KProcess(parent, name) +BlockingTDEProcess::BlockingTDEProcess(TQObject *parent, const char *name) + : TDEProcess(parent, name) { m_stdOut = ""; m_stdErr = ""; m_timeoutValue = 60; m_timer = 0L; - connect(this, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdOut(KProcess *, char *, int))); - connect(this, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdErr(KProcess *, char *, int))); - connect(this, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(slotReceivedStdOut(TDEProcess *, char *, int))); + connect(this, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(slotReceivedStdErr(TDEProcess *, char *, int))); + connect(this, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotProcessExited(TDEProcess *))); } -BlockingKProcess::BlockingKProcess() - : KProcess() +BlockingTDEProcess::BlockingTDEProcess() + : TDEProcess() { m_stdOut = ""; m_stdErr = ""; m_timeoutValue = 60; m_timer = 0L; - connect(this, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdOut(KProcess *, char *, int))); - connect(this, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(slotReceivedStdErr(KProcess *, char *, int))); - connect(this, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT(slotProcessExited(KProcess *))); + connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(slotReceivedStdOut(TDEProcess *, char *, int))); + connect(this, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(slotReceivedStdErr(TDEProcess *, char *, int))); + connect(this, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT(slotProcessExited(TDEProcess *))); } -BlockingKProcess::~BlockingKProcess() +BlockingTDEProcess::~BlockingTDEProcess() { } -bool BlockingKProcess::start(RunMode runmode, Communication comm) +bool BlockingTDEProcess::start(RunMode runmode, Communication comm) { - if (KProcess::start(runmode, comm)) + if (TDEProcess::start(runmode, comm)) { m_timeout = false; m_timer = new TQTimer(); @@ -66,22 +66,22 @@ bool BlockingKProcess::start(RunMode runmode, Communication comm) } -void BlockingKProcess::slotReceivedStdOut(KProcess *, char *buffer, int buflen) +void BlockingTDEProcess::slotReceivedStdOut(TDEProcess *, char *buffer, int buflen) { m_stdOut += TQString::fromLatin1(buffer, buflen); } -void BlockingKProcess::slotReceivedStdErr(KProcess *, char *buffer, int buflen) +void BlockingTDEProcess::slotReceivedStdErr(TDEProcess *, char *buffer, int buflen) { m_stdErr += TQString::fromLatin1(buffer, buflen); } -void BlockingKProcess::slotProcessExited(KProcess *) +void BlockingTDEProcess::slotProcessExited(TDEProcess *) { tqApp->exit_loop(); } -void BlockingKProcess::slotTimeOut() +void BlockingTDEProcess::slotTimeOut() { m_timeout = true; kill(); @@ -92,7 +92,7 @@ void BlockingKProcess::slotTimeOut() void tqt_enter_modal( TQWidget *widget ); void tqt_leave_modal( TQWidget *widget ); -void BlockingKProcess::enter_loop() +void BlockingTDEProcess::enter_loop() { TQWidget dummy(0,0,WType_Dialog | WShowModal); dummy.setFocusPolicy( TQ_NoFocus ); diff --git a/lib/util/blockingkprocess.h b/lib/util/blockingkprocess.h index f6fa9d2e..8d164bef 100644 --- a/lib/util/blockingkprocess.h +++ b/lib/util/blockingkprocess.h @@ -17,8 +17,8 @@ #include <kprocess.h> /** - * Blocking version of KProcess, which stores the stdout. - * Differences between start(KProcess::Block, KProcess::StdOut) and this + * Blocking version of TDEProcess, which stores the stdout. + * Differences between start(TDEProcess::Block, TDEProcess::StdOut) and this * class are: * - the GUI update is not blocked why the external process is running * - in case of problems there is a timeout (defaults to 60 seconds), after which the @@ -28,22 +28,22 @@ */ class TQTimer; -class BlockingKProcess : public KProcess +class BlockingTDEProcess : public TDEProcess { Q_OBJECT public: - BlockingKProcess(TQObject *parent, const char *name=0); - BlockingKProcess(); + BlockingTDEProcess(TQObject *parent, const char *name=0); + BlockingTDEProcess(); - virtual ~BlockingKProcess(); + virtual ~BlockingTDEProcess(); /** * Start the process. It waits until the process exits or the timeout is hit. - * @param runmode @see KProcess, use KProcess::NotifyOnExit to get proper behaviour, - * not KProcess::Block - * @param comm if Stdout is passed, it catches the output. For the rest @see KProcess + * @param runmode @see TDEProcess, use TDEProcess::NotifyOnExit to get proper behaviour, + * not TDEProcess::Block + * @param comm if Stdout is passed, it catches the output. For the rest @see TDEProcess * @return true in case of success, false if there are problems to start the process * or it was killed because of the timeout. */ @@ -75,9 +75,9 @@ public: void setTimeOut(int timeout) { m_timeoutValue = timeout; } private slots: - void slotReceivedStdOut(KProcess *proc, char *buffer, int buflen); - void slotReceivedStdErr(KProcess *proc, char *buffer, int buflen); - void slotProcessExited(KProcess *proc); + void slotReceivedStdOut(TDEProcess *proc, char *buffer, int buflen); + void slotReceivedStdErr(TDEProcess *proc, char *buffer, int buflen); + void slotProcessExited(TDEProcess *proc); void slotTimeOut(); private: diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp index 62eb5924..d62cb2e7 100644 --- a/lib/util/execcommand.cpp +++ b/lib/util/execcommand.cpp @@ -32,21 +32,21 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, { progressDlg = 0; - proc = new KProcess(); + proc = new TDEProcess(); proc->setWorkingDirectory( workingDir ); for ( TQStringList::ConstIterator it = env.begin(); it != env.end(); ++it ) proc->setEnvironment( (*it).section( '=', 0, 0 ), (*it).section( '=', 1, 1 ) ); *proc << executable; *proc << args; - connect( proc, TQT_SIGNAL(processExited(KProcess*)), + connect( proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(processExited()) ); - 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(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)) ); - bool ok = proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ); + bool ok = proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); if ( !ok ) { KMessageBox::error( 0, i18n("Could not invoke \"%1\". Please make sure it is installed correctly").arg( executable ), @@ -63,12 +63,12 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, } } -void ExecCommand::receivedStdout (KProcess*, char *buffer, int buflen) +void ExecCommand::receivedStdout (TDEProcess*, char *buffer, int buflen) { out += TQString::fromUtf8( buffer, buflen ); } -void ExecCommand::receivedStderr (KProcess*, char *buffer, int buflen) +void ExecCommand::receivedStderr (TDEProcess*, char *buffer, int buflen) { err += TQString::fromUtf8( buffer, buflen ); } diff --git a/lib/util/execcommand.h b/lib/util/execcommand.h index 540e5b1a..6c9b96a7 100644 --- a/lib/util/execcommand.h +++ b/lib/util/execcommand.h @@ -23,7 +23,7 @@ #include <tqobject.h> #include <tqstringlist.h> -class KProcess; +class TDEProcess; class KProgressDialog; /** @@ -56,13 +56,13 @@ signals: void finished( const TQString& output, const TQString& errorOutput ); private slots: - void receivedStdout (KProcess *, char *buffer, int buflen); - void receivedStderr (KProcess *, char *buffer, int buflen); + void receivedStdout (TDEProcess *, char *buffer, int buflen); + void receivedStderr (TDEProcess *, char *buffer, int buflen); void processExited(); void cancelClicked(); private: - KProcess* proc; + TDEProcess* proc; KProgressDialog* progressDlg; TQString out; TQString err; diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp index 5eb7c871..b85bea80 100644 --- a/lib/util/kdevshellwidget.cpp +++ b/lib/util/kdevshellwidget.cpp @@ -44,7 +44,7 @@ void KDevShellWidget::activate( ) m_konsolePart = (KParts::ReadOnlyPart *) factory->create( TQT_TQOBJECT(this), "libkonsolepart", "KParts::ReadOnlyPart" ); if ( !m_konsolePart ) return; - connect( m_konsolePart, TQT_SIGNAL( processExited(KProcess *) ), this, TQT_SLOT( processExited(KProcess *) ) ); + connect( m_konsolePart, TQT_SIGNAL( processExited(TDEProcess *) ), this, TQT_SLOT( processExited(TDEProcess *) ) ); connect( m_konsolePart, TQT_SIGNAL( receivedData( const TQString& ) ), this, TQT_SIGNAL( receivedData( const TQString& ) ) ); connect( m_konsolePart, TQT_SIGNAL(destroyed()), this, TQT_SLOT(partDestroyed()) ); @@ -75,7 +75,7 @@ void KDevShellWidget::partDestroyed( ) } } -void KDevShellWidget::processExited( KProcess * proc ) +void KDevShellWidget::processExited( TDEProcess * proc ) { m_isRunning = false; diff --git a/lib/util/kdevshellwidget.h b/lib/util/kdevshellwidget.h index 2743c829..6bb6a8d7 100644 --- a/lib/util/kdevshellwidget.h +++ b/lib/util/kdevshellwidget.h @@ -17,7 +17,7 @@ #include <tqvbox.h> #include <tqguardedptr.h> -class KProcess; +class TDEProcess; namespace KParts { class ReadOnlyPart; @@ -85,7 +85,7 @@ signals: private slots: void partDestroyed(); - void processExited( KProcess * ); + void processExited( TDEProcess * ); void setAutoReactivateOnCloseDelayed( ); private: diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/kscriptactionmanager.cpp index ff3204ca..28756841 100644 --- a/lib/util/kscriptactionmanager.cpp +++ b/lib/util/kscriptactionmanager.cpp @@ -135,12 +135,12 @@ TQPtrList< KAction > KScriptActionManager::scripts( TQObject * interface , const TQPtrList<KAction> actions; TQStringList scripts; - scripts += KGlobal::dirs()->findAllResources("data", + scripts += TDEGlobal::dirs()->findAllResources("data", TQString(kapp->name())+"/scripts/*.desktop", false, true ); for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) { - scripts += KGlobal::dirs()->findAllResources("data", + scripts += TDEGlobal::dirs()->findAllResources("data", (*it)+"/*.desktop", false, true ); } diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp index c9087942..90af2b1c 100644 --- a/lib/util/settings.cpp +++ b/lib/util/settings.cpp @@ -23,7 +23,7 @@ TQString Settings::terminalEmulatorName( KConfig & config ) if ( useKDESetting ) { - KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") ); terminal = confGroup.readEntry("TerminalApplication", TQString::fromLatin1("konsole")); } else diff --git a/lib/widgets/kcomboview.cpp b/lib/widgets/kcomboview.cpp index 2576ed0c..93a6612f 100644 --- a/lib/widgets/kcomboview.cpp +++ b/lib/widgets/kcomboview.cpp @@ -31,7 +31,7 @@ KComboView::KComboView( bool rw, int defaultWidth, TQWidget* parent, const char* if (rw) { KLineEdit *ed = new KLineEdit(this, "combo edit"); - ed->setCompletionMode(KGlobalSettings::CompletionPopup); + ed->setCompletionMode(TDEGlobalSettings::CompletionPopup); ed->setCompletionObject(m_comp); ed->completionBox()->setHScrollBarMode(TQListBox::Auto); setLineEdit(ed); diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index d0406c4e..323c2cc7 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -78,7 +78,7 @@ KDevHTMLPart::KDevHTMLPart() //END documentation history stuff //settings: - KConfig *appConfig = KGlobal::config(); + KConfig *appConfig = TDEGlobal::config(); appConfig->setGroup("KHTMLPart"); setStandardFont(appConfig->readEntry("StandardFont", settings()->stdFontName())); diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp index a7d12348..fc45f704 100644 --- a/lib/widgets/kdevtabwidget.cpp +++ b/lib/widgets/kdevtabwidget.cpp @@ -30,7 +30,7 @@ KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name) { m_pPopupMenu = new TQPopupMenu(this); - TQPixmap closePixmap = KGlobal::instance()->iconLoader()->loadIcon( "tab_remove", KIcon::Small, 0, KIcon::DefaultState, 0, true ); + TQPixmap closePixmap = TDEGlobal::instance()->iconLoader()->loadIcon( "tab_remove", KIcon::Small, 0, KIcon::DefaultState, 0, true ); if (closePixmap.isNull()) closePixmap = SmallIcon("fileclose"); diff --git a/lib/widgets/klistviewaction.cpp b/lib/widgets/klistviewaction.cpp index 0a219da5..adedc5a4 100644 --- a/lib/widgets/klistviewaction.cpp +++ b/lib/widgets/klistviewaction.cpp @@ -28,7 +28,7 @@ KListViewAction::~KListViewAction() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if (config && m_view->name()) { config->setGroup("KListViewAction"); @@ -76,7 +76,7 @@ void KListViewAction::setWhatsThis( const TQString & str ) void KListViewAction::loadComboWidth( ) { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); if (config && m_view->name()) { config->setGroup("KListViewAction"); diff --git a/lib/widgets/processlinemaker.cpp b/lib/widgets/processlinemaker.cpp index 8fdbc5d2..113b206b 100644 --- a/lib/widgets/processlinemaker.cpp +++ b/lib/widgets/processlinemaker.cpp @@ -26,13 +26,13 @@ ProcessLineMaker::ProcessLineMaker() { } -ProcessLineMaker::ProcessLineMaker( const KProcess* proc ) +ProcessLineMaker::ProcessLineMaker( const TDEProcess* proc ) { - connect(proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)) ); + connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); - connect(proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStderr(KProcess*,char*,int)) ); + connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); } void ProcessLineMaker::slotReceivedStdout( const char *buffer ) @@ -50,7 +50,7 @@ void ProcessLineMaker::slotReceivedStdout( const char *buffer ) } } -void ProcessLineMaker::slotReceivedStdout( KProcess*, char *buffer, int ) +void ProcessLineMaker::slotReceivedStdout( TDEProcess*, char *buffer, int ) { slotReceivedStdout(buffer); // It is zero-terminated } @@ -71,7 +71,7 @@ void ProcessLineMaker::slotReceivedStderr( const char *buffer ) } } -void ProcessLineMaker::slotReceivedStderr( KProcess*, char *buffer, int ) +void ProcessLineMaker::slotReceivedStderr( TDEProcess*, char *buffer, int ) { slotReceivedStderr(buffer); // It is zero-terminated } diff --git a/lib/widgets/processlinemaker.h b/lib/widgets/processlinemaker.h index e75824cd..19f714fa 100644 --- a/lib/widgets/processlinemaker.h +++ b/lib/widgets/processlinemaker.h @@ -27,10 +27,10 @@ Utility objects for process output views. */ -class KProcess; +class TDEProcess; /** -Convenience class to catch output of KProcess. +Convenience class to catch output of TDEProcess. */ class ProcessLineMaker : public TQObject { @@ -39,7 +39,7 @@ Q_OBJECT public: ProcessLineMaker(); - ProcessLineMaker( const KProcess* ); + ProcessLineMaker( const TDEProcess* ); void clearBuffers(); void flush(); @@ -49,8 +49,8 @@ public slots: void slotReceivedStderr(const char*); protected slots: - void slotReceivedStdout(KProcess *, char *buffer, int buflen); - void slotReceivedStderr(KProcess *, char *buffer, int buflen); + void slotReceivedStdout(TDEProcess *, char *buffer, int buflen); + void slotReceivedStderr(TDEProcess *, char *buffer, int buflen); signals: void receivedStdoutLine( const TQCString& line ); diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp index f28e4ec7..1f2e1a5e 100644 --- a/lib/widgets/processwidget.cpp +++ b/lib/widgets/processwidget.cpp @@ -112,7 +112,7 @@ ProcessWidget::ProcessWidget(TQWidget *parent, const char *name) // the background ourselves (see ProcessListBoxItem::paint). - childproc = new KProcess(); + childproc = new TDEProcess(); childproc->setUseShell(true); procLineMaker = new ProcessLineMaker( childproc ); @@ -126,8 +126,8 @@ ProcessWidget::ProcessWidget(TQWidget *parent, const char *name) connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), this, TQT_SLOT(addPartialStderrLine(const TQCString&) )); - connect(childproc, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(slotProcessExited(KProcess*) )) ; + connect(childproc, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(slotProcessExited(TDEProcess*) )) ; } @@ -151,7 +151,7 @@ void ProcessWidget::startJob(const TQString &dir, const TQString &command) } *childproc << command; - childproc->start(KProcess::OwnGroup, KProcess::AllOutput); + childproc->start(TDEProcess::OwnGroup, TDEProcess::AllOutput); } @@ -169,7 +169,7 @@ bool ProcessWidget::isRunning() } -void ProcessWidget::slotProcessExited(KProcess *) +void ProcessWidget::slotProcessExited(TDEProcess *) { procLineMaker->flush(); if( !stdoutbuf.isEmpty() ) diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h index 935c7456..b0ad10f7 100644 --- a/lib/widgets/processwidget.h +++ b/lib/widgets/processwidget.h @@ -105,7 +105,7 @@ protected: virtual void childFinished(bool normal, int status); signals: - void processExited(KProcess *); + void processExited(TDEProcess *); void rowSelected(int row); protected: @@ -113,10 +113,10 @@ protected: void maybeScrollToBottom(); protected slots: - void slotProcessExited(KProcess*); + void slotProcessExited(TDEProcess*); private: - KProcess *childproc; + TDEProcess *childproc; ProcessLineMaker* procLineMaker; TQCString stderrbuf; TQCString stdoutbuf; 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; diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index ee2db5bc..ef5fede9 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -125,7 +125,7 @@ void EditorProxy::installPopup( KParts::Part * part ) KAction * action = NULL; //If there is a tab for this file, we don't need to plug the closing menu entries here - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("UI"); bool m_tabBarShown = ! config->readNumEntry("TabWidgetVisibility", 0); if (!m_tabBarShown) diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp index 99330c1b..d84bc1e8 100644 --- a/src/generalinfowidget.cpp +++ b/src/generalinfowidget.cpp @@ -56,7 +56,7 @@ void GeneralInfoWidget::readConfig() { TQStringList encodings; encodings << i18n("Use global editor settings"); - encodings += KGlobal::charsets()->descriptiveEncodingNames(); + encodings += TDEGlobal::charsets()->descriptiveEncodingNames(); TQStringList::const_iterator it = encodings.constBegin(); while ( it != encodings.constEnd() ) { @@ -65,11 +65,11 @@ void GeneralInfoWidget::readConfig() { } encoding_combo->setCurrentItem( 0 ); -// const TQString DefaultEncoding = KGlobal::charsets()->encodingForName( DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString() ) ); +// const TQString DefaultEncoding = TDEGlobal::charsets()->encodingForName( DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString() ) ); const TQString DefaultEncoding = DomUtil::readEntry( m_projectDom, "/general/defaultencoding", TQString() ); for ( int i = 0; i < encoding_combo->count(); i++ ) { - if ( KGlobal::charsets()->encodingForName( encoding_combo->text( i ) ) == DefaultEncoding ) + if ( TDEGlobal::charsets()->encodingForName( encoding_combo->text( i ) ) == DefaultEncoding ) { encoding_combo->setCurrentItem( i ); break; @@ -192,7 +192,7 @@ void GeneralInfoWidget::writeConfig() { TQString DefaultEncoding = TQString(); if ( encoding_combo->currentItem() > 0 ) { - DefaultEncoding = KGlobal::charsets()->encodingForName( encoding_combo->currentText() ); + DefaultEncoding = TDEGlobal::charsets()->encodingForName( encoding_combo->currentText() ); } DomUtil::writeEntry( m_projectDom, "/general/defaultencoding", DefaultEncoding ); } diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index 6386f211..7046c679 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -186,7 +186,7 @@ void MainWindowShare::createActions() void MainWindowShare::slotReportBug() { - KBugReport a(m_pMainWnd, true, KGlobal::instance()->aboutData() ); + KBugReport a(m_pMainWnd, true, TDEGlobal::instance()->aboutData() ); a.exec(); } @@ -285,7 +285,7 @@ void MainWindowShare::slotShowMenuBar() } else { m_pMainWnd->menuBar()->show(); } - m_pMainWnd->saveMainWindowSettings( KGlobal::config(), "Mainwindow" ); + m_pMainWnd->saveMainWindowSettings( TDEGlobal::config(), "Mainwindow" ); } void MainWindowShare::slotConfigureNotifications() @@ -384,7 +384,7 @@ void MainWindowShare::slotNewToolbarConfig() { // replug actionlists here... - m_pMainWnd->applyMainWindowSettings( KGlobal::config(), "Mainwindow" ); + m_pMainWnd->applyMainWindowSettings( TDEGlobal::config(), "Mainwindow" ); // PartController::getInstance()->reinstallPopups(); } @@ -427,7 +427,7 @@ void MainWindowShare::slotKeyBindings() void MainWindowShare::slotConfigureToolbars() { - m_pMainWnd->saveMainWindowSettings( KGlobal::config(), "Mainwindow" ); + m_pMainWnd->saveMainWindowSettings( TDEGlobal::config(), "Mainwindow" ); KEditToolbar dlg( m_pMainWnd->factory() ); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig())); dlg.exec(); diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp index 435e9986..78ed451d 100644 --- a/src/profileengine/editor/profileeditor.cpp +++ b/src/profileengine/editor/profileeditor.cpp @@ -73,7 +73,7 @@ public: { TQColorGroup cgNew = cg; if (m_derived) - cgNew.setColor(TQColorGroup::Text, KGlobalSettings::inactiveTextColor()); + cgNew.setColor(TQColorGroup::Text, TDEGlobalSettings::inactiveTextColor()); KListViewItem::paintCell(p, cgNew, column, width, alignment); } diff --git a/src/profileengine/lib/profile.cpp b/src/profileengine/lib/profile.cpp index 68666f3a..4a75b387 100644 --- a/src/profileengine/lib/profile.cpp +++ b/src/profileengine/lib/profile.cpp @@ -165,7 +165,7 @@ bool Profile::hasInEntryList(EntryList &list, TQString value) bool Profile::remove() { - TQStringList dirs = KGlobal::dirs()->findDirs("data", "tdevelop/profiles" + dirName()); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdevelop/profiles" + dirName()); if ((dirs.count() == 1) && dirs[0].startsWith(TQDir::homeDirPath())) return KIO::NetAccess::del(KURL::fromPathOrURL(dirs[0]), 0); return false; @@ -180,7 +180,7 @@ void Profile::detachFromParent() KURL::List Profile::resources(const TQString &nameFilter) { TQStringList resources; - TQStringList resourceDirs = KGlobal::dirs()->resourceDirs("data"); + TQStringList resourceDirs = TDEGlobal::dirs()->resourceDirs("data"); for (TQStringList::const_iterator it = resourceDirs.begin(); it != resourceDirs.end(); ++it) { TQString dir = *it; @@ -200,6 +200,6 @@ KURL::List Profile::resources(const TQString &nameFilter) void Profile::addResource(const KURL &url) { - TQString saveLocation = KGlobal::dirs()->saveLocation("data", "tdevelop/profiles"+dirName(), true); + TQString saveLocation = TDEGlobal::dirs()->saveLocation("data", "tdevelop/profiles"+dirName(), true); KIO::NetAccess::file_copy(url, KURL::fromPathOrURL(saveLocation), -1, true); } diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp index 6664aba9..78df6789 100644 --- a/src/profileengine/lib/profileengine.cpp +++ b/src/profileengine/lib/profileengine.cpp @@ -29,7 +29,7 @@ ProfileEngine::ProfileEngine() { - TQStringList dirs = KGlobal::dirs()->findDirs("data", "tdevelop/profiles"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdevelop/profiles"); m_rootProfile = new Profile(0, "KDevelop"); diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 91d4d59a..cf545ac9 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -618,7 +618,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url ) return false; } - TQString cmd = KGlobal::dirs()->findExe( "kdevprj2tdevelop" ); + TQString cmd = TDEGlobal::dirs()->findExe( "kdevprj2tdevelop" ); if (cmd.isEmpty()) { KMessageBox::sorry(0, i18n("You do not have 'kdevprj2tdevelop' installed.")); return false; @@ -629,7 +629,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url ) KShellProcess proc( "/bin/sh" ); proc.setWorkingDirectory( fileInfo.dirPath(true) ); proc << "perl" << cmd << KShellProcess::quote( url.path() ); - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); TQString projectFile = fileInfo.dirPath( true ) + "/" + fileInfo.baseName() + ".tdevelop"; return loadProject( KURL(projectFile) ); diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index 3f1c3d4a..4e96785d 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -666,7 +666,7 @@ void SimpleMainWindow::tabContextActivated(int id) void SimpleMainWindow::configureToolbars() { - saveMainWindowSettings(KGlobal::config(), "SimpleMainWindow"); + saveMainWindowSettings(TDEGlobal::config(), "SimpleMainWindow"); KEditToolbar dlg(factory()); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); dlg.exec(); @@ -676,7 +676,7 @@ void SimpleMainWindow::slotNewToolbarConfig() { // setupWindowMenu(); m_mainWindowShare->slotGUICreated(PartController::getInstance()->activePart()); - applyMainWindowSettings(KGlobal::config(), "SimpleMainWindow"); + applyMainWindowSettings(TDEGlobal::config(), "SimpleMainWindow"); } bool SimpleMainWindow::queryClose() diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp index 22ffcf9d..4ec02322 100644 --- a/src/splashscreen.cpp +++ b/src/splashscreen.cpp @@ -67,7 +67,7 @@ void KDevSplashScreen::drawContents (TQPainter* painter) } painter->setPen(TQColor(74,112,18)); - TQFont fnt(KGlobalSettings::generalFont()); + TQFont fnt(TDEGlobalSettings::generalFont()); fnt.setPointSize(8); painter->setFont(fnt); diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp index bd8014d8..cd878508 100644 --- a/vcs/cvsservice/annotateview.cpp +++ b/vcs/cvsservice/annotateview.cpp @@ -89,7 +89,7 @@ TQString AnnotateViewItem::text(int col) const case AuthorColumn: return (m_revision + TQChar(' ') + m_author); case DateColumn: - return KGlobal::locale()->formatDate(m_logDate.date(), true); + return TDEGlobal::locale()->formatDate(m_logDate.date(), true); case ContentColumn: return m_content; default: @@ -107,13 +107,13 @@ void AnnotateViewItem::paintCell(TQPainter *p, const TQColorGroup &, int col, in switch (col) { case LineNumberColumn: - backgroundColor = KGlobalSettings::highlightColor(); - p->setPen(KGlobalSettings::highlightedTextColor()); + backgroundColor = TDEGlobalSettings::highlightColor(); + p->setPen(TDEGlobalSettings::highlightedTextColor()); break; default: - backgroundColor = m_odd ? KGlobalSettings::baseColor() - : KGlobalSettings::alternateBackgroundColor(); - p->setPen(KGlobalSettings::textColor()); + backgroundColor = m_odd ? TDEGlobalSettings::baseColor() + : TDEGlobalSettings::alternateBackgroundColor(); + p->setPen(TDEGlobalSettings::textColor()); break; }; diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp index 42ddff6e..6df262b0 100644 --- a/vcs/cvsservice/integrator/integratordlg.cpp +++ b/vcs/cvsservice/integrator/integratordlg.cpp @@ -74,10 +74,10 @@ void IntegratorDlg::init_clicked() if (dlg.exec() == TQDialog::Accepted) { TQString url = initDlg->location->url(); - KProcess *proc = new KProcess(); + TDEProcess *proc = new TDEProcess(); *proc << "cvs"; *proc << "-d" << url << "init"; - proc->start(KProcess::Block); + proc->start(TDEProcess::Block); if (!proc->normalExit()) KMessageBox::error(this, i18n("cvs init did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository")); else if (proc->exitStatus() != 0) @@ -118,13 +118,13 @@ void IntegratorDlg::accept() if (!createModule->isChecked()) return; - KProcess *proc = new KProcess(); + TDEProcess *proc = new TDEProcess(); proc->setWorkingDirectory(m_projectLocation); *proc << "cvs"; *proc << "-d" << repository->currentText() << "import" << "-m" << TQString("\"%1\"").arg(comment->text()) << module->text() << vendorTag->text() << releaseTag->text(); - proc->start(KProcess::Block); + proc->start(TDEProcess::Block); if (!proc->normalExit()) KMessageBox::error(this, i18n("cvs import did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository")); else if (proc->exitStatus() != 0) @@ -138,17 +138,17 @@ void IntegratorDlg::accept() kdDebug() << "Up is: " << up << endl; //delete sources in project dir - KProcess *rmproc = new KProcess(); + TDEProcess *rmproc = new TDEProcess(); *rmproc << "rm"; *rmproc << "-f" << "-r" << m_projectLocation; - rmproc->start(KProcess::Block); + rmproc->start(TDEProcess::Block); //checkout sources from cvs - KProcess *coproc = new KProcess(); + TDEProcess *coproc = new TDEProcess(); coproc->setWorkingDirectory(up); *coproc << "cvs"; *coproc << "-d" << repository->currentText() << "checkout" << "-d" << m_projectName << module->text(); - coproc->start(KProcess::Block); + coproc->start(TDEProcess::Block); } /* TQCString appId; diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h index 6ed69346..e9cdb1e1 100644 --- a/vcs/perforce/commitdlg.h +++ b/vcs/perforce/commitdlg.h @@ -19,7 +19,7 @@ #include <klistbox.h> #include <kdialogbase.h> -class KProcess; +class TDEProcess; class CommitDialog : public KDialogBase { diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index 3220d33e..06d55ec9 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -136,7 +136,7 @@ void PerforcePart::execCommand( const TQString& cmd, const TQString& filename ) TQString name = fi.fileName(); TQString command("cd "); - command += KProcess::quote(dir); + command += TDEProcess::quote(dir); command += " && p4 " + cmd + " "; command += name; @@ -204,7 +204,7 @@ void PerforcePart::update( const TQString& filename ) } TQString command("cd "); - command += KProcess::quote(dir); + command += TDEProcess::quote(dir); command += " && p4 sync "; command += name; diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp index b197355b..0df43f4a 100644 --- a/vcs/subversion/integrator/svnintegratordlg.cpp +++ b/vcs/subversion/integrator/svnintegratordlg.cpp @@ -86,7 +86,7 @@ void SvnIntegratorDlg::accept() } } //delete the template directory and checkout a fresh one from the server - BlockingKProcess *rmproc = new BlockingKProcess(); + BlockingTDEProcess *rmproc = new BlockingTDEProcess(); *rmproc << "rm"; *rmproc << "-f" << "-r" << m_projectLocation; rmproc->start(); diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index b8f90263..cba5aee4 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -180,16 +180,16 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){ TQString ourCopy = tmpDir.name()+(*it).fileName(); - KProcess copy; + TDEProcess copy; copy << "cp" << (*it).prettyURL(0,KURL::StripFileProtocol) << tmpDir.name(); - copy.start(KProcess::Block); + copy.start(TDEProcess::Block); - KProcess patch; + TDEProcess patch; patch.setWorkingDirectory(tmpDir.name()); patch << "patch" << "-R" << ourCopy << tmpPatch.name(); - patch.start(KProcess::Block, KProcess::All); + patch.start(TDEProcess::Block, TDEProcess::All); - KProcess *p = new KProcess; + TDEProcess *p = new TDEProcess; *p << "kompare" << ourCopy << (*it).prettyURL(); p->start(); } @@ -203,7 +203,7 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){ ( *stream ) << ( *it2 ) << "\n"; } tmp->close(); - KProcess *p = new KProcess; + TDEProcess *p = new TDEProcess; *p << "kompare" << "-n" << "-o" << tmp->name(); p->start(); } @@ -695,7 +695,7 @@ void subversionCore::slotDiffResult( KIO::Job * job ) ( *stream ) << ( *it2 ) << "\n"; } tmp->close(); - KProcess *p = new KProcess; + TDEProcess *p = new TDEProcess; *p << "kompare" << "-n" << "-o" << tmp->name(); p->start(); |