From 2d6954f69caf63ed5057bd8e1405a65d7d970292 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:05:41 -0600 Subject: Rename obsolete tq methods to standard names --- kexi/main/kexifinddialog.cpp | 4 ++-- kexi/main/keximainwindowimpl.cpp | 6 +++--- kexi/main/printing/kexisimpleprintingpagesetupbase.ui | 6 +++--- kexi/main/startup/KexiConnSelector.cpp | 10 +++++----- kexi/main/startup/KexiDBTitlePage.h | 2 +- kexi/main/startup/KexiNewProjectWizard.cpp | 4 ++-- kexi/main/startup/KexiOpenExistingFile.ui | 2 +- kexi/main/startup/KexiStartupFileDialog.cpp | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) (limited to 'kexi/main') diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp index b46eb20d..80f3c83e 100644 --- a/kexi/main/kexifinddialog.cpp +++ b/kexi/main/kexifinddialog.cpp @@ -82,8 +82,8 @@ KexiFindDialog::KexiFindDialog( TQWidget* parent ) , d( new Private() ) { m_search->setCurrentItem((int)KexiSearchAndReplaceViewInterface::Options::SearchDown); - tqlayout()->setMargin( KDialog::marginHint() ); - tqlayout()->setSpacing( KDialog::spacingHint() ); + layout()->setMargin( KDialog::marginHint() ); + layout()->setSpacing( KDialog::spacingHint() ); KAction *a = KStdAction::findNext(0, 0, 0); m_btnFind->setText(a->text()); m_btnFind->setIconSet(a->iconSet()); diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index dc7fc428..5e39ab13 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -127,7 +127,7 @@ //! width changes will be removed in KMDI //#define PROPEDITOR_VISIBILITY_CHANGES -//temporary fix to manage tqlayout +//temporary fix to manage layout #include "ksplitter.h" #define KDOCKWIDGET_P 1 @@ -360,7 +360,7 @@ KexiMainWindowImpl::KexiMainWindowImpl() TQToolButton *closeButton = new TQToolButton( tabWidget() ); closeButton->setAutoRaise( true ); closeButton->setPixmap( TQPixmap( kde2_closebutton ) ); - closeButton->setPaletteBackgroundColor(closeButton->tqpalette().active().background()); + closeButton->setPaletteBackgroundColor(closeButton->palette().active().background()); // closeButton->setIconSet(SmallIconSet("tab_remove")); tabWidget()->setCornerWidget( closeButton, TQt::TopRight ); closeButton->hide(); // hide until it's needed to avoid problems in "user mode" @@ -1788,7 +1788,7 @@ void KexiMainWindowImpl::slotLastActions() } #endif #ifdef TQ_WS_WIN - showMaximized();//js: workaround for not yet completed tqlayout settings storage on win32 + showMaximized();//js: workaround for not yet completed layout settings storage on win32 #endif } diff --git a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui index 4bf6deec..ff46ee7a 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui +++ b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui @@ -24,7 +24,7 @@ - tqlayout15 + layout15 @@ -115,7 +115,7 @@ - tqlayout19 + layout19 @@ -222,7 +222,7 @@ - tqlayout4 + layout4 diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp index 60e98852..6e104659 100644 --- a/kexi/main/startup/KexiConnSelector.cpp +++ b/kexi/main/startup/KexiConnSelector.cpp @@ -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(m_file->tqlayout())->insertWidget( 2, m_fileDlg ); +// static_cast(m_file->layout())->insertWidget( 2, m_fileDlg ); d->stack->addWidget(m_fileDlg); for (TQWidget *w = parentWidget(true);w;w=w->parentWidget(true)) { 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/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 0e7f872a..c8d36aab 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -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->tqlayout())->insertWidget(1,d->m_prjtype_sel->lv_types); -// static_cast(m_prjtype_sel->tqlayout())->insertStretch(3,1); +// static_cast(m_prjtype_sel->layout())->insertWidget(1,d->m_prjtype_sel->lv_types); +// static_cast(m_prjtype_sel->layout())->insertStretch(3,1); // updateGeometry(); addPage(m_prjtype_sel, i18n("Select Storage Method")); diff --git a/kexi/main/startup/KexiOpenExistingFile.ui b/kexi/main/startup/KexiOpenExistingFile.ui index 2f778429..b74936dd 100644 --- a/kexi/main/startup/KexiOpenExistingFile.ui +++ b/kexi/main/startup/KexiOpenExistingFile.ui @@ -75,7 +75,7 @@ - tqlayout2 + layout2 diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index 72db4af2..71e4a317 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -48,8 +48,8 @@ KexiStartupFileDialog::KexiStartupFileDialog( TQPoint point( 0, 0 ); reparent( parentWidget(), point ); - if (tqlayout()) - tqlayout()->setMargin(0); + if (layout()) + layout()->setMargin(0); setMinimumHeight(100); setSizeGripEnabled ( false ); -- cgit v1.2.1