From 1e5d5c92c374c8c950f01fa5aa916b3f722f98c1 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 2 Sep 2023 15:53:29 +0900 Subject: Replace TQ_*Focus* and TQ_Scale* defines Signed-off-by: Michele Calgaro --- tdeui/kactivelabel.cpp | 2 +- tdeui/kcharselect.cpp | 4 ++-- tdeui/kdatetbl.cpp | 4 ++-- tdeui/kdialogbase.cpp | 2 +- tdeui/kdockwidget.cpp | 2 +- tdeui/kdockwidget_private.cpp | 4 ++-- tdeui/kkeybutton.cpp | 2 +- tdeui/kpixmapregionselectorwidget.cpp | 2 +- tdeui/kurllabel.cpp | 8 ++++---- tdeui/kurllabel.h | 2 +- tdeui/qxembed.cpp | 2 +- tdeui/tdeactionclasses.cpp | 2 +- tdeui/tdecompletionbox.cpp | 2 +- tdeui/tdetoolbarbutton.cpp | 4 ++-- 14 files changed, 21 insertions(+), 21 deletions(-) (limited to 'tdeui') diff --git a/tdeui/kactivelabel.cpp b/tdeui/kactivelabel.cpp index 7dad563b2..5fff4a0f1 100644 --- a/tdeui/kactivelabel.cpp +++ b/tdeui/kactivelabel.cpp @@ -44,7 +44,7 @@ void KActiveLabel::init() setVScrollBarMode(TQScrollView::AlwaysOff); setHScrollBarMode(TQScrollView::AlwaysOff); setFrameStyle(TQFrame::NoFrame); - setFocusPolicy( TQ_TabFocus ); + setFocusPolicy( TQWidget::TabFocus ); paletteChanged(); connect(this, TQT_SIGNAL(linkClicked(const TQString &)), diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp index 5561e5883..7f4529b27 100644 --- a/tdeui/kcharselect.cpp +++ b/tdeui/kcharselect.cpp @@ -78,7 +78,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ setToolTips(); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setBackgroundMode( TQWidget::NoBackground ); } @@ -442,7 +442,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f connect( charTable, TQT_SIGNAL(doubleClicked()),this,TQT_SLOT(slotDoubleClicked())); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocusProxy( charTable ); } diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp index 4072bafd2..a158d8404 100644 --- a/tdeui/kdatetbl.cpp +++ b/tdeui/kdatetbl.cpp @@ -124,7 +124,7 @@ KDateTable::KDateTable(TQWidget *parent, TQDate date_, const char* name, WFlags kdDebug() << "KDateTable ctor: WARNING: Given date is invalid, using current date." << endl; date_=TQDate::currentDate(); } - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setNumRows(7); // 6 weeks max + headline setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); @@ -140,7 +140,7 @@ KDateTable::KDateTable(TQWidget *parent, const char* name, WFlags f) { d = new KDateTablePrivate; setFontSize(10); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setNumRows(7); // 6 weeks max + headline setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp index 1f7fbd5e3..4fa65f92f 100644 --- a/tdeui/kdialogbase.cpp +++ b/tdeui/kdialogbase.cpp @@ -395,7 +395,7 @@ void KDialogBase::enableButtonSeparator( bool state ) return; } mActionSep = new KSeparator( this ); - mActionSep->setFocusPolicy(TQ_NoFocus); + mActionSep->setFocusPolicy(TQWidget::NoFocus); mActionSep->setOrientation( mButtonOrientation == Qt::Horizontal ? TQFrame::HLine : TQFrame::VLine ); mActionSep->show(); diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index e57ff440d..1474ad894 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -1167,7 +1167,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, panner->setOpaqueResize(manager->splitterOpaqueResize()); panner->setKeepSize(manager->splitterKeepSize()); - panner->setFocusPolicy( TQ_NoFocus ); + panner->setFocusPolicy( TQWidget::NoFocus ); target->applyToWidget( panner ); applyToWidget( panner ); target->formerDockPos = target->currentDockPos; diff --git a/tdeui/kdockwidget_private.cpp b/tdeui/kdockwidget_private.cpp index a067efe2a..3b9d91b34 100644 --- a/tdeui/kdockwidget_private.cpp +++ b/tdeui/kdockwidget_private.cpp @@ -625,7 +625,7 @@ KDockButton_Private::KDockButton_Private( TQWidget *parent, const char * name ) :TQPushButton( parent, name ) { moveMouse = false; - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); } KDockButton_Private::~KDockButton_Private() @@ -701,7 +701,7 @@ void KDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w) { if (w) { TQWidget* embeddedWdg = ((KDockWidget*)w)->getWidget(); - if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQ_ClickFocus) || (embeddedWdg->focusPolicy() == TQ_StrongFocus))) { + if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQWidget::ClickFocus) || (embeddedWdg->focusPolicy() == TQWidget::StrongFocus))) { embeddedWdg->setFocus(); } } diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp index 9b530b751..42799b2a2 100644 --- a/tdeui/kkeybutton.cpp +++ b/tdeui/kkeybutton.cpp @@ -69,7 +69,7 @@ KKeyButton::KKeyButton(TQWidget *parent, const char *name) : TQPushButton( parent, name ) { d = new KKeyButtonPrivate; - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); m_bEditing = false; connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(captureShortcut()) ); setShortcut( TDEShortcut(), true ); diff --git a/tdeui/kpixmapregionselectorwidget.cpp b/tdeui/kpixmapregionselectorwidget.cpp index 7083dac72..0bc84e108 100644 --- a/tdeui/kpixmapregionselectorwidget.cpp +++ b/tdeui/kpixmapregionselectorwidget.cpp @@ -426,7 +426,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height) { /* We have to resize the pixmap to get it complete on the screen */ TQImage image=m_originalPixmap.convertToImage(); - m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQ_ScaleMin ) ); + m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQImage::ScaleMin ) ); double oldZoomFactor = m_zoomFactor; m_zoomFactor=m_originalPixmap.width()/(double)m_unzoomedPixmap.width(); diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp index 8034423b4..b91dc3c8e 100644 --- a/tdeui/kurllabel.cpp +++ b/tdeui/kurllabel.cpp @@ -87,7 +87,7 @@ KURLLabel::KURLLabel (const TQString& url, const TQString& text, setFont (font()); setUseCursor (true); setLinkColor (d->LinkColor); - setFocusPolicy( TQ_StrongFocus ); //better accessibility + setFocusPolicy( TQWidget::StrongFocus ); //better accessibility setMouseTracking (true); } @@ -98,7 +98,7 @@ KURLLabel::KURLLabel (TQWidget* parent, const char* name) setFont (font()); setUseCursor (true); setLinkColor (d->LinkColor); - setFocusPolicy( TQ_StrongFocus ); //better accessibility + setFocusPolicy( TQWidget::StrongFocus ); //better accessibility setMouseTracking (true); } @@ -428,11 +428,11 @@ void KURLLabel::setMargin( int margin ) d->MarginAltered = true; } -void KURLLabel::setFocusPolicy( TQ_FocusPolicy policy ) +void KURLLabel::setFocusPolicy( TQWidget::FocusPolicy policy ) { TQLabel::setFocusPolicy(policy); if (!d->MarginAltered) { - TQLabel::setMargin(policy == TQ_NoFocus ? 0 : 3); //better default : better look when focused + TQLabel::setMargin(policy == TQWidget::NoFocus ? 0 : 3); //better default : better look when focused } } diff --git a/tdeui/kurllabel.h b/tdeui/kurllabel.h index c3d1eb259..797ee320c 100644 --- a/tdeui/kurllabel.h +++ b/tdeui/kurllabel.h @@ -163,7 +163,7 @@ public: */ #ifdef qdoc #else - virtual void setFocusPolicy ( TQ_FocusPolicy policy ); + virtual void setFocusPolicy ( TQWidget::FocusPolicy policy ); #endif /** diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp index 0915813f8..34543cf04 100644 --- a/tdeui/qxembed.cpp +++ b/tdeui/qxembed.cpp @@ -630,7 +630,7 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f) // See L0660, L0671, L0685. initialize(); window = 0; - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setKeyCompression( false ); // L0910: Trick Qt to create extraData(); diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp index 503782001..f70615b6c 100644 --- a/tdeui/tdeactionclasses.cpp +++ b/tdeui/tdeactionclasses.cpp @@ -677,7 +677,7 @@ int TDESelectAction::plug( TQWidget *widget, int index ) TQComboBox *cb = bar->getCombo( id_ ); if ( cb ) { - if (!isEditable()) cb->setFocusPolicy(TQ_NoFocus); + if (!isEditable()) cb->setFocusPolicy(TQWidget::NoFocus); cb->setMinimumWidth( cb->sizeHint().width() ); if ( d->m_comboWidth > 0 ) { diff --git a/tdeui/tdecompletionbox.cpp b/tdeui/tdecompletionbox.cpp index ee6fd1e57..3f2dfa987 100644 --- a/tdeui/tdecompletionbox.cpp +++ b/tdeui/tdecompletionbox.cpp @@ -61,7 +61,7 @@ TDECompletionBox::TDECompletionBox( TQWidget *parent, const char *name ) if ( parent ) setFocusProxy( parent ); else - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setVScrollBarMode( Auto ); setHScrollBarMode( AlwaysOff ); diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp index cf64f76a3..c5f0eb99f 100644 --- a/tdeui/tdetoolbarbutton.cpp +++ b/tdeui/tdetoolbarbutton.cpp @@ -129,7 +129,7 @@ TDEToolBarButton::TDEToolBarButton( const TQString& _icon, int _id, this, TQT_SLOT( modeChange() )); } - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); // connect all of our slots and start trapping events connect(this, TQT_SIGNAL( clicked() ), @@ -162,7 +162,7 @@ TDEToolBarButton::TDEToolBarButton( const TQPixmap& pixmap, int _id, this, TQT_SLOT( modeChange() )); } - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); // connect all of our slots and start trapping events connect(this, TQT_SIGNAL( clicked() ), -- cgit v1.2.1