summaryrefslogtreecommitdiffstats
path: root/parts
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 12:00:33 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 12:00:33 -0600
commit7e66d7c3611d907ea28b140281b472bb1c406be6 (patch)
treed0512bf457c2bfe012f455b42ab78651afb81438 /parts
parentc3b301575a98e4c3505ad95534d6192b65539dab (diff)
downloadtdevelop-7e66d7c3611d907ea28b140281b472bb1c406be6.tar.gz
tdevelop-7e66d7c3611d907ea28b140281b472bb1c406be6.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'parts')
-rw-r--r--parts/appwizard/appwizarddlg.cpp30
-rw-r--r--parts/appwizard/appwizarddlgbase.ui2
-rw-r--r--parts/appwizard/common/kde-index.docbook38
-rw-r--r--parts/appwizard/importdlg.cpp2
-rw-r--r--parts/appwizard/kdevlicense.cpp4
-rw-r--r--parts/astyle/astyle_part.cpp2
-rw-r--r--parts/classview/classtooldlg.cpp26
-rw-r--r--parts/classview/classtooldlg.h4
-rw-r--r--parts/classview/digraphview.cpp2
-rw-r--r--parts/ctags2/ctags2_part.cpp6
-rw-r--r--parts/ctags2/ctags2_widget.cpp4
-rw-r--r--parts/diff/diffpart.cpp2
-rw-r--r--parts/diff/diffwidget.cpp2
-rw-r--r--parts/distpart/distpart_widget.cpp6
-rw-r--r--parts/documentation/documentation_part.cpp16
-rw-r--r--parts/documentation/docutils.cpp2
-rw-r--r--parts/documentation/indexview.cpp2
-rw-r--r--parts/documentation/plugins/doxygen/docdoxygenplugin.cpp4
-rw-r--r--parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp2
-rw-r--r--parts/documentation/protocols/chm/decompress.cpp2
-rw-r--r--parts/documentation/searchview.cpp12
-rw-r--r--parts/documentation/tools/htdig/htdigindex.cpp4
-rw-r--r--parts/doxygen/config.cpp6
-rw-r--r--parts/doxygen/config.h2
-rw-r--r--parts/doxygen/doxygenpart.cpp2
-rw-r--r--parts/filecreate/fctemplateeditbase.ui4
-rw-r--r--parts/filecreate/fctypeeditbase.ui8
-rw-r--r--parts/filelist/projectviewpart.cpp4
-rw-r--r--parts/fileselector/fileselector_widget.cpp2
-rw-r--r--parts/fileview/fileitemfactory.cpp10
-rw-r--r--parts/fileview/fileitemfactory.h2
-rw-r--r--parts/fileview/partwidget.cpp2
-rw-r--r--parts/fileview/vcsfiletreewidgetimpl.cpp4
-rw-r--r--parts/filter/shellfilterdlg.cpp2
-rw-r--r--parts/filter/shellinsertdlg.cpp2
-rw-r--r--parts/grepview/grepviewpart.cpp2
-rw-r--r--parts/outputviews/appoutputviewpart.cpp2
-rw-r--r--parts/outputviews/appoutputwidget.cpp2
-rw-r--r--parts/outputviews/makeitem.cpp6
-rw-r--r--parts/outputviews/makewidget.cpp2
-rw-r--r--parts/partexplorer/partexplorerform.cpp4
-rw-r--r--parts/quickopen/quickopenclassdialog.cpp2
-rw-r--r--parts/quickopen/quickopenfunctionchooseform.cpp2
-rw-r--r--parts/replace/replace_part.cpp2
-rw-r--r--parts/replace/replaceitem.cpp2
-rw-r--r--parts/snippet/snippet_part.cpp2
-rw-r--r--parts/snippet/snippet_widget.cpp50
-rw-r--r--parts/snippet/snippetdlg.ui2
-rw-r--r--parts/texttools/texttoolswidget.cpp2
-rw-r--r--parts/tools/kapplicationtree.cpp2
-rw-r--r--parts/tools/toolsconfig.cpp2
-rw-r--r--parts/uimode/uichooser.ui2
-rw-r--r--parts/valgrind/dialog_widget.ui8
-rw-r--r--parts/valgrind/valgrind_dialog.cpp18
-rw-r--r--parts/valgrind/valgrind_part.cpp6
-rw-r--r--parts/vcsmanager/vcsmanagerpart.cpp2
-rw-r--r--parts/vcsmanager/vcsmanagerprojectconfig.cpp2
-rw-r--r--parts/vcsmanager/vcsmanagerprojectconfigbase.ui2
58 files changed, 175 insertions, 175 deletions
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 8fa1c8a5..4ab19b48 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -486,7 +486,7 @@ void AppWizardDialog::accept()
}
else
{
- KMessageBox::sorry(this, i18n("The template %1 cannot be opened.").tqarg( source + "/" + m_pCurrentAppInfo->sourceArchive ) );
+ KMessageBox::sorry(this, i18n("The template %1 cannot be opened.").arg( source + "/" + m_pCurrentAppInfo->sourceArchive ) );
templateArchive.close();
return;
}
@@ -543,7 +543,7 @@ void AppWizardDialog::accept()
// This is too silly for words, but it's either this or reimplementing FileTemplate
TQString tempProjectDomSource = "<!DOCTYPE tdevelop><tdevelop><general><author>%1</author><email>%2</email><version>%3</version></general></tdevelop>";
- tempProjectDomSource = tempProjectDomSource.tqarg( author_edit->text() ).tqarg( email_edit->text() ).tqarg( version_edit->text() );
+ tempProjectDomSource = tempProjectDomSource.arg( author_edit->text() ).arg( email_edit->text() ).arg( version_edit->text() );
TQDomDocument tempProjectDom;
tempProjectDom.setContent( tempProjectDomSource );
@@ -559,13 +559,13 @@ void AppWizardDialog::accept()
temps.setEncoding(TQTextStream::UnicodeUTF8);
temps << templateText;
f.flush();
- TQString templateName( TQString( "%1_TEMPLATE" ).tqarg( (*it).suffix ).upper() );
+ TQString templateName( TQString( "%1_TEMPLATE" ).arg( (*it).suffix ).upper() );
cleanUpSubstMap << templateName;
m_pCurrentAppInfo->subMap.insert( templateName, KMacroExpander::expandMacros(templateText , m_pCurrentAppInfo->subMap) );
installFile file;
file.source = tempFile->name();
- file.dest = TQString( "%{dest}/templates/%1" ).tqarg( (*it).suffix );
+ file.dest = TQString( "%{dest}/templates/%1" ).arg( (*it).suffix );
file.process = true;
file.isXML = false;
m_pCurrentAppInfo->fileList.append( file );
@@ -585,8 +585,8 @@ void AppWizardDialog::accept()
for( ; it != files.end(); ++it )
{
installFile file;
- file.source = TQString( "%{tdevelop}/template-common/%1" ).tqarg( *it );
- file.dest = TQString("%{dest}/%1").tqarg( *it );
+ file.source = TQString( "%{tdevelop}/template-common/%1" ).arg( *it );
+ file.dest = TQString("%{dest}/%1").arg( *it );
file.process = true;
file.isXML = false;
m_pCurrentAppInfo->fileList.append( file );
@@ -645,7 +645,7 @@ void AppWizardDialog::accept()
{
if( ! KIO::NetAccess::mkdir( (*dirIt).dir, this ) )
{
- KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").tqarg( (*dirIt).dir ) );
+ KMessageBox::sorry(this, i18n("The directory %1 cannot be created.").arg( (*dirIt).dir ) );
return;
}
}
@@ -664,7 +664,7 @@ void AppWizardDialog::accept()
}
else
{
- KMessageBox::sorry(this, i18n("The archive %1 cannot be opened.").tqarg( (*archIt).source ) );
+ KMessageBox::sorry(this, i18n("The archive %1 cannot be opened.").arg( (*archIt).source ) );
archive.close();
return;
}
@@ -682,7 +682,7 @@ void AppWizardDialog::accept()
{
if( !copyFile( *fileIt ) )
{
- KMessageBox::sorry(this, i18n("The file %1 cannot be created.").tqarg( (*fileIt).dest) );
+ KMessageBox::sorry(this, i18n("The file %1 cannot be created.").arg( (*fileIt).dest) );
return;
}
setPermissions(*fileIt);
@@ -824,7 +824,7 @@ void AppWizardDialog::unpackArchive( const KArchiveDirectory *dir, const TQStrin
// ( where should we currently get that info from? )
if ( !copyFile( TQDir::cleanDirPath(tdir.name()+"/"+file->name()), dest + "/" + file->name(), false, process ) )
{
- KMessageBox::sorry(this, i18n("The file %1 cannot be created.").tqarg( dest) );
+ KMessageBox::sorry(this, i18n("The file %1 cannot be created.").arg( dest) );
return;
}
setPermissions(file, dest + "/" + file->name());
@@ -893,7 +893,7 @@ void AppWizardDialog::templatesTreeViewClicked(TQListViewItem *item)
if (it == l.end())
m_lastPage = edit;
fileTemplate.edit = edit;
- addPage(edit, i18n("Template for .%1 Files").tqarg(fileTemplate.suffix));
+ addPage(edit, i18n("Template for .%1 Files").arg(fileTemplate.suffix));
m_fileTemplates.append(fileTemplate);
}
licenseChanged(); // to populate the template views
@@ -919,7 +919,7 @@ void AppWizardDialog::destButtonClicked(const TQString& dir)
TQDir newDir (dir);
kdDebug(9010) << "DevPrjDir == newdir?: " << defPrjDir.absPath() << " == " << newDir.absPath() << endl;
if (defPrjDir != newDir) {
- if (KMessageBox::questionYesNo(this, i18n("Set default project location to: %1?").tqarg( newDir.absPath() ),
+ if (KMessageBox::questionYesNo(this, i18n("Set default project location to: %1?").arg( newDir.absPath() ),
i18n("New Project"), i18n("Set"), i18n("Do Not Set")) == KMessageBox::Yes)
{
config->writePathEntry("DefaultProjectsDir", newDir.absPath() + "/");
@@ -1015,7 +1015,7 @@ void AppWizardDialog::openAfterGeneration()
{
KMessageBox::sorry( 0, i18n("This is not a valid project file.\n"
"XML error in line %1, column %2:\n%3")
- .tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg));
+ .arg(errorLine).arg(errorCol).arg(errorMsg));
return;
}
@@ -1023,7 +1023,7 @@ void AppWizardDialog::openAfterGeneration()
DomUtil::writeMapEntry( projectDOM, "substmap", m_pCurrentAppInfo->subMap );
//save the selected vcs
- KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").tqarg(m_vcsForm->combo->currentText()));
+ KTrader::OfferList offers = KTrader::self()->query("KDevelop/VCSIntegrator", TQString("[X-KDevelop-VCS]=='%1'").arg(m_vcsForm->combo->currentText()));
if (offers.count() == 1)
{
KService::Ptr service = offers.first();
@@ -1318,7 +1318,7 @@ void AppWizardDialog::showTemplates(bool all)
TQDictIterator<TQListViewItem> dit(m_categoryMap);
for (; dit.current(); ++dit)
{
- //checking whether all tqchildren are not visible
+ //checking whether all children are not visible
kdDebug(9010) << "check: " << dit.current()->text(0) << endl;
bool visible = false;
TQListViewItemIterator it(dit.current());
diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui
index a7d39107..0989be1b 100644
--- a/parts/appwizard/appwizarddlgbase.ui
+++ b/parts/appwizard/appwizarddlgbase.ui
@@ -160,7 +160,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
diff --git a/parts/appwizard/common/kde-index.docbook b/parts/appwizard/common/kde-index.docbook
index aacd7a48..332d3af3 100644
--- a/parts/appwizard/common/kde-index.docbook
+++ b/parts/appwizard/common/kde-index.docbook
@@ -257,7 +257,7 @@ Programming &%{APPNAMELC}; plugins is a joy to behold. Just read through the nex
should consult the docbook reference for further details. The example below was
taken from that reference and shortened a bit for readability. -->
-<refentry id="re-1007-unmanagetqchildren-1">
+<refentry id="re-1007-unmanagechildren-1">
<refmeta>
<refentrytitle>XtUnmanageChildren</refentrytitle>
<refmiscinfo>Xt - Geometry Management</refmiscinfo>
@@ -265,10 +265,10 @@ taken from that reference and shortened a bit for readability. -->
<refnamediv>
<refname>XtUnmanageChildren
</refname>
-<refpurpose>remove a list of tqchildren from a parent widget's managed
+<refpurpose>remove a list of children from a parent widget's managed
list.
-<indexterm id="ix-1007-unmanagetqchildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm>
-<indexterm id="ix-1007-unmanagetqchildren-2"><primary>XtUnmanageChildren</primary></indexterm>
+<indexterm id="ix-1007-unmanagechildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm>
+<indexterm id="ix-1007-unmanagechildren-2"><primary>XtUnmanageChildren</primary></indexterm>
</refpurpose>
</refnamediv>
@@ -277,16 +277,16 @@ list.
<date>4 March 1996</date>
</refsynopsisdivinfo>
<synopsis>
-void XtUnmanageChildren(<replaceable class="parameter">tqchildren</replaceable>, <replaceable class="parameter">num_tqchildren</replaceable>)
- WidgetList <replaceable class="parameter">tqchildren</replaceable>;
- Cardinal <replaceable class="parameter">num_tqchildren</replaceable>;
+void XtUnmanageChildren(<replaceable class="parameter">children</replaceable>, <replaceable class="parameter">num_children</replaceable>)
+ WidgetList <replaceable class="parameter">children</replaceable>;
+ Cardinal <replaceable class="parameter">num_children</replaceable>;
</synopsis>
-<refsect2 id="r2-1007-unmanagetqchildren-1">
+<refsect2 id="r2-1007-unmanagechildren-1">
<title>Inputs</title>
<variablelist>
<varlistentry>
-<term><replaceable class="parameter">tqchildren</replaceable>
+<term><replaceable class="parameter">children</replaceable>
</term>
<listitem>
<para>Specifies an array of child widgets. Each child must be of
@@ -295,26 +295,26 @@ class RectObj or any subclass thereof.
</listitem>
</varlistentry>
<varlistentry>
-<term><replaceable class="parameter">num_tqchildren</replaceable>
+<term><replaceable class="parameter">num_children</replaceable>
</term>
<listitem>
-<para>Specifies the number of elements in <replaceable class="parameter">tqchildren</replaceable>.
+<para>Specifies the number of elements in <replaceable class="parameter">children</replaceable>.
</para>
</listitem>
</varlistentry>
</variablelist>
</refsect2></refsynopsisdiv>
-<refsect1 id="r1-1007-unmanagetqchildren-1">
+<refsect1 id="r1-1007-unmanagechildren-1">
<title>Description
</title>
<para><function>XtUnmanageChildren()</function> unmaps the specified widgets
-and removes them from their parent's tqgeometry management.
+and removes them from their parent's geometry management.
The widgets will disappear from the screen, and (depending
on its parent) may no longer have screen space allocated for
them.
</para>
-<para>Each of the widgets in the <replaceable class="parameter">tqchildren</replaceable> array must have
+<para>Each of the widgets in the <replaceable class="parameter">children</replaceable> array must have
the same parent.
</para>
<para>See the &ldquo;Algorithm&rdquo; section below for full details of the
@@ -322,13 +322,13 @@ widget unmanagement procedure.
</para>
</refsect1>
-<refsect1 id="r1-1007-unmanagetqchildren-2">
+<refsect1 id="r1-1007-unmanagechildren-2">
<title>Usage</title>
<para>Unmanaging widgets is the usual method for temporarily
making them invisible. They can be re-managed with
<function>XtManageChildren()</function>.
</para>
-<para>You can unmap a widget, but leave it under tqgeometry
+<para>You can unmap a widget, but leave it under geometry
management by calling <function>XtUnmapWidget()</function>. You can
destroy a widget's window without destroying the widget by
calling <function>XtUnrealizeWidget()</function>. You can destroy a
@@ -345,7 +345,7 @@ method once.
</para>
</refsect1>
-<refsect1 id="r1-1007-unmanagetqchildren-3">
+<refsect1 id="r1-1007-unmanagechildren-3">
<title>Algorithm
</title>
<para><function>XtUnmanageChildren()</function> performs the following:
@@ -374,11 +374,11 @@ by unmapping it.
</para>
</refsect1>
-<refsect1 id="r1-1007-unmanagetqchildren-4">
+<refsect1 id="r1-1007-unmanagechildren-4">
<title>Structures</title>
<para>The <type>WidgetList</type> type is simply an array of widgets:
</para>
-<screen id="sc-1007-unmanagetqchildren-1">typedef Widget *WidgetList;
+<screen id="sc-1007-unmanagechildren-1">typedef Widget *WidgetList;
</screen>
</refsect1>
</refentry>
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 82662921..1f426a86 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -151,7 +151,7 @@ void ImportDialog::accept()
{
KMessageBox::sorry( 0, i18n("This is not a valid project file.\n"
"XML error in line %1, column %2:\n%3")
- .tqarg(errorLine).tqarg(errorCol).tqarg(errorMsg));
+ .arg(errorLine).arg(errorCol).arg(errorMsg));
return;
}
diff --git a/parts/appwizard/kdevlicense.cpp b/parts/appwizard/kdevlicense.cpp
index 3fed1fed..5e189422 100644
--- a/parts/appwizard/kdevlicense.cpp
+++ b/parts/appwizard/kdevlicense.cpp
@@ -70,12 +70,12 @@ TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const
strFill + " * $EMAIL$ *\n" +
strFill + " * *\n";
-// str = str.tqarg(TQDate::currentDate().year()).tqarg(author.left(45),-45).tqarg(email.left(67),-67);
+// str = str.arg(TQDate::currentDate().year()).arg(author.left(45),-45).arg(email.left(67),-67);
TQStringList::Iterator it;
for( it = m_rawLines.begin(); it != m_rawLines.end(); ++it )
{
- str += TQString( "%1 * %2 *\n").tqarg( strFill ).tqarg( *it, -69 );
+ str += TQString( "%1 * %2 *\n").arg( strFill ).arg( *it, -69 );
}
str += strFill + " ***************************************************************************/\n";
diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
index 6a478982..7cfb6b17 100644
--- a/parts/astyle/astyle_part.cpp
+++ b/parts/astyle/astyle_part.cpp
@@ -531,7 +531,7 @@ void AStylePart::formatFiles()
}
if ( processed != 0 )
{
- KMessageBox::information ( 0, i18n ( "Processed %1 files ending with extensions %2" ).tqarg ( processed ).tqarg(getProjectExtensions().stripWhiteSpace()) );
+ KMessageBox::information ( 0, i18n ( "Processed %1 files ending with extensions %2" ).arg ( processed ).arg(getProjectExtensions().stripWhiteSpace()) );
}
m_urls.clear();
diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp
index 77f76c51..0c09d02c 100644
--- a/parts/classview/classtooldlg.cpp
+++ b/parts/classview/classtooldlg.cpp
@@ -44,11 +44,11 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
parents_button->setFixedSize(parents_button->sizeHint());
TQToolTip::add(parents_button, i18n("Show parents"));
- tqchildren_button = new TQToolButton(this);
- tqchildren_button->setPixmap( UserIcon("CTtqchildren", KIcon::DefaultState, ClassViewFactory::instance()) );
- tqchildren_button->setToggleButton(true);
- tqchildren_button->setFixedSize(tqchildren_button->sizeHint());
- TQToolTip::add(tqchildren_button, i18n("Show tqchildren"));
+ children_button = new TQToolButton(this);
+ children_button->setPixmap( UserIcon("CTchildren", KIcon::DefaultState, ClassViewFactory::instance()) );
+ children_button->setToggleButton(true);
+ children_button->setFixedSize(children_button->sizeHint());
+ TQToolTip::add(children_button, i18n("Show children"));
clients_button = new TQToolButton(this);
clients_button->setPixmap( UserIcon("CTclients", KIcon::DefaultState, ClassViewFactory::instance()) );
@@ -96,7 +96,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
firstrowLayout->addWidget(close_button, 0);
secondrowLayout->addWidget(parents_button);
- secondrowLayout->addWidget(tqchildren_button);
+ secondrowLayout->addWidget(children_button);
secondrowLayout->addWidget(clients_button);
secondrowLayout->addWidget(suppliers_button);
secondrowLayout->addStretch();
@@ -113,7 +113,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
connect( access_combo, TQT_SIGNAL(activated(const TQString&)),
this, TQT_SLOT(slotAccessComboChoice(const TQString&)) );
connect( parents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents()));
- connect( tqchildren_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren()));
+ connect( children_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren()));
connect( clients_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewClients()));
connect( suppliers_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewSuppliers()));
connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods()));
@@ -178,7 +178,7 @@ void ClassToolDialog::viewParents()
}
-/** View the tqchildren of the current class. */
+/** View the children of the current class. */
void ClassToolDialog::viewChildren()
{
currentOperation = ViewChildren;
@@ -287,7 +287,7 @@ void ClassToolDialog::updateCaptionAndButtons()
caption = i18n("Parents");
break;
case ViewChildren:
- button = tqchildren_button;
+ button = children_button;
caption = i18n("Children");
break;
case ViewClients:
@@ -300,11 +300,11 @@ void ClassToolDialog::updateCaptionAndButtons()
break;
case ViewMethods:
button = methods_button;
- caption = i18n("%1 Methods").tqarg(access_combo->currentText());
+ caption = i18n("%1 Methods").arg(access_combo->currentText());
break;
case ViewAttributes:
button = attributes_button;
- caption = i18n("%1 Attributes").tqarg(access_combo->currentText());
+ caption = i18n("%1 Attributes").arg(access_combo->currentText());
break;
default:
button = 0;
@@ -313,7 +313,7 @@ void ClassToolDialog::updateCaptionAndButtons()
}
parents_button->setOn(false);
- tqchildren_button->setOn(false);
+ children_button->setOn(false);
clients_button->setOn(false);
suppliers_button->setOn(false);
methods_button->setOn(false);
@@ -321,7 +321,7 @@ void ClassToolDialog::updateCaptionAndButtons()
if (button) {
button->setOn(true);
- setCaption(i18n("%1 of Class %2").tqarg(caption).tqarg(currentClass->name()));
+ setCaption(i18n("%1 of Class %2").arg(caption).arg(currentClass->name()));
} else
setCaption(caption);
}
diff --git a/parts/classview/classtooldlg.h b/parts/classview/classtooldlg.h
index 9b722346..2ad80a58 100644
--- a/parts/classview/classtooldlg.h
+++ b/parts/classview/classtooldlg.h
@@ -47,7 +47,7 @@ public slots:
void viewNone();
/** View the parents of the current class. */
void viewParents();
- /** View the tqchildren of the current class. */
+ /** View the children of the current class. */
void viewChildren();
/** View all classes that has this class as an attribute. */
void viewClients();
@@ -76,7 +76,7 @@ private:
TQComboBox *class_combo;
TQToolButton *parents_button;
- TQToolButton *tqchildren_button;
+ TQToolButton *children_button;
TQToolButton *clients_button;
TQToolButton *suppliers_button;
TQToolButton *methods_button;
diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp
index 112435b5..35680be9 100644
--- a/parts/classview/digraphview.cpp
+++ b/parts/classview/digraphview.cpp
@@ -235,7 +235,7 @@ void DigraphView::process( const TQString& file, const TQString& ext )
TQTextStream &is = *ifile.textStream();
is << "digraph G {" << endl;
is << "rankdir=LR;" << endl;
- is << "node [tqshape=box,fontname=Helvetica,fontsize=12];" << endl;
+ is << "node [shape=box,fontname=Helvetica,fontsize=12];" << endl;
TQStringList::Iterator it;
for (it = inputs.begin(); it != inputs.end(); ++it)
is << (*it) << endl;
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index 2ea9c643..b05a12a4 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -194,13 +194,13 @@ void CTags2Part::contextMenu(TQPopupMenu *popup, const Context *context)
popup->insertSeparator();
if ( showDeclaration )
- popup->insertItem( i18n("CTags - Go to Declaration: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) );
+ popup->insertItem( i18n("CTags - Go to Declaration: %1").arg(squeezed), this, TQT_SLOT(slotGotoDeclaration()) );
if ( showDefinition )
- popup->insertItem( i18n("CTags - Go to Definition: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoDefinition()) );
+ popup->insertItem( i18n("CTags - Go to Definition: %1").arg(squeezed), this, TQT_SLOT(slotGotoDefinition()) );
if ( showLookup )
- popup->insertItem( i18n("CTags - Lookup: %1").tqarg(squeezed), this, TQT_SLOT(slotGotoTag()) );
+ popup->insertItem( i18n("CTags - Lookup: %1").arg(squeezed), this, TQT_SLOT(slotGotoTag()) );
}
}
diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp
index f6fec985..4f400272 100644
--- a/parts/ctags2/ctags2_widget.cpp
+++ b/parts/ctags2/ctags2_widget.cpp
@@ -104,7 +104,7 @@ void CTags2Widget::line_edit_changed_delayed( )
void CTags2Widget::showHitCount( int n )
{
- hitcount_label->setText( i18n("Hits: %1").tqarg( n ) );
+ hitcount_label->setText( i18n("Hits: %1").arg( n ) );
}
int CTags2Widget::calculateHitCount( )
@@ -174,7 +174,7 @@ void CTags2Widget::goToNext( )
if ( (item = item->nextSibling()) != NULL )
{
item->setSelected( true );
- output_view->tqrepaint( true );
+ output_view->repaint( true );
itemExecuted( item );
return;
}
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 133a29f3..647a5cc5 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -182,7 +182,7 @@ void DiffPart::processExited( KProcess* p )
else
showDiff( resultBuffer );
} else {
- KMessageBox::error( 0, i18n("Diff command failed (%1):\n").tqarg( p->exitStatus() ) + resultErr );
+ KMessageBox::error( 0, i18n("Diff command failed (%1):\n").arg( p->exitStatus() ) + resultErr );
}
resultBuffer = resultErr = TQString();
delete proc;
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index b2a14518..b4f6b6fb 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -73,7 +73,7 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p )
int i = 0;
for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) {
- popup->insertItem( i18n( "Show in %1" ).tqarg( *it ), i + POPUP_BASE, i );
+ popup->insertItem( i18n( "Show in %1" ).arg( *it ), i + POPUP_BASE, i );
i++;
}
if ( !extPartsTranslated.isEmpty() )
diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp
index 438ac469..24e37cdb 100644
--- a/parts/distpart/distpart_widget.cpp
+++ b/parts/distpart/distpart_widget.cpp
@@ -142,14 +142,14 @@ void DistpartDialog::slotcreateSrcArchPushButtonPressed() {
}
else
{
- prog->setLabel(i18n("Adding file: %1").tqarg( file) );
+ prog->setLabel(i18n("Adding file: %1").arg( file) );
prog->progressBar()->setValue( (idx*100)/srcDistFileListBox->numRows() );
}
}
tar.close( );
prog->hide();
delete prog;
- KMessageBox::information( this, i18n("Archive made at: %1").tqarg( filename ), i18n("Archive Done") );
+ KMessageBox::information( this, i18n("Archive made at: %1").arg( filename ), i18n("Archive Done") );
}
else
@@ -592,7 +592,7 @@ void DistpartDialog::slotAddFileButtonPressed(){
}
void DistpartDialog::slotRemoveFile(TQListBoxItem *item){
- if ( KMessageBox::Yes == KMessageBox::warningYesNo( this, i18n("Remove %1").tqarg( item->text() ), i18n("Remove File") )){
+ if ( KMessageBox::Yes == KMessageBox::warningYesNo( this, i18n("Remove %1").arg( item->text() ), i18n("Remove File") )){
for(uint count =0; count< srcDistFileListBox->numRows(); count++){
if ( item == srcDistFileListBox->item(count)){
srcDistFileListBox->removeItem(count);
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 2d3afa95..08db3617 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -126,7 +126,7 @@ void DocumentationPart::loadDocumentationPlugins()
{
KTrader::OfferList docPluginOffers =
KTrader::self()->query(TQString::fromLatin1("KDevelop/DocumentationPlugins"),
- TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION));
+ TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION));
KTrader::OfferList::ConstIterator serviceIt = docPluginOffers.begin();
for ( ; serviceIt != docPluginOffers.end(); ++serviceIt )
@@ -347,13 +347,13 @@ void DocumentationPart::infoPage()
void DocumentationPart::manPage(const TQString &term)
{
- TQString url = TQString::fromLatin1("man:/%1").tqarg(term);
+ TQString url = TQString::fromLatin1("man:/%1").arg(term);
partController()->showDocument(KURL(url));
}
void DocumentationPart::infoPage(const TQString &term)
{
- TQString url = TQString::fromLatin1("info:/%1").tqarg(term);
+ TQString url = TQString::fromLatin1("info:/%1").arg(term);
partController()->showDocument(KURL(url));
}
@@ -465,7 +465,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context)
TQString squeezed = KStringHandler::csqueeze(m_contextStr, 30);
int id = -1;
if (hasContextFeature(Finder)) {
- id = popup->insertItem(i18n("Find Documentation: %1").tqarg(squeezed),
+ id = popup->insertItem(i18n("Find Documentation: %1").arg(squeezed),
this, TQT_SLOT(contextFindDocumentation()));
popup->setWhatsThis(id, i18n("<b>Find documentation</b><p>"
"Opens the documentation finder tab and searches "
@@ -474,7 +474,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context)
"Google, etc."));
}
if (hasContextFeature(IndexLookup)) {
- id = popup->insertItem(i18n("Look in Documentation Index: %1").tqarg(squeezed),
+ id = popup->insertItem(i18n("Look in Documentation Index: %1").arg(squeezed),
this, TQT_SLOT(contextLookInDocumentationIndex()));
popup->setWhatsThis(id, i18n("<b>Look in documentation index</b><p>"
"Opens the documentation index tab. It allows "
@@ -482,7 +482,7 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context)
"the documentation index."));
}
if (hasContextFeature(FullTextSearch)) {
- id = popup->insertItem(i18n("Search in Documentation: %1").tqarg(squeezed),
+ id = popup->insertItem(i18n("Search in Documentation: %1").arg(squeezed),
this, TQT_SLOT(contextSearchInDocumentation()));
popup->setWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches "
"for a term under the cursor in "
@@ -491,12 +491,12 @@ void DocumentationPart::contextMenu(TQPopupMenu *popup, const Context *context)
"configuration dialog of the documentation plugin."));
}
if (hasContextFeature(GotoMan)) {
- id = popup->insertItem(i18n("Goto Manpage: %1").tqarg(squeezed),
+ id = popup->insertItem(i18n("Goto Manpage: %1").arg(squeezed),
this, TQT_SLOT(contextManPage()));
popup->setWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor."));
}
if (hasContextFeature(GotoInfo)) {
- id = popup->insertItem( i18n("Goto Infopage: %1").tqarg(squeezed),
+ id = popup->insertItem( i18n("Goto Infopage: %1").arg(squeezed),
this, TQT_SLOT(contextInfoPage()) );
popup->setWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor."));
}
diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp
index 4291a745..79fa9915 100644
--- a/parts/documentation/docutils.cpp
+++ b/parts/documentation/docutils.cpp
@@ -87,7 +87,7 @@ void DocUtils::docItemPopup(DocumentationPart *part, const TQString &title, cons
if (showSearch)
{
menu.insertSeparator();
- menu.insertItem(TQString("%1: %2").tqarg(i18n("Search")).tqarg(KStringHandler::csqueeze(title,20)), 4);
+ menu.insertItem(TQString("%1: %2").arg(i18n("Search")).arg(KStringHandler::csqueeze(title,20)), 4);
}
switch (menu.exec(pos))
diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp
index 3f323fc5..ad61b4f3 100644
--- a/parts/documentation/indexview.cpp
+++ b/parts/documentation/indexview.cpp
@@ -85,7 +85,7 @@ void IndexView::searchInIndex(TQListBoxItem *item)
else
{
SelectTopic *dia = new SelectTopic(urls);
- dia->topicLabel->setText(dia->topicLabel->text().tqarg(item->text()));
+ dia->topicLabel->setText(dia->topicLabel->text().arg(item->text()));
if (dia->exec())
m_widget->part()->partController()->showDocument(dia->selectedURL());
delete dia;
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
index 09c7310b..a0df440a 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
@@ -450,7 +450,7 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index,
TQString filename = childEl.namedItem("filename").firstChild().toText().data();
IndexItemProto *indexItem = new IndexItemProto(this, item, index, classname,
- i18n("%1 Class Reference").tqarg(classname));
+ i18n("%1 Class Reference").arg(classname));
indexItem->addURL(KURL(prefix + filename));
createIndexFromTag(dom, index, item, childEl, prefix + filename);
@@ -467,7 +467,7 @@ void DocDoxygenPlugin::createIndexFromTag(TQDomDocument &dom, IndexBox *index,
if (classname != membername)
{
- IndexItemProto *indexItem = new IndexItemProto(this, item, index, membername,i18n("%1::%2%3 Member Reference").tqarg(classname).tqarg(membername).tqarg(arglist));
+ IndexItemProto *indexItem = new IndexItemProto(this, item, index, membername,i18n("%1::%2%3 Member Reference").arg(classname).arg(membername).arg(arglist));
indexItem->addURL(KURL(prefix + "#" + anchor));
}
}
diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
index 6513eb90..6abf51fa 100644
--- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
@@ -214,7 +214,7 @@ void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childE
{
while (!childEl.isNull())
{
- if (childEl.tagName() == TQString("tocsect%1").tqarg(level))
+ if (childEl.tagName() == TQString("tocsect%1").arg(level))
{
TQString name = childEl.attribute("name");
TQString url = childEl.attribute("url");
diff --git a/parts/documentation/protocols/chm/decompress.cpp b/parts/documentation/protocols/chm/decompress.cpp
index f411e8ec..b8f45ae2 100644
--- a/parts/documentation/protocols/chm/decompress.cpp
+++ b/parts/documentation/protocols/chm/decompress.cpp
@@ -121,7 +121,7 @@ struct
* The LZX document does not state the uncompressed block has an
* uncompressed length field. Where does this length field come from, so
* we can know how large the block is? The implementation has it as the 24
- * bits following after the 3 blocktype bits, before the tqalignment
+ * bits following after the 3 blocktype bits, before the alignment
* padding.
*
* The LZX document states that aligned offset blocks have their aligned
diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp
index fd88c6c0..5da2efa7 100644
--- a/parts/documentation/searchview.cpp
+++ b/parts/documentation/searchview.cpp
@@ -182,11 +182,11 @@ void SearchView::search()
d.mkdir(savedir);
TQString query = TQString("words=%1;method=%2;matchesperpage=%3;format=%4;sort=%5")
- .tqarg(m_edit->text())
- .tqarg(m_searchMethodBox->currentItem()==1? "or" : "and")
- .tqarg(50)
- .tqarg("builtin-short")
- .tqarg(m_sortMethodBox->currentItem()==2? "date" : m_sortMethodBox->currentItem()==1? "title" : "score");
+ .arg(m_edit->text())
+ .arg(m_searchMethodBox->currentItem()==1? "or" : "and")
+ .arg(50)
+ .arg("builtin-short")
+ .arg(m_sortMethodBox->currentItem()==2? "date" : m_sortMethodBox->currentItem()==1? "title" : "score");
kdDebug(9002) << "starting kprocess" << endl;
kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query << endl;
@@ -211,7 +211,7 @@ void SearchView::search()
}
// While receiving data from the subprocess, we want
- // to block the user interface, but still get tqrepaint
+ // to block the user interface, but still get repaint
// events. Hack taken from NetAccess...
kapp->setOverrideCursor(waitCursor);
TQWidget blocker(0, 0, WType_Dialog | WShowModal);
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index bd63375c..b2e3eeac 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -122,7 +122,7 @@ void ProgressDialog::done(int r)
void ProgressDialog::setFilesScanned(int n)
{
- filesLabel->setText(i18n("Files processed: %1").tqarg(n));
+ filesLabel->setText(i18n("Files processed: %1").arg(n));
}
void ProgressDialog::setFilesToDig(int n)
@@ -214,7 +214,7 @@ bool ProgressDialog::createConfig()
if (language == "C")
language = "en";
- TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").tqarg(language));
+ TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").arg(language));
if (wrapper.isEmpty())
wrapper = locate("data", TQString("kdevdocumentation/en/wrapper.html"));
if (wrapper.isEmpty())
diff --git a/parts/doxygen/config.cpp b/parts/doxygen/config.cpp
index 172da37f..df9ce30c 100644
--- a/parts/doxygen/config.cpp
+++ b/parts/doxygen/config.cpp
@@ -5005,7 +5005,7 @@ void Config::create()
"nodes that will be shown in the graph. If the number of nodes in a graph \n"
"becomes larger than this value, doxygen will truncate the graph, which is \n"
"visualized by representing a node as a red box. Note that doxygen if the \n"
- "number of direct tqchildren of the root node in a graph is already larger than \n"
+ "number of direct children of the root node in a graph is already larger than \n"
"DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note \n"
"that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. \n",
0,10000, 50
@@ -5102,8 +5102,8 @@ static TQCString configFileToString(const char *name)
}
totalSize+=size+2;
contents.resize(totalSize);
- contents.tqat(totalSize-2)='\n'; // to help the scanner
- contents.tqat(totalSize-1)='\0';
+ contents.at(totalSize-2)='\n'; // to help the scanner
+ contents.at(totalSize-1)='\0';
return contents;
}
}
diff --git a/parts/doxygen/config.h b/parts/doxygen/config.h
index 3d47d5c6..2486956e 100644
--- a/parts/doxygen/config.h
+++ b/parts/doxygen/config.h
@@ -30,7 +30,7 @@ class ConfigOption
enum
{
/*! Maximum length of an option in the config file. Used for
- * tqalignment purposes.
+ * alignment purposes.
*/
MAX_OPTION_LENGTH = 23
};
diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp
index c1a6469b..cd73e4b1 100644
--- a/parts/doxygen/doxygenpart.cpp
+++ b/parts/doxygen/doxygenpart.cpp
@@ -448,7 +448,7 @@ void DoxygenPart::slotRunPreview( )
if (poDir != 0)
*poDir->valueRef() = dirVal;
- KMessageBox::error(mainWindow()->main(), i18n("Cannot create temporary file '%1'").tqarg(file.name()));
+ KMessageBox::error(mainWindow()->main(), i18n("Cannot create temporary file '%1'").arg(file.name()));
return;
}
diff --git a/parts/filecreate/fctemplateeditbase.ui b/parts/filecreate/fctemplateeditbase.ui
index 2a8513ce..eef54b8f 100644
--- a/parts/filecreate/fctemplateeditbase.ui
+++ b/parts/filecreate/fctemplateeditbase.ui
@@ -40,7 +40,7 @@
<property name="text">
<string>Template &amp;name:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignBottom</set>
</property>
<property name="buddy" stdset="0">
@@ -77,7 +77,7 @@
<property name="text">
<string>Set template content from &amp;file:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignBottom</set>
</property>
<property name="buddy" stdset="0">
diff --git a/parts/filecreate/fctypeeditbase.ui b/parts/filecreate/fctypeeditbase.ui
index 2d44a4d8..2a9f23f8 100644
--- a/parts/filecreate/fctypeeditbase.ui
+++ b/parts/filecreate/fctypeeditbase.ui
@@ -43,7 +43,7 @@
<property name="text">
<string>Type &amp;extension:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignBottom</set>
</property>
<property name="buddy" stdset="0">
@@ -75,7 +75,7 @@
<property name="text">
<string>Type &amp;name:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignBottom</set>
</property>
<property name="buddy" stdset="0">
@@ -107,7 +107,7 @@
<property name="text">
<string>Type &amp;description:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignBottom</set>
</property>
<property name="buddy" stdset="0">
@@ -161,7 +161,7 @@
<property name="text">
<string>Set template content from &amp;file:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignBottom</set>
</property>
<property name="buddy" stdset="0">
diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp
index 1f35c027..b0b6815c 100644
--- a/parts/filelist/projectviewpart.cpp
+++ b/parts/filelist/projectviewpart.cpp
@@ -107,7 +107,7 @@ ProjectviewPart::~ProjectviewPart()
delete m_guibuilder;
if ( m_widget ) {
mainWindow()->removeView( m_widget );
- delete m_widget; // deletes the tqchildren as well
+ delete m_widget; // deletes the children as well
}
}
@@ -491,7 +491,7 @@ void ProjectviewPart::slotSaveAsProjectView(bool askForName)
}
newProjectView = newProjectView.remove("="); // we use this string in config files and = would confuse it
if (m_projectViews.contains(newProjectView) > 0 &&
- KMessageBox::warningContinueCancel(mainWindow()->main(), i18n("<qt>A view session named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").tqarg(newProjectView), TQString(), i18n("Overwrite")) != KMessageBox::Continue)
+ KMessageBox::warningContinueCancel(mainWindow()->main(), i18n("<qt>A view session named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(newProjectView), TQString(), i18n("Overwrite")) != KMessageBox::Continue)
{
return;
}
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index 06ceac88..7f9e816c 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -352,7 +352,7 @@ void KDevFileSelector::slotFilterChange( const TQString & nf )
filter->lineEdit()->setText( TQString() );
TQToolTip::add
( btnFilter,
- TQString( i18n("Apply last filter (\"%1\")") ).tqarg( lastFilter ) );
+ TQString( i18n("Apply last filter (\"%1\")") ).arg( lastFilter ) );
}
else
{
diff --git a/parts/fileview/fileitemfactory.cpp b/parts/fileview/fileitemfactory.cpp
index 5f4478bc..3ccf5921 100644
--- a/parts/fileview/fileitemfactory.cpp
+++ b/parts/fileview/fileitemfactory.cpp
@@ -50,7 +50,7 @@ bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString&
m_isActiveDir = false;
setVisible( listView()->shouldBeShown( this ) );
foundolddir = true;
- tqrepaint();
+ repaint();
}
if ( this->path() == newdir && isDir() && !m_isActiveDir )
@@ -58,7 +58,7 @@ bool FileTreeViewItem::changeActiveDir( const TQString& olddir, const TQString&
m_isActiveDir = true;
setVisible( listView()->shouldBeShown( this ) );
foundnewdir = true;
- tqrepaint();
+ repaint();
}
if( foundnewdir && foundolddir )
@@ -85,7 +85,7 @@ bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf )
kdDebug( 9017 ) << "FileTreeViewItem::setProjectFile(): " + path << " projectfile: " << pf << endl;
m_isProjectFile = pf;
setVisible( listView()->shouldBeShown( this ) );
- tqrepaint();
+ repaint();
return true;
}
@@ -103,7 +103,7 @@ bool FileTreeViewItem::setProjectFile( TQString const & path, bool pf )
///////////////////////////////////////////////////////////////////////////////
void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,
- int column, int width, int tqalignment)
+ int column, int width, int alignment)
{
if ( listView()->showNonProjectFiles() && isProjectFile() )
{
@@ -119,7 +119,7 @@ void FileTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,
p->setFont( font );
}
- TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+ TQListViewItem::paintCell( p, cg, column, width, alignment );
}
diff --git a/parts/fileview/fileitemfactory.h b/parts/fileview/fileitemfactory.h
index bd484edd..065591d7 100644
--- a/parts/fileview/fileitemfactory.h
+++ b/parts/fileview/fileitemfactory.h
@@ -41,7 +41,7 @@ namespace filetreeview
virtual ~FileTreeViewItem() {}
public:
- virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment );
+ virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment );
FileTreeWidget* listView() const;
void hideOrShow();
bool isProjectFile() const { return m_isProjectFile; }
diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp
index df1cdbd5..dd5b0613 100644
--- a/parts/fileview/partwidget.cpp
+++ b/parts/fileview/partwidget.cpp
@@ -101,7 +101,7 @@ void PartWidget::slotFilterChange( const TQString & nf )
if ( empty )
{
m_filter->lineEdit()->setText( TQString() );
- TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").tqarg( m_lastFilter ) );
+ TQToolTip::add( m_btnFilter, i18n("Apply last filter (\"%1\")").arg( m_lastFilter ) );
}
else
{
diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp
index cae245dc..780ccf9f 100644
--- a/parts/fileview/vcsfiletreewidgetimpl.cpp
+++ b/parts/fileview/vcsfiletreewidgetimpl.cpp
@@ -46,12 +46,12 @@ public:
: FileTreeViewItem( parent, item, branch, pf ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
VCSFileTreeViewItem( KFileTreeView* parent, KFileItem* item, KFileTreeBranch* branch )
: FileTreeViewItem( parent, item, branch ), m_statusColor( &FileViewPart::vcsColors.unknown ) {}
- virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment )
+ virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
{
// paint cell in a different color depending on VCS state
TQColorGroup mycg( cg );
mycg.setColor( TQColorGroup::Base, *m_statusColor );
- FileTreeViewItem::paintCell( p, mycg, column, width, tqalignment );
+ FileTreeViewItem::paintCell( p, mycg, column, width, alignment );
}
void setVCSInfo( const VCSFileInfo &info );
diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp
index 6de74381..8b4685d2 100644
--- a/parts/filter/shellfilterdlg.cpp
+++ b/parts/filter/shellfilterdlg.cpp
@@ -120,7 +120,7 @@ void ShellFilterDialog::slotProcessExited(KProcess *)
accept();
} else {
KMessageBox::error(this, i18n("Process exited with status %1")
- .tqarg(m_proc->exitStatus()));
+ .arg(m_proc->exitStatus()));
reject();
}
}
diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp
index 353dd7de..d923fbb5 100644
--- a/parts/filter/shellinsertdlg.cpp
+++ b/parts/filter/shellinsertdlg.cpp
@@ -117,7 +117,7 @@ void ShellInsertDialog::slotProcessExited(KProcess *)
accept();
} else {
KMessageBox::error(this, i18n("Process exited with status %1")
- .tqarg(m_proc->exitStatus()));
+ .arg(m_proc->exitStatus()));
reject();
}
}
diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp
index 527b13a4..11ffbd77 100644
--- a/parts/grepview/grepviewpart.cpp
+++ b/parts/grepview/grepviewpart.cpp
@@ -116,7 +116,7 @@ void GrepViewPart::contextMenu(TQPopupMenu *popup, const Context *context)
if (!ident.isEmpty()) {
m_popupstr = ident;
TQString squeezed = KStringHandler::csqueeze(ident, 30);
- int id = popup->insertItem( i18n("Grep: %1").tqarg(squeezed),
+ int id = popup->insertItem( i18n("Grep: %1").arg(squeezed),
this, TQT_SLOT(slotContextGrep()) );
popup->setWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog "
"and sets the pattern to the text under the cursor."));
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
index 2413a88a..24413db6 100644
--- a/parts/outputviews/appoutputviewpart.cpp
+++ b/parts/outputviews/appoutputviewpart.cpp
@@ -100,7 +100,7 @@ void AppOutputViewPart::startAppCommand(const TQString &directory, const TQStrin
cmd = Settings::terminalEmulatorName( *kapp->config() );
if ( cmd == "konsole" && !directory.isNull() ) { // isn't setting the working directory below enough?
// If a directory was specified, use it
- cmd += TQString(" --workdir '%1'").tqarg(directory);
+ cmd += TQString(" --workdir '%1'").arg(directory);
}
cmd += " -e /bin/sh -c '";
cmd += program;
diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index 824a3f9e..b245cac9 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -79,7 +79,7 @@ void AppOutputWidget::slotRowSelected(TQListBoxItem* row)
if (row) {
if (assertMatch.exactMatch(row->text())) {
m_part->partController()->editDocument(KURL( assertMatch.cap(2) ), assertMatch.cap(3).toInt() - 1);
- m_part->mainWindow()->statusBar()->message(i18n("Assertion failed: %1").tqarg(assertMatch.cap(1)), 10000);
+ m_part->mainWindow()->statusBar()->message(i18n("Assertion failed: %1").arg(assertMatch.cap(1)), 10000);
m_part->mainWindow()->lowerView(this);
} else if (lineInfoMatch.search(row->text()) != -1) {
diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp
index 9686f035..e6ae4609 100644
--- a/parts/outputviews/makeitem.cpp
+++ b/parts/outputviews/makeitem.cpp
@@ -124,7 +124,7 @@ ExitStatusItem::ExitStatusItem( bool normalExit, int exitStatus )
m_text = i18n("*** Compilation aborted ***");
if ( m_normalExit )
if (m_exitStatus )
- m_text = i18n("*** Exited with status: %1 ***").tqarg( m_exitStatus );
+ m_text = i18n("*** Exited with status: %1 ***").arg( m_exitStatus );
else
m_text = i18n("*** Success ***");
}
@@ -139,14 +139,14 @@ bool DirectoryItem::m_showDirectoryMessages = true;
TQString EnteringDirectoryItem::text( EOutputLevel outputLevel )
{
if ( outputLevel < eFull )
- return i18n("Entering directory %1").tqarg( directory );
+ return i18n("Entering directory %1").arg( directory );
return m_text;
}
TQString ExitingDirectoryItem::text( EOutputLevel outputLevel )
{
if ( outputLevel < eFull )
- return i18n("Leaving directory %1").tqarg( directory );
+ return i18n("Leaving directory %1").arg( directory );
return m_text;
}
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index f483ad7a..6d756ee7 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -580,7 +580,7 @@ void MakeWidget::slotProcessExited(KProcess *)
insertItem( item );
displayPendingItem();
- m_part->mainWindow()->statusBar()->message( TQString("%1: %2").tqarg(currentCommand).tqarg(item->m_text), 3000);
+ m_part->mainWindow()->statusBar()->message( TQString("%1: %2").arg(currentCommand).arg(item->m_text), 3000);
m_part->core()->running(m_part, false);
// Defensive programming: We emit this with a single shot timer so that we go once again
diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp
index 20728b19..fca90a1e 100644
--- a/parts/partexplorer/partexplorerform.cpp
+++ b/parts/partexplorer/partexplorerform.cpp
@@ -47,7 +47,7 @@ public:
TQString tipText() const
{
TQString tip = i18n("Name: %1 | Type: %2 | Value: %3");
- return tip.tqarg( text(0) ).tqarg( text(1) ).tqarg( text(2) );
+ return tip.arg( text(0) ).arg( text(1) ).arg( text(2) );
}
};
@@ -220,7 +220,7 @@ void PartExplorerForm::fillServiceList( const KTrader::OfferList &services )
}
TQString dProperty = " *** Found property < %1, %2, %3 >";
- dProperty = dProperty.tqarg( propertyName ).tqarg( propertyType ).tqarg( propertyValue );
+ dProperty = dProperty.arg( propertyName ).arg( propertyType ).arg( propertyValue );
kdDebug( 9000 ) << dProperty << endl;
new PartExplorer::PropertyItem( serviceItem, propertyName, propertyType, propertyValue );
diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp
index e0e38b70..1a5be1e6 100644
--- a/parts/quickopen/quickopenclassdialog.cpp
+++ b/parts/quickopen/quickopenclassdialog.cpp
@@ -78,7 +78,7 @@ void QuickOpenClassDialog::accept()
TQString fileStr;
QuickOpenFunctionChooseForm fdlg( this, "" );
- fdlg.setCaption(i18n("Select The Location of Class %1").tqarg(klasses.first()->name()));
+ fdlg.setCaption(i18n("Select The Location of Class %1").arg(klasses.first()->name()));
fdlg.textLabel2->setText(i18n("Class name:"));
for( ClassList::const_iterator it = klasses.constBegin(); it != klasses.constEnd() ; ++it )
diff --git a/parts/quickopen/quickopenfunctionchooseform.cpp b/parts/quickopen/quickopenfunctionchooseform.cpp
index 8e7a959d..a8853417 100644
--- a/parts/quickopen/quickopenfunctionchooseform.cpp
+++ b/parts/quickopen/quickopenfunctionchooseform.cpp
@@ -31,7 +31,7 @@
QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(TQWidget* parent, const char* name, bool modal, WFlags fl)
: QuickOpenFunctionChooseFormBase(parent,name, modal,fl)
{
- setCaption( i18n("Select One Argument or File of Function %1").tqarg( name ) );
+ setCaption( i18n("Select One Argument or File of Function %1").arg( name ) );
slotArgsChange( 0 );
slotFileChange( 0 );
}
diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp
index 779ba401..7a64cac8 100644
--- a/parts/replace/replace_part.cpp
+++ b/parts/replace/replace_part.cpp
@@ -99,7 +99,7 @@ void ReplacePart::contextMenu(TQPopupMenu *popup, const Context *context)
if (!ident.isEmpty()) {
m_popupstr = ident;
TQString squeezed = KStringHandler::csqueeze(ident, 30);
- int id = popup->insertItem( i18n("Replace Project Wide: %1").tqarg(squeezed),
+ int id = popup->insertItem( i18n("Replace Project Wide: %1").arg(squeezed),
this, TQT_SLOT(slotReplace()) );
popup->setWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog "
"and sets the pattern to the text under the cursor."));
diff --git a/parts/replace/replaceitem.cpp b/parts/replace/replaceitem.cpp
index ed3814d0..b6ca0519 100644
--- a/parts/replace/replaceitem.cpp
+++ b/parts/replace/replaceitem.cpp
@@ -56,7 +56,7 @@ void ReplaceItem::setChecked( bool checked )
return;
}
- // this is a parent item, set self and tqchildren
+ // this is a parent item, set self and children
ReplaceItem * item = firstChild();
while ( item )
{
diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
index ba7ceca1..7501f77d 100644
--- a/parts/snippet/snippet_part.cpp
+++ b/parts/snippet/snippet_part.cpp
@@ -114,7 +114,7 @@ TQStringList SnippetPart::getAllLanguages()
KTrader::OfferList languageSupportOffers =
KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
TQString::fromLatin1("[X-KDevelop-Version] == %1"
- ).tqarg( KDEVELOP_PLUGIN_VERSION ));
+ ).arg( KDEVELOP_PLUGIN_VERSION ));
TQStringList languages;
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index 70dca46e..fd46fb12 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -327,9 +327,9 @@ void SnippetWidget::writeConfig()
SnippetGroup * group = dynamic_cast<SnippetGroup*>(item);
if (group) {
kdDebug(9035) << "-->GROUP " << item->getName() << group->getId() << " " << iGroupCount<< endl;
- strKeyName=TQString("snippetGroupName_%1").tqarg(iGroupCount);
- strKeyId=TQString("snippetGroupId_%1").tqarg(iGroupCount);
- strKeyText=TQString("snippetGroupLang_%1").tqarg(iGroupCount);
+ strKeyName=TQString("snippetGroupName_%1").arg(iGroupCount);
+ strKeyId=TQString("snippetGroupId_%1").arg(iGroupCount);
+ strKeyText=TQString("snippetGroupLang_%1").arg(iGroupCount);
_cfg->writeEntry(strKeyName, group->getName());
_cfg->writeEntry(strKeyId, group->getId());
@@ -337,9 +337,9 @@ void SnippetWidget::writeConfig()
iGroupCount++;
} else if (dynamic_cast<SnippetItem*>(item)) {
kdDebug(9035) << "-->ITEM " << item->getName() << item->getParent() << " " << iSnipCount << endl;
- strKeyName=TQString("snippetName_%1").tqarg(iSnipCount);
- strKeyText=TQString("snippetText_%1").tqarg(iSnipCount);
- strKeyId=TQString("snippetParent_%1").tqarg(iSnipCount);
+ strKeyName=TQString("snippetName_%1").arg(iSnipCount);
+ strKeyText=TQString("snippetText_%1").arg(iSnipCount);
+ strKeyId=TQString("snippetParent_%1").arg(iSnipCount);
_cfg->writeEntry(strKeyName, item->getName());
_cfg->writeEntry(strKeyText, item->getText());
@@ -357,8 +357,8 @@ void SnippetWidget::writeConfig()
for ( it = _mapSaved.begin(); it != _mapSaved.end(); ++it ) { //write the saved variable values
if (it.data().length()<=0) continue; //is the saved value has no length -> no need to save it
- strKeyName=TQString("snippetSavedName_%1").tqarg(iCount);
- strKeyText=TQString("snippetSavedVal_%1").tqarg(iCount);
+ strKeyName=TQString("snippetSavedName_%1").arg(iCount);
+ strKeyText=TQString("snippetSavedVal_%1").arg(iCount);
_cfg->writeEntry(strKeyName, it.key());
_cfg->writeEntry(strKeyText, it.data());
@@ -394,8 +394,8 @@ void SnippetWidget::initConfigOldVersion(KConfig *cfg)
TQString strKeyName="";
TQString strKeyText="";
for ( int i=0; i<iCount; i++) { //read the snippet-list
- strKeyName=TQString("snippetName_%1").tqarg(i);
- strKeyText=TQString("snippetText_%1").tqarg(i);
+ strKeyName=TQString("snippetName_%1").arg(i);
+ strKeyText=TQString("snippetText_%1").arg(i);
TQString strNameVal="";
TQString strTextVal="";
@@ -434,9 +434,9 @@ void SnippetWidget::initConfig()
int iCount = _cfg->readNumEntry("snippetGroupCount", -1);
for ( int i=0; i<iCount; i++) { //read the group-list
- strKeyName=TQString("snippetGroupName_%1").tqarg(i);
- strKeyId=TQString("snippetGroupId_%1").tqarg(i);
- strKeyText=TQString("snippetGroupLang_%1").tqarg(i);
+ strKeyName=TQString("snippetGroupName_%1").arg(i);
+ strKeyId=TQString("snippetGroupId_%1").arg(i);
+ strKeyText=TQString("snippetGroupLang_%1").arg(i);
TQString strNameVal="";
int iIdVal=-1;
@@ -465,9 +465,9 @@ void SnippetWidget::initConfig()
if (iCount != -1) {
iCount = _cfg->readNumEntry("snippetCount", 0);
for ( int i=0; i<iCount; i++) { //read the snippet-list
- strKeyName=TQString("snippetName_%1").tqarg(i);
- strKeyText=TQString("snippetText_%1").tqarg(i);
- strKeyId=TQString("snippetParent_%1").tqarg(i);
+ strKeyName=TQString("snippetName_%1").arg(i);
+ strKeyText=TQString("snippetText_%1").arg(i);
+ strKeyId=TQString("snippetParent_%1").arg(i);
TQString strNameVal="";
TQString strTextVal="";
@@ -492,8 +492,8 @@ void SnippetWidget::initConfig()
iCount = _cfg->readNumEntry("snippetSavedCount", 0);
for ( int i=1; i<=iCount; i++) { //read the saved-values and store in TQMap
- strKeyName=TQString("snippetSavedName_%1").tqarg(i);
- strKeyText=TQString("snippetSavedVal_%1").tqarg(i);
+ strKeyName=TQString("snippetSavedName_%1").arg(i);
+ strKeyText=TQString("snippetSavedVal_%1").arg(i);
TQString strNameVal="";
TQString strTextVal="";
@@ -597,7 +597,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del)
if ( strName != del+del ) { //if not doubel-delimiter
if (iInMeth == 0) { //if input-method "single" is selected
if ( mapVar[strName].length() <= 0 ) { // and not already in map
- strMsg=i18n("Please enter the value for <b>%1</b>:").tqarg(strName);
+ strMsg=i18n("Please enter the value for <b>%1</b>:").arg(strName);
strNew = showSingleVarDialog( strName, &_mapSaved, rSingle );
if (strNew=="")
return ""; //user clicked Cancle
@@ -742,7 +742,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
bool bReturn = false;
//resize the textedits
if (iWidth > 1) {
- TQRect r = dlg.tqgeometry();
+ TQRect r = dlg.geometry();
r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count());
r.setWidth(iWidth);
dlg.setGeometry(r);
@@ -763,9 +763,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
}
bReturn = true;
- iBasicHeight = dlg.tqgeometry().height() - layoutVar->tqgeometry().height();
- iOneHeight = layoutVar->tqgeometry().height() / mapVar2Te.count();
- iWidth = dlg.tqgeometry().width();
+ iBasicHeight = dlg.geometry().height() - layoutVar->geometry().height();
+ iOneHeight = layoutVar->geometry().height() / mapVar2Te.count();
+ iWidth = dlg.geometry().width();
}
//do some cleanup
@@ -811,7 +811,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
labTop = new TQLabel( &dlg, "label" );
layoutTop->addWidget(labTop, 0, 0);
- labTop->setText(i18n("Enter the replacement values for %1:").tqarg( var ));
+ labTop->setText(i18n("Enter the replacement values for %1:").arg( var ));
tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
@@ -863,7 +863,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
strReturn = te->text(); //copy the entered values back the the given map
- dlgSize = dlg.tqgeometry();
+ dlgSize = dlg.geometry();
}
//do some cleanup
diff --git a/parts/snippet/snippetdlg.ui b/parts/snippet/snippetdlg.ui
index e7665011..44bfe88f 100644
--- a/parts/snippet/snippetdlg.ui
+++ b/parts/snippet/snippetdlg.ui
@@ -116,7 +116,7 @@
<property name="text">
<string>&amp;Snippet:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="buddy" stdset="0">
diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp
index 1133621d..a358fb07 100644
--- a/parts/texttools/texttoolswidget.cpp
+++ b/parts/texttools/texttoolswidget.cpp
@@ -45,7 +45,7 @@ public:
TQString text(int) const
{
- return extra.isNull()? tag : TQString("%1: %2").tqarg(tag).tqarg(extra);
+ return extra.isNull()? tag : TQString("%1: %2").arg(tag).arg(extra);
}
TextStructItem *parentStructItem()
{ return static_cast<TextStructItem*>(parent()); }
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index 2e0a988a..58995d40 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -117,7 +117,7 @@ void KDevAppTreeListItem::activate()
void KDevAppTreeListItem::setOpen( bool o )
{
- if( o && !parsed ) { // fill the tqchildren before opening
+ if( o && !parsed ) { // fill the children before opening
((KDevApplicationTree *) parent())->addDesktopGroup( path, this );
parsed = true;
}
diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp
index 1b4c90f3..5a8add6e 100644
--- a/parts/tools/toolsconfig.cpp
+++ b/parts/tools/toolsconfig.cpp
@@ -162,7 +162,7 @@ void ToolsConfig::updateList()
_list->insertItem(it.current()->icon, it.current()->name);
_list->setUpdatesEnabled(true);
- _list->tqrepaint();
+ _list->repaint();
}
diff --git a/parts/uimode/uichooser.ui b/parts/uimode/uichooser.ui
index 864e015b..d86c0124 100644
--- a/parts/uimode/uichooser.ui
+++ b/parts/uimode/uichooser.ui
@@ -213,7 +213,7 @@
<property name="text">
<string>Note: Changes will take effect after KDevelop is restarted</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
diff --git a/parts/valgrind/dialog_widget.ui b/parts/valgrind/dialog_widget.ui
index 302daf47..621f65d2 100644
--- a/parts/valgrind/dialog_widget.ui
+++ b/parts/valgrind/dialog_widget.ui
@@ -141,10 +141,10 @@
</widget>
<widget class="TQCheckBox">
<property name="name">
- <cstring>tqchildrenBox</cstring>
+ <cstring>childrenBox</cstring>
</property>
<property name="text">
- <string>&amp;Trace tqchildren</string>
+ <string>&amp;Trace children</string>
</property>
</widget>
<widget class="TQLayoutWidget">
@@ -271,7 +271,7 @@
<cstring>ctChildrenBox</cstring>
</property>
<property name="text">
- <string>&amp;Trace tqchildren</string>
+ <string>&amp;Trace children</string>
</property>
</widget>
</grid>
@@ -323,7 +323,7 @@
<tabstop>paramEdit</tabstop>
<tabstop>memleakBox</tabstop>
<tabstop>reachableBox</tabstop>
- <tabstop>tqchildrenBox</tabstop>
+ <tabstop>childrenBox</tabstop>
<tabstop>valExecutableEdit</tabstop>
<tabstop>valParamEdit</tabstop>
<tabstop>ctChildrenBox</tabstop>
diff --git a/parts/valgrind/valgrind_dialog.cpp b/parts/valgrind/valgrind_dialog.cpp
index cfca7074..67c05c56 100644
--- a/parts/valgrind/valgrind_dialog.cpp
+++ b/parts/valgrind/valgrind_dialog.cpp
@@ -89,7 +89,7 @@ void ValgrindDialog::setValExecutable( const TQString& ve )
static const TQString memCheckParam( "--tool=memcheck" );
static const TQString leakCheckParam( "--leak-check=yes" );
static const TQString reachableParam( "--show-reachable=yes" );
-static const TQString tqchildrenParam( "--trace-tqchildren=yes" );
+static const TQString childrenParam( "--trace-children=yes" );
TQString ValgrindDialog::valParams() const
{
@@ -100,8 +100,8 @@ TQString ValgrindDialog::valParams() const
params += " " + leakCheckParam;
if ( w->reachableBox->isChecked() )
params += " " + reachableParam;
- if ( w->tqchildrenBox->isChecked() )
- params += " " + tqchildrenParam;
+ if ( w->childrenBox->isChecked() )
+ params += " " + childrenParam;
return params;
}
@@ -113,14 +113,14 @@ void ValgrindDialog::setValParams( const TQString& params )
w->memleakBox->setChecked( true );
if ( myParams.contains( reachableParam ) )
w->reachableBox->setChecked( true );
- if ( myParams.contains( tqchildrenParam ) )
- w->tqchildrenBox->setChecked( true );
+ if ( myParams.contains( childrenParam ) )
+ w->childrenBox->setChecked( true );
w->init();
myParams = myParams.replace( TQRegExp( memCheckParam ), "" );
myParams = myParams.replace( TQRegExp( leakCheckParam ), "" );
myParams = myParams.replace( TQRegExp( reachableParam ), "" );
- myParams = myParams.replace( TQRegExp( tqchildrenParam ), "" );
+ myParams = myParams.replace( TQRegExp( childrenParam ), "" );
myParams = myParams.stripWhiteSpace();
w->valParamEdit->setText( myParams );
}
@@ -150,7 +150,7 @@ TQString ValgrindDialog::ctParams() const
{
TQString params = w->ctParamEdit->text();
if ( w->ctChildrenBox->isChecked() )
- params += " " + tqchildrenParam;
+ params += " " + childrenParam;
return params;
}
@@ -161,11 +161,11 @@ void ValgrindDialog::setCtParams( const TQString& params )
//force --tool=callgrind if no params are given
if (myParams.isEmpty())
myParams = "--tool=callgrind";
- if ( myParams.contains( tqchildrenParam ) )
+ if ( myParams.contains( childrenParam ) )
w->ctChildrenBox->setChecked( true );
w->init();
- myParams = myParams.replace( TQRegExp( tqchildrenParam ), "" );
+ myParams = myParams.replace( TQRegExp( childrenParam ), "" );
myParams = myParams.stripWhiteSpace();
w->ctParamEdit->setText( myParams );
}
diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp
index abf10a6d..bd0df1ef 100644
--- a/parts/valgrind/valgrind_part.cpp
+++ b/parts/valgrind/valgrind_part.cpp
@@ -93,7 +93,7 @@ void ValgrindPart::loadOutput()
TQFile f( fName );
if ( !f.open( IO_ReadOnly ) ) {
- KMessageBox::sorry( 0, i18n("Could not open valgrind output: %1").tqarg(fName) );
+ KMessageBox::sorry( 0, i18n("Could not open valgrind output: %1").arg(fName) );
return;
}
@@ -234,7 +234,7 @@ void ValgrindPart::runValgrind( const TQString& exec, const TQString& params, co
DomUtil::PairList::ConstIterator it;
for (it = run_envvars.begin(); it != run_envvars.end(); ++it)
{
- envVarList << TQString("%1=\"%2\" ").tqarg((*it).first).tqarg((*it).second);
+ envVarList << TQString("%1=\"%2\" ").arg((*it).first).arg((*it).second);
}
*proc << envVarList.join("") << valExec << valParams << exec << params;
@@ -312,7 +312,7 @@ void ValgrindPart::processExited( KProcess* p )
KProcess *kcProc = new KProcess;
// kcProc->setWorkingDirectory(kcInfo.kcWorkDir);
*kcProc << kcInfo.kcPath;
- *kcProc << TQString("callgrind.out.%1").tqarg(p->pid());
+ *kcProc << TQString("callgrind.out.%1").arg(p->pid());
kcProc->start(KProcess::DontCare);
}
}
diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp
index 43e8bdb7..58ef9444 100644
--- a/parts/vcsmanager/vcsmanagerpart.cpp
+++ b/parts/vcsmanager/vcsmanagerpart.cpp
@@ -95,7 +95,7 @@ void VCSManagerPart::loadVCSPlugin()
m_vcsPluginName = DomUtil::readEntry( dom, "/general/versioncontrol" ).stripWhiteSpace();
if ( m_vcsPluginName.isEmpty() ) return;
- TQString constraint = TQString( "DesktopEntryName=='%1'" ).tqarg( m_vcsPluginName );
+ TQString constraint = TQString( "DesktopEntryName=='%1'" ).arg( m_vcsPluginName );
pluginController()->loadPlugin( "KDevelop/VersionControl", constraint );
}
diff --git a/parts/vcsmanager/vcsmanagerprojectconfig.cpp b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
index ef2f9568..9a081f3a 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfig.cpp
+++ b/parts/vcsmanager/vcsmanagerprojectconfig.cpp
@@ -51,7 +51,7 @@ void VCSManagerProjectConfig::setup( )
int current = 0;
- TQString constraint = TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION);
+ TQString constraint = TQString("[X-KDevelop-Version] == %1").arg(KDEVELOP_PLUGIN_VERSION);
KTrader::OfferList offers = KTrader::self()->query("KDevelop/VersionControl", constraint );
KTrader::OfferList::const_iterator it = offers.begin();
for ( int i = 1; it != offers.end(); ++it, ++i )
diff --git a/parts/vcsmanager/vcsmanagerprojectconfigbase.ui b/parts/vcsmanager/vcsmanagerprojectconfigbase.ui
index 03bf9c47..9649ec6e 100644
--- a/parts/vcsmanager/vcsmanagerprojectconfigbase.ui
+++ b/parts/vcsmanager/vcsmanagerprojectconfigbase.ui
@@ -26,7 +26,7 @@
<property name="text">
<string>Version control system to use for this project:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>