From 5e58c04b1456ff687d05184e031ee0b6aa66cefb Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 2 Sep 2023 15:54:50 +0900 Subject: [PATCH] Replace TQ_*Focus* and TQ_Scale* defines Signed-off-by: Michele Calgaro --- kimagemapeditor/qextfileinfo.cpp | 2 +- klinkstatus/src/ui/tabwidgetsession.cpp | 2 +- kommander/editor/connectioneditorimpl.cpp | 2 +- kommander/editor/formwindow.cpp | 4 +- kommander/editor/previewwidgetimpl.cpp | 2 +- kommander/widget/myprocess.cpp | 2 +- .../tdemdi/qextmdi/kdockwidget.cpp | 2 +- .../tdemdi/qextmdi/kdockwidget_private.cpp | 4 +- .../tdemdi/qextmdi/tdemdichildarea.cpp | 2 +- .../tdemdi/qextmdi/tdemdichildfrm.cpp | 58 +++++++++---------- .../tdemdi/qextmdi/tdemdichildfrm.h | 4 +- .../tdemdi/qextmdi/tdemdichildfrmcaption.cpp | 2 +- .../tdemdi/qextmdi/tdemdichildview.cpp | 18 +++--- .../tdemdi/qextmdi/tdemdifocuslist.cpp | 6 +- .../tdemdi/qextmdi/tdemdifocuslist.h | 2 +- .../tdemdi/qextmdi/tdemdimainfrm.cpp | 2 +- .../tdemdi/qextmdi/tdemditaskbar.cpp | 4 +- lib/qextfileinfo.cpp | 2 +- quanta/messages/messageoutput.cpp | 2 +- quanta/parts/kafka/htmldocumentproperties.cpp | 4 +- quanta/plugins/quantaplugin.cpp | 2 +- quanta/src/quanta_init.cpp | 6 +- quanta/src/quantaview.cpp | 2 +- quanta/src/viewmanager.cpp | 2 +- quanta/treeviews/basetreeview.cpp | 2 +- quanta/treeviews/doctreeview.cpp | 2 +- quanta/treeviews/structtreeview.cpp | 2 +- quanta/treeviews/tagattributetree.cpp | 4 +- quanta/treeviews/uploadtreeview.cpp | 2 +- 29 files changed, 75 insertions(+), 75 deletions(-) diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp index 031a34ab..04bafce2 100644 --- a/kimagemapeditor/qextfileinfo.cpp +++ b/kimagemapeditor/qextfileinfo.cpp @@ -280,7 +280,7 @@ void tqt_leave_modal( TQWidget *widget ); void QExtFileInfo::enter_loop() { TQWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); // kdDebug(24000)<<"QExtFileInfo::enter_loop:before tqApp->enter_loop()"<enter_loop(); diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp index 9f27d344..9ed1aef5 100644 --- a/klinkstatus/src/ui/tabwidgetsession.cpp +++ b/klinkstatus/src/ui/tabwidgetsession.cpp @@ -45,7 +45,7 @@ TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f) : KTabWidget(parent, name, f) // tabs_ is initialized with size 17 { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setMargin(0); setTabReorderingEnabled(true); setHoverCloseButton(true); diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp index 23088e69..05a3c2ad 100644 --- a/kommander/editor/connectioneditorimpl.cpp +++ b/kommander/editor/connectioneditorimpl.cpp @@ -163,7 +163,7 @@ bool ConnectionEditor::isSlotIgnored(const TQMetaData* md) if (!m_formWindow->isMainContainer(TQT_TQOBJECT(m_receiver)) && !qstrcmp(md->name, "close()")) return true; if (!qstrcmp(md->name, "setFocus()") && m_receiver->isWidgetType() && - ((TQWidget*)m_receiver)->focusPolicy() == TQ_NoFocus) + ((TQWidget*)m_receiver)->focusPolicy() == TQWidget::NoFocus) return true; for (int i = 0; icount(); i++) if (checkConnectArgs(MetaDataBase::normalizeSlot(signalBox->text(i)).latin1(), m_receiver, md->name)) diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index b8daf492..717bc9c9 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -140,7 +140,7 @@ void FormWindow::init() unclippedPainter = 0; widgetPressed = false; drawRubber = false; - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); sizePreviewLabel = 0; checkSelectionsTimer = new TQTimer(this, "checkSelectionsTimer"); connect(checkSelectionsTimer, TQT_SIGNAL(timeout()), @@ -1695,7 +1695,7 @@ void FormWindow::showOrderIndicators() { TQWidget *w = (TQWidget *) o; if (w->isVisibleTo(w->parentWidget()) && - insertedWidgets[(void *) w] && w->focusPolicy() != TQ_NoFocus) + insertedWidgets[(void *) w] && w->focusPolicy() != TQWidget::NoFocus) { OrderIndicator *ind = new OrderIndicator(order++, w, this); orderIndicators.append(ind); diff --git a/kommander/editor/previewwidgetimpl.cpp b/kommander/editor/previewwidgetimpl.cpp index 6ac39c22..2b08ee3a 100644 --- a/kommander/editor/previewwidgetimpl.cpp +++ b/kommander/editor/previewwidgetimpl.cpp @@ -31,7 +31,7 @@ PreviewWidget::PreviewWidget( TQWidget *parent, const char *name ) while ((obj = it.current()) != 0) { ++it; obj->installEventFilter(this); - ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus); + ((TQWidget*)obj)->setFocusPolicy(TQWidget::NoFocus); } } diff --git a/kommander/widget/myprocess.cpp b/kommander/widget/myprocess.cpp index 45e64790..5b56ec8d 100644 --- a/kommander/widget/myprocess.cpp +++ b/kommander/widget/myprocess.cpp @@ -102,7 +102,7 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell) else { TQWidget dummy(0, 0, WType_Dialog | WShowModal); - dummy.setFocusPolicy(TQ_NoFocus); + dummy.setFocusPolicy(TQWidget::NoFocus); m_loopStarted = true; tqt_enter_modal(&dummy); tqApp->enter_loop(); diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp index 6cdbc897..ba7cfad3 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp @@ -1152,7 +1152,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/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp index ef60f031..b773582f 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp @@ -544,7 +544,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() @@ -620,7 +620,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/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp index 3a4c7a79..95e3c6b2 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp +++ b/lib/compatibility/tdemdi/qextmdi/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/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp index 4c9461f8..aec2b9a5 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp +++ b/lib/compatibility/tdemdi/qextmdi/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/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h index c1b2f0c9..c9a7faa6 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h @@ -424,13 +424,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/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp index f07e1a56..8f6858fb 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp +++ b/lib/compatibility/tdemdi/qextmdi/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/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp index 84948205..9b67ccbb 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp +++ b/lib/compatibility/tdemdi/qextmdi/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 @@ -87,7 +87,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 @@ -362,7 +362,7 @@ void KMdiChildView::youAreDetached() if ( myIconPtr() ) setIcon( *( myIconPtr() ) ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); emit isDetachedNow(); } @@ -526,8 +526,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) if ( ke->key() == TQt::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 ) { @@ -577,8 +577,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 @@ -611,8 +611,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/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp index 63024aa2..68983b6f 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp +++ b/lib/compatibility/tdemdi/qextmdi/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/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h index 92cc86a3..63290687 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h @@ -35,7 +35,7 @@ public: protected slots: void objectHasBeenDestroyed( TQObject* ); private: - TQMap m_list; + TQMap m_list; }; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp index 74c82f53..aa8f9069 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp @@ -185,7 +185,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod m_pToolViews = new TQMap; // This seems to be needed (re-check it after TQt2.0 comed out) - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); // create the central widget createMdiManager(); diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp index d38824c2..a9c03157 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp @@ -63,7 +63,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() @@ -152,7 +152,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/lib/qextfileinfo.cpp b/lib/qextfileinfo.cpp index 094e1f77..c4d65d83 100644 --- a/lib/qextfileinfo.cpp +++ b/lib/qextfileinfo.cpp @@ -440,7 +440,7 @@ void tqt_leave_modal( TQWidget *widget ); void QExtFileInfo::enter_loop() { TQWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); //kdDebug(24000)<<"QExtFileInfo::enter_loop:before tqApp->enter_loop()"<< endl; tqApp->enter_loop(); diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index 10e4fb5b..6b396e94 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -41,7 +41,7 @@ MessageOutput::MessageOutput(TQWidget *parent, const char *name ) pal.setColor(TQColorGroup::HighlightedText, pal.color(TQPalette::Active, TQColorGroup::Text)); pal.setColor(TQColorGroup::Highlight, pal.color(TQPalette::Active, TQColorGroup::Mid)); setPalette(pal); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); m_popupMenu = new TDEPopupMenu(this); connect(this, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp index c997ffee..18cf44da 100644 --- a/quanta/parts/kafka/htmldocumentproperties.cpp +++ b/quanta/parts/kafka/htmldocumentproperties.cpp @@ -69,7 +69,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse ok->setAutoDefault(true); //set the taborder and disable focus for some widgets. - currentDTD->setFocusPolicy(TQ_NoFocus); + currentDTD->setFocusPolicy(TQWidget::NoFocus); TQWidget::setTabOrder(title, metaItems); TQWidget::setTabOrder(metaItems, metaItemsAdd); TQWidget::setTabOrder(metaItemsAdd, metaItemsDelete); @@ -98,7 +98,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse cssRules->addColumn(i18n("Rule")); cssRules->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); cssRules->setLineWidth( 2 ); - //cssRules->setFocusPolicy(TQ_ClickFocus); + //cssRules->setFocusPolicy(TQWidget::ClickFocus); cssRules->setSorting(-1); //search for the head, html, title Node diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp index 19cc5981..b528c9ff 100644 --- a/quanta/plugins/quantaplugin.cpp +++ b/quanta/plugins/quantaplugin.cpp @@ -126,7 +126,7 @@ bool QuantaPlugin::load() } m_part->setName(m_name.ascii()); // for better debug output m_part->widget()->setName(m_name.ascii()); //needed to be able to dock the same plugin twice in separate toolviews - m_part->widget()->setFocusPolicy(TQ_ClickFocus); + m_part->widget()->setFocusPolicy(TQWidget::ClickFocus); quantaApp->slotNewPart(m_part, false); // register the part in the partmanager return true; } diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index 62931561..428f9b98 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -485,15 +485,15 @@ void QuantaInit::initView() m_quanta->scriptTab = new ScriptTreeView(m_quanta, "Scripts"); m_quanta->m_messageOutput = new MessageOutput(m_quanta, "Messages"); - m_quanta->m_messageOutput->setFocusPolicy(TQ_NoFocus); + m_quanta->m_messageOutput->setFocusPolicy(TQWidget::NoFocus); m_quanta->m_messageOutput->showMessage(i18n("Message Window...")); connect(m_quanta, TQT_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&, bool))); connect(m_quanta, TQT_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQT_SLOT(clear())); m_quanta->m_problemOutput = new MessageOutput(m_quanta, "Problems"); - m_quanta->m_problemOutput->setFocusPolicy(TQ_NoFocus); + m_quanta->m_problemOutput->setFocusPolicy(TQWidget::NoFocus); m_quanta->m_annotationOutput = new AnnotationOutput(m_quanta, "Annotations"); - m_quanta->m_annotationOutput->setFocusPolicy(TQ_NoFocus); + m_quanta->m_annotationOutput->setFocusPolicy(TQWidget::NoFocus); m_quanta->createPreviewPart(); m_quanta->createDocPart(); diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index 6d3ef86f..18bb8b29 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -95,7 +95,7 @@ QuantaView::QuantaView(TQWidget *parent, const char *name, const TQString &capti //get the reference to the user toolbar holding widget ToolbarTabWidget *m_toolbarTab = ToolbarTabWidget::ref(); m_toolbarTab->reparent(this, 0, TQPoint(), true); - m_toolbarTab ->setFocusPolicy( TQ_NoFocus ); + m_toolbarTab ->setFocusPolicy( TQWidget::NoFocus ); //create a splitter to separate the VPL and document area m_splitter = new TQSplitter(Qt::Vertical, this); diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp index 92e502a2..e06201a2 100644 --- a/quanta/src/viewmanager.cpp +++ b/quanta/src/viewmanager.cpp @@ -142,7 +142,7 @@ void ViewManager::createNewDocument() popupIf->installPopup((TQPopupMenu *)quantaApp->factory()->container("popup_editor", quantaApp)); quantaApp->setFocusProxy(w->view()); - w->view()->setFocusPolicy(TQ_WheelFocus); + w->view()->setFocusPolicy(TQWidget::WheelFocus); connect( v, TQT_SIGNAL(newStatus()), quantaApp, TQT_SLOT(slotNewStatus())); quantaApp->slotNewPart(doc, true); // register new part in partmanager and make active diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 8023e0d6..6abdc5b7 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -303,7 +303,7 @@ BaseTreeView::BaseTreeView(TQWidget *parent, const char *name) setLineWidth(2); setFullWidth(true); setShowSortIndicator(true); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); setShowFolderOpenPixmap(false); connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp index 9b9e7d14..abe67424 100644 --- a/quanta/treeviews/doctreeview.cpp +++ b/quanta/treeviews/doctreeview.cpp @@ -54,7 +54,7 @@ DocTreeView::DocTreeView(TQWidget *parent, const char *name ) projectDocFolder = new TDEListViewItem(this, i18n("Project Documentation")); projectDocFolder->setOpen(true); slotRefreshTree(); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); connect(this, TQT_SIGNAL(executed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *)) ); connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *))); diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index feb56bc9..3cf66b14 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -83,7 +83,7 @@ StructTreeView::StructTreeView(TQWidget *parent, const char *name ) setLineWidth( 2 ); addColumn( i18n("Name"), -1 ); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); dtdMenu = new TDEPopupMenu(this); diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index e8d0bbfc..26d676d2 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -104,7 +104,7 @@ DualEditableTree::DualEditableTree(TQWidget *parent, const char *name) : EditableTree(parent, name) { curCol = 0; - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); this->installEventFilter(this); connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(itemClicked(TQListViewItem *, const TQPoint &, int ))); @@ -223,7 +223,7 @@ TagAttributeTree::TagAttributeTree(TQWidget *parent, const char *name) setSorting(-1); setFrameStyle( Panel | Sunken ); setLineWidth( 2 ); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); addColumn(i18n("Attribute Name")); addColumn(i18n("Value")); setResizeMode(TQListView::LastColumn); diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp index 7780f8aa..4761b25f 100644 --- a/quanta/treeviews/uploadtreeview.cpp +++ b/quanta/treeviews/uploadtreeview.cpp @@ -37,7 +37,7 @@ UploadTreeView::UploadTreeView( TQWidget *parent, const char *name ) : addColumn( i18n("Size") ); addColumn( i18n("Date") ); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectFile())); connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem *)),