summaryrefslogtreecommitdiffstats
path: root/buildtools/autotools
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
commitb9e542d0c805e9adee3a67e44532d5321032e21e (patch)
treee82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /buildtools/autotools
parent7a392a04059bd904dab4c78910a6d34aa0b37798 (diff)
downloadtdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz
tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'buildtools/autotools')
-rw-r--r--buildtools/autotools/addexistingdirectoriesdlg.cpp4
-rw-r--r--buildtools/autotools/addexistingfilesdlg.cpp8
-rw-r--r--buildtools/autotools/addicondlg.cpp4
-rw-r--r--buildtools/autotools/addsubprojectdlg.cpp6
-rw-r--r--buildtools/autotools/autoprojectpart.cpp14
-rw-r--r--buildtools/autotools/autosubprojectview.cpp10
-rw-r--r--buildtools/autotools/choosetargetdialog.cpp2
-rw-r--r--buildtools/autotools/kimporticonview.cpp2
8 files changed, 25 insertions, 25 deletions
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() );