diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:12:30 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:12:30 -0600 |
commit | 11191ef0b9908604d1d7aaca382b011ef22c454c (patch) | |
tree | d38f0ccd8bfcc9756f5cfc42fb2ad1dad351e6aa /kexi/main/startup | |
parent | c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 (diff) | |
download | koffice-11191ef0b9908604d1d7aaca382b011ef22c454c.tar.gz koffice-11191ef0b9908604d1d7aaca382b011ef22c454c.zip |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kexi/main/startup')
-rw-r--r-- | kexi/main/startup/KexiConnSelectorBase.ui | 10 | ||||
-rw-r--r-- | kexi/main/startup/KexiDBTitlePageBase.ui | 6 | ||||
-rw-r--r-- | kexi/main/startup/KexiNewPrjTypeSelector.ui | 2 | ||||
-rw-r--r-- | kexi/main/startup/KexiNewProjectWizard.cpp | 4 | ||||
-rw-r--r-- | kexi/main/startup/KexiOpenExistingFile.ui | 6 | ||||
-rw-r--r-- | kexi/main/startup/KexiProjectSelectorBase.ui | 2 | ||||
-rw-r--r-- | kexi/main/startup/KexiServerDBNamePage.ui | 10 | ||||
-rw-r--r-- | kexi/main/startup/KexiStartup.cpp | 20 | ||||
-rw-r--r-- | kexi/main/startup/KexiStartup.h | 2 | ||||
-rw-r--r-- | kexi/main/startup/KexiStartupDialog.cpp | 6 | ||||
-rw-r--r-- | kexi/main/startup/KexiStartupFileDialog.cpp | 2 | ||||
-rw-r--r-- | kexi/main/startup/KexiStartupFileDialog_win.cpp | 4 |
12 files changed, 37 insertions, 37 deletions
diff --git a/kexi/main/startup/KexiConnSelectorBase.ui b/kexi/main/startup/KexiConnSelectorBase.ui index 5c7bb64d..4c371ed2 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> 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..29e52812 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> diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index b24a66ab..625af34f 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -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 @@ -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()); diff --git a/kexi/main/startup/KexiOpenExistingFile.ui b/kexi/main/startup/KexiOpenExistingFile.ui index f11d7f58..b822f0ff 100644 --- a/kexi/main/startup/KexiOpenExistingFile.ui +++ b/kexi/main/startup/KexiOpenExistingFile.ui @@ -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> diff --git a/kexi/main/startup/KexiProjectSelectorBase.ui b/kexi/main/startup/KexiProjectSelectorBase.ui index 18c80544..57aa28ad 100644 --- a/kexi/main/startup/KexiProjectSelectorBase.ui +++ b/kexi/main/startup/KexiProjectSelectorBase.ui @@ -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..1708efbc 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -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); } } } @@ -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 { @@ -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) { @@ -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>") + TQString::fromLatin1("<p>") +i18n("Database driver for this file type not found.\nDetected MIME type: %1") .tqarg(mimename) +(ptr.data()->comment().isEmpty() - ? TQString::tqfromLatin1(".") : TQString::tqfromLatin1(" (%1).").tqarg(ptr.data()->comment())) - +TQString::tqfromLatin1("</p>") + ? TQString::fromLatin1(".") : TQString::fromLatin1(" (%1).").tqarg(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; @@ -922,7 +922,7 @@ KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled 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\"") +// setStatus(i18n("Could not load list of available projects for database server \"%1\"") // .tqarg(cdata->serverInfoString(true)), prjdlg.projectSet()->errorMsg()); return 0; } 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..91bd6bfc 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -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/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index cd54602b..1e50a12d 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -42,7 +42,7 @@ KexiStartupFileDialog::KexiStartupFileDialog( , m_confirmOverwrites(true) , m_filtersUpdated(false) { - tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum); + setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Minimum); setMode( mode ); TQPoint point( 0, 0 ); diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index c81de131..67a44ca6 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -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(); |