From 1e5d5c92c374c8c950f01fa5aa916b3f722f98c1 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 2 Sep 2023 15:53:29 +0900 Subject: [PATCH] Replace TQ_*Focus* and TQ_Scale* defines Signed-off-by: Michele Calgaro --- arts/kde/kvideowidget.cpp | 2 +- kate/part/katecodecompletion.cpp | 2 +- kate/part/kateview.cpp | 2 +- .../plugins/ldaptdeio/resourceldaptdeio.cpp | 2 +- tdecore/svgicons/ksvgiconengine.cpp | 2 +- tdehtml/html/html_formimpl.cpp | 2 +- tdehtml/rendering/render_frames.cpp | 2 +- tdehtml/rendering/render_replaced.cpp | 6 +- tdehtml/tdehtmlview.cpp | 2 +- tdeio/tdefile/kurlbar.cpp | 2 +- tdeio/tdefile/tdediroperator.cpp | 2 +- tdeio/tdeio/netaccess.cpp | 2 +- tdemdi/tdemdichildarea.cpp | 2 +- tdemdi/tdemdichildfrm.cpp | 58 +++++++++---------- tdemdi/tdemdichildfrm.h | 4 +- tdemdi/tdemdichildfrmcaption.cpp | 2 +- tdemdi/tdemdichildview.cpp | 18 +++--- tdemdi/tdemdifocuslist.cpp | 6 +- tdemdi/tdemdifocuslist.h | 2 +- tdemdi/tdemdimainfrm.cpp | 2 +- tdemdi/tdemditaskbar.cpp | 4 +- tdeparts/part.cpp | 2 +- tdeparts/partmanager.cpp | 4 +- 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 +- 37 files changed, 87 insertions(+), 87 deletions(-) diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp index f78c5c5db..3f93a92c8 100644 --- a/arts/kde/kvideowidget.cpp +++ b/arts/kde/kvideowidget.cpp @@ -93,7 +93,7 @@ void KVideoWidget::init(void) { setMinimumSize(0, 0); setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); fullscreenWidget = 0; poVideo = Arts::VideoPlayObject::null(); diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp index e8e53f661..86fecba1d 100644 --- a/kate/part/katecodecompletion.cpp +++ b/kate/part/katecodecompletion.cpp @@ -404,7 +404,7 @@ KateArgHint::KateArgHint( KateView* parent, const char* name ) m_markCurrentFunction = true; - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setFocusProxy( parent ); reset( -1, -1 ); diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index bee2e4fb3..6d56f6560 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -131,7 +131,7 @@ KateView::KateView( KateDocument *doc, TQWidget *parent, const char * name ) doc->addView( this ); setFocusProxy( m_viewInternal ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); if (!doc->singleViewMode()) { setXMLFile( "katepartui.rc" ); diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp index ed6675392..84c62370d 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp @@ -123,7 +123,7 @@ ResourceLDAPTDEIO::~ResourceLDAPTDEIO() void ResourceLDAPTDEIO::enter_loop() { TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); tqt_leave_modal(&dummy); diff --git a/tdecore/svgicons/ksvgiconengine.cpp b/tdecore/svgicons/ksvgiconengine.cpp index 307261fa1..79f34d806 100644 --- a/tdecore/svgicons/ksvgiconengine.cpp +++ b/tdecore/svgicons/ksvgiconengine.cpp @@ -441,7 +441,7 @@ public: { // Scale, if needed if(image.width() != (int) w || image.height() != (int) h) - image = image.smoothScale((int) w, (int) h, TQ_ScaleFree); + image = image.smoothScale((int) w, (int) h, TQImage::ScaleFree); m_engine->painter()->drawImage(x, y, image); } diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp index b10aaba99..6fb13b75b 100644 --- a/tdehtml/html/html_formimpl.cpp +++ b/tdehtml/html/html_formimpl.cpp @@ -957,7 +957,7 @@ bool HTMLGenericFormElementImpl::isFocusable() const return false; TQWidget* widget = static_cast(m_render)->widget(); - return widget && widget->focusPolicy() >= TQ_TabFocus; + return widget && widget->focusPolicy() >= TQWidget::TabFocus; } class FocusHandleWidget : public TQWidget diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp index 5ec96aad4..f92d0b281 100644 --- a/tdehtml/rendering/render_frames.cpp +++ b/tdehtml/rendering/render_frames.cpp @@ -634,7 +634,7 @@ void RenderPart::setWidget( TQWidget *widget ) #endif setQWidget( widget ); - widget->setFocusPolicy(TQ_WheelFocus); + widget->setFocusPolicy(TQWidget::WheelFocus); if(widget->inherits("TDEHTMLView")) connect( widget, TQT_SIGNAL( cleared() ), this, TQT_SLOT( slotViewCleared() ) ); diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp index 2d991c3a2..925f800fd 100644 --- a/tdehtml/rendering/render_replaced.cpp +++ b/tdehtml/rendering/render_replaced.cpp @@ -215,8 +215,8 @@ void RenderWidget::setQWidget(TQWidget *widget) if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqqt_cast(m_widget)) m_widget->setBackgroundMode( TQWidget::NoBackground ); - if (m_widget->focusPolicy() > TQ_StrongFocus) - m_widget->setFocusPolicy(TQ_StrongFocus); + if (m_widget->focusPolicy() > TQWidget::StrongFocus) + m_widget->setFocusPolicy(TQWidget::StrongFocus); // if we've already received a layout, apply the calculated space to the // widget immediately, but we have to have really been full constructed (with a non-null // style pointer). @@ -673,7 +673,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) // currently focused. this avoids accidentally changing a select box // or something while wheeling a webpage. if (tqApp->focusWidget() != widget() && - widget()->focusPolicy() <= TQ_StrongFocus) { + widget()->focusPolicy() <= TQWidget::StrongFocus) { TQT_TQWHEELEVENT(e)->ignore(); TQApplication::sendEvent(view(), e); filtered = true; diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp index f68df55c9..28a81a91f 100644 --- a/tdehtml/tdehtmlview.cpp +++ b/tdehtml/tdehtmlview.cpp @@ -546,7 +546,7 @@ void TDEHTMLView::init() d->vertPaintBuffer = new TQPixmap(10, PAINT_BUFFER_HEIGHT); if(!d->tp) d->tp = new TQPainter(); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); viewport()->setFocusProxy(this); _marginWidth = -1; // undefined diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp index 3dcb5620a..2171c28f1 100644 --- a/tdeio/tdefile/kurlbar.cpp +++ b/tdeio/tdefile/kurlbar.cpp @@ -410,7 +410,7 @@ void KURLBar::setListBox( KURLBarListBox *view ) m_listBox->setSelectionMode( TDEListBox::Single ); paletteChange( palette() ); - m_listBox->setFocusPolicy( TQ_TabFocus ); + m_listBox->setFocusPolicy( TQWidget::TabFocus ); connect( m_listBox, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), TQT_SLOT( slotSelected( int, TQListBoxItem * ))); diff --git a/tdeio/tdefile/tdediroperator.cpp b/tdeio/tdefile/tdediroperator.cpp index a969179fe..f803cf1b7 100644 --- a/tdeio/tdefile/tdediroperator.cpp +++ b/tdeio/tdefile/tdediroperator.cpp @@ -144,7 +144,7 @@ KDirOperator::KDirOperator(const KURL& _url, setupActions(); setupMenu(); - setFocusPolicy(TQ_WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); } KDirOperator::~KDirOperator() diff --git a/tdeio/tdeio/netaccess.cpp b/tdeio/tdeio/netaccess.cpp index 9c4def4ba..05aec6743 100644 --- a/tdeio/tdeio/netaccess.cpp +++ b/tdeio/tdeio/netaccess.cpp @@ -516,7 +516,7 @@ void tqt_leave_modal( TQWidget *widget ); void NetAccess::enter_loop() { TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); tqt_leave_modal(&dummy); diff --git a/tdemdi/tdemdichildarea.cpp b/tdemdi/tdemdichildarea.cpp index 2fe083ec0..5ae455b46 100644 --- a/tdemdi/tdemdichildarea.cpp +++ b/tdemdi/tdemdichildarea.cpp @@ -58,7 +58,7 @@ KMdiChildArea::KMdiChildArea( TQWidget *parent ) m_captionInactiveForeColor = TDEGlobalSettings::inactiveTextColor(); m_pZ = new TQPtrList; m_pZ->setAutoDelete( true ); - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); m_defaultChildFrmSize = TQSize( 400, 300 ); } diff --git a/tdemdi/tdemdichildfrm.cpp b/tdemdi/tdemdichildfrm.cpp index bc5bf335f..f83a8b86a 100644 --- a/tdemdi/tdemdichildfrm.cpp +++ b/tdemdi/tdemdichildfrm.cpp @@ -149,15 +149,15 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent ) redecorateButtons(); - m_pWinIcon->setFocusPolicy( TQ_NoFocus ); - m_pUnixIcon->setFocusPolicy( TQ_NoFocus ); - m_pClose->setFocusPolicy( TQ_NoFocus ); - m_pMinimize->setFocusPolicy( TQ_NoFocus ); - m_pMaximize->setFocusPolicy( TQ_NoFocus ); - m_pUndock->setFocusPolicy( TQ_NoFocus ); + m_pWinIcon->setFocusPolicy( TQWidget::NoFocus ); + m_pUnixIcon->setFocusPolicy( TQWidget::NoFocus ); + m_pClose->setFocusPolicy( TQWidget::NoFocus ); + m_pMinimize->setFocusPolicy( TQWidget::NoFocus ); + m_pMaximize->setFocusPolicy( TQWidget::NoFocus ); + m_pUndock->setFocusPolicy( TQWidget::NoFocus ); setFrameStyle( TQFrame::WinPanel | TQFrame::Raised ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setMouseTracking( true ); @@ -705,7 +705,7 @@ void KMdiChildFrm::setIcon( const TQPixmap& pxm ) if ( p.width() != 18 || p.height() != 18 ) { TQImage img = p.convertToImage(); - p = img.smoothScale( 18, 18, TQ_ScaleMin ); + p = img.smoothScale( 18, 18, TQImage::ScaleMin ); } const bool do_resize = m_pIconButtonPixmap->size() != p.size(); *m_pIconButtonPixmap = p; @@ -750,7 +750,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) } // memorize the focuses in a dictionary because they will get lost during reparenting - TQDict* pFocPolDict = new TQDict; + TQDict* pFocPolDict = new TQDict; pFocPolDict->setAutoDelete( true ); TQObjectList *list = m_pClient->queryList( "TQWidget" ); TQObjectListIt it( *list ); // iterate over the buttons @@ -768,7 +768,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) widg->setName( tmpStr.latin1() ); i++; } - TQ_FocusPolicy* pFocPol = new TQ_FocusPolicy; + TQWidget::FocusPolicy* pFocPol = new TQWidget::FocusPolicy; *pFocPol = widg->focusPolicy(); pFocPolDict->insert( widg->name(), pFocPol ); } @@ -817,7 +817,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) TQObject::disconnect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) ); //reparent to desktop widget , no flags , point , show it - TQDict* pFocPolDict; + TQDict* pFocPolDict; pFocPolDict = unlinkChildren(); // get name of focused child widget @@ -842,7 +842,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) { // for each found object... TQWidget * widg = ( TQWidget* ) obj; ++it; - TQ_FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent + TQWidget::FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent if ( pFocPol ) widg->setFocusPolicy( *pFocPol ); @@ -851,7 +851,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) widg->setFocus(); // get first and last focusable widget - if ( ( widg->focusPolicy() == TQ_StrongFocus ) || ( widg->focusPolicy() == TQ_TabFocus ) ) + if ( ( widg->focusPolicy() == TQWidget::StrongFocus ) || ( widg->focusPolicy() == TQWidget::TabFocus ) ) { if ( firstFocusableChildWidget == 0 ) firstFocusableChildWidget = widg; // first widget @@ -860,7 +860,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) } else { - if ( widg->focusPolicy() == TQ_WheelFocus ) + if ( widg->focusPolicy() == TQWidget::WheelFocus ) { if ( firstFocusableChildWidget == 0 ) firstFocusableChildWidget = widg; // first widget @@ -877,14 +877,14 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) m_pClient->setLastFocusableChildWidget( lastFocusableChildWidget ); // reset the focus policy of the view - m_pClient->setFocusPolicy( TQ_ClickFocus ); + m_pClient->setFocusPolicy( TQWidget::ClickFocus ); // lose information about the view (because it's undocked now) m_pClient = 0; } //============== linkChildren =============// -void KMdiChildFrm::linkChildren( TQDict* pFocPolDict ) +void KMdiChildFrm::linkChildren( TQDict* pFocPolDict ) { // reset the focus policies for all widgets in the view (take them from the dictionary) TQObjectList* list = m_pClient->queryList( "TQWidget" ); @@ -894,7 +894,7 @@ void KMdiChildFrm::linkChildren( TQDict* pFocPolDict ) { // for each found object... TQWidget* widg = ( TQWidget* ) obj; ++it; - TQ_FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent + TQWidget::FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent if ( pFocPol != 0 ) widg->setFocusPolicy( *pFocPol ); @@ -907,14 +907,14 @@ void KMdiChildFrm::linkChildren( TQDict* pFocPolDict ) delete pFocPolDict; // reset the focus policies for the rest - m_pWinIcon->setFocusPolicy( TQ_NoFocus ); - m_pUnixIcon->setFocusPolicy( TQ_NoFocus ); - m_pClient->setFocusPolicy( TQ_ClickFocus ); - m_pCaption->setFocusPolicy( TQ_NoFocus ); - m_pUndock->setFocusPolicy( TQ_NoFocus ); - m_pMinimize->setFocusPolicy( TQ_NoFocus ); - m_pMaximize->setFocusPolicy( TQ_NoFocus ); - m_pClose->setFocusPolicy( TQ_NoFocus ); + m_pWinIcon->setFocusPolicy( TQWidget::NoFocus ); + m_pUnixIcon->setFocusPolicy( TQWidget::NoFocus ); + m_pClient->setFocusPolicy( TQWidget::ClickFocus ); + m_pCaption->setFocusPolicy( TQWidget::NoFocus ); + m_pUndock->setFocusPolicy( TQWidget::NoFocus ); + m_pMinimize->setFocusPolicy( TQWidget::NoFocus ); + m_pMaximize->setFocusPolicy( TQWidget::NoFocus ); + m_pClose->setFocusPolicy( TQWidget::NoFocus ); // install the event filter (catch mouse clicks) for the rest m_pWinIcon->installEventFilter( this ); @@ -930,10 +930,10 @@ void KMdiChildFrm::linkChildren( TQDict* pFocPolDict ) //============== unlinkChildren =============// -TQDict* KMdiChildFrm::unlinkChildren() +TQDict* KMdiChildFrm::unlinkChildren() { // memorize the focuses in a dictionary because they will get lost during reparenting - TQDict* pFocPolDict = new TQDict; + TQDict* pFocPolDict = new TQDict; pFocPolDict->setAutoDelete( true ); TQObjectList *list = m_pClient->queryList( "TQWidget" ); @@ -953,7 +953,7 @@ TQDict* KMdiChildFrm::unlinkChildren() w->setName( tmpStr.latin1() ); i++; } - TQ_FocusPolicy* pFocPol = new TQ_FocusPolicy; + TQWidget::FocusPolicy* pFocPol = new TQWidget::FocusPolicy; *pFocPol = w->focusPolicy(); // memorize focus policy pFocPolDict->insert( w->name(), pFocPol ); @@ -1115,7 +1115,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) if ( ( obj->parent() != m_pCaption ) && ( obj != m_pCaption ) ) { TQWidget* w = ( TQWidget* ) obj; - if ( ( w->focusPolicy() == TQ_ClickFocus ) || ( w->focusPolicy() == TQ_StrongFocus ) ) + if ( ( w->focusPolicy() == TQWidget::ClickFocus ) || ( w->focusPolicy() == TQWidget::StrongFocus ) ) { w->setFocus(); } diff --git a/tdemdi/tdemdichildfrm.h b/tdemdi/tdemdichildfrm.h index 6b9a2a648..8bdac6e40 100644 --- a/tdemdi/tdemdichildfrm.h +++ b/tdemdi/tdemdichildfrm.h @@ -422,13 +422,13 @@ protected: * Restore the focus policies for _all_ widgets in the view using the list given as parameter. * Install the event filter for all direct child widgets of this. (See KMdiChildFrm::eventFilter) */ - void linkChildren( TQDict* pFocPolDict ); + void linkChildren( TQDict* pFocPolDict ); /** * Backups all focus policies of _all_ child widgets in the MDI childview since they get lost during a reparent. * Remove all event filters for all direct child widgets of this. (See KMdiChildFrm::eventFilter) */ - TQDict* unlinkChildren(); + TQDict* unlinkChildren(); /** * Calculates the corner id for the resize cursor. The return value can be tested for: diff --git a/tdemdi/tdemdichildfrmcaption.cpp b/tdemdi/tdemdichildfrmcaption.cpp index 6930eaebf..1ab6d1902 100644 --- a/tdemdi/tdemdichildfrmcaption.cpp +++ b/tdemdi/tdemdichildfrmcaption.cpp @@ -72,7 +72,7 @@ KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *parent ) m_bActive = false; m_pParent = parent; setBackgroundMode( NoBackground ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); m_bChildInDrag = false; } diff --git a/tdemdi/tdemdichildview.cpp b/tdemdi/tdemdichildview.cpp index 487627b08..7f9e07595 100644 --- a/tdemdi/tdemdichildview.cpp +++ b/tdemdi/tdemdichildview.cpp @@ -63,7 +63,7 @@ KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, c m_szCaption = i18n( "Unnamed" ); m_sTabCaption = m_szCaption; - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); installEventFilter( this ); // store the current time @@ -88,7 +88,7 @@ KMdiChildView::KMdiChildView( TQWidget* parentWidget, const char* name, WFlags f setGeometry( 0, 0, 0, 0 ); // reset m_szCaption = i18n( "Unnamed" ); m_sTabCaption = m_szCaption; - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); installEventFilter( this ); // store the current time @@ -363,7 +363,7 @@ void KMdiChildView::youAreDetached() if ( myIconPtr() ) setIcon( *( myIconPtr() ) ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); emit isDetachedNow(); } @@ -527,8 +527,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) if ( ke->key() == Qt::Key_Tab ) { TQWidget* w = ( TQWidget* ) obj; - TQ_FocusPolicy wfp = w->focusPolicy(); - if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || w->focusPolicy() == TQ_WheelFocus ) + TQWidget::FocusPolicy wfp = w->focusPolicy(); + if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || w->focusPolicy() == TQWidget::WheelFocus ) { if ( m_lastFocusableChildWidget != 0 ) { @@ -578,8 +578,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) TQWidget * widg = ( TQWidget* ) o; ++it; widg->removeEventFilter( this ); - TQ_FocusPolicy wfp = widg->focusPolicy(); - if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || widg->focusPolicy() == TQ_WheelFocus ) + TQWidget::FocusPolicy wfp = widg->focusPolicy(); + if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus ) { if ( m_firstFocusableChildWidget == widg ) m_firstFocusableChildWidget = 0L; // reset first widget @@ -612,8 +612,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) ++it; widg->installEventFilter( this ); connect( widg, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slot_childDestroyed() ) ); - TQ_FocusPolicy wfp = widg->focusPolicy(); - if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || widg->focusPolicy() == TQ_WheelFocus ) + TQWidget::FocusPolicy wfp = widg->focusPolicy(); + if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus ) { if ( m_firstFocusableChildWidget == 0 ) m_firstFocusableChildWidget = widg; // first widge diff --git a/tdemdi/tdemdifocuslist.cpp b/tdemdi/tdemdifocuslist.cpp index 63024aa20..68983b6f5 100644 --- a/tdemdi/tdemdifocuslist.cpp +++ b/tdemdi/tdemdifocuslist.cpp @@ -31,7 +31,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w ) { //this method should never be called twice on the same hierarchy m_list.insert( w, w->focusPolicy() ); - w->setFocusPolicy( TQ_ClickFocus ); + w->setFocusPolicy( TQWidget::ClickFocus ); kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding toplevel" << endl; connect( w, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); TQObjectList *l = w->queryList( "TQWidget" ); @@ -41,7 +41,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w ) { TQWidget * wid = ( TQWidget* ) obj; m_list.insert( wid, wid->focusPolicy() ); - wid->setFocusPolicy( TQ_ClickFocus ); + wid->setFocusPolicy( TQWidget::ClickFocus ); kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding widget" << endl; connect( wid, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); ++it; @@ -51,7 +51,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w ) void KMdiFocusList::restore() { - for ( TQMap::const_iterator it = m_list.constBegin();it != m_list.constEnd();++it ) + for ( TQMap::const_iterator it = m_list.constBegin();it != m_list.constEnd();++it ) { it.key() ->setFocusPolicy( it.data() ); } diff --git a/tdemdi/tdemdifocuslist.h b/tdemdi/tdemdifocuslist.h index 8653d32bf..d3fdc039c 100644 --- a/tdemdi/tdemdifocuslist.h +++ b/tdemdi/tdemdifocuslist.h @@ -34,7 +34,7 @@ public: protected slots: void objectHasBeenDestroyed( TQObject* ); private: - TQMap m_list; + TQMap m_list; }; diff --git a/tdemdi/tdemdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp index ae5f1b584..09b5f7382 100644 --- a/tdemdi/tdemdimainfrm.cpp +++ b/tdemdi/tdemdimainfrm.cpp @@ -184,7 +184,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod m_pToolViews = new TQMap; // This seems to be needed (re-check it after Qt2.0 comed out) - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); // create the central widget createMdiManager(); diff --git a/tdemdi/tdemditaskbar.cpp b/tdemdi/tdemditaskbar.cpp index 75c76f6fd..d064c25c2 100644 --- a/tdemdi/tdemditaskbar.cpp +++ b/tdemdi/tdemditaskbar.cpp @@ -67,7 +67,7 @@ KMdiTaskBarButton::KMdiTaskBarButton( KMdiTaskBar *pTaskBar, KMdiChildView *win_ m_pWindow = win_ptr; TQToolTip::add ( this, win_ptr->caption() ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); } KMdiTaskBarButton::~KMdiTaskBarButton() @@ -156,7 +156,7 @@ KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock ) m_pButtonList->setAutoDelete( true ); //QT30 setFontPropagation(TQWidget::SameFont); setMinimumWidth( 1 ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); parent->moveToolBar( this, dock ); //XXX obsolete! } diff --git a/tdeparts/part.cpp b/tdeparts/part.cpp index 075b13d77..286a5f93b 100644 --- a/tdeparts/part.cpp +++ b/tdeparts/part.cpp @@ -690,7 +690,7 @@ bool ReadWritePart::waitSaveComplete() d->m_waitForSave = true; TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); tqt_leave_modal(&dummy); diff --git a/tdeparts/partmanager.cpp b/tdeparts/partmanager.cpp index 5ba9c8b41..f63fdc3b3 100644 --- a/tdeparts/partmanager.cpp +++ b/tdeparts/partmanager.cpp @@ -351,11 +351,11 @@ void PartManager::addPart( Part *part, bool setActive ) } // Prevent focus problems - if ( part->widget() && part->widget()->focusPolicy() == TQ_NoFocus ) + if ( part->widget() && part->widget()->focusPolicy() == TQWidget::NoFocus ) { kdWarning(1000) << "Part '" << part->name() << "' has a widget " << part->widget()->name() << " with a focus policy of NoFocus. It should have at least a ClickFocus policy, for part activation to work well." << endl; } - if ( part->widget() && part->widget()->focusPolicy() == TQ_TabFocus ) + if ( part->widget() && part->widget()->focusPolicy() == TQWidget::TabFocus ) { kdWarning(1000) << "Part '" << part->name() << "' has a widget " << part->widget()->name() << " with a focus policy of TabFocus. It should have at least a ClickFocus policy, for part activation to work well." << endl; } 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() ),