diff options
Diffstat (limited to 'buildtools')
-rw-r--r-- | buildtools/autotools/autoprojectpart.cpp | 12 | ||||
-rw-r--r-- | buildtools/autotools/autosubprojectview.cpp | 4 | ||||
-rw-r--r-- | buildtools/autotools/kdevautoproject.rc | 2 | ||||
-rw-r--r-- | buildtools/custommakefiles/customprojectpart.cpp | 10 | ||||
-rw-r--r-- | buildtools/lib/base/Makefile.am | 2 | ||||
-rw-r--r-- | buildtools/lib/parsers/autotools/Makefile.am | 2 | ||||
-rw-r--r-- | buildtools/lib/parsers/qmake/Makefile.am | 2 | ||||
-rw-r--r-- | buildtools/lib/widgets/Makefile.am | 2 | ||||
-rw-r--r-- | buildtools/lib/widgets/runoptionswidget.cpp | 4 | ||||
-rw-r--r-- | buildtools/lib/widgets/runoptionswidgetbase.ui | 4 |
10 files changed, 22 insertions, 22 deletions
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index e6e2e272..bb9a2e68 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -155,10 +155,10 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr action = new KAction( i18n("Install (as root user)"), 0, this, TQT_SLOT(slotInstallWithKdesu()), - actionCollection(), "build_install_kdesu" ); + actionCollection(), "build_install_tdesu" ); action->setToolTip(i18n("Install as root user")); action->setWhatsThis(i18n("<b>Install</b><p>Runs <b>make install</b> command from the project directory with root privileges.<br>" - "It is executed via kdesu command.<br>" + "It is executed via tdesu command.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab.")); action->setGroup("autotools"); @@ -706,7 +706,7 @@ void AutoProjectPart::startMakeCommand(const TQString &dir, const TQString &targ m_buildCommand = constructMakeCommandLine(dir, target); if (withKdesu) - m_buildCommand = "kdesu -t -c '" + m_buildCommand + "'"; + m_buildCommand = "tdesu -t -c '" + m_buildCommand + "'"; if (!m_buildCommand.isNull()) makeFrontend()->queueCommand(dir, m_buildCommand); @@ -1099,8 +1099,8 @@ void AutoProjectPart::slotExecute() if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/autoinstall", false) && isDirty() ){ m_executeAfterBuild = true; - // Use kdesu?? - if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/autokdesu", false) ){ + // Use tdesu?? + if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/autotdesu", false) ){ //slotInstallWithKdesu assumes that it hasn't just been build... kdDebug(9020) << "slotExecute: before startMakeCommand" << endl; _auto ? slotInstallWithKdesu() : startMakeCommand(buildDirectory(), TQString::tqfromLatin1("install"), true); @@ -1451,7 +1451,7 @@ void AutoProjectPart::startSimpleMakeCommand( const TQString & dir, const TQStri m_buildCommand = dircmd + cmdline; if (withKdesu) - m_buildCommand = "kdesu -t -c '" + m_buildCommand + "'"; + m_buildCommand = "tdesu -t -c '" + m_buildCommand + "'"; if (!m_buildCommand.isNull()) makeFrontend()->queueCommand(dir, m_buildCommand); diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 3bd53803..0c27eb1b 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -255,7 +255,7 @@ void AutoSubprojectView::initActions() TQT_TQOBJECT(this), TQT_SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" ); installSuSubprojectAction->setWhatsThis(i18n("<qt><b>Install as root user</b><p>Runs <b>make install</b> " "command from the directory of the selected subproject " - "with root privileges.<br> It is executed via kdesu " + "with root privileges.<br> It is executed via tdesu " "command.<br> Environment variables and make arguments " "can be specified in the project settings dialog, " "<b>Make Options</b> tab.</qt>")); @@ -1082,7 +1082,7 @@ void AutoSubprojectView::slotCustomBuildCommand(int val) break; case 5: //command as root m_part->appFrontend()->startAppCommand(m_part->buildDirectory() + relpath, - "kdesu -t -c ' cd " + + "tdesu -t -c ' cd " + KProcess::quote(m_part->buildDirectory() + relpath) + " && " + cmd + "'", false); break; diff --git a/buildtools/autotools/kdevautoproject.rc b/buildtools/autotools/kdevautoproject.rc index 89571c11..eceff675 100644 --- a/buildtools/autotools/kdevautoproject.rc +++ b/buildtools/autotools/kdevautoproject.rc @@ -12,7 +12,7 @@ <Action name="build_configure" /> <Action name="build_makefilecvs" /> <Action name="build_install" /> - <Action name="build_install_kdesu" /> + <Action name="build_install_tdesu" /> <Separator/> <Action name="build_clean" /> <Action name="build_distclean" /> diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index 50d69800..4010c742 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -122,10 +122,10 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const action = new KAction( i18n( "Install (as root user)" ), 0, this, TQT_SLOT( slotInstallWithKdesu() ), - actionCollection(), "build_install_kdesu" ); + actionCollection(), "build_install_tdesu" ); action->setToolTip( i18n( "Install as root user" ) ); action->setWhatsThis( i18n( "<b>Install</b><p>Runs <b>make install</b> command from the project directory with root privileges.<br>" - "It is executed via kdesu command.<br>" + "It is executed via tdesu command.<br>" "Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> tab." ) ); @@ -951,7 +951,7 @@ void CustomProjectPart::startMakeCommand( const TQString &dir, const TQString &t cmdline.prepend( makeEnvironment() ); if ( withKdesu ) - cmdline = "kdesu -t -c '" + cmdline + "'"; + cmdline = "tdesu -t -c '" + cmdline + "'"; m_buildCommand = dircmd + cmdline; @@ -1053,8 +1053,8 @@ void CustomProjectPart::slotExecute() if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autoinstall", false ) && ( isDirty() || !TQFileInfo( mainProgram() ).exists() ) ) { m_executeAfterBuild = true; - // Use kdesu?? - if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autokdesu", false ) ) + // Use tdesu?? + if ( DomUtil::readBoolEntry( *projectDom(), "/kdevcustomproject/run/autotdesu", false ) ) //slotInstallWithKdesu assumes that it hasn't just been build... _auto ? slotInstallWithKdesu() : startMakeCommand( buildDirectory(), TQString::tqfromLatin1( "install" ), true ); else diff --git a/buildtools/lib/base/Makefile.am b/buildtools/lib/base/Makefile.am index 6c9f6df6..00645ec0 100644 --- a/buildtools/lib/base/Makefile.am +++ b/buildtools/lib/base/Makefile.am @@ -9,7 +9,7 @@ libkdevbuildbase_la_SOURCES = kdevbuildtool.cpp kdevelopbuildtoolsincludedir = $(includedir)/kdevelop/buildtools/base kdevelopbuildtoolsinclude_HEADERS = kdevbuildtool.h -DOXYGEN_REFERENCES = dcop interfaces kdecore kdefx kdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces kdevextensions +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces kdevextensions DOXYGEN_PROJECTNAME = KDevelop Buildtool Base Library DOXYGEN_DOCDIRPREFIX = kdevbt include ../../../Doxyfile.am diff --git a/buildtools/lib/parsers/autotools/Makefile.am b/buildtools/lib/parsers/autotools/Makefile.am index c0776c2f..929f089a 100644 --- a/buildtools/lib/parsers/autotools/Makefile.am +++ b/buildtools/lib/parsers/autotools/Makefile.am @@ -18,7 +18,7 @@ parser: EXTRA_DIST = autotools.yy autotools.ll -DOXYGEN_REFERENCES = dcop interfaces kdecore kdefx kdeui khtml kmdi kio kjs kparts kutils +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils DOXYGEN_PROJECTNAME = KDevelop AutoTools Parser DOXYGEN_DOCDIRPREFIX = kdevparser include ../../../../Doxyfile.am diff --git a/buildtools/lib/parsers/qmake/Makefile.am b/buildtools/lib/parsers/qmake/Makefile.am index fd80170c..ac6f9ea5 100644 --- a/buildtools/lib/parsers/qmake/Makefile.am +++ b/buildtools/lib/parsers/qmake/Makefile.am @@ -23,7 +23,7 @@ parser: EXTRA_DIST = qmake.yy qmake.ll -DOXYGEN_REFERENCES = dcop interfaces kdecore kdefx kdeui khtml kmdi kio kjs kparts kutils +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils DOXYGEN_PROJECTNAME = KDevelop QMake parser DOXYGEN_DOCDIRPREFIX = kdevparser include ../../../../Doxyfile.am diff --git a/buildtools/lib/widgets/Makefile.am b/buildtools/lib/widgets/Makefile.am index 2277d9d0..ad607b18 100644 --- a/buildtools/lib/widgets/Makefile.am +++ b/buildtools/lib/widgets/Makefile.am @@ -23,7 +23,7 @@ kdevelopbuildtoolsinclude_HEADERS = addenvvardlg.h addfilesdialog.h \ makeoptionswidgetbase.h removesubprojectdialog.h removesubprojectdlgbase.h runoptionswidget.h \ runoptionswidgetbase.h subclassesdlg.h subclassesdlgbase.h -DOXYGEN_REFERENCES = dcop interfaces kdecore kdefx kdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces kdevutil +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces kdevutil DOXYGEN_PROJECTNAME = KDevelop Buildtool Widgets Library DOXYGEN_DOCDIRPREFIX = kdevbt include ../../../Doxyfile.am diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp index 9aecbe17..bb2b88b1 100644 --- a/buildtools/lib/widgets/runoptionswidget.cpp +++ b/buildtools/lib/widgets/runoptionswidget.cpp @@ -99,7 +99,7 @@ RunOptionsWidget::RunOptionsWidget(TQDomDocument &dom, const TQString &configGro startinterminal_box->setChecked(DomUtil::readBoolEntry(dom, configGroup + "/run/terminal")); autocompile_box->setChecked(DomUtil::readBoolEntry(dom, configGroup + "/run/autocompile", false)); autoinstall_box->setChecked(DomUtil::readBoolEntry(dom, configGroup + "/run/autoinstall", false)); - autokdesu_box->setChecked(DomUtil::readBoolEntry(dom, configGroup + "/run/autokdesu", false)); + autotdesu_box->setChecked(DomUtil::readBoolEntry(dom, configGroup + "/run/autotdesu", false)); } @@ -117,7 +117,7 @@ void RunOptionsWidget::accept() DomUtil::writeBoolEntry(m_dom, m_configGroup + "/run/terminal", startinterminal_box->isChecked()); DomUtil::writeBoolEntry(m_dom, m_configGroup + "/run/autocompile", autocompile_box->isChecked()); DomUtil::writeBoolEntry(m_dom, m_configGroup + "/run/autoinstall", autoinstall_box->isChecked()); - DomUtil::writeBoolEntry(m_dom, m_configGroup + "/run/autokdesu", autokdesu_box->isChecked()); + DomUtil::writeBoolEntry(m_dom, m_configGroup + "/run/autotdesu", autotdesu_box->isChecked()); m_environmentVariablesWidget->accept(); } diff --git a/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui index 8134aead..40d79634 100644 --- a/buildtools/lib/widgets/runoptionswidgetbase.ui +++ b/buildtools/lib/widgets/runoptionswidgetbase.ui @@ -179,10 +179,10 @@ </widget> <widget class="TQCheckBox"> <property name="name"> - <cstring>autokdesu_box</cstring> + <cstring>autotdesu_box</cstring> </property> <property name="text"> - <string>Use &kdesu when installing</string> + <string>Use &tdesu when installing</string> </property> <property name="toolTip" stdset="0"> <string></string> |