Rename old tq methods that no longer need a unique name

1 files changed, 15 insertions, 15 deletions

diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index 9c1b4559..91de5f7f 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -110,7 +110,7 @@ ImportWizard::ImportWizard(TQWidget *parent, TQMap<TQString,TQString>* args)
 		}
 	}
 
-	m_sourceDBEncoding = TQString::tqfromLatin1(KGlobal::locale()->encoding()); //default
+	m_sourceDBEncoding = TQString::fromLatin1(KGlobal::locale()->encoding()); //default
 }
 
 //===========================================================
@@ -148,7 +148,7 @@ void ImportWizard::setupIntro()
 	TQVBoxLayout *vbox = new TQVBoxLayout(m_introPage, KDialog::marginHint());
 	
 	TQLabel *lblIntro = new TQLabel(m_introPage);
-	lblIntro->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+	lblIntro->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
 	TQString msg;
 	if (m_predefinedConnectionData) { //predefined import: server source
 		msg = i18n("<qt>Database Importing wizard is about to import \"%1\" database "
@@ -247,7 +247,7 @@ void ImportWizard::setupDstType()
 
 	TQHBoxLayout *hbox = new TQHBoxLayout(vbox);
 	TQLabel *lbl = new TQLabel(i18n("Destination database type:")+" ", m_dstTypePage);
-	lbl->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop);
+	lbl->setAlignment(TQt::AlignAuto|TQt::AlignTop);
 	hbox->addWidget(lbl);
 
 	m_dstPrjTypeSelector = new KexiPrjTypeSelector(m_dstTypePage);
@@ -339,10 +339,10 @@ void ImportWizard::setupImporting()
 	m_importingPage->hide();
 	TQVBoxLayout *vbox = new TQVBoxLayout(m_importingPage, KDialog::marginHint());
 	m_lblImportingTxt = new TQLabel(m_importingPage);
-	m_lblImportingTxt->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+	m_lblImportingTxt->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
 
 	m_lblImportingErrTxt = new TQLabel(m_importingPage);
-	m_lblImportingErrTxt->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+	m_lblImportingErrTxt->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
 
 	m_progressBar = new KProgress(100, m_importingPage);
 	m_progressBar->hide();
@@ -374,7 +374,7 @@ void ImportWizard::setupFinish()
 	m_finishPage->hide();
 	TQVBoxLayout *vbox = new TQVBoxLayout(m_finishPage, KDialog::marginHint());
 	m_finishLbl = new TQLabel(m_finishPage);
-	m_finishLbl->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
+	m_finishLbl->setAlignment( TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak );
 
 	vbox->addWidget( m_finishLbl );
 	m_openImportedProjectCheckBox = new TQCheckBox(i18n("Open imported project"), 
@@ -398,7 +398,7 @@ bool ImportWizard::checkUserInput()
 		finishtxt = finishtxt + "<br>" + i18n("No new database name was entered.");
 	}
 
-	Kexi::ObjecttqStatus result;
+	Kexi::ObjectStatus result;
 	KexiMigrate* sourceDriver = prepareImport(result);
 	if (sourceDriver && sourceDriver->isSourceAndDestinationDataSourceTheSame())
 	{
@@ -551,7 +551,7 @@ void ImportWizard::arriveImportingPage() {
 //! and KexiMigration::Driver classes
 	bool showOptions = false;
 	if (fileBasedSrcSelected()) {
-		Kexi::ObjecttqStatus result;
+		Kexi::ObjectStatus result;
 		KexiMigrate* sourceDriver = prepareImport(result);
 		if (sourceDriver) {
 			showOptions = !result.error() 
@@ -650,7 +650,7 @@ void ImportWizard::accept()
 	KWizard::accept();
 }
 
-KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
+KexiMigrate* ImportWizard::prepareImport(Kexi::ObjectStatus& result)
 {
 	KexiUtils::WaitCursor wait;
 	
@@ -667,10 +667,10 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
 	);
 	if (!destDriver || manager.error())
 	{
-		result.settqStatus(&manager);
+		result.setStatus(&manager);
 		kdDebug() << "Manager error..." << endl;
 		manager.debugError();
-//		result.settqStatus(&manager);
+//		result.setStatus(&manager);
 	}
 
 	// Set up destination connection data
@@ -702,7 +702,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
 		{
 			//TODO This needs a better message
 			//KMessageBox::error(this, 
-			result.settqStatus(i18n("No connection data is available. You did not select a destination filename."),"");
+			result.setStatus(i18n("No connection data is available. You did not select a destination filename."),"");
 			//return false;
 		} */
 	}
@@ -713,7 +713,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
 	{
 		sourceDriverName = driverNameForSelectedSource();
 		if (sourceDriverName.isEmpty())
-			result.settqStatus(i18n("No appropriate migration driver found."), 
+			result.setStatus(i18n("No appropriate migration driver found."), 
 				m_migrateManager.possibleProblemsInfoMsg());
 	}
 
@@ -724,7 +724,7 @@ KexiMigrate* ImportWizard::prepareImport(Kexi::ObjecttqStatus& result)
 		sourceDriver = m_migrateManager.driver( sourceDriverName );
 		if(!sourceDriver || m_migrateManager.error()) {
 			kdDebug() << "Import migrate driver error..." << endl;
-			result.settqStatus(&m_migrateManager);
+			result.setStatus(&m_migrateManager);
 		}
 	}
 
@@ -793,7 +793,7 @@ tristate ImportWizard::import()
 {
 	m_importExecuted = true;
 
-	Kexi::ObjecttqStatus result;
+	Kexi::ObjectStatus result;
 	KexiMigrate* sourceDriver = prepareImport(result);
 
 	bool acceptingNeeded = false;