summaryrefslogtreecommitdiffstats
path: root/parts
diff options
context:
space:
mode:
Diffstat (limited to 'parts')
-rw-r--r--parts/abbrev/abbrevconfigwidgetbase.ui4
-rw-r--r--parts/abbrev/addtemplatedlgbase.ui4
-rw-r--r--parts/appwizard/appwizarddlg.cpp38
-rw-r--r--parts/appwizard/appwizarddlgbase.ui22
-rw-r--r--parts/appwizard/common/incadmin/ltmain.sh2
-rw-r--r--parts/appwizard/common/kde-index.docbook38
-rw-r--r--parts/appwizard/common/scons/admin/kde.py6
-rw-r--r--parts/appwizard/filepropspage.cpp2
-rw-r--r--parts/appwizard/importdlg.cpp6
-rw-r--r--parts/appwizard/importdlgbase.ui6
-rw-r--r--parts/appwizard/kdevlicense.cpp4
-rw-r--r--parts/appwizard/vcs_form.ui2
-rw-r--r--parts/astyle/astyle_adaptor.h2
-rw-r--r--parts/astyle/astyle_part.cpp4
-rw-r--r--parts/astyle/astyleconfig.ui26
-rw-r--r--parts/bookmarks/bookmarks_part.cpp2
-rw-r--r--parts/bookmarks/bookmarks_settings_base.ui10
-rw-r--r--parts/bookmarks/bookmarks_widget.cpp4
-rw-r--r--parts/classview/classtooldlg.cpp44
-rw-r--r--parts/classview/classtooldlg.h6
-rw-r--r--parts/classview/classtreebase.cpp2
-rw-r--r--parts/classview/classviewwidget.cpp4
-rw-r--r--parts/classview/digraphview.cpp8
-rw-r--r--parts/classview/digraphview.h2
-rw-r--r--parts/classview/hierarchydlg.cpp12
-rw-r--r--parts/ctags2/ctags2_createtagfilebase.ui4
-rw-r--r--parts/ctags2/ctags2_part.cpp8
-rw-r--r--parts/ctags2/ctags2_selecttagfilebase.ui4
-rw-r--r--parts/ctags2/ctags2_settingswidgetbase.ui8
-rw-r--r--parts/ctags2/ctags2_widget.cpp4
-rw-r--r--parts/ctags2/ctags2_widgetbase.ui4
-rw-r--r--parts/diff/diffdlg.cpp6
-rw-r--r--parts/diff/diffpart.cpp2
-rw-r--r--parts/diff/diffwidget.cpp12
-rw-r--r--parts/diff/diffwidget.h2
-rw-r--r--parts/distpart/distpart_ui.ui36
-rw-r--r--parts/distpart/distpart_widget.cpp10
-rw-r--r--parts/documentation/addcatalogdlgbase.ui6
-rw-r--r--parts/documentation/bookmarkview.cpp2
-rw-r--r--parts/documentation/contentsview.cpp2
-rw-r--r--parts/documentation/docglobalconfigwidget.cpp2
-rw-r--r--parts/documentation/docglobalconfigwidgetbase.ui12
-rw-r--r--parts/documentation/docprojectconfigwidgetbase.ui2
-rw-r--r--parts/documentation/documentation_part.cpp30
-rw-r--r--parts/documentation/documentation_widget.cpp2
-rw-r--r--parts/documentation/docutils.cpp2
-rw-r--r--parts/documentation/editbookmarkdlg.ui4
-rw-r--r--parts/documentation/editcatalogdlgbase.ui6
-rw-r--r--parts/documentation/find_documentation.cpp4
-rw-r--r--parts/documentation/find_documentation_optionsbase.ui6
-rw-r--r--parts/documentation/find_documentationbase.ui2
-rw-r--r--parts/documentation/indexview.cpp4
-rw-r--r--parts/documentation/interfaces/kdevdocumentationplugin.cpp6
-rw-r--r--parts/documentation/plugins/chm/docchmplugin.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/chm.cpp2
-rw-r--r--parts/documentation/protocols/chm/decompress.cpp2
-rw-r--r--parts/documentation/searchview.cpp16
-rw-r--r--parts/documentation/selecttopicbase.ui2
-rw-r--r--parts/documentation/tools/htdig/htdigindex.cpp8
-rw-r--r--parts/doxygen/config.cpp18
-rw-r--r--parts/doxygen/config.h4
-rw-r--r--parts/doxygen/doxygenconfigwidget.cpp6
-rw-r--r--parts/doxygen/doxygenconfigwidget.h2
-rw-r--r--parts/doxygen/doxygenpart.cpp4
-rw-r--r--parts/doxygen/input.cpp54
-rw-r--r--parts/filecreate/addglobaldlg.cpp4
-rw-r--r--parts/filecreate/fcconfigwidget.cpp2
-rw-r--r--parts/filecreate/fcconfigwidgetbase.ui12
-rw-r--r--parts/filecreate/fctemplateeditbase.ui14
-rw-r--r--parts/filecreate/fctypeeditbase.ui24
-rw-r--r--parts/filecreate/file-templates/ui-confdialog2
-rw-r--r--parts/filecreate/file-templates/ui-dialogb2
-rw-r--r--parts/filecreate/file-templates/ui-dialogb-qt46
-rw-r--r--parts/filecreate/file-templates/ui-dialogr2
-rw-r--r--parts/filecreate/file-templates/ui-dialogr-qt46
-rw-r--r--parts/filecreate/file-templates/ui-tabdialog2
-rw-r--r--parts/filecreate/filecreate_newfile.cpp2
-rw-r--r--parts/filecreate/filecreate_part.cpp2
-rw-r--r--parts/filecreate/filecreate_widget2.cpp4
-rw-r--r--parts/filelist/filelist_widget.cpp2
-rw-r--r--parts/filelist/projectviewconfigbase.ui2
-rw-r--r--parts/filelist/projectviewpart.cpp6
-rw-r--r--parts/filelist/projectviewprojectconfigbase.ui4
-rw-r--r--parts/fileselector/fileselector_widget.cpp10
-rw-r--r--parts/fileselector/kactionselector.cpp2
-rw-r--r--parts/fileselector/kbookmarkhandler.cpp2
-rw-r--r--parts/fileview/addfilegroupdlg.cpp12
-rw-r--r--parts/fileview/filegroupsconfigwidgetbase.ui6
-rw-r--r--parts/fileview/filegroupswidget.cpp2
-rw-r--r--parts/fileview/fileitemfactory.cpp10
-rw-r--r--parts/fileview/fileitemfactory.h2
-rw-r--r--parts/fileview/filetreeviewwidgetimpl.cpp2
-rw-r--r--parts/fileview/partwidget.cpp8
-rw-r--r--parts/fileview/vcsfiletreewidgetimpl.cpp14
-rw-r--r--parts/filter/shellfilterdlg.cpp12
-rw-r--r--parts/filter/shellinsertdlg.cpp12
-rw-r--r--parts/grepview/grepdlg.cpp44
-rw-r--r--parts/grepview/grepviewpart.cpp4
-rw-r--r--parts/grepview/grepviewwidget.cpp6
-rw-r--r--parts/konsole/konsoleviewwidget.cpp2
-rw-r--r--parts/openwith/openwithpart.cpp6
-rw-r--r--parts/outputviews/appoutputviewpart.cpp2
-rw-r--r--parts/outputviews/appoutputwidget.cpp8
-rw-r--r--parts/outputviews/compileerrorfilter.cpp4
-rw-r--r--parts/outputviews/directorystatusmessagefilter.cpp6
-rw-r--r--parts/outputviews/filterdlg.ui2
-rw-r--r--parts/outputviews/makeitem.cpp8
-rw-r--r--parts/outputviews/makewidget.cpp22
-rw-r--r--parts/outputviews/makewidget.h2
-rw-r--r--parts/partexplorer/partexplorerform.cpp14
-rw-r--r--parts/quickopen/quickopenbase.ui2
-rw-r--r--parts/quickopen/quickopenclassdialog.cpp2
-rw-r--r--parts/quickopen/quickopenfunctionchooseform.cpp2
-rw-r--r--parts/quickopen/quickopenfunctionchooseformbase.ui6
-rw-r--r--parts/regexptest/regexptestdlgbase.ui4
-rw-r--r--parts/replace/replace_part.cpp4
-rw-r--r--parts/replace/replace_widget.cpp18
-rw-r--r--parts/replace/replacedlg.ui8
-rw-r--r--parts/replace/replaceitem.cpp12
-rw-r--r--parts/replace/replaceview.cpp6
-rw-r--r--parts/scripting/scriptingpart.cpp4
-rw-r--r--parts/snippet/snippet_part.cpp6
-rw-r--r--parts/snippet/snippet_widget.cpp84
-rw-r--r--parts/snippet/snippetdlg.ui10
-rw-r--r--parts/snippet/snippetsettingsbase.ui8
-rw-r--r--parts/texttools/texttoolswidget.cpp2
-rw-r--r--parts/tools/addtooldlg.ui2
-rw-r--r--parts/tools/kapplicationtree.cpp8
-rw-r--r--parts/tools/toolsconfig.cpp4
-rw-r--r--parts/tools/toolsconfigwidgetbase.ui18
-rw-r--r--parts/uimode/uichooser.ui6
-rw-r--r--parts/valgrind/dialog_widget.ui16
-rw-r--r--parts/valgrind/valgrind_dialog.cpp20
-rw-r--r--parts/valgrind/valgrind_part.cpp6
-rw-r--r--parts/valgrind/valgrind_widget.cpp2
-rw-r--r--parts/vcsmanager/vcsmanagerpart.cpp2
-rw-r--r--parts/vcsmanager/vcsmanagerprojectconfig.cpp2
-rw-r--r--parts/vcsmanager/vcsmanagerprojectconfigbase.ui4
140 files changed, 584 insertions, 584 deletions
diff --git a/parts/abbrev/abbrevconfigwidgetbase.ui b/parts/abbrev/abbrevconfigwidgetbase.ui
index f53ec3df..fd04ec23 100644
--- a/parts/abbrev/abbrevconfigwidgetbase.ui
+++ b/parts/abbrev/abbrevconfigwidgetbase.ui
@@ -45,7 +45,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/parts/abbrev/addtemplatedlgbase.ui b/parts/abbrev/addtemplatedlgbase.ui
index bab82762..b4a01258 100644
--- a/parts/abbrev/addtemplatedlgbase.ui
+++ b/parts/abbrev/addtemplatedlgbase.ui
@@ -43,7 +43,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -119,7 +119,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>10</height>
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index eb3fb4f6..8498f392 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -27,8 +27,8 @@
#include <tqpushbutton.h>
#include <tqradiobutton.h>
#include <tqregexp.h>
-#include <tqtextstream.h>
-#include <tqtextview.h>
+#include <textstream.h>
+#include <textview.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
#include <tqvalidator.h>
@@ -61,7 +61,7 @@
#include <kfileitem.h>
#include <kio/chmodjob.h>
-#include <tqlayout.h>
+#include <layout.h>
#include "domutil.h"
#include "kdevversioncontrol.h"
@@ -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;
}
@@ -509,7 +509,7 @@ void AppWizardDialog::accept()
m_pCurrentAppInfo->subMap.insert("EMAIL", email_edit->text() );
m_pCurrentAppInfo->subMap.insert("VERSION", version_edit->text());
m_pCurrentAppInfo->subMap.insert( "I18N", "i18n" );
- m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::tqcurrentDate().year() ) );
+ m_pCurrentAppInfo->subMap.insert("YEAR", TQString::number( TQDate::currentDate().year() ) );
// This isn't too pretty, but we have several templates that use KAboutData::License_${LICENSE}
// and unsurprisingly, KAboutData doesn't cover every imaginable case.
@@ -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 902be185..525aeef0 100644
--- a/parts/appwizard/appwizarddlgbase.ui
+++ b/parts/appwizard/appwizarddlgbase.ui
@@ -139,13 +139,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>180</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>250</width>
<height>180</height>
@@ -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">
@@ -179,7 +179,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@@ -219,7 +219,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@@ -286,13 +286,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>250</width>
<height>32767</height>
@@ -345,7 +345,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@@ -388,7 +388,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@@ -422,7 +422,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -491,7 +491,7 @@
<verstretch>1</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>550</width>
<height>270</height>
diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh
index 0cb90869..3506ead3 100644
--- a/parts/appwizard/common/incadmin/ltmain.sh
+++ b/parts/appwizard/common/incadmin/ltmain.sh
@@ -4565,7 +4565,7 @@ func_mode_link ()
continue
;;
- # Tru64 UNIX uses -model [arg] to determine the tqlayout of C++
+ # Tru64 UNIX uses -model [arg] to determine the layout of C++
# classes, name mangling, and exception handling.
# Darwin uses the -arch flag to determine output architecture.
-model|-arch|-isysroot)
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/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py
index 037b4af0..2e875b75 100644
--- a/parts/appwizard/common/scons/admin/kde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -117,15 +117,15 @@ def detect_kde(env):
## check for the qt and kde includes
print "Checking for the qt includes : ",
- if qtincludes and os.path.isfile(qtincludes + "/qtqlayout.h"):
+ if qtincludes and os.path.isfile(qtincludes + "/qlayout.h"):
# The user told where to look for and it looks valid
print GREEN + "ok " + qtincludes + NORMAL
else:
- if os.path.isfile(qtdir + "/include/qtqlayout.h"):
+ if os.path.isfile(qtdir + "/include/qlayout.h"):
# Automatic detection
print GREEN + "ok " + qtdir + "/include/ " + NORMAL
qtincludes = qtdir + "/include/"
- elif os.path.isfile("/usr/include/qt3/qtqlayout.h"):
+ elif os.path.isfile("/usr/include/qt3/qlayout.h"):
# Debian probably
print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL
qtincludes = "/usr/include/qt3"
diff --git a/parts/appwizard/filepropspage.cpp b/parts/appwizard/filepropspage.cpp
index 3e946abf..d83be6c3 100644
--- a/parts/appwizard/filepropspage.cpp
+++ b/parts/appwizard/filepropspage.cpp
@@ -1,7 +1,7 @@
#include "filepropspage.h"
#include <tqlistbox.h>
#include <klineedit.h>
-#include <tqtextview.h>
+#include <textview.h>
#include <klocale.h>
#include <tqlabel.h>
#include <tqmultilineedit.h>
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 82662921..6234d81c 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -15,11 +15,11 @@
#include <tqdir.h>
#include <tqfile.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <klineedit.h>
#include <tqpushbutton.h>
#include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqtooltip.h>
#include <tqcheckbox.h>
#include <kbuttonbox.h>
@@ -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/importdlgbase.ui b/parts/appwizard/importdlgbase.ui
index 29687ff9..957bb80d 100644
--- a/parts/appwizard/importdlgbase.ui
+++ b/parts/appwizard/importdlgbase.ui
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -208,7 +208,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -276,7 +276,7 @@ will be the author, everything between
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/appwizard/kdevlicense.cpp b/parts/appwizard/kdevlicense.cpp
index 1357c774..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::tqcurrentDate().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/appwizard/vcs_form.ui b/parts/appwizard/vcs_form.ui
index 9ac7dba9..6bb59c93 100644
--- a/parts/appwizard/vcs_form.ui
+++ b/parts/appwizard/vcs_form.ui
@@ -58,7 +58,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
diff --git a/parts/astyle/astyle_adaptor.h b/parts/astyle/astyle_adaptor.h
index 21398fbb..7b5c7ef9 100644
--- a/parts/astyle/astyle_adaptor.h
+++ b/parts/astyle/astyle_adaptor.h
@@ -3,7 +3,7 @@
#include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqmap.h>
#include <tqvariant.h>
diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp
index 6a478982..38f9b737 100644
--- a/parts/astyle/astyle_part.cpp
+++ b/parts/astyle/astyle_part.cpp
@@ -2,7 +2,7 @@
#include <tqwhatsthis.h>
#include <tqvbox.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqpopupmenu.h>
#include <tdeversion.h>
#include <kdebug.h>
@@ -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/astyle/astyleconfig.ui b/parts/astyle/astyleconfig.ui
index 4582fa4b..fd68fe48 100644
--- a/parts/astyle/astyleconfig.ui
+++ b/parts/astyle/astyleconfig.ui
@@ -62,13 +62,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
@@ -293,7 +293,7 @@ Can use * on its own for any file.</string>
<property name="name">
<cstring>FillingGroup</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
@@ -322,7 +322,7 @@ Can use * on its own for any file.</string>
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@@ -380,7 +380,7 @@ Can use * on its own for any file.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>34</width>
<height>21</height>
@@ -440,7 +440,7 @@ The number of spaces per tab is controled by the editor.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>21</height>
@@ -455,7 +455,7 @@ The number of spaces per tab is controled by the editor.</string>
<property name="name">
<cstring>BracketGroup</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
@@ -473,7 +473,7 @@ The number of spaces per tab is controled by the editor.</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@@ -567,7 +567,7 @@ from their immediately preceding closing brackets.</string>
<property name="name">
<cstring>ContinueationGroup</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
@@ -640,7 +640,7 @@ belonging to a conditional header.</string>
<property name="name">
<cstring>IndentGroup</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
@@ -772,7 +772,7 @@ flushed completely to the left (which is the default).</string>
<property name="name">
<cstring>BlockGroup</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
@@ -844,7 +844,7 @@ correctly.
<property name="name">
<cstring>PaddingGroup</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
@@ -909,7 +909,7 @@ There is no unpad operator option.</string>
<property name="name">
<cstring>OneLinersGroup</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>400</width>
<height>32767</height>
diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp
index 965b359b..0d101a3f 100644
--- a/parts/bookmarks/bookmarks_part.cpp
+++ b/parts/bookmarks/bookmarks_part.cpp
@@ -12,7 +12,7 @@
#include <tqwhatsthis.h>
#include <tqvbox.h>
#include <tqtimer.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include <kdebug.h>
diff --git a/parts/bookmarks/bookmarks_settings_base.ui b/parts/bookmarks/bookmarks_settings_base.ui
index 5fe07a63..e23e55f4 100644
--- a/parts/bookmarks/bookmarks_settings_base.ui
+++ b/parts/bookmarks/bookmarks_settings_base.ui
@@ -49,7 +49,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -96,7 +96,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>121</width>
<height>20</height>
@@ -137,7 +137,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -172,7 +172,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>20</height>
@@ -204,7 +204,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>240</height>
diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp
index 304d40fd..5fccd218 100644
--- a/parts/bookmarks/bookmarks_widget.cpp
+++ b/parts/bookmarks/bookmarks_widget.cpp
@@ -13,7 +13,7 @@
#include <tqheader.h>
#include <tqtooltip.h>
#include <tqpair.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <kparts/part.h>
#include <klibloader.h>
@@ -167,7 +167,7 @@ void BookmarksWidget::maybeTip(const TQPoint &p)
if ( ! _part->config()->toolTip() ) return;
BookmarkItem * item = dynamic_cast<BookmarkItem*>( itemAt( p ) );
- TQRect r = tqitemRect( item );
+ TQRect r = itemRect( item );
if ( item && r.isValid() )
{
diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp
index a30e0e11..43ccfa18 100644
--- a/parts/classview/classtooldlg.cpp
+++ b/parts/classview/classtooldlg.cpp
@@ -41,37 +41,37 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
parents_button = new TQToolButton(this);
parents_button->setPixmap( UserIcon("CTparents", KIcon::DefaultState, ClassViewFactory::instance()) );
parents_button->setToggleButton(true);
- parents_button->setFixedSize(parents_button->tqsizeHint());
+ 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->tqsizeHint());
- 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()) );
clients_button->setToggleButton(true);
- clients_button->setFixedSize(clients_button->tqsizeHint());
+ clients_button->setFixedSize(clients_button->sizeHint());
TQToolTip::add(clients_button, i18n("Show clients"));
suppliers_button = new TQToolButton(this);
suppliers_button->setPixmap( UserIcon("CTsuppliers", KIcon::DefaultState, ClassViewFactory::instance()) );
suppliers_button->setToggleButton(true);
- suppliers_button->setFixedSize(suppliers_button->tqsizeHint());
+ suppliers_button->setFixedSize(suppliers_button->sizeHint());
TQToolTip::add(suppliers_button, i18n("Show suppliers"));
methods_button = new TQToolButton(this);
methods_button->setPixmap( UserIcon("CVpublic_meth", KIcon::DefaultState, ClassViewFactory::instance()) );
methods_button->setToggleButton(true);
- methods_button->setFixedSize(methods_button->tqsizeHint());
+ methods_button->setFixedSize(methods_button->sizeHint());
TQToolTip::add(methods_button, i18n("Show methods"));
attributes_button = new TQToolButton(this);
attributes_button->setPixmap( UserIcon("CVpublic_var", KIcon::DefaultState, ClassViewFactory::instance()) );
attributes_button->setToggleButton(true);
- attributes_button->setFixedSize(attributes_button->tqsizeHint());
+ attributes_button->setFixedSize(attributes_button->sizeHint());
TQToolTip::add(attributes_button, i18n("Show attributes"));
access_combo = new TQComboBox(false, this, "access combo");
@@ -86,17 +86,17 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
class_tree = new ClassToolWidget(part, this);
// classTree->setMinimumSize( 500, 400 );
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
TQHBoxLayout *firstrowLayout = new TQHBoxLayout();
TQHBoxLayout *secondrowLayout = new TQHBoxLayout();
- tqlayout->addLayout(firstrowLayout);
- tqlayout->addLayout(secondrowLayout);
+ layout->addLayout(firstrowLayout);
+ layout->addLayout(secondrowLayout);
firstrowLayout->addWidget(class_combo, 1);
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();
@@ -104,7 +104,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
secondrowLayout->addWidget(attributes_button);
secondrowLayout->addWidget(access_combo);
- tqlayout->addWidget(class_tree, 10);
+ layout->addWidget(class_tree, 10);
connect( class_combo, TQT_SIGNAL(activated(const TQString&)),
this, TQT_SLOT(slotClassComboChoice(const TQString&)) );
@@ -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..54d1d1cd 100644
--- a/parts/classview/classtooldlg.h
+++ b/parts/classview/classtooldlg.h
@@ -18,7 +18,7 @@
#include <tqlabel.h>
#include <tqtoolbutton.h>
#include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include "classtoolwidget.h"
#include "parseditem.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/classtreebase.cpp b/parts/classview/classtreebase.cpp
index d057f6e0..a541251b 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -436,7 +436,7 @@ void ClassToolTip::maybeTip(const TQPoint &p)
ClassTreeBase *ctw = static_cast<ClassTreeBase*>(parentWidget());
TQListViewItem *item = ctw->itemAt(p);
- TQRect r = ctw->tqitemRect(item);
+ TQRect r = ctw->itemRect(item);
if (item && r.isValid()) {
ClassTreeItem *ctitem = static_cast<ClassTreeItem*>(item);
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 20c8e8b1..0908af61 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -43,7 +43,7 @@
#include <tqheader.h>
#include <tqdir.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <tqstringlist.h>
// namespace ?!?
@@ -1259,7 +1259,7 @@ void ClassViewWidget::maybeTip( TQPoint const & p )
kdDebug(0) << tooltip << endl;
- TQRect r = tqitemRect( item );
+ TQRect r = itemRect( item );
if ( item && r.isValid() && !tooltip.isEmpty() )
{
diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp
index ba09e463..49d3b259 100644
--- a/parts/classview/digraphview.cpp
+++ b/parts/classview/digraphview.cpp
@@ -16,7 +16,7 @@
#include <tqapplication.h>
#include <tqpainter.h>
#include <tqpaintdevicemetrics.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kglobal.h>
#include <klocale.h>
#include <kmessagebox.h>
@@ -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;
@@ -313,7 +313,7 @@ void DigraphView::drawContents(TQPainter* p, int clipx, int clipy, int clipw, in
triangle[0] = p2 + TQPoint((int)(d11+d21),(int)(d12+d22));
triangle[1] = p2 + TQPoint((int)(d11-d21),(int)(d12-d22));
triangle[2] = p2;
- p->tqdrawPolygon(triangle, true);
+ p->drawPolygon(triangle, true);
}
}
@@ -338,7 +338,7 @@ void DigraphView::contentsMousePressEvent(TQMouseEvent *e)
}
-TQSize DigraphView::tqsizeHint() const
+TQSize DigraphView::sizeHint() const
{
if (width == -1)
return TQSize(100, 100); // arbitrary
diff --git a/parts/classview/digraphview.h b/parts/classview/digraphview.h
index 9130be75..cd25e279 100644
--- a/parts/classview/digraphview.h
+++ b/parts/classview/digraphview.h
@@ -42,7 +42,7 @@ signals:
protected:
virtual void drawContents(TQPainter* p, int clipx, int clipy, int clipw, int cliph);
virtual void contentsMousePressEvent(TQMouseEvent *e);
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
private:
int toXPixel(double x);
diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp
index 0929c5cd..428692fa 100644
--- a/parts/classview/hierarchydlg.cpp
+++ b/parts/classview/hierarchydlg.cpp
@@ -22,7 +22,7 @@
#include <kmessagebox.h>
#include <kdebug.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqfileinfo.h>
#include <tqlistview.h>
#include <tqapplication.h>
@@ -41,10 +41,10 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part )
: TQDialog(0, "hierarchy dialog", false)
{
class_combo = new KComboView(true, 150, this);
- class_combo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
+ class_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
// class_combo->setMinimumWidth(150);
namespace_combo = new KComboView(true, 150, this);
- namespace_combo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
+ namespace_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
// namespace_combo->setMinimumWidth(150);
TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this);
@@ -55,16 +55,16 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part )
digraph = new DigraphView(splitter, "digraph view");
// member_tree = new ClassToolWidget(part, splitter);
- TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
TQBoxLayout *combo_layout = new TQHBoxLayout();
- tqlayout->addLayout(combo_layout);
+ layout->addLayout(combo_layout);
combo_layout->addWidget(namespace_combo);
combo_layout->addWidget(class_combo);
combo_layout->addSpacing(60);
combo_layout->addWidget(refresh_button);
combo_layout->addWidget(save_button);
combo_layout->addWidget(close_button);
- tqlayout->addWidget(splitter);
+ layout->addWidget(splitter);
connect( namespace_combo, TQT_SIGNAL(activated(TQListViewItem*)),
this, TQT_SLOT(slotNamespaceComboChoice(TQListViewItem*)) );
diff --git a/parts/ctags2/ctags2_createtagfilebase.ui b/parts/ctags2/ctags2_createtagfilebase.ui
index 39202844..c60f9145 100644
--- a/parts/ctags2/ctags2_createtagfilebase.ui
+++ b/parts/ctags2/ctags2_createtagfilebase.ui
@@ -60,7 +60,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -76,7 +76,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp
index 2ea9c643..4cf8a9b5 100644
--- a/parts/ctags2/ctags2_part.cpp
+++ b/parts/ctags2/ctags2_part.cpp
@@ -11,7 +11,7 @@
#include <tqwhatsthis.h>
#include <tqpopupmenu.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include <tqregexp.h>
@@ -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_selecttagfilebase.ui b/parts/ctags2/ctags2_selecttagfilebase.ui
index 3969a4f1..c06582b8 100644
--- a/parts/ctags2/ctags2_selecttagfilebase.ui
+++ b/parts/ctags2/ctags2_selecttagfilebase.ui
@@ -47,7 +47,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -63,7 +63,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>20</height>
diff --git a/parts/ctags2/ctags2_settingswidgetbase.ui b/parts/ctags2/ctags2_settingswidgetbase.ui
index 2367f673..c96d04a2 100644
--- a/parts/ctags2/ctags2_settingswidgetbase.ui
+++ b/parts/ctags2/ctags2_settingswidgetbase.ui
@@ -192,7 +192,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -214,7 +214,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<grid>
<property name="name">
@@ -248,7 +248,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>tqlayout21</cstring>
+ <cstring>layout21</cstring>
</property>
<grid>
<property name="name">
@@ -290,7 +290,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>61</height>
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/ctags2/ctags2_widgetbase.ui b/parts/ctags2/ctags2_widgetbase.ui
index 99f150e7..465958df 100644
--- a/parts/ctags2/ctags2_widgetbase.ui
+++ b/parts/ctags2/ctags2_widgetbase.ui
@@ -71,7 +71,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>20</height>
diff --git a/parts/diff/diffdlg.cpp b/parts/diff/diffdlg.cpp
index 16e84b9e..1965cebb 100644
--- a/parts/diff/diffdlg.cpp
+++ b/parts/diff/diffdlg.cpp
@@ -9,7 +9,7 @@
* *
***************************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include <klocale.h>
@@ -22,8 +22,8 @@ DiffDlg::DiffDlg( TQWidget *parent, const char *name ):
diffWidget = new DiffWidget( this, "Main Diff Widget" );
setMainWidget( diffWidget );
- TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 0, spacingHint() );
- tqlayout->addWidget( diffWidget );
+ TQVBoxLayout* layout = new TQVBoxLayout( this, 0, spacingHint() );
+ layout->addWidget( diffWidget );
}
DiffDlg::~DiffDlg()
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..c8e2c171 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -9,8 +9,8 @@
* *
***************************************************************************/
-#include <tqlayout.h>
-#include <tqtextedit.h>
+#include <layout.h>
+#include <textedit.h>
#include <tqpopupmenu.h>
#include <tqcursor.h>
#include <tqfile.h>
@@ -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() )
@@ -192,8 +192,8 @@ DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFl
// te->setMinimumSize( 300, 200 );
connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) );
- TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
- tqlayout->addWidget( te );
+ TQVBoxLayout* layout = new TQVBoxLayout( this );
+ layout->addWidget( te );
}
DiffWidget::~DiffWidget()
@@ -233,7 +233,7 @@ void DiffWidget::loadExtPart( const TQString& partName )
if ( !extPart || !extPart->widget() )
return;
- tqlayout()->add( extPart->widget() );
+ layout()->add( extPart->widget() );
setExtPartVisible( true );
diff --git a/parts/diff/diffwidget.h b/parts/diff/diffwidget.h
index df4b296b..ec5904b0 100644
--- a/parts/diff/diffwidget.h
+++ b/parts/diff/diffwidget.h
@@ -13,7 +13,7 @@
#define _DIFFWIDGET_H_
#include <tqwidget.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqstringlist.h>
#include <kurl.h>
diff --git a/parts/distpart/distpart_ui.ui b/parts/distpart/distpart_ui.ui
index 7cb665ce..6182100f 100644
--- a/parts/distpart/distpart_ui.ui
+++ b/parts/distpart/distpart_ui.ui
@@ -21,13 +21,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -69,7 +69,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -91,13 +91,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>48</width>
<height>48</height>
@@ -231,7 +231,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -314,7 +314,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@@ -322,7 +322,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<grid>
<property name="name">
@@ -646,7 +646,7 @@ changes project compiled version number</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<vbox>
<property name="name">
@@ -654,7 +654,7 @@ changes project compiled version number</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@@ -702,7 +702,7 @@ Build Files</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -710,7 +710,7 @@ Build Files</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<vbox>
<property name="name">
@@ -755,7 +755,7 @@ Build Files</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<vbox>
<property name="name">
@@ -866,7 +866,7 @@ Build Files</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -885,7 +885,7 @@ Build Files</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -954,7 +954,7 @@ Build Files</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -993,7 +993,7 @@ Build Files</string>
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1071,7 +1071,7 @@ Build Files</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp
index 412f957e..cabbe68d 100644
--- a/parts/distpart/distpart_widget.cpp
+++ b/parts/distpart/distpart_widget.cpp
@@ -34,7 +34,7 @@
#include <kdevcore.h>
#include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqnetwork.h>
#include <tqurloperator.h>
#include <tqmessagebox.h>
@@ -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
@@ -457,7 +457,7 @@ TQString DistpartDialog::getSourceName() {
name += (getcustomProjectCheckBoxState() && getbzipCheckBoxState()) ? ".tar.bz2" : ".tar.gz";
return name.replace(TQRegExp("%n"),getappNameFormatLineEditText())
.replace(TQRegExp("%v"),getversionLineEditText())
- .replace(TQRegExp("%d"),TQDate::tqcurrentDate().toString("yyyyMMdd"));
+ .replace(TQRegExp("%d"),TQDate::currentDate().toString("yyyyMMdd"));
}
void DistpartDialog::loadSettings() {
@@ -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/addcatalogdlgbase.ui b/parts/documentation/addcatalogdlgbase.ui
index 699361be..8b67c4fa 100644
--- a/parts/documentation/addcatalogdlgbase.ui
+++ b/parts/documentation/addcatalogdlgbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout20</cstring>
+ <cstring>layout20</cstring>
</property>
<grid>
<property name="name">
@@ -53,7 +53,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>18</height>
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp
index 6ee782ee..4ba521f1 100644
--- a/parts/documentation/bookmarkview.cpp
+++ b/parts/documentation/bookmarkview.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "bookmarkview.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqheader.h>
#include <tqpoint.h>
diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp
index 2581f5a0..7282ccd2 100644
--- a/parts/documentation/contentsview.cpp
+++ b/parts/documentation/contentsview.cpp
@@ -20,7 +20,7 @@
#include "contentsview.h"
#include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kdebug.h>
#include <klistview.h>
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index 8d524a47..36bdb589 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -23,7 +23,7 @@
***************************************************************************/
#include "docglobalconfigwidget.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtoolbox.h>
#include <tqcheckbox.h>
#include <tqwidgetstack.h>
diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui
index b073b6ee..5efa3b92 100644
--- a/parts/documentation/docglobalconfigwidgetbase.ui
+++ b/parts/documentation/docglobalconfigwidgetbase.ui
@@ -60,7 +60,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>190</height>
@@ -141,7 +141,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<grid>
<property name="name">
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -265,7 +265,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/documentation/docprojectconfigwidgetbase.ui b/parts/documentation/docprojectconfigwidgetbase.ui
index 3476d07a..d1c52d8c 100644
--- a/parts/documentation/docprojectconfigwidgetbase.ui
+++ b/parts/documentation/docprojectconfigwidgetbase.ui
@@ -26,7 +26,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 9585c4e7..3d2f6f21 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -24,7 +24,7 @@
#include <tqtimer.h>
#include <tqdir.h>
#include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpopupmenu.h>
#include <tqtabwidget.h>
#include <tqapplication.h>
@@ -125,8 +125,8 @@ DocumentationPart::~DocumentationPart()
void DocumentationPart::loadDocumentationPlugins()
{
KTrader::OfferList docPluginOffers =
- KTrader::self()->query(TQString::tqfromLatin1("KDevelop/DocumentationPlugins"),
- TQString("[X-KDevelop-Version] == %1").tqarg(KDEVELOP_PLUGIN_VERSION));
+ KTrader::self()->query(TQString::fromLatin1("KDevelop/DocumentationPlugins"),
+ 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::tqfromLatin1("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::tqfromLatin1("info:/%1").tqarg(term);
+ TQString url = TQString::fromLatin1("info:/%1").arg(term);
partController()->showDocument(KURL(url));
}
@@ -465,40 +465,40 @@ 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->tqsetWhatsThis(id, i18n("<b>Find documentation</b><p>"
+ popup->setWhatsThis(id, i18n("<b>Find documentation</b><p>"
"Opens the documentation finder tab and searches "
"all possible sources of documentation like "
"table of contents, index, man and info databases, "
"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->tqsetWhatsThis(id, i18n("<b>Look in documentation index</b><p>"
+ popup->setWhatsThis(id, i18n("<b>Look in documentation index</b><p>"
"Opens the documentation index tab. It allows "
"a term to be entered which will be looked for in "
"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->tqsetWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches "
+ popup->setWhatsThis(id, i18n("<b>Search in documentation</b><p>Searches "
"for a term under the cursor in "
"the documentation. For this to work, "
"a full text index must be created first, which can be done in the "
"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->tqsetWhatsThis(id, i18n("<b>Goto manpage</b><p>Tries to open a man page for the term under the cursor."));
+ 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->tqsetWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor."));
+ popup->setWhatsThis(id, i18n("<b>Goto infopage</b><p>Tries to open an info page for the term under the cursor."));
}
if (id != -1)
popup->insertSeparator();
diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp
index 90cd6234..1bc9ae42 100644
--- a/parts/documentation/documentation_widget.cpp
+++ b/parts/documentation/documentation_widget.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include "documentation_widget.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtoolbox.h>
#include <klineedit.h>
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/editbookmarkdlg.ui b/parts/documentation/editbookmarkdlg.ui
index 6f5ea912..8d6ac359 100644
--- a/parts/documentation/editbookmarkdlg.ui
+++ b/parts/documentation/editbookmarkdlg.ui
@@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -125,7 +125,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/parts/documentation/editcatalogdlgbase.ui b/parts/documentation/editcatalogdlgbase.ui
index 8a064022..d0d11779 100644
--- a/parts/documentation/editcatalogdlgbase.ui
+++ b/parts/documentation/editcatalogdlgbase.ui
@@ -49,7 +49,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -91,7 +91,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@@ -107,7 +107,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp
index 594c07c5..ac95d878 100644
--- a/parts/documentation/find_documentation.cpp
+++ b/parts/documentation/find_documentation.cpp
@@ -147,12 +147,12 @@ void FindDocumentation::procManExited( KProcess* )
void FindDocumentation::procInfoReadStdout( KProcess*, char* buf, int len)
{
- proc_info_out += TQString::tqfromLatin1( buf, len );
+ proc_info_out += TQString::fromLatin1( buf, len );
}
void FindDocumentation::procManReadStdout( KProcess*, char* buf, int len)
{
- proc_man_out += TQString::tqfromLatin1( buf, len );
+ proc_man_out += TQString::fromLatin1( buf, len );
}
void FindDocumentation::searchInInfo()
diff --git a/parts/documentation/find_documentation_optionsbase.ui b/parts/documentation/find_documentation_optionsbase.ui
index 4321cea0..5d85bdf1 100644
--- a/parts/documentation/find_documentation_optionsbase.ui
+++ b/parts/documentation/find_documentation_optionsbase.ui
@@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -92,7 +92,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -133,7 +133,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui
index 7cc11627..aa144ba4 100644
--- a/parts/documentation/find_documentationbase.ui
+++ b/parts/documentation/find_documentationbase.ui
@@ -70,7 +70,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp
index 3f323fc5..33e338f3 100644
--- a/parts/documentation/indexview.cpp
+++ b/parts/documentation/indexview.cpp
@@ -21,7 +21,7 @@
#include <tqapplication.h>
#include <tqevent.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <klineedit.h>
@@ -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/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
index a7db4555..e99e6db2 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
@@ -22,7 +22,7 @@
#include <tqpainter.h>
#include <tqstyle.h>
#include <tqheader.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
@@ -209,7 +209,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu
p->fillRect(0, 0, width, height(), cg.brush(crole));
TQFontMetrics fm(lv->fontMetrics());
- int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
+ int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
int marg = lv->itemMargin();
int styleflags = TQStyle::Style_Default;
@@ -240,7 +240,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu
int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int c) const
{
if ((c == 0) || (c == 1) || (c == 2))
- return lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
+ return lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
return TQListViewItem::width(fm, lv, c);
}
diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index 21b07207..09b81d72 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -138,7 +138,7 @@ static KListViewItem* chainEnd(KListViewItem *parent) {
}
static TQString decodeHTML(const TQString& s) {
- TQRegExp rx(TQString::tqfromLatin1("&#(\\d+);|&nbsp;"));
+ TQRegExp rx(TQString::fromLatin1("&#(\\d+);|&nbsp;"));
TQString out = s;
int pos = rx.search(out);
while(pos > -1) {
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/chm.cpp b/parts/documentation/protocols/chm/chm.cpp
index e1528d03..1d7543c3 100644
--- a/parts/documentation/protocols/chm/chm.cpp
+++ b/parts/documentation/protocols/chm/chm.cpp
@@ -342,7 +342,7 @@ bool ChmProtocol::checkNewFile( TQString fullPath, TQString& path )
}
else
{
- path = TQString::tqfromLatin1("/");
+ path = TQString::fromLatin1("/");
}
kdDebug() << "Found. chmFile=" << chmFile << " path=" << path << endl;
break;
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..74d7a11b 100644
--- a/parts/documentation/searchview.cpp
+++ b/parts/documentation/searchview.cpp
@@ -23,10 +23,10 @@
***************************************************************************/
#include "searchview.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdir.h>
#include <tqregexp.h>
@@ -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/selecttopicbase.ui b/parts/documentation/selecttopicbase.ui
index bf53e4a9..696d78ae 100644
--- a/parts/documentation/selecttopicbase.ui
+++ b/parts/documentation/selecttopicbase.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index bd63375c..41c4529a 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -19,8 +19,8 @@
#include <tqapplication.h>
#include <tqdir.h>
#include <tqfile.h>
-#include <tqlayout.h>
-#include <tqtextstream.h>
+#include <layout.h>
+#include <textstream.h>
#include <tqtimer.h>
#include <tqlabel.h>
@@ -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..74ad2b30 100644
--- a/parts/doxygen/config.cpp
+++ b/parts/doxygen/config.cpp
@@ -550,7 +550,7 @@ char *yytext;
#include <tqfileinfo.h>
#include <tqfile.h>
#include <tqdir.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqregexp.h>
#include <tqptrstack.h>
@@ -3773,12 +3773,12 @@ void Config::create()
);
cs->setWidgetType(ConfigString::File);
cs = addString( "LAYOUT_FILE",
- "The LAYOUT_FILE tag can be used to specify a tqlayout file which will be parsed by \n"
- "doxygen. The tqlayout file controls the global structure of the generated output files \n"
- "in an output format independent way. The create the tqlayout file that represents \n"
+ "The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by \n"
+ "doxygen. The layout file controls the global structure of the generated output files \n"
+ "in an output format independent way. The create the layout file that represents \n"
"doxygen's defaults, run doxygen with the -l option. You can optionally specify a \n"
"file name after the option, if omitted DoxygenLayout.xml will be used as the name \n"
- "of the tqlayout file.\n"
+ "of the layout file.\n"
);
cs->setWidgetType(ConfigString::File);
addObsolete("DETAILS_AT_TOP");
@@ -4857,7 +4857,7 @@ void Config::create()
cs = addString( "DOT_FONTNAME",
"By default doxygen will write a font called FreeSans.ttf to the output \n"
"directory and reference it in all dot files that doxygen generates. This \n"
- "font does not include all possible tqunicode characters however, so when you need \n"
+ "font does not include all possible unicode characters however, so when you need \n"
"these (or just want a differently looking font) you can specify the font name \n"
"using DOT_FONTNAME. You need need to make sure dot is able to find the font, \n"
"which can be done by putting it in a standard location or by setting the \n"
@@ -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..adedd17c 100644
--- a/parts/doxygen/config.h
+++ b/parts/doxygen/config.h
@@ -5,7 +5,7 @@
#include <tqfile.h>
#include <tqdict.h>
#include <tqptrlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
/*! \brief Abstract base class for any configuration option.
*
@@ -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/doxygenconfigwidget.cpp b/parts/doxygen/doxygenconfigwidget.cpp
index c70f5df6..72a7b5f2 100644
--- a/parts/doxygen/doxygenconfigwidget.cpp
+++ b/parts/doxygen/doxygenconfigwidget.cpp
@@ -16,7 +16,7 @@
#include <tqscrollview.h>
#include <tqvbox.h>
#include <tqwhatsthis.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <klocale.h>
#include <kdebug.h>
@@ -171,10 +171,10 @@ DoxygenConfigWidget::~DoxygenConfigWidget()
}
-TQSize DoxygenConfigWidget::tqsizeHint() const
+TQSize DoxygenConfigWidget::sizeHint() const
{
// without this the whole dialog becomes much too large
- return TQSize(TQTabWidget::tqsizeHint().width(), 1);
+ return TQSize(TQTabWidget::sizeHint().width(), 1);
}
diff --git a/parts/doxygen/doxygenconfigwidget.h b/parts/doxygen/doxygenconfigwidget.h
index 7c4a31e6..f4a6db38 100644
--- a/parts/doxygen/doxygenconfigwidget.h
+++ b/parts/doxygen/doxygenconfigwidget.h
@@ -38,7 +38,7 @@ private slots:
void changed();
private:
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
void loadFile();
void saveFile();
void init();
diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp
index c1a6469b..b8953d52 100644
--- a/parts/doxygen/doxygenpart.cpp
+++ b/parts/doxygen/doxygenpart.cpp
@@ -41,7 +41,7 @@
#include <tqvbox.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqpopupmenu.h>
#include <tqfileinfo.h>
@@ -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/doxygen/input.cpp b/parts/doxygen/input.cpp
index 31a1d4ed..907d5cd2 100644
--- a/parts/doxygen/input.cpp
+++ b/parts/doxygen/input.cpp
@@ -12,7 +12,7 @@
***************************************************************************/
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcombobox.h>
#include <klineedit.h>
#include <tqpushbutton.h>
@@ -113,13 +113,13 @@ const char **update_xpm = (const char **)update_xpm_data;
InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * parent, bool &flag)
: TQWidget(parent), state(flag), key(k)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
cb = new TQCheckBox(text,this);
init();
- tqlayout->addWidget(cb);
- tqlayout->addStretch(1);
+ layout->addWidget(cb);
+ layout->addStretch(1);
connect( cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(valueChanged(bool)));
}
@@ -154,16 +154,16 @@ void InputBool::setEnabled(bool b)
InputInt::InputInt(const TQString &label, TQWidget *parent, int &val, int minVal, int maxVal)
: TQWidget(parent), m_val(val), m_minVal(minVal), m_maxVal(maxVal)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5);
+ TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
sp = new TQSpinBox(minVal, maxVal, 1, this);
lab = new TQLabel(sp, label+":", this);
init();
- tqlayout->addWidget(lab);
- tqlayout->addWidget(sp);
- tqlayout->addStretch(1);
+ layout->addWidget(lab);
+ layout->addWidget(sp);
+ layout->addStretch(1);
connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
}
@@ -203,25 +203,25 @@ InputString::InputString(const TQString & label,
le = 0; br = 0; com = 0;
if (m == StringFixed) {
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5);
+ TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
com = new TQComboBox(this);
lab = new TQLabel(com,label+":", this);
- tqlayout->addWidget(lab);
- tqlayout->addWidget(com);
- tqlayout->addStretch(1);
+ layout->addWidget(lab);
+ layout->addWidget(com);
+ layout->addStretch(1);
} else {
- TQGridLayout *tqlayout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5);
+ TQGridLayout *layout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5);
le = new KLineEdit(this);
lab = new TQLabel(le,label+":", this);
- tqlayout->addWidget(lab, 0, 0);
+ layout->addWidget(lab, 0, 0);
le->setText(s);
- tqlayout->addWidget(le, 0, 1);
+ layout->addWidget(le, 0, 1);
if (m == StringFile || m == StringDir) {
br = new TQPushButton(this);
br->setPixmap(SmallIcon(m==StringFile? "document" : "folder"));
TQToolTip::add(br, m==StringFile? i18n("Browse to a file") : i18n("Browse to a folder"));
- tqlayout->addWidget(br, 0, 2);
+ layout->addWidget(br, 0, 2);
}
}
@@ -327,29 +327,29 @@ InputStrList::InputStrList(const TQString & label,
TQWidget *parent, TQStrList &sl, ListMode lm)
: TQWidget(parent), strList(sl)
{
- TQGridLayout *tqlayout = new TQGridLayout(this, 2, 2, 5);
+ TQGridLayout *layout = new TQGridLayout(this, 2, 2, 5);
TQWidget *dw = new TQWidget(this); /* dummy widget used for layouting */
- TQHBoxLayout *boxtqlayout = new TQHBoxLayout(dw, 0, 5);
+ TQHBoxLayout *boxlayout = new TQHBoxLayout(dw, 0, 5);
le = new KLineEdit(dw);
lab = new TQLabel(le,label+":", this );
- tqlayout->addWidget(lab, 0, 0);
- boxtqlayout->addWidget(le, 1);
+ layout->addWidget(lab, 0, 0);
+ boxlayout->addWidget(le, 1);
add = new TQPushButton(dw);
add->setPixmap(TQPixmap( add_xpm ));
TQToolTip::add(add, i18n("Add item"));
- boxtqlayout->addWidget(add);
+ boxlayout->addWidget(add);
del = new TQPushButton(dw);
del->setPixmap(TQPixmap( del_xpm ));
TQToolTip::add(del, i18n("Delete selected item"));
- boxtqlayout->addWidget(del);
+ boxlayout->addWidget(del);
upd = new TQPushButton(dw);
upd->setPixmap(TQPixmap( update_xpm ));
TQToolTip::add(upd, i18n("Update selected item"));
- boxtqlayout->addWidget(upd);
+ boxlayout->addWidget(upd);
lb = new TQListBox(this);
lb->setMinimumSize(400, 100);
@@ -364,17 +364,17 @@ InputStrList::InputStrList(const TQString & label,
brFile = new TQPushButton(dw);
brFile->setPixmap(SmallIcon("document"));
TQToolTip::add(brFile, i18n("Browse to a file"));
- boxtqlayout->addWidget(brFile);
+ boxlayout->addWidget(brFile);
}
if (lm & ListDir) {
brDir = new TQPushButton(dw);
brDir->setPixmap(SmallIcon("folder"));
TQToolTip::add(brDir, i18n("Browse to a folder"));
- boxtqlayout->addWidget(brDir);
+ boxlayout->addWidget(brDir);
}
}
- tqlayout->addWidget(dw, 0, 1);
- tqlayout->addWidget(lb, 1, 1);
+ layout->addWidget(dw, 0, 1);
+ layout->addWidget(lb, 1, 1);
connect( le, TQT_SIGNAL(returnPressed()),
this, TQT_SLOT(addString()) );
diff --git a/parts/filecreate/addglobaldlg.cpp b/parts/filecreate/addglobaldlg.cpp
index 93914a2f..b60d90a4 100644
--- a/parts/filecreate/addglobaldlg.cpp
+++ b/parts/filecreate/addglobaldlg.cpp
@@ -14,7 +14,7 @@
#include <tqheader.h>
#include <tqlistview.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -68,7 +68,7 @@ AddGlobalDlg::AddGlobalDlg( TQWidget* parent, const char* name, bool modal, WFla
AddGlobalDlgLayout->addWidget( fcglobal_view, 0, 0 );
languageChange();
- resize( TQSize(511, 282).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(511, 282).expandedTo(minimumSizeHint()) );
// signals and slots connections
connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp
index 8b4ca11a..fa1af3e1 100644
--- a/parts/filecreate/fcconfigwidget.cpp
+++ b/parts/filecreate/fcconfigwidget.cpp
@@ -15,7 +15,7 @@
#include <tqtabwidget.h>
#include <tqdom.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqcheckbox.h>
#include <klineedit.h>
#include <tqlabel.h>
diff --git a/parts/filecreate/fcconfigwidgetbase.ui b/parts/filecreate/fcconfigwidgetbase.ui
index 6302f05f..be039483 100644
--- a/parts/filecreate/fcconfigwidgetbase.ui
+++ b/parts/filecreate/fcconfigwidgetbase.ui
@@ -140,7 +140,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -173,7 +173,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -190,7 +190,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -286,7 +286,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>330</width>
<height>20</height>
@@ -381,7 +381,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>150</height>
@@ -406,7 +406,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/filecreate/fctemplateeditbase.ui b/parts/filecreate/fctemplateeditbase.ui
index 371c37c9..df15692c 100644
--- a/parts/filecreate/fctemplateeditbase.ui
+++ b/parts/filecreate/fctemplateeditbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -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">
@@ -56,7 +56,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -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">
@@ -96,7 +96,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>26</height>
@@ -110,7 +110,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -126,7 +126,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/parts/filecreate/fctypeeditbase.ui b/parts/filecreate/fctypeeditbase.ui
index faf18a37..9d97d82b 100644
--- a/parts/filecreate/fctypeeditbase.ui
+++ b/parts/filecreate/fctypeeditbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -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">
@@ -59,7 +59,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -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">
@@ -91,7 +91,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout3_2</cstring>
+ <cstring>layout3_2</cstring>
</property>
<vbox>
<property name="name">
@@ -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">
@@ -125,7 +125,7 @@
<property name="name">
<cstring>icon_url</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
@@ -140,7 +140,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -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">
@@ -180,7 +180,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>26</height>
@@ -194,7 +194,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -210,7 +210,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/parts/filecreate/file-templates/ui-confdialog b/parts/filecreate/file-templates/ui-confdialog
index e6be7b92..b61af20d 100644
--- a/parts/filecreate/file-templates/ui-confdialog
+++ b/parts/filecreate/file-templates/ui-confdialog
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/filecreate/file-templates/ui-dialogb b/parts/filecreate/file-templates/ui-dialogb
index f369c82f..e02e5ea6 100644
--- a/parts/filecreate/file-templates/ui-dialogb
+++ b/parts/filecreate/file-templates/ui-dialogb
@@ -64,7 +64,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/filecreate/file-templates/ui-dialogb-qt4 b/parts/filecreate/file-templates/ui-dialogb-qt4
index 4925e2dd..33167acc 100644
--- a/parts/filecreate/file-templates/ui-dialogb-qt4
+++ b/parts/filecreate/file-templates/ui-dialogb-qt4
@@ -24,7 +24,7 @@
<height>33</height>
</rect>
</property>
- <tqlayout class=TQHBOXLAYOUT_OBJECT_NAME_STRING >
+ <layout class=TQHBOXLAYOUT_OBJECT_NAME_STRING >
<property name="margin" >
<number>0</number>
</property>
@@ -36,7 +36,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="tqsizeHint" >
+ <property name="sizeHint" >
<size>
<width>131</width>
<height>31</height>
@@ -58,7 +58,7 @@
</property>
</widget>
</item>
- </tqlayout>
+ </layout>
</widget>
</widget>
<pixmapfunction></pixmapfunction>
diff --git a/parts/filecreate/file-templates/ui-dialogr b/parts/filecreate/file-templates/ui-dialogr
index 76b7f24e..f5d5ffad 100644
--- a/parts/filecreate/file-templates/ui-dialogr
+++ b/parts/filecreate/file-templates/ui-dialogr
@@ -95,7 +95,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/filecreate/file-templates/ui-dialogr-qt4 b/parts/filecreate/file-templates/ui-dialogr-qt4
index 74dbf04c..d047e11c 100644
--- a/parts/filecreate/file-templates/ui-dialogr-qt4
+++ b/parts/filecreate/file-templates/ui-dialogr-qt4
@@ -24,7 +24,7 @@
<height>106</height>
</rect>
</property>
- <tqlayout class=TQVBOXLAYOUT_OBJECT_NAME_STRING >
+ <layout class=TQVBOXLAYOUT_OBJECT_NAME_STRING >
<property name="margin" >
<number>0</number>
</property>
@@ -50,7 +50,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="tqsizeHint" >
+ <property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
@@ -58,7 +58,7 @@
</property>
</spacer>
</item>
- </tqlayout>
+ </layout>
</widget>
</widget>
<pixmapfunction></pixmapfunction>
diff --git a/parts/filecreate/file-templates/ui-tabdialog b/parts/filecreate/file-templates/ui-tabdialog
index f7447450..56ac7bd7 100644
--- a/parts/filecreate/file-templates/ui-tabdialog
+++ b/parts/filecreate/file-templates/ui-tabdialog
@@ -87,7 +87,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/filecreate/filecreate_newfile.cpp b/parts/filecreate/filecreate_newfile.cpp
index b4b84de1..22084aef 100644
--- a/parts/filecreate/filecreate_newfile.cpp
+++ b/parts/filecreate/filecreate_newfile.cpp
@@ -16,7 +16,7 @@
#include <tqgrid.h>
#include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <klineedit.h>
diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp
index dc581ac3..0f33b216 100644
--- a/parts/filecreate/filecreate_part.cpp
+++ b/parts/filecreate/filecreate_part.cpp
@@ -451,7 +451,7 @@ KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString
}
void FileCreatePart::slotNoteFiletype(const FileType * filetype) {
- kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : TQString::tqfromLatin1("Null") ) << endl;
+ kdDebug(9034) << "Noting file type: " << (filetype ? filetype->ext() : TQString::fromLatin1("Null") ) << endl;
m_filedialogFiletype = filetype;
}
diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp
index 840d62b4..d934aba0 100644
--- a/parts/filecreate/filecreate_widget2.cpp
+++ b/parts/filecreate/filecreate_widget2.cpp
@@ -191,7 +191,7 @@ namespace FileCreate {
if( !i )
continue;
- TQSize size = i->tqsizeHint();
+ TQSize size = i->sizeHint();
maxHeight = size.height()>maxHeight ? size.height() : maxHeight;
}
setRowHeight(row,maxHeight+2); // bit of extra room
@@ -206,7 +206,7 @@ namespace FileCreate {
if( !i )
continue;
- TQSize size = item(r,col)->tqsizeHint();
+ TQSize size = item(r,col)->sizeHint();
maxWidth = size.width()>maxWidth ? size.width() : maxWidth;
}
setColumnWidth(col,maxWidth+2); // bit of extra room
diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp
index 223f53b6..4898440d 100644
--- a/parts/filelist/filelist_widget.cpp
+++ b/parts/filelist/filelist_widget.cpp
@@ -81,7 +81,7 @@ void FileListWidget::startRefreshTimer( )
void FileListWidget::maybeTip( TQPoint const & p )
{
FileListItem * item = static_cast<FileListItem*>( itemAt( p ) );
- TQRect r = tqitemRect( item );
+ TQRect r = itemRect( item );
if ( item && r.isValid() )
{
diff --git a/parts/filelist/projectviewconfigbase.ui b/parts/filelist/projectviewconfigbase.ui
index f5ae5a6d..7e362f85 100644
--- a/parts/filelist/projectviewconfigbase.ui
+++ b/parts/filelist/projectviewconfigbase.ui
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>61</height>
diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp
index 1f35c027..63e943b6 100644
--- a/parts/filelist/projectviewpart.cpp
+++ b/parts/filelist/projectviewpart.cpp
@@ -34,7 +34,7 @@
#include <tqvbox.h>
#include <tqhbox.h>
#include <tqpoint.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kmainwindow.h>
#include <kinputdialog.h>
@@ -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/filelist/projectviewprojectconfigbase.ui b/parts/filelist/projectviewprojectconfigbase.ui
index 847e423d..eca292ad 100644
--- a/parts/filelist/projectviewprojectconfigbase.ui
+++ b/parts/filelist/projectviewprojectconfigbase.ui
@@ -61,7 +61,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>265</width>
<height>20</height>
@@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>71</height>
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index 04e09af1..e73bc347 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -30,7 +30,7 @@
#include <kdevmainwindow.h>
#include <kdevpartcontroller.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtoolbutton.h>
#include <tqhbox.h>
#include <tqvbox.h>
@@ -105,7 +105,7 @@ void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
{
if (m_tb)
{
- setMinimumHeight(m_tb->tqsizeHint().height());
+ setMinimumHeight(m_tb->sizeHint().height());
m_tb->resize(width(),height());
}
}
@@ -136,7 +136,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
tqInstallMsgHandler( oldHandler );
cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
- cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion);
cmbPath->setCompletionObject( cmpl );
lo->addWidget(cmbPath);
@@ -171,7 +171,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main
btnFilter->setIconSet( SmallIconSet("filter" ) );
btnFilter->setToggleButton( true );
filter = new KHistoryCombo( true, filterBox, "filter");
- filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
filterBox->setStretchFactor(filter, 2);
connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) );
lo->addWidget(filterBox);
@@ -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/fileselector/kactionselector.cpp b/parts/fileselector/kactionselector.cpp
index 3d2a67c3..42f0dbde 100644
--- a/parts/fileselector/kactionselector.cpp
+++ b/parts/fileselector/kactionselector.cpp
@@ -28,7 +28,7 @@
#include <tqlistbox.h>
#include <tqtoolbutton.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqevent.h>
#include <tqwhatsthis.h>
diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp
index 6467b83f..014749fa 100644
--- a/parts/fileselector/kbookmarkhandler.cpp
+++ b/parts/fileselector/kbookmarkhandler.cpp
@@ -21,7 +21,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kxmlguiclient.h>
#include <kbookmarkimporter.h>
diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp
index 98eec46d..701bc9c1 100644
--- a/parts/fileview/addfilegroupdlg.cpp
+++ b/parts/fileview/addfilegroupdlg.cpp
@@ -10,7 +10,7 @@
***************************************************************************/
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <kbuttonbox.h>
#include <klocale.h>
@@ -35,10 +35,10 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString
TQFontMetrics fm(pattern_edit->fontMetrics());
pattern_edit->setMinimumWidth(fm.width('X')*35);
connect( pattern_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) );
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 10);
TQGridLayout *grid = new TQGridLayout(2, 2);
- tqlayout->addLayout(grid);
+ layout->addLayout(grid);
grid->addWidget(title_label, 0, 0);
grid->addWidget(title_edit, 0, 1);
grid->addWidget(pattern_label, 1, 0);
@@ -46,7 +46,7 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString
TQFrame *frame = new TQFrame(this);
frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
- tqlayout->addWidget(frame, 0);
+ layout->addWidget(frame, 0);
KButtonBox *buttonbox = new KButtonBox(this);
buttonbox->addStretch();
@@ -56,8 +56,8 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString
m_pOk->setDefault(true);
connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
- buttonbox->tqlayout();
- tqlayout->addWidget(buttonbox, 0);
+ buttonbox->layout();
+ layout->addWidget(buttonbox, 0);
slotTextChanged();
}
diff --git a/parts/fileview/filegroupsconfigwidgetbase.ui b/parts/fileview/filegroupsconfigwidgetbase.ui
index 00687a21..01574b69 100644
--- a/parts/fileview/filegroupsconfigwidgetbase.ui
+++ b/parts/fileview/filegroupsconfigwidgetbase.ui
@@ -97,7 +97,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -138,7 +138,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -171,7 +171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp
index 7efefd96..e0222eb5 100644
--- a/parts/fileview/filegroupswidget.cpp
+++ b/parts/fileview/filegroupswidget.cpp
@@ -228,7 +228,7 @@ void FileGroupsWidget::slotContextMenu(KListView *, TQListViewItem *item, const
popup.insertTitle(i18n("File Groups"));
/// @todo Add, remove groups
int customizeId = popup.insertItem(i18n("Customize..."));
- popup.tqsetWhatsThis(customizeId, i18n("<b>Customize</b><p>Opens <b>Customize File Groups</b> dialog where the groups can be managed."));
+ popup.setWhatsThis(customizeId, i18n("<b>Customize</b><p>Opens <b>Customize File Groups</b> dialog where the groups can be managed."));
if (item) {
if (item->parent()) {
// Not for group items
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/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp
index 2793a52b..f1b557f2 100644
--- a/parts/fileview/filetreeviewwidgetimpl.cpp
+++ b/parts/fileview/filetreeviewwidgetimpl.cpp
@@ -97,7 +97,7 @@ void FileTreeViewWidgetImpl::fillPopupMenu( TQPopupMenu *popupMenu, TQListViewIt
if (item == fileTree()->firstChild() && canReloadTree())
{
int id = popupMenu->insertItem( i18n( "Reload Tree"), this, TQT_SLOT( slotReloadTree() ) );
- popupMenu->tqsetWhatsThis( id, i18n("<b>Reload tree</b><p>Reloads the project files tree.") );
+ popupMenu->setWhatsThis( id, i18n("<b>Reload tree</b><p>Reloads the project files tree.") );
}
m_actionToggleShowNonProjectFiles->plug( popupMenu );
diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp
index 39177191..11bd6f56 100644
--- a/parts/fileview/partwidget.cpp
+++ b/parts/fileview/partwidget.cpp
@@ -12,7 +12,7 @@
#include <tqwhatsthis.h>
#include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtoolbutton.h>
#include <tqdom.h>
#include <kxmlguiclient.h>
@@ -50,14 +50,14 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent )
m_filetree->setIcon(SmallIcon("folder"));
TQWhatsThis::add(m_filetree, i18n("<b>File tree</b><p>"
"The file viewer shows all files of the project "
- "in a tree tqlayout."));
+ "in a tree layout."));
TQHBox* filterBox = new TQHBox( this );
m_btnFilter = new TQToolButton( filterBox );
m_btnFilter->setIconSet( SmallIconSet("filter" ) );
m_btnFilter->setToggleButton( true );
m_filter = new KHistoryCombo( true, filterBox, "filter");
- m_filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ m_filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
filterBox->setStretchFactor(m_filter, 2);
connect( m_btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBtnFilterClick() ) );
@@ -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 0e102cd9..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 );
@@ -62,7 +62,7 @@ public:
void setFileName( const TQString &p ) { setText( FILENAME_COLUMN, p ); }
void setWorkingRev( const TQString &p ) { setText( WORKREVISION_COLUMN, p ); }
void setRepositoryRev( const TQString &p ) { setText( REPOREVISION_COLUMN, p ); }
- void settqStatus( const VCSFileInfo::FileState status );
+ void setStatus( const VCSFileInfo::FileState status );
private:
TQColor *m_statusColor; // cached
@@ -75,12 +75,12 @@ void VCSFileTreeViewItem::setVCSInfo( const VCSFileInfo &info )
//setFileName( info.fileName );
setRepositoryRev( info.repoRevision );
setWorkingRev( info.workRevision );
- settqStatus( info.state );
+ setStatus( info.state );
}
///////////////////////////////////////////////////////////////////////////////
-void VCSFileTreeViewItem::settqStatus( const VCSFileInfo::FileState status )
+void VCSFileTreeViewItem::setStatus( const VCSFileInfo::FileState status )
{
setText( STATUS_COLUMN, VCSFileInfo::state2String( status ) );
// Update color too
@@ -331,7 +331,7 @@ void VCSFileTreeWidgetImpl::slotSyncWithRepository()
const VCSFileTreeViewItem *myFileItem = static_cast<VCSFileTreeViewItem *>( m_vcsStatusRequestedItem );
const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), myFileItem->fileItem()->url().path() );
kdDebug(9017) << "VCS Info requested for: " << relDirPath << endl;
- m_vcsInfoProvider->requesttqStatus( relDirPath, m_vcsStatusRequestedItem );
+ m_vcsInfoProvider->requestStatus( relDirPath, m_vcsStatusRequestedItem );
m_isSyncingWithRepository = true;
}
@@ -344,7 +344,7 @@ void VCSFileTreeWidgetImpl::slotDirectoryExpanded( TQListViewItem* aItem )
const TQString relDirPath = URLUtil::extractPathNameRelative( projectDirectory(), item->fileItem()->url().path() );
kdDebug(9017) << "ASync VCS Info requested for: " << relDirPath << endl;
- m_vcsInfoProvider->requesttqStatus( relDirPath, item, false, false );
+ m_vcsInfoProvider->requestStatus( relDirPath, item, false, false );
// m_isSyncingWithRepository = true;
diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp
index 6de74381..35e957a2 100644
--- a/parts/filter/shellfilterdlg.cpp
+++ b/parts/filter/shellfilterdlg.cpp
@@ -12,7 +12,7 @@
#include "shellfilterdlg.h"
#include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <kbuttonbox.h>
#include <kconfig.h>
@@ -31,18 +31,18 @@
ShellFilterDialog::ShellFilterDialog()
: TQDialog(0, "shell filter dialog", true)
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4);
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4);
combo = new TQComboBox(true, this);
combo->setDuplicatesEnabled(false);
- tqlayout->addWidget(combo);
+ layout->addWidget(combo);
KButtonBox *buttonbox = new KButtonBox(this);
start_button = buttonbox->addButton(i18n("&Start"));
start_button->setDefault(true);
cancel_button = buttonbox->addButton(KStdGuiItem::cancel());
- buttonbox->tqlayout();
- tqlayout->addWidget(buttonbox);
+ buttonbox->layout();
+ layout->addWidget(buttonbox);
connect( start_button, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotStartClicked()) );
@@ -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..8752f6e9 100644
--- a/parts/filter/shellinsertdlg.cpp
+++ b/parts/filter/shellinsertdlg.cpp
@@ -12,7 +12,7 @@
#include "shellinsertdlg.h"
#include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <kconfig.h>
#include <kbuttonbox.h>
@@ -32,18 +32,18 @@
ShellInsertDialog::ShellInsertDialog()
: TQDialog(0, "shell filter dialog", true)
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4);
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4);
combo = new TQComboBox(true, this);
combo->setDuplicatesEnabled(false);
- tqlayout->addWidget(combo);
+ layout->addWidget(combo);
KButtonBox *buttonbox = new KButtonBox(this);
start_button = buttonbox->addButton(i18n("&Start"));
start_button->setDefault(true);
cancel_button = buttonbox->addButton(KStdGuiItem::cancel());
- buttonbox->tqlayout();
- tqlayout->addWidget(buttonbox);
+ buttonbox->layout();
+ layout->addWidget(buttonbox);
connect( start_button, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotStartClicked()) );
@@ -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/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index 18849f40..40d4ec85 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -11,7 +11,7 @@
#include "grepdlg.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqregexp.h>
#include <tqhbox.h>
@@ -88,25 +88,25 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
config = GrepViewFactory::instance()->config();
config->setGroup("GrepDialog");
- TQGridLayout *tqlayout = new TQGridLayout(this, 9, 2, 10, 4);
- tqlayout->setColStretch(0, 0);
- tqlayout->setColStretch(1, 20);
+ TQGridLayout *layout = new TQGridLayout(this, 9, 2, 10, 4);
+ layout->setColStretch(0, 0);
+ layout->setColStretch(1, 20);
TQLabel *pattern_label = new TQLabel(i18n("&Pattern:"), this);
- tqlayout->addWidget(pattern_label, 0, 0, AlignRight | AlignVCenter);
+ layout->addWidget(pattern_label, 0, 0, AlignRight | AlignVCenter);
pattern_combo = new KHistoryCombo(true, this);
pattern_label->setBuddy(pattern_combo);
pattern_combo->setFocus();
pattern_combo->setHistoryItems(config->readListEntry("LastSearchItems"), true);
pattern_combo->setInsertionPolicy(TQComboBox::NoInsertion);
- tqlayout->addWidget(pattern_combo, 0, 1);
+ layout->addWidget(pattern_combo, 0, 1);
TQLabel *template_label = new TQLabel(i18n("&Template:"), this);
- tqlayout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter);
+ layout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter);
TQBoxLayout *template_layout = new TQHBoxLayout(4);
- tqlayout->addLayout(template_layout, 1, 1);
+ layout->addLayout(template_layout, 1, 1);
template_edit = new KLineEdit(this);
template_label->setBuddy(template_edit);
@@ -118,22 +118,22 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
template_layout->addWidget(template_combo, 0);
TQBoxLayout *search_opts_layout = new TQHBoxLayout(15);
- tqlayout->addLayout(search_opts_layout, 2, 1);
+ layout->addLayout(search_opts_layout, 2, 1);
regexp_box = new TQCheckBox(i18n("&Regular Expression"), this);
regexp_box->setChecked(config->readBoolEntry("regexp", false ));
search_opts_layout->addWidget(regexp_box);
case_sens_box = new TQCheckBox(i18n("C&ase sensitive"), this);
- case_sens_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+ case_sens_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
case_sens_box->setChecked(config->readBoolEntry("case_sens", true));
search_opts_layout->addWidget(case_sens_box);
TQLabel *dir_label = new TQLabel(i18n("&Directory:"), this);
- tqlayout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter);
+ layout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter);
TQBoxLayout *dir_layout = new TQHBoxLayout(4);
- tqlayout->addLayout(dir_layout, 3, 1);
+ layout->addLayout(dir_layout, 3, 1);
dir_combo = new KComboBox( true, this );
dir_combo->insertStringList(config->readPathListEntry("LastSearchPaths"));
@@ -158,27 +158,27 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
dir_layout->addWidget( synch_button );
TQBoxLayout *dir_opts_layout = new TQHBoxLayout(15);
- tqlayout->addLayout(dir_opts_layout, 4, 1);
+ layout->addLayout(dir_opts_layout, 4, 1);
recursive_box = new TQCheckBox(i18n("Rec&ursive"), this);
recursive_box->setChecked(config->readBoolEntry("recursive", true));
dir_opts_layout->addWidget(recursive_box);
use_project_box = new TQCheckBox(i18n("Limit search to &project files"), this);
- use_project_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+ use_project_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
use_project_box->setChecked(config->readBoolEntry("search_project_files", true));
dir_opts_layout->addWidget(use_project_box);
TQLabel *files_label = new TQLabel(i18n("&Files:"), this);
- tqlayout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter);
+ layout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter);
files_combo = new KComboBox(true, this);
files_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy()));
files_combo->insertStrList(filepatterns);
- tqlayout->addWidget(files_combo, 5, 1);
+ layout->addWidget(files_combo, 5, 1);
TQLabel *exclude_label = new TQLabel(i18n("&Exclude:"), this);
- tqlayout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter);
+ layout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter);
TQStringList exclude_list = config->readListEntry("exclude_patterns");
exclude_combo = new KComboBox(true, this);
@@ -191,22 +191,22 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
exclude_combo->insertItem("/CVS/,/SCCS/,/\\.svn/,/_darcs/");
exclude_combo->insertItem("");
}
- tqlayout->addWidget(exclude_combo, 6, 1);
+ layout->addWidget(exclude_combo, 6, 1);
TQBoxLayout *other_opts_layout = new TQHBoxLayout(15);
- tqlayout->addLayout(other_opts_layout, 7, 1);
+ layout->addLayout(other_opts_layout, 7, 1);
keep_output_box = new TQCheckBox(i18n("New view"), this);
keep_output_box->setChecked(config->readBoolEntry("new_view", true));
other_opts_layout->addWidget(keep_output_box);
no_find_err_box = new TQCheckBox(i18n("&Suppress find errors"), this);
- no_find_err_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+ no_find_err_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
no_find_err_box->setChecked(config->readBoolEntry("no_find_errs", true));
other_opts_layout->addWidget(no_find_err_box);
TQBoxLayout *button_layout = new TQHBoxLayout(4);
- tqlayout->addLayout(button_layout, 8, 1);
+ layout->addLayout(button_layout, 8, 1);
search_button = new KPushButton(KGuiItem(i18n("Sea&rch"),"grep"), this);
search_button->setDefault(true);
KPushButton *done_button = new KPushButton(KStdGuiItem::cancel(), this);
@@ -214,7 +214,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
button_layout->addWidget(search_button);
button_layout->addWidget(done_button);
- resize(tqsizeHint());
+ resize(sizeHint());
TQWhatsThis::add(pattern_combo,
i18n("<qt>Enter the regular expression you want to search for here.<p>"
diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp
index 997723c1..11ffbd77 100644
--- a/parts/grepview/grepviewpart.cpp
+++ b/parts/grepview/grepviewpart.cpp
@@ -116,9 +116,9 @@ 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->tqsetWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog "
+ popup->setWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog "
"and sets the pattern to the text under the cursor."));
popup->insertSeparator();
}
diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp
index b0cd9968..fedd038c 100644
--- a/parts/grepview/grepviewwidget.cpp
+++ b/parts/grepview/grepviewwidget.cpp
@@ -10,7 +10,7 @@
***************************************************************************/
#include <tqdir.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqregexp.h>
#include <tqpainter.h>
#include <tqtoolbutton.h>
@@ -73,7 +73,7 @@ void GrepListBoxItem::paint(TQPainter *p)
{
TQColor base, dim, result, bkground;
if (listBox()) {
- const TQColorGroup& group = listBox()->tqpalette().active();
+ const TQColorGroup& group = listBox()->palette().active();
if (isSelected()) {
bkground = group.button();
base = group.buttonText();
@@ -126,7 +126,7 @@ void GrepListBoxItem::paint(TQPainter *p)
GrepViewWidget::GrepViewWidget(GrepViewPart *part) : TQWidget(0, "grepview widget")
{
- m_layout = new TQHBoxLayout(this, 0, -1, "greptqlayout");
+ m_layout = new TQHBoxLayout(this, 0, -1, "greplayout");
m_tabWidget = new KTabWidget(this);
diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp
index 62a10d86..a69be352 100644
--- a/parts/konsole/konsoleviewwidget.cpp
+++ b/parts/konsole/konsoleviewwidget.cpp
@@ -9,7 +9,7 @@
* *
***************************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqframe.h>
#include <tqdir.h>
diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp
index 7fc1fcbe..c41d0ee6 100644
--- a/parts/openwith/openwithpart.cpp
+++ b/parts/openwith/openwithpart.cpp
@@ -50,7 +50,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context)
KPopupMenu * openAsPopup = new KPopupMenu( popup );
int id = popup->insertItem( i18n("Open As"), openAsPopup );
- popup->tqsetWhatsThis(id, i18n("<b>Open As</b><p>Lists all encodings that can be used to open the selected file."));
+ popup->setWhatsThis(id, i18n("<b>Open As</b><p>Lists all encodings that can be used to open the selected file."));
TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames();
@@ -80,13 +80,13 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context)
}
id = popup->insertItem( i18n("Open With"), openWithPopup );
- popup->tqsetWhatsThis(id, i18n("<b>Open With</b><p>Lists all applications that can be used to open the selected file."));
+ popup->setWhatsThis(id, i18n("<b>Open With</b><p>Lists all applications that can be used to open the selected file."));
openWithPopup->insertSeparator();
// make sure the generic "Open with ..." entry gets appended to the submenu
id = openWithPopup->insertItem(i18n("Open With..."), this, TQT_SLOT(openWithDialog()));
- openWithPopup->tqsetWhatsThis(id, i18n("<b>Open With...</b><p>Provides a dialog to choose the application to open the selected file."));
+ openWithPopup->setWhatsThis(id, i18n("<b>Open With...</b><p>Provides a dialog to choose the application to open the selected file."));
}
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..5525f1f4 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -19,8 +19,8 @@
#include <tqcheckbox.h>
#include <tqradiobutton.h>
#include <tqfile.h>
-#include <tqtextstream.h>
-#include <tqclipboard.h>
+#include <textstream.h>
+#include <clipboard.h>
#include <klocale.h>
#include <kdebug.h>
@@ -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) {
@@ -339,7 +339,7 @@ void AppOutputWidget::copySelected()
if (isSelected(i))
buffer += item(i)->text() + "\n";
}
- kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard);
+ kapp->clipboard()->setText(buffer, TQClipboard::Clipboard);
}
void AppOutputWidget::addPartialStderrLine(const TQCString & line)
diff --git a/parts/outputviews/compileerrorfilter.cpp b/parts/outputviews/compileerrorfilter.cpp
index 626187ca..efff1e1b 100644
--- a/parts/outputviews/compileerrorfilter.cpp
+++ b/parts/outputviews/compileerrorfilter.cpp
@@ -112,8 +112,8 @@ void CompileErrorFilter::processLine( const TQString& line )
if( hasmatch )
{
// Add hacks for error strings you want excluded here
- if( text.find( TQString::tqfromLatin1("(Each undeclared identifier is reported only once") ) >= 0
- || text.find( TQString::tqfromLatin1("for each function it appears in.)") ) >= 0 )
+ if( text.find( TQString::fromLatin1("(Each undeclared identifier is reported only once") ) >= 0
+ || text.find( TQString::fromLatin1("for each function it appears in.)") ) >= 0 )
hasmatch = false;
}
diff --git a/parts/outputviews/directorystatusmessagefilter.cpp b/parts/outputviews/directorystatusmessagefilter.cpp
index cde1d552..114b98ac 100644
--- a/parts/outputviews/directorystatusmessagefilter.cpp
+++ b/parts/outputviews/directorystatusmessagefilter.cpp
@@ -87,8 +87,8 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const TQString& line, TQString
// we need a TQRegExp because KRegExp is not Utf8 aware.
// 0x00AB is LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK
// 0X00BB is RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK
- static TQRegExp dirChange(TQString::tqfromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::tqfromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::tqfromLatin1(")(.*)"));
- static TQRegExp enEnter(TQString::tqfromLatin1(".*: Entering directory"));
+ static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)"));
+ static TQRegExp enEnter(TQString::fromLatin1(".*: Entering directory"));
kdDebug(9004) << "Directory filter line " << line << endl;
// avoid TQRegExp if possible. This regex performs VERY badly with large inputs,
@@ -160,7 +160,7 @@ bool DirectoryStatusMessageFilter::matchLeaveDir( const TQString& line, TQString
// 0x00AB is LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK
// 0X00BB is RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK
- static TQRegExp dirChange(TQString::tqfromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::tqfromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::tqfromLatin1(")(.*)"));
+ static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)"));
// avoid TQRegExp if possible. This regex performs VERY badly with large inputs,
// and the input required is very short if these strings match.
diff --git a/parts/outputviews/filterdlg.ui b/parts/outputviews/filterdlg.ui
index 4faa7f58..6a315a70 100644
--- a/parts/outputviews/filterdlg.ui
+++ b/parts/outputviews/filterdlg.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp
index 9686f035..aa25057d 100644
--- a/parts/outputviews/makeitem.cpp
+++ b/parts/outputviews/makeitem.cpp
@@ -11,7 +11,7 @@
#include "makeitem.h"
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <kdebug.h>
#include <klocale.h>
@@ -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 34618a97..e916d92c 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -37,10 +37,10 @@
#include <tqapplication.h>
#include <tqdir.h>
#include <tqimage.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <tqtimer.h>
#include <tqfileinfo.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqpopupmenu.h>
#include <tqrichtext_p.h>
@@ -342,7 +342,7 @@ void MakeWidget::copy()
selection.replace("&quot;","\"");
selection.replace("&amp;","&");
- kapp->tqclipboard()->setText(selection, TQClipboard::Clipboard);
+ kapp->clipboard()->setText(selection, TQClipboard::Clipboard);
}
void MakeWidget::nextError()
@@ -566,12 +566,12 @@ void MakeWidget::slotProcessExited(KProcess *)
{
if (childproc->exitStatus())
{
- KNotifyClient::event( tqtopLevelWidget()->winId(), "ProcessError", i18n("The process has finished with errors"));
+ KNotifyClient::event( topLevelWidget()->winId(), "ProcessError", i18n("The process has finished with errors"));
emit m_part->commandFailed(currentCommand);
}
else
{
- KNotifyClient::event( tqtopLevelWidget()->winId(), "ProcessSuccess", i18n("The process has finished successfully"));
+ KNotifyClient::event( topLevelWidget()->winId(), "ProcessSuccess", i18n("The process has finished successfully"));
emit m_part->commandFinished(currentCommand);
}
}
@@ -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
@@ -700,22 +700,22 @@ TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos )
pMenu->insertSeparator();
int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQT_SLOT(toggleLineWrapping()) );
pMenu->setItemChecked(id, m_bLineWrapping);
- pMenu->tqsetWhatsThis(id, i18n("<b>Line wrapping</b><p>Enables or disables wrapping of command lines displayed."));
+ pMenu->setWhatsThis(id, i18n("<b>Line wrapping</b><p>Enables or disables wrapping of command lines displayed."));
pMenu->insertSeparator();
id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQT_SLOT(slotVeryShortCompilerOutput()) );
- pMenu->tqsetWhatsThis(id, i18n("<b>Very short compiler output</b><p>Displays only warnings, errors and the file names which are compiled."));
+ pMenu->setWhatsThis(id, i18n("<b>Very short compiler output</b><p>Displays only warnings, errors and the file names which are compiled."));
pMenu->setItemChecked(id, m_compilerOutputLevel == eVeryShort);
id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQT_SLOT(slotShortCompilerOutput()) );
- pMenu->tqsetWhatsThis(id, i18n("<b>Short compiler output</b><p>Suppresses all the compiler flags and formats to something readable."));
+ pMenu->setWhatsThis(id, i18n("<b>Short compiler output</b><p>Suppresses all the compiler flags and formats to something readable."));
pMenu->setItemChecked(id, m_compilerOutputLevel == eShort);
id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQT_SLOT(slotFullCompilerOutput()) );
- pMenu->tqsetWhatsThis(id, i18n("<b>Full compiler output</b><p>Displays unmodified compiler output."));
+ pMenu->setWhatsThis(id, i18n("<b>Full compiler output</b><p>Displays unmodified compiler output."));
pMenu->setItemChecked(id, m_compilerOutputLevel == eFull);
pMenu->insertSeparator();
id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQT_SLOT(toggleShowDirNavigMessages()));
- pMenu->tqsetWhatsThis(id, i18n("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building."));
+ pMenu->setWhatsThis(id, i18n("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building."));
pMenu->setItemChecked(id, DirectoryItem::getShowDirectoryMessages());
return pMenu;
diff --git a/parts/outputviews/makewidget.h b/parts/outputviews/makewidget.h
index b97b16bb..4d627efc 100644
--- a/parts/outputviews/makewidget.h
+++ b/parts/outputviews/makewidget.h
@@ -14,7 +14,7 @@
#include <tqptrstack.h>
#include <tqregexp.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqvaluevector.h>
#include <tqintdict.h>
diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp
index a32aabb5..934866cc 100644
--- a/parts/partexplorer/partexplorerform.cpp
+++ b/parts/partexplorer/partexplorerform.cpp
@@ -10,10 +10,10 @@
***************************************************************************/
#include <tqlineedit.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqpushbutton.h>
#include <tqtooltip.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqwhatsthis.h>
#include <tqlabel.h>
@@ -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) );
}
};
@@ -96,7 +96,7 @@ void ResultsToolTip::maybeTip( const TQPoint& p )
PartExplorer::PropertyItem *item = dynamic_cast<PartExplorer::PropertyItem*>( m_resultsList->itemAt( p ) );
if ( item )
{
- TQRect r = m_resultsList->tqitemRect( item );
+ TQRect r = m_resultsList->itemRect( item );
if ( r.isValid() )
tip( r, item->tipText() );
}
@@ -116,12 +116,12 @@ PartExplorerForm::PartExplorerForm( TQWidget *parent )
m_resultsList->addColumn( i18n( "Property" ) );
m_resultsList->addColumn( i18n( "Type" ) );
m_resultsList->addColumn( i18n( "Value" ) );
- m_resultsList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3,
+ m_resultsList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3,
(TQSizePolicy::SizeType)3, 0, 0,
m_resultsList->sizePolicy().hasHeightForWidth() ) );
TQWhatsThis::add( m_resultsList, i18n("<b>Matching services</b><p>Results (if any) are shown grouped by matching service name.") );
m_base->resultsLabel->setBuddy(m_resultsList);
- m_base->tqlayout()->add( m_resultsList );
+ m_base->layout()->add( m_resultsList );
setMainWidget( m_base );
m_base->typeCombo->lineEdit()->setFocus();
@@ -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/quickopenbase.ui b/parts/quickopen/quickopenbase.ui
index f4281564..2537a710 100644
--- a/parts/quickopen/quickopenbase.ui
+++ b/parts/quickopen/quickopenbase.ui
@@ -73,7 +73,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
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/quickopen/quickopenfunctionchooseformbase.ui b/parts/quickopen/quickopenfunctionchooseformbase.ui
index 48f1d6b8..592eff07 100644
--- a/parts/quickopen/quickopenfunctionchooseformbase.ui
+++ b/parts/quickopen/quickopenfunctionchooseformbase.ui
@@ -72,7 +72,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>261</width>
<height>31</height>
@@ -120,7 +120,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="1" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
diff --git a/parts/regexptest/regexptestdlgbase.ui b/parts/regexptest/regexptestdlgbase.ui
index fe6bb670..5649238c 100644
--- a/parts/regexptest/regexptestdlgbase.ui
+++ b/parts/regexptest/regexptestdlgbase.ui
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -226,7 +226,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp
index e808ab70..7a64cac8 100644
--- a/parts/replace/replace_part.cpp
+++ b/parts/replace/replace_part.cpp
@@ -99,9 +99,9 @@ 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->tqsetWhatsThis(id, i18n("<b>Replace Project Wide</b><p>Opens the find in files dialog "
+ 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."));
popup->insertSeparator();
}
diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp
index 1136e08a..b9ac5984 100644
--- a/parts/replace/replace_widget.cpp
+++ b/parts/replace/replace_widget.cpp
@@ -35,7 +35,7 @@
#include <klocale.h>
#include <kstdguiitem.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqlineedit.h>
#include <tqradiobutton.h>
@@ -45,7 +45,7 @@
#include <tqdialog.h>
#include <tqfile.h>
#include <tqdir.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdatastream.h>
#include <sys/types.h>
@@ -65,8 +65,8 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part)
_terminateOperation( false )
{
// setup outputview
- TQVBoxLayout * tqlayout = new TQVBoxLayout( this );
- TQHBoxLayout * buttontqlayout = new TQHBoxLayout( tqlayout );
+ TQVBoxLayout * layout = new TQVBoxLayout( this );
+ TQHBoxLayout * buttonlayout = new TQHBoxLayout( layout );
_cancel = new KPushButton( KStdGuiItem::cancel(), this );
_replace = new KPushButton( KGuiItem(i18n("Replace"),"filefind"), this );
@@ -74,11 +74,11 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part)
_cancel->setEnabled( false );
_replace->setEnabled( false );
- buttontqlayout->addWidget( _replace );
- buttontqlayout->addWidget( _cancel );
+ buttonlayout->addWidget( _replace );
+ buttonlayout->addWidget( _cancel );
_listview = new ReplaceView( this );
- tqlayout->addWidget( _listview );
+ layout->addWidget( _listview );
// setup signals
connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( find() ) );
@@ -235,7 +235,7 @@ bool ReplaceWidget::showReplacements()
}
++it;
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
}
m_part->core()->running( m_part, false );
@@ -330,7 +330,7 @@ bool ReplaceWidget::makeReplacements()
}
fileitem = fileitem->nextSibling();
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
}
// Telling the project about the edited files
diff --git a/parts/replace/replacedlg.ui b/parts/replace/replacedlg.ui
index 6a8b81f9..ce58234a 100644
--- a/parts/replace/replacedlg.ui
+++ b/parts/replace/replacedlg.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -93,7 +93,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -200,7 +200,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -229,7 +229,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/parts/replace/replaceitem.cpp b/parts/replace/replaceitem.cpp
index 853c170d..85033406 100644
--- a/parts/replace/replaceitem.cpp
+++ b/parts/replace/replaceitem.cpp
@@ -11,7 +11,7 @@
#include <tqpainter.h>
#include <tqstyle.h>
-#include <tqpalette.h>
+#include <palette.h>
#include <tqcheckbox.h>
#include "replaceitem.h"
@@ -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 )
{
@@ -84,13 +84,13 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column,
const BackgroundMode bgmode = lv->viewport()->backgroundMode();
const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode );
- if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) )
+ if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) )
p->fillRect( 0, 0, width, height(), cg.brush( crole ) );
else
lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) );
TQFontMetrics fm( lv->fontMetrics() );
- int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
+ int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
int marg = lv->itemMargin();
int r = marg;
@@ -138,8 +138,8 @@ void ReplaceItem::activate( int, TQPoint const & localPos )
{
TQListView * lv = listView();
TQCheckBox cb(0);
- int boxsize = cb.tqsizeHint().width();
-//that's KDE-3.1 only int boxsize = lv->style().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
+ int boxsize = cb.sizeHint().width();
+//that's KDE-3.1 only int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
int rightside = lv->itemMargin() + boxsize + ( isFile() ? 0 : lv->treeStepSize() );
// _lineclicked indicates if the click was on the line or in the checkbox
diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp
index 4d5c4b41..3c84c0f0 100644
--- a/parts/replace/replaceview.cpp
+++ b/parts/replace/replaceview.cpp
@@ -10,11 +10,11 @@
***************************************************************************/
#include <tqheader.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdir.h>
#include <tqstringlist.h>
#include <tqregexp.h>
-#include <tqpalette.h>
+#include <palette.h>
#include "replaceitem.h"
#include "replaceview.h"
@@ -119,7 +119,7 @@ void ReplaceView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& po
else if ( btn == Qt::LeftButton )
{
// map pos to item/column and call ReplacetItem::activate(pos)
- item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(item).top() ) );
+ item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(item).top() ) );
}
}
}
diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp
index 0501ecd9..496746b2 100644
--- a/parts/scripting/scriptingpart.cpp
+++ b/parts/scripting/scriptingpart.cpp
@@ -86,8 +86,8 @@ void scriptingPart::setupActions()
KConfig *cfg = kapp->config();
searchDirs += cfg->readListEntry("SearchDirs");
- unplugActionList(TQString::tqfromLatin1( "script_actions" ));
- plugActionList( TQString::tqfromLatin1( "script_actions" ), m_scripts->scripts(core(),searchDirs));
+ unplugActionList(TQString::fromLatin1( "script_actions" ));
+ plugActionList( TQString::fromLatin1( "script_actions" ), m_scripts->scripts(core(),searchDirs));
}
void scriptingPart::insertConfigWidget(const KDialogBase *dlg, TQWidget *page, unsigned int pageNo)
diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp
index 4d847f01..7501f77d 100644
--- a/parts/snippet/snippet_part.cpp
+++ b/parts/snippet/snippet_part.cpp
@@ -112,9 +112,9 @@ void SnippetPart::slotConfigWidget( KDialogBase *dlg )
TQStringList SnippetPart::getAllLanguages()
{
KTrader::OfferList languageSupportOffers =
- KTrader::self()->query(TQString::tqfromLatin1("KDevelop/LanguageSupport"),
- TQString::tqfromLatin1("[X-KDevelop-Version] == %1"
- ).tqarg( KDEVELOP_PLUGIN_VERSION ));
+ KTrader::self()->query(TQString::fromLatin1("KDevelop/LanguageSupport"),
+ TQString::fromLatin1("[X-KDevelop-Version] == %1"
+ ).arg( KDEVELOP_PLUGIN_VERSION ));
TQStringList languages;
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index 8b7796e8..db257d0a 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -11,7 +11,7 @@
#include <kurl.h>
#include <kdebug.h>
#include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kpushbutton.h>
#include <klistview.h>
#include <tqheader.h>
@@ -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="";
@@ -526,7 +526,7 @@ void SnippetWidget::maybeTip( const TQPoint & p )
if (!item)
return;
- TQRect r = tqitemRect( item );
+ TQRect r = itemRect( item );
if (r.isValid() &&
_SnippetConfig.useToolTips() )
@@ -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
@@ -671,7 +671,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
TQDialog dlg(this);
dlg.setCaption(i18n("Enter Values for Variables"));
- TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
+ TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout");
TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn");
@@ -681,15 +681,15 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
TQCheckBox * cb = NULL;
labTop = new TQLabel( &dlg, "label" );
- labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+ labTop->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
labTop->sizePolicy().hasHeightForWidth() ) );
labTop->setText(i18n("Enter the replacement values for these variables:"));
layoutTop->addWidget(labTop, 0, 0);
- tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
+ layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
int i = 0; //walk through the variable map and add
- for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main tqlayout
+ for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main layout
if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter())
continue;
@@ -716,22 +716,22 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
i++;
}
- tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
+ layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" );
btn1->setText(i18n("&Cancel"));
- btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+ btn1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
btn1->sizePolicy().hasHeightForWidth() ) );
layoutBtn->addWidget( btn1, 0, 0 );
KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" );
btn2->setText(i18n("&Apply"));
btn2->setDefault( TRUE );
- btn2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
+ btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
btn2->sizePolicy().hasHeightForWidth() ) );
layoutBtn->addWidget( btn2, 0, 1 );
- tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
+ layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
// --END-- building a dynamic dialog
//connect the buttons to the TQDialog default slots
@@ -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
@@ -780,7 +780,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
delete layoutTop;
delete layoutVar;
delete layoutBtn;
- delete tqlayout;
+ delete layout;
if (i==0) //if nothing happened this means, that there are no variables to translate
return true; //.. so just return OK
@@ -800,7 +800,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
TQDialog dlg(this);
dlg.setCaption(i18n("Enter Values for Variables"));
- TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
+ TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout");
TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn");
@@ -811,8 +811,8 @@ 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 ));
- tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
+ labTop->setText(i18n("Enter the replacement values for %1:").arg( var ));
+ layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
cb = new TQCheckBox( &dlg, "cbVar" );
@@ -832,7 +832,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
"If you use the same variable later, even in another snippet, the value entered to the right "
"will be the default value for that variable.") );
- tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
+ layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" );
btn1->setText(i18n("&Cancel"));
@@ -843,7 +843,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
btn2->setDefault( TRUE );
layoutBtn->addWidget( btn2, 0, 1 );
- tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
+ layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
te->setFocus();
// --END-- building a dynamic dialog
@@ -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
@@ -875,7 +875,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
delete layoutTop;
delete layoutVar;
delete layoutBtn;
- delete tqlayout;
+ delete layout;
return strReturn;
}
@@ -920,7 +920,7 @@ void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *)
group = dynamic_cast<SnippetGroup *>(item2->parent());
TQCString dropped;
- TQByteArray data = e->tqencodedData("text/plain");
+ TQByteArray data = e->encodedData("text/plain");
if ( e->provides("text/plain") && data.size()>0 ) {
//get the data from the event...
TQString encData(data.data());
diff --git a/parts/snippet/snippetdlg.ui b/parts/snippet/snippetdlg.ui
index 55bd67ad..3606549b 100644
--- a/parts/snippet/snippetdlg.ui
+++ b/parts/snippet/snippetdlg.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -64,7 +64,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@@ -91,7 +91,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>80</height>
@@ -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/snippet/snippetsettingsbase.ui b/parts/snippet/snippetsettingsbase.ui
index f5c56b99..7ae3bfc8 100644
--- a/parts/snippet/snippetsettingsbase.ui
+++ b/parts/snippet/snippetsettingsbase.ui
@@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>70</height>
@@ -123,7 +123,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -144,7 +144,7 @@
<property name="name">
<cstring>leDelimiter</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>40</width>
<height>32767</height>
@@ -164,7 +164,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
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/addtooldlg.ui b/parts/tools/addtooldlg.ui
index 78363581..a1a6157e 100644
--- a/parts/tools/addtooldlg.ui
+++ b/parts/tools/addtooldlg.ui
@@ -123,7 +123,7 @@ executed.&lt;/p&gt;</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index 7db56d91..e5360ba3 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -26,7 +26,7 @@
#include <tqdialog.h>
#include <tqpixmap.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqtoolbutton.h>
#include <tqcheckbox.h>
@@ -104,7 +104,7 @@ void KDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, con
TQString KDevAppTreeListItem::key(int column, bool /*ascending*/) const
{
if (directory)
- return TQString::tqfromLatin1(" ") + text(column).upper();
+ return TQString::fromLatin1(" ") + text(column).upper();
else
return text(column).upper();
}
@@ -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;
}
@@ -248,7 +248,7 @@ void KDevApplicationTree::slotSelectionChanged(TQListViewItem* i)
void KDevApplicationTree::resizeEvent( TQResizeEvent * e)
{
- setColumnWidth(0, width()-TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent));
+ setColumnWidth(0, width()-TQApplication::tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent));
KListView::resizeEvent(e);
}
diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp
index 1b4c90f3..5ace3932 100644
--- a/parts/tools/toolsconfig.cpp
+++ b/parts/tools/toolsconfig.cpp
@@ -2,7 +2,7 @@
#include <tqapplication.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlistbox.h>
#include <tqpushbutton.h>
#include <tqheader.h>
@@ -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/tools/toolsconfigwidgetbase.ui b/parts/tools/toolsconfigwidgetbase.ui
index cd4a7e6f..67f9b7b5 100644
--- a/parts/tools/toolsconfigwidgetbase.ui
+++ b/parts/tools/toolsconfigwidgetbase.ui
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -170,7 +170,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -209,7 +209,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -228,7 +228,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -274,7 +274,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -313,7 +313,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -332,7 +332,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/parts/uimode/uichooser.ui b/parts/uimode/uichooser.ui
index 864e015b..e66cc1a2 100644
--- a/parts/uimode/uichooser.ui
+++ b/parts/uimode/uichooser.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -107,7 +107,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -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 727215ba..5da3365d 100644
--- a/parts/valgrind/dialog_widget.ui
+++ b/parts/valgrind/dialog_widget.ui
@@ -103,7 +103,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -122,7 +122,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -141,15 +141,15 @@
</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">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@@ -223,7 +223,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout3_2</cstring>
+ <cstring>layout3_2</cstring>
</property>
<grid>
<property name="name">
@@ -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..fe440449 100644
--- a/parts/valgrind/valgrind_dialog.cpp
+++ b/parts/valgrind/valgrind_dialog.cpp
@@ -1,4 +1,4 @@
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqregexp.h>
#include <tqwidgetstack.h>
@@ -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/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp
index 074a2c38..d9980d7c 100644
--- a/parts/valgrind/valgrind_widget.cpp
+++ b/parts/valgrind/valgrind_widget.cpp
@@ -1,4 +1,4 @@
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpainter.h>
#include <tqpopupmenu.h>
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 ae87176c..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>
@@ -45,7 +45,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>131</height>