From c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:31 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 94844816550ad672ccfcdc25659c625546239998. --- kexi/main/startup/KexiConnSelector.cpp | 20 +++---- kexi/main/startup/KexiConnSelectorBase.ui | 14 ++--- kexi/main/startup/KexiDBTitlePage.h | 2 +- kexi/main/startup/KexiDBTitlePageBase.ui | 6 +- kexi/main/startup/KexiNewPrjTypeSelector.ui | 4 +- kexi/main/startup/KexiNewProjectWizard.cpp | 14 ++--- kexi/main/startup/KexiOpenExistingFile.ui | 12 ++-- kexi/main/startup/KexiProjectSelector.cpp | 4 +- kexi/main/startup/KexiProjectSelectorBase.ui | 4 +- kexi/main/startup/KexiServerDBNamePage.ui | 10 ++-- kexi/main/startup/KexiStartup.cpp | 68 +++++++++++----------- kexi/main/startup/KexiStartup.h | 2 +- kexi/main/startup/KexiStartupDialog.cpp | 8 +-- .../startup/KexiStartupDialogTemplatesPage.cpp | 4 +- kexi/main/startup/KexiStartupFileDialog.cpp | 14 ++--- kexi/main/startup/KexiStartupFileDialog_win.cpp | 14 ++--- kexi/main/startup/KexiStartup_p.cpp | 2 +- 17 files changed, 101 insertions(+), 101 deletions(-) (limited to 'kexi/main/startup') diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp index c2c84011..a9a2a316 100644 --- a/kexi/main/startup/KexiConnSelector.cpp +++ b/kexi/main/startup/KexiConnSelector.cpp @@ -42,10 +42,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include #include @@ -149,8 +149,8 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, TQToolTip::add(m_remote->btn_edit, i18n("Edit selected database connection")); TQToolTip::add(m_remote->btn_remove, i18n("Remove selected database connections")); d->stack->addWidget(m_remote); - if (m_remote->layout()) - m_remote->layout()->setMargin(0); + if (m_remote->tqlayout()) + m_remote->tqlayout()->setMargin(0); // connect(m_remote->btn_back,TQT_SIGNAL(clicked()),this,TQT_SLOT(showSimpleConn())); connect(m_remote->list,TQT_SIGNAL(doubleClicked(TQListViewItem*)), this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*))); @@ -197,8 +197,8 @@ void KexiConnSelectorWidget::slotPrjTypeSelected(int id) if (m_remote->list->firstChild()) { m_remote->list->setSelected(m_remote->list->firstChild(),true); } - m_remote->descriptionEdit->setPaletteBackgroundColor(palette().active().background()); - m_remote->descGroupBox->layout()->setMargin(2); + m_remote->descriptionEdit->setPaletteBackgroundColor(tqpalette().active().background()); + m_remote->descGroupBox->tqlayout()->setMargin(2); m_remote->list->setFocus(); slotConnectionSelectionChanged(); } @@ -222,7 +222,7 @@ void KexiConnSelectorWidget::showSimpleConn() m_fileDlg = new KexiStartupFileDialog( d->startDirOrVariable, KexiStartupFileDialog::Opening, d->stack, "openExistingFileDlg"); m_fileDlg->setConfirmOverwrites( d->confirmOverwrites ); -// static_cast(m_file->layout())->insertWidget( 2, m_fileDlg ); +// static_cast(m_file->tqlayout())->insertWidget( 2, m_fileDlg ); d->stack->addWidget(m_fileDlg); for (TQWidget *w = parentWidget(true);w;w=w->parentWidget(true)) { @@ -350,9 +350,9 @@ bool KexiConnSelectorWidget::confirmOverwrites() const /*static TQString msgUnfinished() { return i18n("To define or change a connection, use command line options or click on .kexis file. " - "You can find example .kexis file at here.").arg("") //temporary, please do not change for 0.8! + "You can find example .kexis file at here.").tqarg("") //temporary, please do not change for 0.8! + "\nhttp://www.kexi-project.org/resources/testdb.kexis"; */ -// .arg("http://websvn.kde.org/*checkout*/branches/kexi/0.9/koffice/kexi/tests/startup/testdb.kexis"); +// .tqarg("http://websvn.kde.org/*checkout*/branches/kexi/0.9/koffice/kexi/tests/startup/testdb.kexis"); //} void KexiConnSelectorWidget::slotRemoteAddBtnClicked() @@ -407,7 +407,7 @@ void KexiConnSelectorWidget::slotRemoteRemoveBtnClicked() return; if (KMessageBox::Continue!=KMessageBox::warningContinueCancel(0, i18n("Do you want to remove database connection \"%1\" from the list of available connections?") - .arg(item->data()->serverInfoString(true)), TQString(), KStdGuiItem::del(), TQString(), + .tqarg(item->data()->serverInfoString(true)), TQString(), KStdGuiItem::del(), TQString(), KMessageBox::Notify|KMessageBox::Dangerous)) return; diff --git a/kexi/main/startup/KexiConnSelectorBase.ui b/kexi/main/startup/KexiConnSelectorBase.ui index c55614e2..5c7bb64d 100644 --- a/kexi/main/startup/KexiConnSelectorBase.ui +++ b/kexi/main/startup/KexiConnSelectorBase.ui @@ -72,7 +72,7 @@ 1 - + 0 60 @@ -149,7 +149,7 @@ Fixed - + 16 20 @@ -166,7 +166,7 @@ Expanding - + 20 41 @@ -177,7 +177,7 @@ descGroupBox - + 32767 80 @@ -205,7 +205,7 @@ 0 - + 32767 50 @@ -246,7 +246,7 @@ <p>You will see existing Kexi projects available for the selected connection. Here you may also add, edit or remove connections from the list. - + WordBreak|AlignTop @@ -268,7 +268,7 @@ - + AlignTop diff --git a/kexi/main/startup/KexiDBTitlePage.h b/kexi/main/startup/KexiDBTitlePage.h index 0ee1e4dd..4ac59bc0 100644 --- a/kexi/main/startup/KexiDBTitlePage.h +++ b/kexi/main/startup/KexiDBTitlePage.h @@ -22,7 +22,7 @@ #include "KexiDBTitlePageBase.h" -//! @short A helper widget used to displaying a line edit with a label and layout +//! @short A helper widget used to displaying a line edit with a label and tqlayout class KEXIMAIN_EXPORT KexiDBTitlePage : public KexiDBTitlePageBase { Q_OBJECT diff --git a/kexi/main/startup/KexiDBTitlePageBase.ui b/kexi/main/startup/KexiDBTitlePageBase.ui index e8a00ef9..7b711ea3 100644 --- a/kexi/main/startup/KexiDBTitlePageBase.ui +++ b/kexi/main/startup/KexiDBTitlePageBase.ui @@ -40,7 +40,7 @@ Expanding - + 20 111 @@ -57,7 +57,7 @@ Minimum - + 40 20 @@ -76,7 +76,7 @@ 0 - + 100 0 diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui index 122137e1..79f763ee 100644 --- a/kexi/main/startup/KexiNewPrjTypeSelector.ui +++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui @@ -29,7 +29,7 @@ Fixed - + 20 16 @@ -74,7 +74,7 @@ Kexi will create a new database project. Select a storage method which will be used to store the new project. - + WordBreak|AlignTop diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 9842cb41..b24a66ab 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include @@ -96,7 +96,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, //page: type selector m_prjtype_sel = new KexiNewPrjTypeSelector(this, "KexiNewPrjTypeSelector"); // lv_types = new KListView(m_prjtype_sel, "types listview"); -// m_prjtype_sel->lv_types->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2)); +// m_prjtype_sel->lv_types->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2)); #if KDE_IS_VERSION(3,3,9) m_prjtype_sel->lv_types->setShadeSortColumn(false); #endif @@ -127,8 +127,8 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, connect(m_prjtype_sel->lv_types,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*))); connect(m_prjtype_sel->lv_types,TQT_SIGNAL(selectionChanged( TQListViewItem*)),this,TQT_SLOT(slotLvTypesSelected(TQListViewItem*))); -// static_cast(m_prjtype_sel->layout())->insertWidget(1,d->m_prjtype_sel->lv_types); -// static_cast(m_prjtype_sel->layout())->insertStretch(3,1); +// static_cast(m_prjtype_sel->tqlayout())->insertWidget(1,d->m_prjtype_sel->lv_types); +// static_cast(m_prjtype_sel->tqlayout())->insertStretch(3,1); // updateGeometry(); addPage(m_prjtype_sel, i18n("Select Storage Method")); @@ -142,7 +142,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, m_conn_sel_widget = new TQWidget(this); TQVBoxLayout* conn_sel_lyr = new TQVBoxLayout(m_conn_sel_widget); TQLabel *conn_sel_label = new TQLabel(i18n("Enter a new Kexi project's file name:"), m_conn_sel_widget); - conn_sel_label->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); + conn_sel_label->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); conn_sel_lyr->addWidget( conn_sel_label ); conn_sel_lyr->addSpacing(KDialogBase::spacingHint()); @@ -301,7 +301,7 @@ void KexiNewProjectWizard::next() return; } m_project_selector->label->setText( - d->server_db_name_dblist_lbl_txt.arg(m_conn_sel->selectedConnectionData()->serverInfoString(false)) ); + d->server_db_name_dblist_lbl_txt.tqarg(m_conn_sel->selectedConnectionData()->serverInfoString(false)) ); m_server_db_name->le_caption->setFocus(); } @@ -342,7 +342,7 @@ void KexiNewProjectWizard::accept() if (KMessageBox::Continue!=KMessageBox::warningContinueCancel( this, "" +i18n("A project with database name \"%1\" already exists" "

