summaryrefslogtreecommitdiffstats
path: root/buildtools/autotools
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 12:00:33 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-23 19:35:16 +0200
commitec049c7c32d50faf317b13d5c844a19978881fc3 (patch)
treeca9b445d4cba887b9161fddd3ba714e1d7b5060b /buildtools/autotools
parent1c082a5ba751ddd4edd36bb0061462f9a999f88d (diff)
downloadtdevelop-ec049c7c32d50faf317b13d5c844a19978881fc3.tar.gz
tdevelop-ec049c7c32d50faf317b13d5c844a19978881fc3.zip
Remove additional unneeded tq method conversions
(cherry picked from commit 7e66d7c3611d907ea28b140281b472bb1c406be6)
Diffstat (limited to 'buildtools/autotools')
-rw-r--r--buildtools/autotools/addapplicationdlgbase.ui12
-rw-r--r--buildtools/autotools/addexistingdirectoriesdlg.cpp2
-rw-r--r--buildtools/autotools/addicondlgbase.ui8
-rw-r--r--buildtools/autotools/addservicedlg.cpp2
-rw-r--r--buildtools/autotools/addservicedlgbase.ui12
-rw-r--r--buildtools/autotools/addsubprojectdlg.cpp10
-rw-r--r--buildtools/autotools/addtargetdlgbase.ui6
-rw-r--r--buildtools/autotools/autodetailsview.cpp4
-rw-r--r--buildtools/autotools/autolistviewitems.cpp4
-rw-r--r--buildtools/autotools/autolistviewitems.h2
-rw-r--r--buildtools/autotools/autoprojectpart.cpp30
-rw-r--r--buildtools/autotools/autoprojectwidget.cpp8
-rw-r--r--buildtools/autotools/autosubprojectview.cpp10
-rw-r--r--buildtools/autotools/choosetargetdlgbase.ui2
-rw-r--r--buildtools/autotools/configureoptionswidget.cpp4
-rw-r--r--buildtools/autotools/makefilehandler.cpp4
-rw-r--r--buildtools/autotools/removefiledlg.cpp2
-rw-r--r--buildtools/autotools/subprojectoptionsdlg.cpp2
-rw-r--r--buildtools/autotools/targetoptionsdlg.cpp2
19 files changed, 63 insertions, 63 deletions
diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui
index 85c754f9..9b357801 100644
--- a/buildtools/autotools/addapplicationdlgbase.ui
+++ b/buildtools/autotools/addapplicationdlgbase.ui
@@ -192,7 +192,7 @@
<property name="text">
<string>E&amp;xecutable:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -210,7 +210,7 @@
<property name="text">
<string>&amp;Icon:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -228,7 +228,7 @@
<property name="text">
<string>&amp;Section:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -246,7 +246,7 @@
<property name="text">
<string>&amp;File name:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -264,7 +264,7 @@
<property name="text">
<string>&amp;Name:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -282,7 +282,7 @@
<property name="text">
<string>Co&amp;mment:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/buildtools/autotools/addexistingdirectoriesdlg.cpp b/buildtools/autotools/addexistingdirectoriesdlg.cpp
index 341953e0..912edc52 100644
--- a/buildtools/autotools/addexistingdirectoriesdlg.cpp
+++ b/buildtools/autotools/addexistingdirectoriesdlg.cpp
@@ -229,7 +229,7 @@ void AddExistingDirectoriesDialog::slotOk()
m_widget->getSubprojectView()->parse( newitem );
} else {
if (!f.open(IO_WriteOnly)) {
-// KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").tqarg(name));
+// KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name));
continue;
}
TQTextStream stream(&f);
diff --git a/buildtools/autotools/addicondlgbase.ui b/buildtools/autotools/addicondlgbase.ui
index b9ac24a8..7a3336dc 100644
--- a/buildtools/autotools/addicondlgbase.ui
+++ b/buildtools/autotools/addicondlgbase.ui
@@ -34,7 +34,7 @@
<property name="text">
<string>&amp;Type:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -52,7 +52,7 @@
<property name="text">
<string>&amp;Size:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -75,7 +75,7 @@
<property name="text">
<string>File name:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -93,7 +93,7 @@
<property name="text">
<string>&amp;Name:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp
index 67a9f213..dde34053 100644
--- a/buildtools/autotools/addservicedlg.cpp
+++ b/buildtools/autotools/addservicedlg.cpp
@@ -136,7 +136,7 @@ void AddServiceDialog::propertyExecuted(TQListViewItem *item)
TQString prop = item->text(0);
TQString value = item->text(1);
bool ok;
- value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").tqarg(prop), value, &ok, this);
+ value = KInputDialog::getText(i18n("Enter Value"), i18n("Property %1:").arg(prop), value, &ok, this);
if (!ok)
return;
diff --git a/buildtools/autotools/addservicedlgbase.ui b/buildtools/autotools/addservicedlgbase.ui
index 540f0f1c..c1f52b22 100644
--- a/buildtools/autotools/addservicedlgbase.ui
+++ b/buildtools/autotools/addservicedlgbase.ui
@@ -54,7 +54,7 @@
<property name="text">
<string>&amp;Icon:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -138,7 +138,7 @@
<property name="text">
<string>&amp;Library:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -156,7 +156,7 @@
<property name="text">
<string>&amp;File name:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -174,7 +174,7 @@
<property name="text">
<string>&amp;Name:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -192,7 +192,7 @@
<property name="text">
<string>Co&amp;mment:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -405,7 +405,7 @@
<property name="text">
<string>&amp;Properties:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp
index 80cc5040..9aeef695 100644
--- a/buildtools/autotools/addsubprojectdlg.cpp
+++ b/buildtools/autotools/addsubprojectdlg.cpp
@@ -82,25 +82,25 @@ void AddSubprojectDialog::accept()
TQFileInfo file( dir, name );
if( file.exists() && !file.isDir() ) {
- KMessageBox::sorry(this, i18n("A file named %1 already exists.").tqarg(name));
+ KMessageBox::sorry(this, i18n("A file named %1 already exists.").arg(name));
TQDialog::accept();
return;
} else if( file.isDir() ) {
if( KMessageBox::warningContinueCancel(this,
i18n("A subdirectory %1 already exists. "
- "Do you wish to add it as a subproject?").tqarg(name))
+ "Do you wish to add it as a subproject?").arg(name))
== KMessageBox::Cancel ){
TQDialog::accept();
return;
}
} else if (!dir.mkdir(name)) {
- KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").tqarg(name));
+ KMessageBox::sorry(this, i18n("Could not create subdirectory %1.").arg(name));
TQDialog::accept();
return;
}
if(!dir.cd(name)) {
- KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").tqarg(name));
+ KMessageBox::sorry(this, i18n("Could not access the subdirectory %1.").arg(name));
TQDialog::accept();
return;
}
@@ -148,7 +148,7 @@ void AddSubprojectDialog::accept()
m_subprojectView->parse( newitem );
} else {
if (!f.open(IO_WriteOnly)) {
- KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").tqarg(name));
+ KMessageBox::sorry(this, i18n("Could not create Makefile.am in subdirectory %1.").arg(name));
return;
}
TQTextStream stream(&f);
diff --git a/buildtools/autotools/addtargetdlgbase.ui b/buildtools/autotools/addtargetdlgbase.ui
index 34c028af..9e8b561f 100644
--- a/buildtools/autotools/addtargetdlgbase.ui
+++ b/buildtools/autotools/addtargetdlgbase.ui
@@ -44,7 +44,7 @@
<property name="text">
<string>&amp;Primary:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -67,7 +67,7 @@
<property name="text">
<string>Pre&amp;fix:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -90,7 +90,7 @@
<property name="text">
<string>File &amp;name:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index 474802dc..a8ee138d 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -499,7 +499,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
else
caption = titem->name;
- KPopupMenu popup( i18n( "Target: %1" ).tqarg( caption ), this );
+ KPopupMenu popup( i18n( "Target: %1" ).arg( caption ), this );
if ( titem->primary == "PROGRAMS" || titem->primary == "LIBRARIES"
|| titem->primary == "LTLIBRARIES" || titem->primary == "JAVA" )
@@ -554,7 +554,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item,
return;
}
- KPopupMenu popup( i18n( "File: %1" ).tqarg( fitem->name ), this );
+ KPopupMenu popup( i18n( "File: %1" ).arg( fitem->name ), this );
removeDetailAction->plug( &popup );
KURL::List urls;
diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp
index f9860490..971a2dbe 100644
--- a/buildtools/autotools/autolistviewitems.cpp
+++ b/buildtools/autotools/autolistviewitems.cpp
@@ -42,7 +42,7 @@ ProjectItem::ProjectItem( Type type, ProjectItem *parent, const TQString &text )
void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg,
- int column, int width, int tqalignment )
+ int column, int width, int alignment )
{
if ( isBold() )
{
@@ -50,7 +50,7 @@ void ProjectItem::paintCell( TQPainter *p, const TQColorGroup &cg,
font.setBold( true );
p->setFont( font );
}
- TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, cg, column, width, alignment );
}
diff --git a/buildtools/autotools/autolistviewitems.h b/buildtools/autotools/autolistviewitems.h
index 116d316c..9a82b025 100644
--- a/buildtools/autotools/autolistviewitems.h
+++ b/buildtools/autotools/autolistviewitems.h
@@ -35,7 +35,7 @@ public:
ProjectItem( Type type, ProjectItem *parent, const TQString &text );
void paintCell( TQPainter *p, const TQColorGroup &cg,
- int column, int width, int tqalignment );
+ int column, int width, int alignment );
void setBold( bool b )
{
bld = b;
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index a35a79bf..7ab96d66 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -414,7 +414,7 @@ TQString AutoProjectPart::mainProgram() const
KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n"
"Unable to determine the main program. If you want this\n"
"to be the active target, set a main program under\n"
- "Project -> Project Options -> Run Options").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") );
+ "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") );
kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl;
return TQString();
}
@@ -643,7 +643,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ
{
int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory\n"
"and no configure script for this project.\n"
- "Run automake & friends and configure first?").tqarg(buildDirectory()), TQString(), i18n("Run Them"), i18n("Do Not Run"));
+ "Run automake & friends and configure first?").arg(buildDirectory()), TQString(), i18n("Run Them"), i18n("Do Not Run"));
if (r == KMessageBox::No)
return TQString();
preCommand = makefileCvsCommand();
@@ -654,7 +654,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ
}
else
{
- int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").tqarg(dir), TQString(), i18n("Run configure"), i18n("Do Not Run"));
+ int r = KMessageBox::questionYesNo(m_widget, i18n("%1\nThere is no Makefile in this directory. Run 'configure' first?").arg(dir), TQString(), i18n("Run configure"), i18n("Do Not Run"));
if (r == KMessageBox::No)
return TQString();
preCommand = configureCommand() + " && ";
@@ -668,7 +668,7 @@ TQString AutoProjectPart::constructMakeCommandLine(const TQString &dir, const TQ
kdDebug(9020) << k_funcinfo << "nice = " << prio<< endl;
if (prio != 0)
{
- nice = TQString("nice -n%1 ").tqarg(prio);
+ nice = TQString("nice -n%1 ").arg(prio);
}
if (cmdline.isEmpty())
@@ -792,7 +792,7 @@ bool AutoProjectPart::queueInternalLibDependenciesBuild(TargetItem* titem, TQStr
tdir += dependency.left(pos+1);
tname = dependency.mid(pos+1);
}
- KMessageBox::error( 0, i18n("Found a circular dependency in the project, between this target and %1.\nCannot build this project until this is resolved.").tqarg(tname), i18n("Circular Dependency found") );
+ KMessageBox::error( 0, i18n("Found a circular dependency in the project, between this target and %1.\nCannot build this project until this is resolved.").arg(tname), i18n("Circular Dependency found") );
return false;
}
}
@@ -912,28 +912,28 @@ TQString AutoProjectPart::configureCommand() const
cmdline += "/configure\"";
TQString cc = DomUtil::readEntry(dom, prefix + "ccompilerbinary");
if (!cc.isEmpty())
- cmdline.prepend(TQString("CC=%1 ").tqarg(cc));
+ cmdline.prepend(TQString("CC=%1 ").arg(cc));
TQString cflags = DomUtil::readEntry(dom, prefix + "cflags");
if (!cflags.isEmpty())
- cmdline.prepend(TQString("CFLAGS=\"%1\" ").tqarg(cflags));
+ cmdline.prepend(TQString("CFLAGS=\"%1\" ").arg(cflags));
TQString cxx = DomUtil::readEntry(dom, prefix + "cxxcompilerbinary");
if (!cxx.isEmpty())
- cmdline.prepend(TQString("CXX=%1 ").tqarg(cxx));
+ cmdline.prepend(TQString("CXX=%1 ").arg(cxx));
TQString cxxflags = DomUtil::readEntry(dom, prefix + "cxxflags");
if (!cxxflags.isEmpty())
- cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").tqarg(cxxflags));
+ cmdline.prepend(TQString("CXXFLAGS=\"%1\" ").arg(cxxflags));
TQString f77 = DomUtil::readEntry(dom, prefix + "f77compilerbinary");
if (!f77.isEmpty())
- cmdline.prepend(TQString("F77=%1 ").tqarg(f77));
+ cmdline.prepend(TQString("F77=%1 ").arg(f77));
TQString fflags = DomUtil::readEntry(dom, prefix + "f77flags");
if (!fflags.isEmpty())
- cmdline.prepend(TQString("FFLAGS=\"%1\" ").tqarg(fflags));
+ cmdline.prepend(TQString("FFLAGS=\"%1\" ").arg(fflags));
TQString cppflags = DomUtil::readEntry(dom, prefix + "cppflags");
if (!cppflags.isEmpty())
- cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").tqarg(cppflags));
+ cmdline.prepend(TQString("CPPFLAGS=\"%1\" ").arg(cppflags));
TQString ldflags = DomUtil::readEntry(dom, prefix + "ldflags");
if (!ldflags.isEmpty())
- cmdline.prepend(TQString("LDFLAGS=\"%1\" ").tqarg(ldflags));
+ cmdline.prepend(TQString("LDFLAGS=\"%1\" ").arg(ldflags));
TQString configargs = DomUtil::readEntry(dom, prefix + "configargs");
if (!configargs.isEmpty()) {
@@ -997,7 +997,7 @@ TQString AutoProjectPart::makefileCvsCommand() const
TQString nice;
kdDebug(9020) << "makefileCvsCommand() nice = " << prio<< endl;
if (prio != 0) {
- nice = TQString("nice -n%1 ").tqarg(prio);
+ nice = TQString("nice -n%1 ").arg(prio);
}
if (TQFile::exists(topsourceDirectory() + "/Makefile.cvs"))
@@ -1171,7 +1171,7 @@ void AutoProjectPart::executeTarget(const TQDir& dir, const TargetItem* titem)
KMessageBox::error( m_widget, i18n("Active target \"%1\" is not binary ( %2 ).\n"
"Unable to determine the main program. If you want this\n"
"to be the active target, set a main program under\n"
- "Project -> Project Options -> Run Options").tqarg(titem->name).tqarg(titem->primary), i18n("Active target is not a library") );
+ "Project -> Project Options -> Run Options").arg(titem->name).arg(titem->primary), i18n("Active target is not a library") );
kdDebug ( 9020 ) << k_funcinfo << "Error! : Active target isn't binary (" << titem->primary << ") ! -> Unable to determine the main program in AutoProjectPart::mainProgram()" << endl;
program += titem->name;
}else
diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp
index 56a80dfc..be55b927 100644
--- a/buildtools/autotools/autoprojectwidget.cpp
+++ b/buildtools/autotools/autoprojectwidget.cpp
@@ -557,7 +557,7 @@ void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item )
// Delete the items from the details view first.
if ( m_shownSubproject )
{
- // Remove all TargetItems and all of their tqchildren from the view
+ // Remove all TargetItems and all of their children from the view
kdDebug ( 9020 ) << "m_shownSubproject (before takeItem()): " << m_shownSubproject->subdir << endl;
TQListViewItem* i = m_detailView->listView()->firstChild();
@@ -575,7 +575,7 @@ void AutoProjectWidget::slotOverviewSelectionChanged( TQListViewItem *item )
if ( !m_shownSubproject) return;
kdDebug ( 9020 ) << "m_shownSubproject (after takeItem()): " << selectedSubproject()->subdir << endl;
- // Insert all TargetItems and all of their tqchildren into the view
+ // Insert all TargetItems and all of their children into the view
TQPtrListIterator<TargetItem> it2( selectedSubproject()->targets );
for ( ; it2.current(); ++it2 )
{
@@ -632,9 +632,9 @@ TargetItem *AutoProjectWidget::createTargetItem( const TQString &name,
if ( docgroup )
text = i18n( "Documentation data" );
else if ( icongroup )
- text = i18n( "KDE Icon data" ).tqarg( prefix );
+ text = i18n( "KDE Icon data" ).arg( prefix );
else
- text = i18n( "%1 (%2 in %3)" ).tqarg( name ).tqarg( nicePrimary( primary ) ).tqarg( prefix );
+ text = i18n( "%1 (%2 in %3)" ).arg( name ).arg( nicePrimary( primary ) ).arg( prefix );
// Workaround because of TQListView not being able to create
// items without actually inserting them
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 53bb69a4..eca543da 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -280,7 +280,7 @@ void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, con
if ( !item )
return ;
- KPopupMenu popup( i18n( "Subproject: %1" ).tqarg( item->text( 0 ) ), this );
+ KPopupMenu popup( i18n( "Subproject: %1" ).arg( item->text( 0 ) ), this );
subProjectOptionsAction->plug( &popup );
popup.insertSeparator();
@@ -448,13 +448,13 @@ void AutoSubprojectView::slotRemoveSubproject()
{
topsubdirs = false;
if( it == list.end() ){
- KMessageBox::sorry(this, i18n("There is no subproject %1 in SUBDIRS").tqarg(spitem->subdir));
+ KMessageBox::sorry(this, i18n("There is no subproject %1 in SUBDIRS").arg(spitem->subdir));
return;
}
}
- RemoveSubprojectDialog dlg(i18n("Remove Subproject %1").tqarg(spitem->text(0)),
- i18n("Do you really want to remove subproject %1 with all targets and files?").tqarg(spitem->text(0)));
+ RemoveSubprojectDialog dlg(i18n("Remove Subproject %1").arg(spitem->text(0)),
+ i18n("Do you really want to remove subproject %1 with all targets and files?").arg(spitem->text(0)));
if( dlg.exec() ){
bool removeSources = dlg.removeFromDisk();
@@ -1045,7 +1045,7 @@ void AutoSubprojectView::slotManageBuildCommands( )
{
config->writeEntry(widget->commandsTable->text(i, 0),
widget->commandsTable->text(i, 1)+":::"+
- TQString("%1").tqarg(static_cast<TQComboTableItem*>(widget->
+ TQString("%1").arg(static_cast<TQComboTableItem*>(widget->
commandsTable->item(i, 2))->currentItem()));
}
config->sync();
diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui
index 927ad6eb..f98c9145 100644
--- a/buildtools/autotools/choosetargetdlgbase.ui
+++ b/buildtools/autotools/choosetargetdlgbase.ui
@@ -158,7 +158,7 @@
<property name="text">
<string>&lt;qt&gt;&lt;b&gt;Note:&lt;/b&gt; If you cancel, your files will be created but will &lt;b&gt;not&lt;/b&gt; be added to the project.&lt;/qt&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter</set>
</property>
</widget>
diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp
index 34ffbe58..e0f48fdd 100644
--- a/buildtools/autotools/configureoptionswidget.cpp
+++ b/buildtools/autotools/configureoptionswidget.cpp
@@ -236,7 +236,7 @@ void ConfigureOptionsWidget::saveSettings(const TQString &config)
DomUtil::writeEntry(dom, prefix + "cxxflags", cxxflags_edit->text());
DomUtil::writeEntry(dom, prefix + "f77flags", f77flags_edit->text());
- if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").tqarg(config), TQString(), i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes)
+ if (KMessageBox::questionYesNo(this, i18n("Re-run configure for %1 now?").arg(config), TQString(), i18n("Rerun"), i18n("Do Not Run")) == KMessageBox::Yes)
TQTimer::singleShot(0, m_part, TQT_SLOT(slotConfigure()));
}
@@ -396,7 +396,7 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin
if (!factory) {
TQString errorMessage = KLibLoader::self()->lastErrorMessage();
KMessageBox::error(0, i18n("There was an error loading the module %1.\n"
- "The diagnostics is:\n%2").tqarg(service->name()).tqarg(errorMessage));
+ "The diagnostics is:\n%2").arg(service->name()).arg(errorMessage));
exit(1);
}
diff --git a/buildtools/autotools/makefilehandler.cpp b/buildtools/autotools/makefilehandler.cpp
index 7e19dd56..db30508d 100644
--- a/buildtools/autotools/makefilehandler.cpp
+++ b/buildtools/autotools/makefilehandler.cpp
@@ -81,7 +81,7 @@ void MakefileHandler::parse( const TQString& folder, bool recursive )
if ( recursive && ast && ast->hasChildren() )
{
- TQValueList<AutoTools::AST*> astChildList = ast->tqchildren();
+ TQValueList<AutoTools::AST*> astChildList = ast->children();
TQValueList<AutoTools::AST*>::iterator it(astChildList.begin()), clEnd(astChildList.end());
for ( ; it != clEnd; ++it )
{
@@ -145,7 +145,7 @@ TQString MakefileHandler::resolveVariable( const TQString& variable, AutoTools::
return variable;
kdDebug(9020) << k_funcinfo << "attempting to resolve '" << variable << "'"<< endl;
- ASTList childList = ast->tqchildren();
+ ASTList childList = ast->children();
ASTList::iterator it( childList.begin() ), clEnd( childList.end() );
for ( ; it != clEnd; ++it )
{
diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp
index fef4b2df..e265a969 100644
--- a/buildtools/autotools/removefiledlg.cpp
+++ b/buildtools/autotools/removefiledlg.cpp
@@ -63,7 +63,7 @@ RemoveFileDialog::RemoveFileDialog(AutoProjectWidget *widget, AutoProjectPart* p
TQString joinedtargets = " *" + targets.join("\n *");
removeFromTargetsCheckBox->setText ( i18n ( "The file %1 is still used by the following targets:\n%2\n"
- "Remove it from all of them?").tqarg(filename).tqarg(joinedtargets) );
+ "Remove it from all of them?").arg(filename).arg(joinedtargets) );
setMinimumSize(TQSize(size().width(), size().height() + removeFromTargetsCheckBox->size().height()*2) );
}
diff --git a/buildtools/autotools/subprojectoptionsdlg.cpp b/buildtools/autotools/subprojectoptionsdlg.cpp
index 85b69b16..ac23e8c4 100644
--- a/buildtools/autotools/subprojectoptionsdlg.cpp
+++ b/buildtools/autotools/subprojectoptionsdlg.cpp
@@ -45,7 +45,7 @@ SubprojectOptionsDialog::SubprojectOptionsDialog(AutoProjectPart *part, AutoProj
SubprojectItem *item, TQWidget *parent, const char *name)
: SubprojectOptionsDialogBase(parent, name, true)
{
- setCaption(i18n("Subproject Options for '%1'").tqarg(item->subdir));
+ setCaption(i18n("Subproject Options for '%1'").arg(item->subdir));
subProject = item;
m_part = part;
diff --git a/buildtools/autotools/targetoptionsdlg.cpp b/buildtools/autotools/targetoptionsdlg.cpp
index da9ade0c..9a028332 100644
--- a/buildtools/autotools/targetoptionsdlg.cpp
+++ b/buildtools/autotools/targetoptionsdlg.cpp
@@ -37,7 +37,7 @@ TargetOptionsDialog::TargetOptionsDialog(AutoProjectWidget *widget, TargetItem *
TQWidget *parent, const char *name)
: TargetOptionsDialogBase(parent, name, true)
{
- setCaption( i18n("Target Options for '%1'").tqarg(item->name) );
+ setCaption( i18n("Target Options for '%1'").arg(item->name) );
setIcon( SmallIcon("configure") );
target = item;