summaryrefslogtreecommitdiffstats
path: root/buildtools/qmake
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:51:01 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:51:01 -0600
commitb9e542d0c805e9adee3a67e44532d5321032e21e (patch)
treee82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /buildtools/qmake
parent7a392a04059bd904dab4c78910a6d34aa0b37798 (diff)
downloadtdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz
tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'buildtools/qmake')
-rw-r--r--buildtools/qmake/qmakedefaultopts.cpp4
-rw-r--r--buildtools/qmake/qmakedefaultopts.h6
-rw-r--r--buildtools/qmake/trollprojectpart.cpp2
-rw-r--r--buildtools/qmake/trollprojectwidget.cpp30
4 files changed, 21 insertions, 21 deletions
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 );