Rename a number of old tq methods that are no longer tq specific

1 files changed, 19 insertions, 19 deletions

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());