Do you want to delete it and create a new one?") - .arg( m_server_db_name->le_dbname->text() ), TQString(), KStdGuiItem::del(), + .tqarg( m_server_db_name->le_dbname->text() ), TQString(), KStdGuiItem::del(), TQString(), KMessageBox::Notify|KMessageBox::Dangerous )) { m_server_db_name->le_dbname->setFocus(); diff --git a/kexi/main/startup/KexiOpenExistingFile.ui b/kexi/main/startup/KexiOpenExistingFile.ui index b74936dd..f11d7f58 100644 --- a/kexi/main/startup/KexiOpenExistingFile.ui +++ b/kexi/main/startup/KexiOpenExistingFile.ui @@ -35,7 +35,7 @@ <b>Select existing Kexi project file to open:</b> - + WordBreak|AlignTop @@ -43,7 +43,7 @@ line - + 32767 8 @@ -60,13 +60,13 @@ spacer - + 0 6 - + 32767 6 @@ -75,7 +75,7 @@ - layout2 + tqlayout2 @@ -112,7 +112,7 @@ Click "Advanced" button if you want to find an existing project on a server rather than a file. - + WordBreak|AlignTop diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp index 05cd5293..9353e3a6 100644 --- a/kexi/main/startup/KexiProjectSelector.cpp +++ b/kexi/main/startup/KexiProjectSelector.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include @@ -248,7 +248,7 @@ KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *parent, const ch init(prj_set, showProjectNameColumn, showConnectionColumns); m_sel->label->setText( i18n("Select a project on %1 database server to open:") - .arg(cdata->serverInfoString(false)) ); + .tqarg(cdata->serverInfoString(false)) ); } KexiProjectSelectorDialog::~KexiProjectSelectorDialog() diff --git a/kexi/main/startup/KexiProjectSelectorBase.ui b/kexi/main/startup/KexiProjectSelectorBase.ui index 5159d9bb..18c80544 100644 --- a/kexi/main/startup/KexiProjectSelectorBase.ui +++ b/kexi/main/startup/KexiProjectSelectorBase.ui @@ -43,7 +43,7 @@ <b>There are Kexi projects you have recently opened.</b> Select one you wish to open: - + WordBreak|AlignTop @@ -103,7 +103,7 @@ 1 - + 0 60 diff --git a/kexi/main/startup/KexiServerDBNamePage.ui b/kexi/main/startup/KexiServerDBNamePage.ui index f482ed73..b423d467 100644 --- a/kexi/main/startup/KexiServerDBNamePage.ui +++ b/kexi/main/startup/KexiServerDBNamePage.ui @@ -44,7 +44,7 @@ 0 - + 100 0 @@ -55,7 +55,7 @@ le_dbname - + 100 0 @@ -72,7 +72,7 @@ MinimumExpanding - + 70 20 @@ -89,7 +89,7 @@ Preferred - + 70 20 @@ -128,7 +128,7 @@ Fixed - + 20 12 diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index d405aee3..c479a4e0 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -54,7 +54,7 @@ #include #include -#include +#include namespace Kexi { static KStaticDeleter Kexi_startupHandlerDeleter; @@ -126,7 +126,7 @@ void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen) if (ok && percent>=0 && percent<=100 && pd->progressBar()->progress()progressBar()->setProgress(percent); - tqApp->processEvents(100); + tqApp->tqprocessEvents(100); } } } @@ -144,13 +144,13 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD + i18n("Please enter the password.") + "

