diff options
Diffstat (limited to 'kexi')
31 files changed, 61 insertions, 61 deletions
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cpp b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp index 2f0db91a3..a0f05ab6a 100644 --- a/kexi/3rdparty/kolibs/koPageLayoutDia.cpp +++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp @@ -148,7 +148,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, if ( tabs & FORMAT_AND_BORDERS ) setupTab1( true ); if ( tabs & HEADER_AND_FOOTER ) setupTab2( hf ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocus(); } @@ -176,7 +176,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name, if ( tabs & COLUMNS ) setupTab3(); if ( tabs & KW_HEADER_AND_FOOTER ) setupTab4(kwhf); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocus(); } diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index 66321cf1b..58fdf6c00 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -457,14 +457,14 @@ Form::addWidgetToTabStops(ObjectTreeItem *it) TQWidget *w = it->widget(); if(!w) return; - if(!(w->focusPolicy() & TQ_TabFocus)) + if(!(w->focusPolicy() & TQWidget::TabFocus)) { TQObjectList clo = w->childrenListObject(); if (clo.isEmpty()) return; // For composed widgets, we check if one of the child can have focus for(TQObjectListIterator chIt(clo); chIt.current(); ++chIt) { - if(chIt.current()->isWidgetType()) {//TQ_TabFocus flag will be checked later! + if(chIt.current()->isWidgetType()) {//TQWidget::TabFocus flag will be checked later! if(d->tabstops.findRef(it) == -1) { d->tabstops.append(it); return; @@ -480,7 +480,7 @@ void Form::updateTabStopsOrder() { for (ObjectTreeListIterator it(d->tabstops);it.current();) { - if(!(it.current()->widget()->focusPolicy() & TQ_TabFocus)) { + if(!(it.current()->widget()->focusPolicy() & TQWidget::TabFocus)) { kexidbg << "Form::updateTabStopsOrder(): widget removed because has no TabFocus: " << it.current()->widget()->name() << endl; d->tabstops.remove( it.current() ); } diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index f4f7bdf9a..dfd56a225 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -139,7 +139,7 @@ KFormDesignerKDevPart::KFormDesignerKDevPart(TQWidget *parent, const char *name, m_inShell = (!args.grep("shell").isEmpty()); TQHBox *container = new TQHBox(parent, "kfd_container_widget"); - container->setFocusPolicy(TQ_ClickFocus); + container->setFocusPolicy(TQWidget::ClickFocus); m_workspace = new TQWorkspace(container, "kfd_workspace"); m_workspace->show(); diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp index f9fd3cd09..ed62c07cb 100644 --- a/kexi/kexiutils/utils.cpp +++ b/kexi/kexiutils/utils.cpp @@ -283,7 +283,7 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect, if (scaledContents) { if (keepAspectRatio) { TQImage img(pixmap.convertToImage()); - img = img.smoothScale(w, h, TQ_ScaleMin); + img = img.smoothScale(w, h, TQImage::ScaleMin); pos = rect.topLeft(); //0, 0); if (img.width() < w) { int hAlign = TQApplication::horizontalAlignment( alignment ); diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp index 8aed1c0aa..c6e75b549 100644 --- a/kexi/main/printing/kexisimpleprintingengine.cpp +++ b/kexi/main/printing/kexisimpleprintingengine.cpp @@ -481,7 +481,7 @@ void KexiSimplePrintingEngine::paintRecord(TQPainter& painter, KexiTableItem *it int( (rect.y()+m_mainLineSpacing/4) / m_SCALE), pixmap.convertToImage().smoothScale( int(pixmapWidth / m_SCALE), int(pixmapHeight / m_SCALE), - TQ_ScaleMin )); + TQImage::ScaleMin )); painter.restore(); // back to m_SCALE:1 scale } } diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index a30f2695b..26d9cc643 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -192,7 +192,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, m_project_selector = new KexiProjectSelectorWidget( m_server_db_name->frm_dblist, "KexiProjectSelectorWidget", 0, false, false ); GLUE_WIDGET(m_project_selector, m_server_db_name->frm_dblist); - m_project_selector->setFocusPolicy(TQ_NoFocus); + m_project_selector->setFocusPolicy(TQWidget::NoFocus); m_project_selector->setSelectable(false); addPage(m_server_db_name, i18n("Select Project's Caption & Database Name")); diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp index 54ecbb1d5..ba21827e5 100644 --- a/kexi/plugins/forms/kexidatasourcepage.cpp +++ b/kexi/plugins/forms/kexidatasourcepage.cpp @@ -176,7 +176,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) "add_field", "addFieldButton"); m_addField->setMinimumHeight(m_availableFieldsLabel->minimumHeight()); // m_addField->setTextPosition(TQToolButton::Right); - m_addField->setFocusPolicy(TQ_StrongFocus); + m_addField->setFocusPolicy(TQWidget::StrongFocus); TQToolTip::add(m_addField, i18n("Insert selected fields into form")); hlyr->addWidget(m_addField); connect(m_addField, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInsertSelectedFields())); diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp index 52272fc7c..c9b14274b 100644 --- a/kexi/plugins/forms/widgets/kexidbautofield.cpp +++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp @@ -300,9 +300,9 @@ KexiDBAutoField::setInvalidState( const TQString &text ) return; d->widgetType = Auto; createEditor(); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); if (m_subwidget) - m_subwidget->setFocusPolicy(TQ_NoFocus); + m_subwidget->setFocusPolicy(TQWidget::NoFocus); //! @todo or set this to editor's text? d->label->setText( text ); } @@ -667,7 +667,7 @@ KexiDBAutoField::sizeHint() const } void -KexiDBAutoField::setFocusPolicy( TQ_FocusPolicy policy ) +KexiDBAutoField::setFocusPolicy( TQWidget::FocusPolicy policy ) { d->focusPolicyChanged = true; TQWidget::setFocusPolicy(policy); diff --git a/kexi/plugins/forms/widgets/kexidbautofield.h b/kexi/plugins/forms/widgets/kexidbautofield.h index a45289d0a..3c0c7548f 100644 --- a/kexi/plugins/forms/widgets/kexidbautofield.h +++ b/kexi/plugins/forms/widgets/kexidbautofield.h @@ -133,7 +133,7 @@ class KEXIFORMUTILS_EXPORT KexiDBAutoField : TQString fieldCaptionInternal() const; virtual TQSize sizeHint() const; - virtual void setFocusPolicy ( TQ_FocusPolicy policy ); + virtual void setFocusPolicy ( TQWidget::FocusPolicy policy ); //! Reimplemented to return internal editor's color. const TQColor & paletteForegroundColor() const; diff --git a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp index 5d123d4dd..d97fe7d91 100644 --- a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp @@ -29,7 +29,7 @@ KexiDBCheckBox::KexiDBCheckBox(const TQString &text, TQWidget *parent, const cha , m_tristateChanged(false) , m_tristate(TristateDefault) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); updateTristate(); connect(this, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotStateChanged(int))); } @@ -44,8 +44,8 @@ void KexiDBCheckBox::setInvalidState( const TQString& displayText ) setState(NoChange); m_invalidState = true; //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? - if (focusPolicy() & TQ_TabFocus) - setFocusPolicy(TQ_ClickFocus); + if (focusPolicy() & TQWidget::TabFocus) + setFocusPolicy(TQWidget::ClickFocus); setText(displayText); } diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index 26ba8ebe5..afe2e3aa2 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -78,7 +78,7 @@ KexiDBComboBox::KexiDBComboBox(TQWidget *parent, const char *name, bool designMo , d(new Private()) { setMouseTracking(true); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); installEventFilter(this); d->designMode = designMode; d->paintedCombo = new KComboBox(this); diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp index 2b72fc53e..da8c9fc43 100644 --- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp @@ -82,7 +82,7 @@ void KexiDBDateEdit::setInvalidState( const TQString& ) m_invalidState = true; //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? if (focusPolicy() & TabFocus) - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); } void diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp index 65edd28af..355065918 100644 --- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp @@ -91,7 +91,7 @@ void KexiDBDateTimeEdit::setInvalidState(const TQString & /*! @todo paint this t m_invalidState = true; //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? if (focusPolicy() & TabFocus) - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); } void diff --git a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp index 99afcbd6c..0fdc08cf5 100644 --- a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp @@ -39,7 +39,7 @@ void KexiDBDoubleSpinBox::setInvalidState( const TQString& displayText ) setReadOnly(true); //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? if (focusPolicy() & TabFocus) - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); setSpecialValueText(displayText); KDoubleSpinBox::setValue(minValue()); } diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp index 106e465b6..a6603867e 100644 --- a/kexi/plugins/forms/widgets/kexidbform.cpp +++ b/kexi/plugins/forms/widgets/kexidbform.cpp @@ -310,7 +310,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form) // if (d->orderedFocusWidgets.isEmpty()) { //generate a new list for (KFormDesigner::ObjectTreeListIterator it(form->tabStopsIterator()); it.current(); ++it) { - if (it.current()->widget()->focusPolicy() & TQ_TabFocus) { + if (it.current()->widget()->focusPolicy() & TQWidget::TabFocus) { //this widget has tab focus: it.current()->widget()->installEventFilter(this); //also filter events for data-aware children of this widget (i.e. KexiDBAutoField's editors) @@ -368,7 +368,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form) void KexiDBForm::updateTabStopsOrder() { for (TQPtrListIterator<TQWidget> it( d->orderedFocusWidgets ); it.current();) { - if (! (it.current()->focusPolicy() & TQ_TabFocus)) + if (! (it.current()->focusPolicy() & TQWidget::TabFocus)) d->orderedFocusWidgets.remove( it.current() ); else ++it; diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index e8b7aa939..1d81cc1cf 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -91,7 +91,7 @@ KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *n } else { m_chooser = new KexiDropDownButton(this); - m_chooser->setFocusPolicy(TQ_StrongFocus); + m_chooser->setFocusPolicy(TQWidget::StrongFocus); m_chooser->setPopup(m_popupMenu); setFocusProxy(m_chooser); m_chooser->installEventFilter(this); @@ -711,7 +711,7 @@ void KexiDBImageBox::updatePixmap() KexiDBImageBox_pmDeleter.setObject( KexiDBImageBox_pm, new TQPixmap(fname, "PNG") ); TQImage img(KexiDBImageBox_pm->convertToImage()); KexiDBImageBox_pmSmallDeleter.setObject( KexiDBImageBox_pmSmall, - new TQPixmap( img.smoothScale(img.width()/2, img.height()/2, TQ_ScaleMin) ) ); + new TQPixmap( img.smoothScale(img.width()/2, img.height()/2, TQImage::ScaleMin) ) ); } } @@ -849,19 +849,19 @@ bool KexiDBImageBox::eventFilter( TQObject * watched, TQEvent * e ) return KexiFrame::eventFilter(watched, e); } -TQ_FocusPolicy KexiDBImageBox::focusPolicy() const +TQWidget::FocusPolicy KexiDBImageBox::focusPolicy() const { if (dataSource().isEmpty()) - return TQ_NoFocus; + return TQWidget::NoFocus; return m_focusPolicyInternal; } -TQ_FocusPolicy KexiDBImageBox::focusPolicyInternal() const +TQWidget::FocusPolicy KexiDBImageBox::focusPolicyInternal() const { return m_focusPolicyInternal; } -void KexiDBImageBox::setFocusPolicy( TQ_FocusPolicy policy ) +void KexiDBImageBox::setFocusPolicy( TQWidget::FocusPolicy policy ) { m_focusPolicyInternal = policy; KexiFrame::setFocusPolicy( focusPolicy() ); //set modified policy diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.h b/kexi/plugins/forms/widgets/kexidbimagebox.h index 4abb9fb3c..8c0be8585 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.h +++ b/kexi/plugins/forms/widgets/kexidbimagebox.h @@ -127,14 +127,14 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox : /*! Overriden to change the policy behaviour a bit: NoFocus is returned regardless the real focus flag if the data source is empty (see dataSource()). */ - TQ_FocusPolicy focusPolicy() const; + TQWidget::FocusPolicy focusPolicy() const; //! \return the internal focus policy value, i.e. the one unrelated to data source presence. - TQ_FocusPolicy focusPolicyInternal() const; + TQWidget::FocusPolicy focusPolicyInternal() const; /*! Sets the internal focus policy value. "Internal" means that if there is no data source set, real policy becomes NoFocus. */ - virtual void setFocusPolicy( TQ_FocusPolicy policy ); + virtual void setFocusPolicy( TQWidget::FocusPolicy policy ); public slots: void setPixmapId(uint id); @@ -259,7 +259,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox : // *m_deleteAction, *m_propertiesAction; // TQTimer m_clickTimer; int m_alignment; - TQ_FocusPolicy m_focusPolicyInternal; //!< Used for focusPolicyInternal() + TQWidget::FocusPolicy m_focusPolicyInternal; //!< Used for focusPolicyInternal() bool m_designMode : 1; bool m_readOnly : 1; bool m_scaledContents : 1; diff --git a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp index a48d06c80..633fe6fc7 100644 --- a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp @@ -40,7 +40,7 @@ void KexiDBIntSpinBox::setInvalidState( const TQString& displayText ) setReadOnly(true); //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? if (focusPolicy() & TabFocus) - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); setSpecialValueText(displayText); KIntSpinBox::setValue(minValue()); } diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp index 8e74324aa..5d1fadf61 100644 --- a/kexi/plugins/forms/widgets/kexidblineedit.cpp +++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp @@ -80,8 +80,8 @@ void KexiDBLineEdit::setInvalidState( const TQString& displayText ) { KLineEdit::setReadOnly(true); //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? - if (focusPolicy() & TQ_TabFocus) - setFocusPolicy(TQ_ClickFocus); + if (focusPolicy() & TQWidget::TabFocus) + setFocusPolicy(TQWidget::ClickFocus); setText(displayText); } diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp index 6948d840a..07e932b4b 100644 --- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp @@ -47,8 +47,8 @@ void KexiDBTextEdit::setInvalidState( const TQString& displayText ) { setReadOnly(true); //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? - if (focusPolicy() & TQ_TabFocus) - setFocusPolicy(TQ_ClickFocus); + if (focusPolicy() & TQWidget::TabFocus) + setFocusPolicy(TQWidget::ClickFocus); KTextEdit::setText(displayText); } diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp index 5473a9cba..ac42fa857 100644 --- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp @@ -56,7 +56,7 @@ void KexiDBTimeEdit::setInvalidState( const TQString&) m_invalidState = true; //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ? if (focusPolicy() & TabFocus) - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); } void diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp index b1ee43668..d424ffada 100644 --- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp +++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp @@ -169,7 +169,7 @@ KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent m_iconLbl->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); m_iconLbl->setAlignment(TQt::AlignVCenter | TQt::AlignLeft); m_fnameLbl = new KActiveLabel(this); - m_fnameLbl->setFocusPolicy(TQ_NoFocus); + m_fnameLbl->setFocusPolicy(TQWidget::NoFocus); m_fnameLbl->setTextFormat(TQt::PlainText); m_fnameLbl->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding,1,0)); m_fnameLbl->setLineWidth(1); @@ -180,7 +180,7 @@ KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent hbox->addWidget(m_fnameLbl, 1, TQt::AlignVCenter | TQt::AlignLeft | TQt::WordBreak); hbox->addSpacing(10); m_commentLbl = new KActiveLabel(this); - m_commentLbl->setFocusPolicy(TQ_NoFocus); + m_commentLbl->setFocusPolicy(TQWidget::NoFocus); m_commentLbl->setTextFormat(TQt::PlainText); m_commentLbl->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); m_commentLbl->setLineWidth(1); diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp index 1612871b1..6af497d1c 100644 --- a/kexi/widget/kexipropertyeditorview.cpp +++ b/kexi/widget/kexipropertyeditorview.cpp @@ -132,7 +132,7 @@ KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget lyr->addWidget(d->editor); setFocusProxy(d->editor); d->objectInfoLabel->setBuddy(d->editor); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); connect(d->editor, TQT_SIGNAL(propertySetChanged(KoProperty::Set*)), this, TQT_SLOT(slotPropertySetChanged(KoProperty::Set*))); diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp index 6b9a819fa..ea456b217 100644 --- a/kexi/widget/kexiscrollview.cpp +++ b/kexi/widget/kexiscrollview.cpp @@ -60,7 +60,7 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview) // (fc.blue()+bc.blue()*2)/3); m_helpFont.setPointSize( m_helpFont.pointSize() * 3 ); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); //initial resize mode is always manual; //will be changed on show(), if needed diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp index 2a3003ab2..7a414d2b7 100644 --- a/kexi/widget/kexisectionheader.cpp +++ b/kexi/widget/kexisectionheader.cpp @@ -66,7 +66,7 @@ KexiSectionHeader::KexiSectionHeader(const TQString &caption, Qt::Orientation o, d->lbl_b = new TQHBox(this); d->lbl = new TQLabel(TQString(" ")+caption, d->lbl_b); d->lbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred); - d->lbl->setFocusPolicy(TQ_StrongFocus); + d->lbl->setFocusPolicy(TQWidget::StrongFocus); d->lbl->installEventFilter(this); installEventFilter(this); setCaption(caption); @@ -82,7 +82,7 @@ void KexiSectionHeader::addButton(const TQString& icon, const TQString& toolTip, { KPushButton *btn = new KPushButton(d->lbl_b); btn->setFlat(true); - btn->setFocusPolicy(TQ_NoFocus); + btn->setFocusPolicy(TQWidget::NoFocus); btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); if (receiver && member) { connect(btn, TQT_SIGNAL(clicked()), receiver, member); diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index c2ce43cfe..3ad9e5568 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -343,7 +343,7 @@ PixmapCollectionEditor::getPixmap(const TQString &name) KPixmapIO io; TQImage image = io.convertToImage(pixmap); - pixmap = io.convertToPixmap(image.scale(48, 48, TQ_ScaleMin)); + pixmap = io.convertToPixmap(image.scale(48, 48, TQImage::ScaleMin)); return pixmap; } @@ -420,7 +420,7 @@ PixmapCollectionChooser::getPixmap(const TQString &name) // We scale the pixmap down to 48x48 to fit in the iconView KPixmapIO io; TQImage image = io.convertToImage(pixmap); - pixmap = io.convertToPixmap(image.scale(48, 48, TQ_ScaleMin)); + pixmap = io.convertToPixmap(image.scale(48, 48, TQImage::ScaleMin)); return pixmap; } diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index faf708875..47e9c8595 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -58,7 +58,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) // connect(relation, TQT_SIGNAL(relationListUpdated(TQObject *)), this, TQT_SLOT(slotListUpdate(TQObject *))); viewport()->setPaletteBackgroundColor(colorGroup().mid()); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); setResizePolicy(Manual); /*MOVED TO KexiRelationDialog //actions diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp index 3c08b265d..9eecc4986 100644 --- a/kexi/widget/tableview/kexicomboboxtableedit.cpp +++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp @@ -70,7 +70,7 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg m_setVisibleValueOnSetValueInternal = true; d->button = new KexiComboBoxDropDownButton( parentWidget() /*usually a viewport*/ ); d->button->hide(); - d->button->setFocusPolicy( TQ_NoFocus ); + d->button->setFocusPolicy( TQWidget::NoFocus ); connect(d->button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotButtonClicked())); connect(m_lineedit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLineEditTextChanged(const TQString&))); diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index ab76fa955..39e397ea5 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -192,9 +192,9 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch setResizePolicy(Manual); viewport()->setBackgroundMode(TQt::NoBackground); -// viewport()->setFocusPolicy(TQ_StrongFocus); - viewport()->setFocusPolicy(TQ_WheelFocus); - setFocusPolicy(TQ_WheelFocus); //<--- !!!!! important (was NoFocus), +// viewport()->setFocusPolicy(TQWidget::StrongFocus); + viewport()->setFocusPolicy(TQWidget::WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); //<--- !!!!! important (was NoFocus), // otherwise TQApplication::setActiveWindow() won't activate // this widget when needed! // setFocusProxy(viewport()); diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp index 2c4ef8cfb..d61c7dc89 100644 --- a/kexi/widget/utils/kexirecordnavigator.cpp +++ b/kexi/widget/utils/kexirecordnavigator.cpp @@ -88,13 +88,13 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const d->lyr->addWidget( m_navBtnFirst = new TQToolButton(this) ); m_navBtnFirst->setFixedWidth(bw); - m_navBtnFirst->setFocusPolicy(TQ_NoFocus); + m_navBtnFirst->setFocusPolicy(TQWidget::NoFocus); m_navBtnFirst->setIconSet( SmallIconSet("navigator_first") ); TQToolTip::add(m_navBtnFirst, i18n("First row")); d->lyr->addWidget( m_navBtnPrev = new TQToolButton(this) ); m_navBtnPrev->setFixedWidth(bw); - m_navBtnPrev->setFocusPolicy(TQ_NoFocus); + m_navBtnPrev->setFocusPolicy(TQWidget::NoFocus); m_navBtnPrev->setIconSet( SmallIconSet("navigator_prev") ); m_navBtnPrev->setAutoRepeat(true); TQToolTip::add(m_navBtnPrev, i18n("Previous row")); @@ -103,7 +103,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const d->lyr->addWidget( m_navRecordNumber = new KLineEdit(this) ); m_navRecordNumber->setAlignment(AlignRight | AlignVCenter); - m_navRecordNumber->setFocusPolicy(TQ_ClickFocus); + m_navRecordNumber->setFocusPolicy(TQWidget::ClickFocus); m_navRecordNumber->installEventFilter(this); // m_navRowNumber->setFixedWidth(fw); m_navRecordNumberValidator = new TQIntValidator(1, INT_MAX, TQT_TQOBJECT(this)); @@ -116,7 +116,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const lbl_of->setMaximumWidth(fm.width(lbl_of->text())+8); lbl_of->setReadOnly(true); lbl_of->setLineWidth(0); - lbl_of->setFocusPolicy(TQ_NoFocus); + lbl_of->setFocusPolicy(TQWidget::NoFocus); lbl_of->setAlignment(AlignCenter); d->lyr->addWidget( lbl_of ); @@ -124,7 +124,7 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const m_navRecordCount->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Preferred); m_navRecordCount->setReadOnly(true); m_navRecordCount->setLineWidth(0); - m_navRecordCount->setFocusPolicy(TQ_NoFocus); + m_navRecordCount->setFocusPolicy(TQWidget::NoFocus); m_navRecordCount->setAlignment(AlignLeft | AlignVCenter); TQToolTip::add(m_navRecordCount, i18n("Number of rows")); @@ -135,21 +135,21 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const d->lyr->addWidget( m_navBtnNext = new TQToolButton(this) ); m_navBtnNext->setFixedWidth(bw); - m_navBtnNext->setFocusPolicy(TQ_NoFocus); + m_navBtnNext->setFocusPolicy(TQWidget::NoFocus); m_navBtnNext->setIconSet( SmallIconSet("navigator_next") ); m_navBtnNext->setAutoRepeat(true); TQToolTip::add(m_navBtnNext, i18n("Next row")); d->lyr->addWidget( m_navBtnLast = new TQToolButton(this) ); m_navBtnLast->setFixedWidth(bw); - m_navBtnLast->setFocusPolicy(TQ_NoFocus); + m_navBtnLast->setFocusPolicy(TQWidget::NoFocus); m_navBtnLast->setIconSet( SmallIconSet("navigator_last") ); TQToolTip::add(m_navBtnLast, i18n("Last row")); d->lyr->addSpacing( 6 ); d->lyr->addWidget( m_navBtnNew = new TQToolButton(this) ); m_navBtnNew->setFixedWidth(bw); - m_navBtnNew->setFocusPolicy(TQ_NoFocus); + m_navBtnNew->setFocusPolicy(TQWidget::NoFocus); m_navBtnNew->setIconSet( SmallIconSet("navigator_new") ); TQToolTip::add(m_navBtnNew, i18n("New row")); m_navBtnNext->setEnabled(isInsertingEnabled()); diff --git a/kexi/widget/utils/kexitooltip.cpp b/kexi/widget/utils/kexitooltip.cpp index 2a36ef093..1e8d6d80f 100644 --- a/kexi/widget/utils/kexitooltip.cpp +++ b/kexi/widget/utils/kexitooltip.cpp @@ -35,7 +35,7 @@ KexiToolTip::KexiToolTip(const TQVariant& value, TQWidget* parent) , m_value(value) { setPalette( TQToolTip::palette() ); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); } KexiToolTip::~KexiToolTip() |