summaryrefslogtreecommitdiffstats
path: root/kexi/main/startup
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/main/startup')
-rw-r--r--kexi/main/startup/KexiConnSelector.cpp20
-rw-r--r--kexi/main/startup/KexiConnSelectorBase.ui14
-rw-r--r--kexi/main/startup/KexiDBTitlePage.h2
-rw-r--r--kexi/main/startup/KexiDBTitlePageBase.ui6
-rw-r--r--kexi/main/startup/KexiNewPrjTypeSelector.ui4
-rw-r--r--kexi/main/startup/KexiNewProjectWizard.cpp14
-rw-r--r--kexi/main/startup/KexiOpenExistingFile.ui12
-rw-r--r--kexi/main/startup/KexiProjectSelector.cpp4
-rw-r--r--kexi/main/startup/KexiProjectSelectorBase.ui4
-rw-r--r--kexi/main/startup/KexiServerDBNamePage.ui10
-rw-r--r--kexi/main/startup/KexiStartup.cpp68
-rw-r--r--kexi/main/startup/KexiStartup.h2
-rw-r--r--kexi/main/startup/KexiStartupDialog.cpp8
-rw-r--r--kexi/main/startup/KexiStartupDialogTemplatesPage.cpp4
-rw-r--r--kexi/main/startup/KexiStartupFileDialog.cpp14
-rw-r--r--kexi/main/startup/KexiStartupFileDialog_win.cpp14
-rw-r--r--kexi/main/startup/KexiStartup_p.cpp2
17 files changed, 101 insertions, 101 deletions
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index a9a2a316..c2c84011 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -42,10 +42,10 @@
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqtooltip.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqgroupbox.h>
#include <tqwidgetstack.h>
#include <tqbuttongroup.h>
@@ -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->tqlayout())
- m_remote->tqlayout()->setMargin(0);
+ if (m_remote->layout())
+ m_remote->layout()->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(tqpalette().active().background());
- m_remote->descGroupBox->tqlayout()->setMargin(2);
+ m_remote->descriptionEdit->setPaletteBackgroundColor(palette().active().background());
+ m_remote->descGroupBox->layout()->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<TQVBoxLayout*>(m_file->tqlayout())->insertWidget( 2, m_fileDlg );
+// static_cast<TQVBoxLayout*>(m_file->layout())->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 <a href=\"%1\">here</a>.").tqarg("") //temporary, please do not change for 0.8!
+ "You can find example .kexis file at <a href=\"%1\">here</a>.").arg("") //temporary, please do not change for 0.8!
+ "\nhttp://www.kexi-project.org/resources/testdb.kexis"; */
-// .tqarg("http://websvn.kde.org/*checkout*/branches/kexi/0.9/koffice/kexi/tests/startup/testdb.kexis");
+// .arg("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?")
- .tqarg(item->data()->serverInfoString(true)), TQString(), KStdGuiItem::del(), TQString(),
+ .arg(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 5c7bb64d..c55614e2 100644
--- a/kexi/main/startup/KexiConnSelectorBase.ui
+++ b/kexi/main/startup/KexiConnSelectorBase.ui
@@ -72,7 +72,7 @@
<verstretch>1</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>60</height>
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -166,7 +166,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
@@ -177,7 +177,7 @@
<property name="name">
<cstring>descGroupBox</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>80</height>
@@ -205,7 +205,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>50</height>
@@ -246,7 +246,7 @@
&lt;p&gt;You will see existing Kexi projects available for the selected connection. Here you may also add, edit or remove connections from the list.
</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="buddy" stdset="0">
@@ -268,7 +268,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
</widget>
diff --git a/kexi/main/startup/KexiDBTitlePage.h b/kexi/main/startup/KexiDBTitlePage.h
index 4ac59bc0..0ee1e4dd 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 tqlayout
+//! @short A helper widget used to displaying a line edit with a label and layout
class KEXIMAIN_EXPORT KexiDBTitlePage : public KexiDBTitlePageBase
{
Q_OBJECT
diff --git a/kexi/main/startup/KexiDBTitlePageBase.ui b/kexi/main/startup/KexiDBTitlePageBase.ui
index 7b711ea3..e8a00ef9 100644
--- a/kexi/main/startup/KexiDBTitlePageBase.ui
+++ b/kexi/main/startup/KexiDBTitlePageBase.ui
@@ -40,7 +40,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>111</height>
@@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -76,7 +76,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui
index 79f763ee..122137e1 100644
--- a/kexi/main/startup/KexiNewPrjTypeSelector.ui
+++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -74,7 +74,7 @@
<string>Kexi will create a new database project. Select a storage method which will be used to store the new project.
</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index b24a66ab..9842cb41 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -46,7 +46,7 @@
#include <tqobjectlist.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqheader.h>
@@ -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->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2));
+// m_prjtype_sel->lv_types->setSizePolicy(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<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertWidget(1,d->m_prjtype_sel->lv_types);
-// static_cast<TQVBoxLayout*>(m_prjtype_sel->tqlayout())->insertStretch(3,1);
+// static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertWidget(1,d->m_prjtype_sel->lv_types);
+// static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->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->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+ conn_sel_label->setAlignment(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.tqarg(m_conn_sel->selectedConnectionData()->serverInfoString(false)) );
+ d->server_db_name_dblist_lbl_txt.arg(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, "<qt>"
+i18n("<b>A project with database name \"%1\" already exists</b>"
"<p>Do you want to delete it and create a new one?")
- .tqarg( m_server_db_name->le_dbname->text() ), TQString(), KStdGuiItem::del(),
+ .arg( 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 f11d7f58..b74936dd 100644
--- a/kexi/main/startup/KexiOpenExistingFile.ui
+++ b/kexi/main/startup/KexiOpenExistingFile.ui
@@ -35,7 +35,7 @@
<string>&lt;b&gt;Select existing Kexi project file to open:&lt;/b&gt;
</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -43,7 +43,7 @@
<property name="name">
<cstring>line</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>8</height>
@@ -60,13 +60,13 @@
<property name="name">
<cstring>spacer</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>6</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>6</height>
@@ -75,7 +75,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -112,7 +112,7 @@
<property name="text">
<string>Click "Advanced" button if you want to find an existing project on a server rather than a file.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index 9353e3a6..05cd5293 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -31,7 +31,7 @@
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlistview.h>
#include <assert.h>
@@ -248,7 +248,7 @@ KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *parent, const ch
init(prj_set, showProjectNameColumn, showConnectionColumns);
m_sel->label->setText( i18n("Select a project on <b>%1</b> database server to open:")
- .tqarg(cdata->serverInfoString(false)) );
+ .arg(cdata->serverInfoString(false)) );
}
KexiProjectSelectorDialog::~KexiProjectSelectorDialog()
diff --git a/kexi/main/startup/KexiProjectSelectorBase.ui b/kexi/main/startup/KexiProjectSelectorBase.ui
index 18c80544..5159d9bb 100644
--- a/kexi/main/startup/KexiProjectSelectorBase.ui
+++ b/kexi/main/startup/KexiProjectSelectorBase.ui
@@ -43,7 +43,7 @@
<string>&lt;b&gt;There are Kexi projects you have recently opened.&lt;/b&gt; Select one you wish to open:
</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -103,7 +103,7 @@
<verstretch>1</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>60</height>
diff --git a/kexi/main/startup/KexiServerDBNamePage.ui b/kexi/main/startup/KexiServerDBNamePage.ui
index b423d467..f482ed73 100644
--- a/kexi/main/startup/KexiServerDBNamePage.ui
+++ b/kexi/main/startup/KexiServerDBNamePage.ui
@@ -44,7 +44,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -55,7 +55,7 @@
<property name="name">
<cstring>le_dbname</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -72,7 +72,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>20</height>
@@ -89,7 +89,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>20</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>12</height>
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index c479a4e0..d405aee3 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -54,7 +54,7 @@
#include <tqcstring.h>
#include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
namespace Kexi {
static KStaticDeleter<KexiStartupHandler> Kexi_startupHandlerDeleter;
@@ -126,7 +126,7 @@ void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen)
if (ok && percent>=0 && percent<=100 && pd->progressBar()->progress()<percent) {
// kdDebug() << percent << endl;
pd->progressBar()->setProgress(percent);
- tqApp->tqprocessEvents(100);
+ tqApp->processEvents(100);
}
}
}
@@ -144,13 +144,13 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD
+ i18n("Please enter the password.") + "</p>";
/* msg += cdata.userName.isEmpty() ?
"<p>"+i18n("Please enter the password.")
- : "<p>"+i18n("Please enter the password for user.").tqarg("<b>"+cdata.userName+"</b>");*/
+ : "<p>"+i18n("Please enter the password for user.").arg("<b>"+cdata.userName+"</b>");*/
TQString srv = cdata.serverInfoString(false);
if (srv.isEmpty() || srv.lower()=="localhost")
srv = i18n("local database server");
- msg += ("</p><p>"+i18n("Database server: %1").tqarg(TQString("<nobr>")+srv+"</nobr>")+"</p>");
+ msg += ("</p><p>"+i18n("Database server: %1").arg(TQString("<nobr>")+srv+"</nobr>")+"</p>");
TQString usr;
if (cdata.userName.isEmpty())
@@ -158,7 +158,7 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD
else
usr = cdata.userName;
- msg += ("<p>"+i18n("Username: %1").tqarg(usr)+"</p>");
+ msg += ("<p>"+i18n("Username: %1").arg(usr)+"</p>");
setPrompt( msg );
if (showDetailsButton) {
@@ -176,7 +176,7 @@ KexiDBPasswordDialog::~KexiDBPasswordDialog()
void KexiDBPasswordDialog::done(int r)
{
if (r == TQDialog::Accepted) {
- m_cdata->password = TQString::tqfromLatin1(password());
+ m_cdata->password = TQString::fromLatin1(password());
}
// if (d->showConnectionDetailsExecuted || ret == TQDialog::Accepted) {
/* } else {
@@ -283,7 +283,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
KMessageBox::sorry( 0, "<qt>"
+i18n("Could not read connection information from connection shortcut "
"file <nobr>\"%1\"</nobr>.<br><br>Check whether the file has valid contents.")
- .tqarg(TQDir::convertSeparators(connectionShortcut.fileName())));
+ .arg(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.")
- .tqarg(fileType));
+ .arg(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::tqfromLatin1("\n")
+ const TQString couldnotMsg = TQString::fromLatin1("\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.")
- .tqarg(TQDir::convertSeparators(cdata.dbFileName())));
+ .arg(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\".")
- .tqarg(TQDir::convertSeparators(cdata.fileName())));
+ .arg(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\".")
- .tqarg(TQDir::convertSeparators(cdata.fileName())));
+ .arg(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.")
- .tqarg( TQDir::convertSeparators(projectData()->databaseName()) ));
+ .arg( 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.")
- .tqarg( TQDir::convertSeparators(projectData()->databaseName()) ));
+ .arg( TQDir::convertSeparators(projectData()->databaseName()) ));
return res!=false;
}
@@ -749,7 +749,7 @@ tristate KexiStartupHandler::detectActionForFile(
if (!(options & SkipMessages))
KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>")
+i18n("<p>The file <nobr>\"%1\"</nobr> does not exist or is not readable.</p>")
- .tqarg(TQDir::convertSeparators(dbFileName))
+ .arg(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("<p>Could not open project.</p>")
+i18n("<p>The file <nobr>\"%1\"</nobr> is not readable.</p>")
- .tqarg(TQDir::convertSeparators(dbFileName))
+ .arg(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?")
- .tqarg(TQDir::convertSeparators(dbFileName)).tqarg(ptr.data()->comment()),
+ .arg(TQDir::convertSeparators(dbFileName)).arg(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?")
- .tqarg(TQDir::convertSeparators(dbFileName))
- .tqarg(tmpDriverName).tqarg(suggestedDriverName).tqarg(tmpDriverName));
+ .arg(TQDir::convertSeparators(dbFileName))
+ .arg(tmpDriverName).arg(suggestedDriverName).arg(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)?")
- .tqarg(detectedDriverName).tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat)) )
+ .arg(detectedDriverName).arg(TQDir::convertSeparators(dbFileName)).arg(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.")
- .tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat) );
+ .arg(TQDir::convertSeparators(dbFileName)).arg(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::tqfromLatin1("<p>")+i18n("Possible problems:"));
- possibleProblemsInfoMsg += TQString::tqfromLatin1("</p>");
+ possibleProblemsInfoMsg.prepend(TQString::fromLatin1("<p>")+i18n("Possible problems:"));
+ possibleProblemsInfoMsg += TQString::fromLatin1("</p>");
}
if (!(options & SkipMessages))
KMessageBox::detailedSorry(parent,
i18n( "The file \"%1\" is not recognized as being supported by Kexi.")
- .tqarg(TQDir::convertSeparators(dbFileName)),
- TQString::tqfromLatin1("<p>")
+ .arg(TQDir::convertSeparators(dbFileName)),
+ TQString::fromLatin1("<p>")
+i18n("Database driver for this file type not found.\nDetected MIME type: %1")
- .tqarg(mimename)
+ .arg(mimename)
+(ptr.data()->comment().isEmpty()
- ? TQString::tqfromLatin1(".") : TQString::tqfromLatin1(" (%1).").tqarg(ptr.data()->comment()))
- +TQString::tqfromLatin1("</p>")
+ ? TQString::fromLatin1(".") : TQString::fromLatin1(" (%1).").arg(ptr.data()->comment()))
+ +TQString::fromLatin1("</p>")
+possibleProblemsInfoMsg);
return false;
}
@@ -894,7 +894,7 @@ tristate KexiStartupHandler::detectActionForFile(
KexiProjectData*
KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent)
{
- cleartqStatus();
+ clearStatus();
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 <b>%1</b> database server.")
- .tqarg(cdata->serverInfoString(true)));
+ .arg(cdata->serverInfoString(true)));
else
msgh.showErrorMessage(
i18n("Could not load list of available projects for <b>%1</b> database server.")
- .tqarg(cdata->serverInfoString(true)));
-// settqStatus(i18n("Could not load list of available projects for database server \"%1\"")
-// .tqarg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg());
+ .arg(cdata->serverInfoString(true)));
+// setStatus(i18n("Could not load list of available projects for database server \"%1\"")
+// .arg(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.")
- .tqarg(TQDir::convertSeparators(d->shortcutFile->fileName())));
+ .arg(TQDir::convertSeparators(d->shortcutFile->fileName())));
}
}
diff --git a/kexi/main/startup/KexiStartup.h b/kexi/main/startup/KexiStartup.h
index fe1b3cf0..23d8e832 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::ObjecttqStatus
+ : public TQObject, public KexiStartupData, public Kexi::ObjectStatus
{
Q_OBJECT
TQ_OBJECT
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 7f67bc76..b2ad8cfd 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -25,7 +25,7 @@
#include "KexiConnSelector.h"
#include "KexiConnSelectorBase.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtabwidget.h>
#include <tqcombobox.h>
#include <tqcheckbox.h>
@@ -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->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+ lbl_blank->setAlignment(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->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+ lbl_templ->setAlignment(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->tqsetAlignment(TQt::AlignAuto|TQt::AlignTop|TQt::WordBreak);
+ lbl_import->setAlignment(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 429499f4..d919463d 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("<h2>%1</h2><p>%2</p>")
- .tqarg(static_cast<TemplateItem*>(item)->name)
- .tqarg(static_cast<TemplateItem*>(item)->description);
+ .arg(static_cast<TemplateItem*>(item)->name)
+ .arg(static_cast<TemplateItem*>(item)->description);
#ifndef DB_TEMPLATES
t += TQString("<p>") + i18n("We are sorry, templates are not yet available.") +"</p>";
#endif
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index cd54602b..8dd74298 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -23,7 +23,7 @@
#include <core/kexi.h>
#include <kexiutils/utils.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqobjectlist.h>
#include <tqpushbutton.h>
#include <tqapplication.h>
@@ -42,14 +42,14 @@ KexiStartupFileDialog::KexiStartupFileDialog(
, m_confirmOverwrites(true)
, m_filtersUpdated(false)
{
- tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum);
+ setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum);
setMode( mode );
TQPoint point( 0, 0 );
reparent( parentWidget(), point );
- if (tqlayout())
- tqlayout()->setMargin(0);
+ if (layout())
+ layout()->setMargin(0);
setMinimumHeight(100);
setSizeGripEnabled ( false );
@@ -300,7 +300,7 @@ bool KexiStartupFileDialog::checkFileName()
if (mode() & KFile::ExistingOnly) {
if ( !fi.exists() ) {
KMessageBox::error( this, "<qt>"+i18n( "The file \"%1\" does not exist." )
- .tqarg( TQDir::convertSeparators(path) ) );
+ .arg( TQDir::convertSeparators(path) ) );
return false;
}
else if (mode() & KFile::File) {
@@ -310,7 +310,7 @@ bool KexiStartupFileDialog::checkFileName()
}
else if (!fi.isReadable()) {
KMessageBox::error( this, "<qt>"+i18n( "The file \"%1\" is not readable." )
- .tqarg( TQDir::convertSeparators(path) ) );
+ .arg( 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?").tqarg( TQDir::convertSeparators(filePath) ), TQString(),
+ "Do you want to overwrite it?").arg( 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 c81de131..36b8c527 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").tqarg( u.path() );
+ TQString text = i18n("Root Directory: %1").arg( u.path() );
d->pathCombo->addDefaultURL( u,
KMimeType::pixmapForURL( u, 0, KIcon::Small ),
text );
u.setPath( TQDir::homeDirPath() );
- text = i18n("Home Directory: %1").tqarg( u.path( +1 ) );
+ text = i18n("Home Directory: %1").arg( 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").tqarg( docPath.path( +1 ) );
+ text = i18n("Documents: %1").arg( docPath.path( +1 ) );
d->pathCombo->addDefaultURL( u,
KMimeType::pixmapForURL( u, 0, KIcon::Small ),
text );
}
u.setPath( KGlobalSettings::desktopPath() );
- text = i18n("Desktop: %1").tqarg( u.path( +1 ) );
+ text = i18n("Desktop: %1").arg( 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("<qt>Click this button to enter the parent directory.<p>"
"For instance, if the current location is file:/home/%1 clicking this "
- "button will take you to file:/home.</qt>").tqarg(getlogin()));
+ "button will take you to file:/home.</qt>").arg(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::tqfromLatin1("bookmark"),
+ toolbar->insertButton(TQString::fromLatin1("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::tqfromLatin1( "inode/directory" ));
+//(js) types.append( TQString::fromLatin1( "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 e8139e18..e959ccdc 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...")
- .tqarg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).tqarg("SQLite3")
+ .arg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).arg("SQLite3")
);
m_dlg->setModal(true);
connect(m_dlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked()));
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-15 12:57:47 +0000