"; /* msg += cdata.userName.isEmpty() ? "

"+i18n("Please enter the password.") - : "

"+i18n("Please enter the password for user.").arg(""+cdata.userName+"");*/ + : "

"+i18n("Please enter the password for user.").tqarg(""+cdata.userName+"");*/ TQString srv = cdata.serverInfoString(false); if (srv.isEmpty() || srv.lower()=="localhost") srv = i18n("local database server"); - msg += ("

"+i18n("Database server: %1").arg(TQString("")+srv+"")+"

"); + msg += ("

"+i18n("Database server: %1").tqarg(TQString("")+srv+"")+"

"); TQString usr; if (cdata.userName.isEmpty()) @@ -158,7 +158,7 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD else usr = cdata.userName; - msg += ("

"+i18n("Username: %1").arg(usr)+"

"); + msg += ("

"+i18n("Username: %1").tqarg(usr)+"

"); setPrompt( msg ); if (showDetailsButton) { @@ -176,7 +176,7 @@ KexiDBPasswordDialog::~KexiDBPasswordDialog() void KexiDBPasswordDialog::done(int r) { if (r == TQDialog::Accepted) { - m_cdata->password = TQString::fromLatin1(password()); + m_cdata->password = TQString::tqfromLatin1(password()); } // if (d->showConnectionDetailsExecuted || ret == TQDialog::Accepted) { /* } else { @@ -283,7 +283,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) KMessageBox::sorry( 0, "" +i18n("Could not read connection information from connection shortcut " "file \"%1\".

Check whether the file has valid contents.") - .arg(TQDir::convertSeparators(connectionShortcut.fileName()))); + .tqarg(TQDir::convertSeparators(connectionShortcut.fileName()))); return false; } } @@ -295,7 +295,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (args->count()>0 && (!fileType.isEmpty() && fileType!="project" && fileType!="shortcut" && fileType!="connection")) { KMessageBox::sorry( 0, i18n("You have specified invalid argument (\"%1\") for \"type\" command-line option.") - .arg(fileType)); + .tqarg(fileType)); return false; } @@ -364,7 +364,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) const bool dropDB = args->isSet("dropdb"); const bool openExisting = !createDB && !dropDB; const bool readOnly = args->isSet("readonly"); - const TQString couldnotMsg = TQString::fromLatin1("\n") + const TQString couldnotMsg = TQString::tqfromLatin1("\n") +i18n("Could not start Kexi application this way."); if (createDB && dropDB) { @@ -434,7 +434,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (dropDB && !projectFileExists) { KMessageBox::sorry(0, i18n("Could not remove project.\nThe file \"%1\" does not exist.") - .arg(TQDir::convertSeparators(cdata.dbFileName()))); + .tqarg(TQDir::convertSeparators(cdata.dbFileName()))); return 0; } } @@ -476,7 +476,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) m_projectData = new KexiProjectData(); if (!d->shortcutFile->loadProjectData(*m_projectData, &d->shortcutFileGroupKey)) { KMessageBox::sorry(0, i18n("Could not open shortcut file\n\"%1\".") - .arg(TQDir::convertSeparators(cdata.fileName()))); + .tqarg(TQDir::convertSeparators(cdata.fileName()))); delete m_projectData; m_projectData = 0; delete d->shortcutFile; @@ -509,7 +509,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) d->connShortcutFile = new KexiDBConnShortcutFile(cdata.fileName()); if (!d->connShortcutFile->loadConnectionData(cdata, &d->shortcutFileGroupKey)) { KMessageBox::sorry(0, i18n("Could not open connection data file\n\"%1\".") - .arg(TQDir::convertSeparators(cdata.fileName()))); + .tqarg(TQDir::convertSeparators(cdata.fileName()))); delete d->connShortcutFile; d->connShortcutFile = 0; return false; @@ -612,7 +612,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (!alsoOpenDB) { if (ok) { KMessageBox::information( 0, i18n("Project \"%1\" created successfully.") - .arg( TQDir::convertSeparators(projectData()->databaseName()) )); + .tqarg( TQDir::convertSeparators(projectData()->databaseName()) )); } return ok; } @@ -622,7 +622,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) tristate res = KexiProject::dropProject(projectData(), &gui, false/*ask*/); if (res==true) KMessageBox::information( 0, i18n("Project \"%1\" dropped successfully.") - .arg( TQDir::convertSeparators(projectData()->databaseName()) )); + .tqarg( TQDir::convertSeparators(projectData()->databaseName()) )); return res!=false; } @@ -749,7 +749,7 @@ tristate KexiStartupHandler::detectActionForFile( if (!(options & SkipMessages)) KMessageBox::sorry(parent, i18n("

Could not open project.

") +i18n("

The file \"%1\" does not exist or is not readable.

") - .arg(TQDir::convertSeparators(dbFileName)) + .tqarg(TQDir::convertSeparators(dbFileName)) +i18n("Check the file's permissions and whether it is already opened " "and locked by another application.")); return false; @@ -781,7 +781,7 @@ tristate KexiStartupHandler::detectActionForFile( if (!(options & SkipMessages)) KMessageBox::sorry(parent, i18n("

Could not open project.

") +i18n("

The file \"%1\" is not readable.

") - .arg(TQDir::convertSeparators(dbFileName)) + .tqarg(TQDir::convertSeparators(dbFileName)) +i18n("Check the file's permissions and whether it is already opened " "and locked by another application.")); return false; @@ -804,7 +804,7 @@ tristate KexiStartupHandler::detectActionForFile( if ((options & SkipMessages) || KMessageBox::Yes != KMessageBox::questionYesNo( parent, i18n("\"%1\" is an external file of type:\n\"%2\".\n" "Do you want to import the file as a Kexi project?") - .arg(TQDir::convertSeparators(dbFileName)).arg(ptr.data()->comment()), + .tqarg(TQDir::convertSeparators(dbFileName)).tqarg(ptr.data()->comment()), i18n("Open External File"), KGuiItem(i18n("Import...")), KStdGuiItem::cancel() ) ) { return cancelled; @@ -830,8 +830,8 @@ tristate KexiStartupHandler::detectActionForFile( "The project file \"%1\" is recognized as compatible with \"%2\" database driver, " "while you have asked for \"%3\" database driver to be used.\n" "Do you want to use \"%4\" database driver?") - .arg(TQDir::convertSeparators(dbFileName)) - .arg(tmpDriverName).arg(suggestedDriverName).arg(tmpDriverName)); + .tqarg(TQDir::convertSeparators(dbFileName)) + .tqarg(tmpDriverName).tqarg(suggestedDriverName).tqarg(tmpDriverName)); if (KMessageBox::Yes == res) useDetectedDriver = true; else if (KMessageBox::Cancel == res) @@ -851,7 +851,7 @@ tristate KexiStartupHandler::detectActionForFile( && KMessageBox::Yes == KMessageBox::questionYesNo(parent, i18n( "Previous version of database file format (\"%1\") is detected in the \"%2\" " "project file.\nDo you want to convert the project to a new \"%3\" format (recommended)?") - .arg(detectedDriverName).arg(TQDir::convertSeparators(dbFileName)).arg(newFileFormat)) ) + .tqarg(detectedDriverName).tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat)) ) { // SQLite2ToSQLite3Migration *migr = new SQLite2ToSQLite3Migration migr( finfo.absFilePath() ); @@ -862,7 +862,7 @@ tristate KexiStartupHandler::detectActionForFile( KMessageBox::sorry(parent, i18n( "Failed to convert project file \"%1\" to a new \"%2\" format.\n" "The file format remains unchanged.") - .arg(TQDir::convertSeparators(dbFileName)).arg(newFileFormat) ); + .tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat) ); //continue... } if (res==true) @@ -872,19 +872,19 @@ tristate KexiStartupHandler::detectActionForFile( if (detectedDriverName.isEmpty()) { TQString possibleProblemsInfoMsg( Kexi::driverManager().possibleProblemsInfoMsg() ); if (!possibleProblemsInfoMsg.isEmpty()) { - possibleProblemsInfoMsg.prepend(TQString::fromLatin1("

")+i18n("Possible problems:")); - possibleProblemsInfoMsg += TQString::fromLatin1("

"); + possibleProblemsInfoMsg.prepend(TQString::tqfromLatin1("

")+i18n("Possible problems:")); + possibleProblemsInfoMsg += TQString::tqfromLatin1("

"); } if (!(options & SkipMessages)) KMessageBox::detailedSorry(parent, i18n( "The file \"%1\" is not recognized as being supported by Kexi.") - .arg(TQDir::convertSeparators(dbFileName)), - TQString::fromLatin1("

") + .tqarg(TQDir::convertSeparators(dbFileName)), + TQString::tqfromLatin1("

") +i18n("Database driver for this file type not found.\nDetected MIME type: %1") - .arg(mimename) + .tqarg(mimename) +(ptr.data()->comment().isEmpty() - ? TQString::fromLatin1(".") : TQString::fromLatin1(" (%1).").arg(ptr.data()->comment())) - +TQString::fromLatin1("

") + ? TQString::tqfromLatin1(".") : TQString::tqfromLatin1(" (%1).").tqarg(ptr.data()->comment())) + +TQString::tqfromLatin1("

") +possibleProblemsInfoMsg); return false; } @@ -894,7 +894,7 @@ tristate KexiStartupHandler::detectActionForFile( KexiProjectData* KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent) { - clearStatus(); + cleartqStatus(); cancelled = false; if (!cdata) return 0; @@ -917,13 +917,13 @@ KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled if (prjdlg.projectSet()) msgh.showErrorMessage(prjdlg.projectSet(), i18n("Could not load list of available projects for %1 database server.") - .arg(cdata->serverInfoString(true))); + .tqarg(cdata->serverInfoString(true))); else msgh.showErrorMessage( i18n("Could not load list of available projects for %1 database server.") - .arg(cdata->serverInfoString(true))); -// setStatus(i18n("Could not load list of available projects for database server \"%1\"") -// .arg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg()); + .tqarg(cdata->serverInfoString(true))); +// settqStatus(i18n("Could not load list of available projects for database server \"%1\"") +// .tqarg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg()); return 0; } if (prjdlg.exec()!=TQDialog::Accepted) { @@ -952,7 +952,7 @@ void KexiStartupHandler::slotSaveShortcutFileChanges() if (!ok) { KMessageBox::sorry(0, i18n("Failed saving connection data to\n\"%1\" file.") - .arg(TQDir::convertSeparators(d->shortcutFile->fileName()))); + .tqarg(TQDir::convertSeparators(d->shortcutFile->fileName()))); } } diff --git a/kexi/main/startup/KexiStartup.h b/kexi/main/startup/KexiStartup.h index 23d8e832..fe1b3cf0 100644 --- a/kexi/main/startup/KexiStartup.h +++ b/kexi/main/startup/KexiStartup.h @@ -59,7 +59,7 @@ class KEXIMAIN_EXPORT KexiDBPasswordDialog : public KPasswordDialog /*! Handles startup actions for Kexi application. */ class KEXIMAIN_EXPORT KexiStartupHandler - : public TQObject, public KexiStartupData, public Kexi::ObjectStatus + : public TQObject, public KexiStartupData, public Kexi::ObjecttqStatus { Q_OBJECT TQ_OBJECT diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index b2ad8cfd..7f67bc76 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -25,7 +25,7 @@ #include "KexiConnSelector.h" #include "KexiConnSelectorBase.h" -#include +#include #include #include #include @@ -324,7 +324,7 @@ void KexiStartupDialog::setupPageTemplates() tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); TQLabel *lbl_blank = new TQLabel( i18n("Kexi will create a new blank database project.")+clickMsg, templPageFrame ); - lbl_blank->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); + lbl_blank->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); lbl_blank->setMargin(0); tmplyr->addWidget( lbl_blank ); tmplyr->addStretch(1); @@ -342,7 +342,7 @@ void KexiStartupDialog::setupPageTemplates() TQLabel *lbl_templ = new TQLabel( i18n("Kexi will create a new database project using selected template.\n" "Select template and click \"OK\" button to proceed."), templPageFrame ); - lbl_templ->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); + lbl_templ->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); lbl_templ->setMargin(0); tmplyr->addWidget( lbl_templ ); @@ -389,7 +389,7 @@ void KexiStartupDialog::setupPageTemplates() TQLabel *lbl_import = new TQLabel( i18n("Kexi will import the structure and data of an existing database as a new database project.") +clickMsg, templPageFrame ); - lbl_import->setAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); + lbl_import->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak); lbl_import->setMargin(0); tmplyr->addWidget( lbl_import ); tmplyr->addStretch(1); diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp index d919463d..429499f4 100644 --- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp +++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp @@ -123,8 +123,8 @@ void TemplatesPage::itemClicked(TQIconViewItem *item) { return; } TQString t = TQString("

%1

%2

") - .arg(static_cast(item)->name) - .arg(static_cast(item)->description); + .tqarg(static_cast(item)->name) + .tqarg(static_cast(item)->description); #ifndef DB_TEMPLATES t += TQString("

") + i18n("We are sorry, templates are not yet available.") +"

"; #endif diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index 8dd74298..cd54602b 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include @@ -42,14 +42,14 @@ KexiStartupFileDialog::KexiStartupFileDialog( , m_confirmOverwrites(true) , m_filtersUpdated(false) { - setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum); + tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum); setMode( mode ); TQPoint point( 0, 0 ); reparent( parentWidget(), point ); - if (layout()) - layout()->setMargin(0); + if (tqlayout()) + tqlayout()->setMargin(0); setMinimumHeight(100); setSizeGripEnabled ( false ); @@ -300,7 +300,7 @@ bool KexiStartupFileDialog::checkFileName() if (mode() & KFile::ExistingOnly) { if ( !fi.exists() ) { KMessageBox::error( this, ""+i18n( "The file \"%1\" does not exist." ) - .arg( TQDir::convertSeparators(path) ) ); + .tqarg( TQDir::convertSeparators(path) ) ); return false; } else if (mode() & KFile::File) { @@ -310,7 +310,7 @@ bool KexiStartupFileDialog::checkFileName() } else if (!fi.isReadable()) { KMessageBox::error( this, ""+i18n( "The file \"%1\" is not readable." ) - .arg( TQDir::convertSeparators(path) ) ); + .tqarg( TQDir::convertSeparators(path) ) ); return false; } } @@ -329,7 +329,7 @@ bool KexiStartupFileDialog::askForOverwriting(const TQString& filePath, TQWidget if (!fi.exists()) return true; const int res = KMessageBox::warningYesNo( parent, i18n( "The file \"%1\" already exists.\n" - "Do you want to overwrite it?").arg( TQDir::convertSeparators(filePath) ), TQString(), + "Do you want to overwrite it?").tqarg( TQDir::convertSeparators(filePath) ), TQString(), i18n("Overwrite"), KStdGuiItem::no() ); if (res == KMessageBox::Yes) return true; diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index 36b8c527..c81de131 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -120,27 +120,27 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f /* KURL u; u.setPath( TQDir::rootDirPath() ); - TQString text = i18n("Root Directory: %1").arg( u.path() ); + TQString text = i18n("Root Directory: %1").tqarg( u.path() ); d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), text ); u.setPath( TQDir::homeDirPath() ); - text = i18n("Home Directory: %1").arg( u.path( +1 ) ); + text = i18n("Home Directory: %1").tqarg( u.path( +1 ) ); d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), text ); KURL docPath; docPath.setPath( KGlobalSettings::documentPath() ); if ( u.path(+1) != docPath.path(+1) ) { - text = i18n("Documents: %1").arg( docPath.path( +1 ) ); + text = i18n("Documents: %1").tqarg( docPath.path( +1 ) ); d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), text ); } u.setPath( KGlobalSettings::desktopPath() ); - text = i18n("Desktop: %1").arg( u.path( +1 ) ); + text = i18n("Desktop: %1").tqarg( u.path( +1 ) ); d->pathCombo->addDefaultURL( u, KMimeType::pixmapForURL( u, 0, KIcon::Small ), text ); @@ -185,7 +185,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f coll->action( "up" )->plug( toolbar ); coll->action( "up" )->setWhatsThis(i18n("Click this button to enter the parent directory.

" "For instance, if the current location is file:/home/%1 clicking this " - "button will take you to file:/home.").arg(getlogin())); + "button will take you to file:/home.").tqarg(getlogin())); coll->action( "back" )->plug( toolbar ); coll->action( "back" )->setWhatsThis(i18n("Click this button to move backwards one step in the browsing history.")); coll->action( "forward" )->plug( toolbar ); @@ -197,7 +197,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f coll->action( "mkdir" )->setWhatsThis(i18n("Click this button to create a new directory.")); d->bookmarkHandler = new KFileBookmarkHandler( this ); - toolbar->insertButton(TQString::fromLatin1("bookmark"), + toolbar->insertButton(TQString::tqfromLatin1("bookmark"), (int)HOTLIST_BUTTON, true, i18n("Bookmarks")); toolbar->getButton(HOTLIST_BUTTON)->setPopup( d->bookmarkHandler->menu(), @@ -441,7 +441,7 @@ void KexiStartupFileDialogBase::setMimeFilter( const TQStringList& mimeTypes, //(js) filterWidget->setMimeFilter( mimeTypes, defaultType ); //(js) TQStringList types = TQStringList::split(" ", filterWidget->currentFilter()); -//(js) types.append( TQString::fromLatin1( "inode/directory" )); +//(js) types.append( TQString::tqfromLatin1( "inode/directory" )); //(js) ops->clearFilter(); //(js) ops->setMimeFilter( types ); //(js) d->hasDefaultFilter = !defaultType.isEmpty(); diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp index e959ccdc..e8139e18 100644 --- a/kexi/main/startup/KexiStartup_p.cpp +++ b/kexi/main/startup/KexiStartup_p.cpp @@ -73,7 +73,7 @@ tristate SQLite2ToSQLite3Migration::run() m_dlg = new KProgressDialog(0, 0, TQString(), i18n("Saving \"%1\" project file to a new \"%2\" database format...") - .arg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).arg("SQLite3") + .tqarg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).tqarg("SQLite3") ); m_dlg->setModal(true); connect(m_dlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked())); -- cgit v1.2.1