From b93a9330d8b06f081d4ea3d2d48cdba2b6b2ce46 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 6 Nov 2023 11:39:17 +0900 Subject: Replace Qt with TQt Signed-off-by: Michele Calgaro --- kpovmodeler/pmdockwidget.cpp | 22 +++++++++++----------- kpovmodeler/pmdockwidget.h | 2 +- kpovmodeler/pmdockwidget_private.cpp | 22 +++++++++++----------- kpovmodeler/pmdockwidget_private.h | 6 +++--- kpovmodeler/pmglview.cpp | 10 +++++----- kpovmodeler/pmtreeview.cpp | 4 ++-- kpovmodeler/pmvectorlistedit.cpp | 2 +- kpovmodeler/pmview.cpp | 4 ++-- kpovmodeler/pmviewlayoutmanager.cpp | 2 +- 9 files changed, 37 insertions(+), 37 deletions(-) (limited to 'kpovmodeler') diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp index 950269ab..7de15eb1 100644 --- a/kpovmodeler/pmdockwidget.cpp +++ b/kpovmodeler/pmdockwidget.cpp @@ -798,7 +798,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP if( pw->inherits( "PMDockSplitter" ) ) { PMDockSplitter* ds = ( PMDockSplitter* ) pw; - if( ds->splitterOrientation( ) ==Qt::Vertical ) + if( ds->splitterOrientation( ) ==TQt::Vertical ) found = true; } } @@ -874,8 +874,8 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP // if to dock not to the center of the target dockwidget, // dock to newDock PMDockSplitter* panner = 0L; - if ( dockPos == PMDockWidget::DockTop || dockPos == PMDockWidget::DockBottom ) panner = new PMDockSplitter( newDock, "_dock_split_",Qt::Horizontal, spliPos, manager->splitterHighResolution() ); - if ( dockPos == PMDockWidget::DockLeft || dockPos == PMDockWidget::DockRight ) panner = new PMDockSplitter( newDock, "_dock_split_",Qt::Vertical , spliPos, manager->splitterHighResolution() ); + if ( dockPos == PMDockWidget::DockTop || dockPos == PMDockWidget::DockBottom ) panner = new PMDockSplitter( newDock, "_dock_split_",TQt::Horizontal, spliPos, manager->splitterHighResolution() ); + if ( dockPos == PMDockWidget::DockLeft || dockPos == PMDockWidget::DockRight ) panner = new PMDockSplitter( newDock, "_dock_split_",TQt::Vertical , spliPos, manager->splitterHighResolution() ); newDock->setWidget( panner ); panner->setOpaqueResize(manager->splitterOpaqueResize()); @@ -994,13 +994,13 @@ void PMDockWidget::undock() split->deactivate(); if ( split->getFirst() == parentOfTab ){ split->activate( lastTab ); - if ( ((PMDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical ) + if ( ((PMDockWidget*)split->parent())->splitterOrientation ==TQt::Vertical ) emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockLeft ); else emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockTop ); } else { split->activate( 0L, lastTab ); - if ( ((PMDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical ) + if ( ((PMDockWidget*)split->parent())->splitterOrientation ==TQt::Vertical ) emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockRight ); else emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockBottom ); @@ -1343,7 +1343,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event ) else curdw->toDesktop( ); break; case TQEvent::MouseButtonPress: - if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){ if ( curdw->eDocking != (int)PMDockWidget::DockNone ){ dropCancel = true; curdw->setFocus(); @@ -1367,7 +1367,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event ) } break; case TQEvent::MouseButtonRelease: - if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){ if ( draging ){ if ( !dropCancel ) drop(); @@ -1426,7 +1426,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event ) if (d->readyToDrag) { d->readyToDrag = false; } - if ( (((TQMouseEvent*)event)->state() == Qt::LeftButton) && + if ( (((TQMouseEvent*)event)->state() == TQt::LeftButton) && (curdw->eDocking != (int)PMDockWidget::DockNone) ) { startDrag( curdw); } @@ -1915,7 +1915,7 @@ void PMDockManager::readConfig(TQDomElement &base) PMDockWidget *second = getDockWidgetFromName(secondName); if (first && second) { obj = first->manualDock(second, - (orientation == (int)Qt::Vertical)? PMDockWidget::DockLeft : PMDockWidget::DockTop, + (orientation == (int)TQt::Vertical)? PMDockWidget::DockLeft : PMDockWidget::DockTop, separatorPos); if (obj) obj->setName(name.latin1()); @@ -2165,9 +2165,9 @@ void PMDockManager::readConfig( TDEConfig* c, TQString group ) PMDockWidget* last = getDockWidgetFromName( c->readEntry( oname + ":last_name" ) ); int sepPos = c->readNumEntry( oname + ":sepPos" ); - Qt::Orientation p = (Qt::Orientation)c->readNumEntry( oname + ":orientation" ); + TQt::Orientation p = (TQt::Orientation)c->readNumEntry( oname + ":orientation" ); if ( first && last ){ - obj = first->manualDock( last, ( p ==Qt::Vertical ) ? PMDockWidget::DockLeft : PMDockWidget::DockTop, sepPos ); + obj = first->manualDock( last, ( p ==TQt::Vertical ) ? PMDockWidget::DockLeft : PMDockWidget::DockTop, sepPos ); if (obj){ obj->setName( oname.latin1() ); } diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h index a997aefb..d65c5aa7 100644 --- a/kpovmodeler/pmdockwidget.h +++ b/kpovmodeler/pmdockwidget.h @@ -805,7 +805,7 @@ private: // GROUP data TQString firstName; TQString lastName; - Qt::Orientation splitterOrientation; + TQt::Orientation splitterOrientation; bool isGroup; bool isTabGroup; diff --git a/kpovmodeler/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp index c0b9355a..60a06867 100644 --- a/kpovmodeler/pmdockwidget_private.cpp +++ b/kpovmodeler/pmdockwidget_private.cpp @@ -22,7 +22,7 @@ #include #include -PMDockSplitter::PMDockSplitter(TQWidget *parent, const char *name, Qt::Orientation orient, int pos, bool highResolution) +PMDockSplitter::PMDockSplitter(TQWidget *parent, const char *name, TQt::Orientation orient, int pos, bool highResolution) : TQWidget(parent, name) { divider = 0L; @@ -49,7 +49,7 @@ void PMDockSplitter::activate(TQWidget *c0, TQWidget *c1) divider->setLineWidth(1); divider->raise(); - if (orientation ==Qt::Horizontal) + if (orientation ==TQt::Horizontal) divider->setCursor(TQCursor(sizeVerCursor)); else divider->setCursor(TQCursor(sizeHorCursor)); @@ -68,7 +68,7 @@ void PMDockSplitter::setupMinMaxSize() { // Set the minimum and maximum sizes int minx, maxx, miny, maxy; - if (orientation ==Qt::Horizontal) { + if (orientation ==TQt::Horizontal) { miny = child0->minimumSize().height() + child1->minimumSize().height()+4; maxy = child0->maximumSize().height() + child1->maximumSize().height()+4; minx = (child0->minimumSize().width() > child1->minimumSize().width()) ? child0->minimumSize().width() : child1->minimumSize().width(); @@ -118,7 +118,7 @@ void PMDockSplitter::resizeEvent(TQResizeEvent *ev) int factor = (mHighResolution)? 10000:100; // real resize event, recalculate xpos if (ev && mKeepSize && isVisible()) { - if (orientation ==Qt::Horizontal) { + if (orientation ==TQt::Horizontal) { if (ev->oldSize().height() != ev->size().height()) xpos = factor * checkValue( child0->height()+1 ) / height(); } else { @@ -126,8 +126,8 @@ void PMDockSplitter::resizeEvent(TQResizeEvent *ev) xpos = factor * checkValue( child0->width()+1 ) / width(); } } - int position = checkValue( (orientation ==Qt::Vertical ? width() : height()) * xpos/factor ); - if (orientation ==Qt::Horizontal){ + int position = checkValue( (orientation ==TQt::Vertical ? width() : height()) * xpos/factor ); + if (orientation ==TQt::Horizontal){ child0->setGeometry(0, 0, width(), position); child1->setGeometry(0, position+4, width(), height()-position-4); divider->setGeometry(0, position, width(), 4); @@ -142,7 +142,7 @@ void PMDockSplitter::resizeEvent(TQResizeEvent *ev) int PMDockSplitter::checkValue( int position ) const { if (initialised){ - if (orientation ==Qt::Vertical){ + if (orientation ==TQt::Vertical){ if (position < (child0->minimumSize().width())) position = child0->minimumSize().width(); if ((width()-4-position) < (child1->minimumSize().width())) @@ -157,9 +157,9 @@ int PMDockSplitter::checkValue( int position ) const if (position < 0) position = 0; - if ((orientation ==Qt::Vertical) && (position > width())) + if ((orientation ==TQt::Vertical) && (position > width())) position = width(); - if ((orientation ==Qt::Horizontal) && (position > height())) + if ((orientation ==TQt::Horizontal) && (position > height())) position = height(); return position; @@ -176,7 +176,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e) mev= (TQMouseEvent*)e; child0->setUpdatesEnabled(mOpaqueResize); child1->setUpdatesEnabled(mOpaqueResize); - if (orientation ==Qt::Horizontal) { + if (orientation ==TQt::Horizontal) { if (!mOpaqueResize) { int position = checkValue( mapFromGlobal(mev->globalPos()).y() ); divider->move( 0, position ); @@ -201,7 +201,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e) child0->setUpdatesEnabled(true); child1->setUpdatesEnabled(true); mev= (TQMouseEvent*)e; - if (orientation ==Qt::Horizontal){ + if (orientation ==TQt::Horizontal){ xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height(); resizeEvent(0); divider->repaint(true); diff --git a/kpovmodeler/pmdockwidget_private.h b/kpovmodeler/pmdockwidget_private.h index 0bf8ebba..b9f9f06d 100644 --- a/kpovmodeler/pmdockwidget_private.h +++ b/kpovmodeler/pmdockwidget_private.h @@ -44,7 +44,7 @@ class PMDockSplitter : public TQWidget TQ_OBJECT public: - PMDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false); + PMDockSplitter(TQWidget *parent= 0, const char *name= 0, TQt::Orientation orient=TQt::Vertical, int pos= 50, bool highResolution=false); virtual ~PMDockSplitter(){}; void activate(TQWidget *c0, TQWidget *c1 = 0L); @@ -71,7 +71,7 @@ public: bool highResolution() const; // MODIFICATION (Zehender) - Qt::Orientation splitterOrientation( ) const { return orientation; } + TQt::Orientation splitterOrientation( ) const { return orientation; } protected: int checkValue( int ) const; @@ -81,7 +81,7 @@ private: void setupMinMaxSize(); TQWidget *child0, *child1; - Qt::Orientation orientation; + TQt::Orientation orientation; bool initialised; TQFrame* divider; int xpos; diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp index 794aac67..9e0e6deb 100644 --- a/kpovmodeler/pmglview.cpp +++ b/kpovmodeler/pmglview.cpp @@ -507,7 +507,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e ) { if( m_bScaleMode || m_bTranslateMode ) { - if( ( e->button( ) & Qt::LeftButton ) && ( e->state( ) == 0 ) ) + if( ( e->button( ) & TQt::LeftButton ) && ( e->state( ) == 0 ) ) { m_bMousePressed = true; m_mousePos = e->pos( ); @@ -517,7 +517,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e ) } else if( m_type != PMViewCamera ) { - if( ( e->button( ) & Qt::LeftButton ) && m_bInverseValid + if( ( e->button( ) & TQt::LeftButton ) && m_bInverseValid && m_pActiveObject ) { if( m_pUnderMouse ) @@ -578,7 +578,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e ) if( !( m_bGraphicalChangeMode || m_bMousePressed ) ) { - if( ( e->button( ) == Qt::RightButton ) && ( e->state( ) == 0 ) ) + if( ( e->button( ) == TQt::RightButton ) && ( e->state( ) == 0 ) ) { m_contextClickPosition = PMVector( screenToInternalX( e->x( ) ), screenToInternalY( e->y( ) ) ); @@ -599,7 +599,7 @@ void PMGLView::mousePressEvent( TQMouseEvent* e ) } } - if( e->button( ) == Qt::MidButton ) + if( e->button( ) == TQt::MidButton ) { m_bMidMousePressed = true; m_mousePos = e->pos( ); @@ -677,7 +677,7 @@ void PMGLView::mouseReleaseEvent( TQMouseEvent* e ) m_autoScrollTimer.stop( ); } - if( e->button( ) & Qt::MidButton ) + if( e->button( ) & TQt::MidButton ) m_bMidMousePressed = false; m_bSelectUnderMouse = false; diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp index 51be79b1..41cd66b9 100644 --- a/kpovmodeler/pmtreeview.cpp +++ b/kpovmodeler/pmtreeview.cpp @@ -472,7 +472,7 @@ void PMTreeView::viewportMousePressEvent( TQMouseEvent* e ) TQPoint p = e->pos( ); - if( e->button( ) & Qt::RightButton ) + if( e->button( ) & TQt::RightButton ) { if( m_pPart->factory( ) ) { @@ -497,7 +497,7 @@ void PMTreeView::viewportMousePressEvent( TQMouseEvent* e ) if( item ) { - if( e->button( ) == Qt::LeftButton || e->button( ) == Qt::MidButton ) + if( e->button( ) == TQt::LeftButton || e->button( ) == TQt::MidButton ) { m_pressed = true; m_pressedPos = e->pos( ); diff --git a/kpovmodeler/pmvectorlistedit.cpp b/kpovmodeler/pmvectorlistedit.cpp index 0fa5ded9..3d3862c8 100644 --- a/kpovmodeler/pmvectorlistedit.cpp +++ b/kpovmodeler/pmvectorlistedit.cpp @@ -345,7 +345,7 @@ bool PMVectorListEdit::eventFilter( TQObject* o, TQEvent* e ) if( e->type( ) == TQEvent::Wheel && parent( ) ) return TQApplication::sendEvent( parent( ), e ); if( e->type( ) == TQEvent::MouseButtonPress - && ( ( TQMouseEvent* ) e )->button( ) == Qt::RightButton ) + && ( ( TQMouseEvent* ) e )->button( ) == TQt::RightButton ) { bool b = TQTable::eventFilter( o, e ); emit showContextMenu( ); diff --git a/kpovmodeler/pmview.cpp b/kpovmodeler/pmview.cpp index e9ec01d1..8ede8ab1 100644 --- a/kpovmodeler/pmview.cpp +++ b/kpovmodeler/pmview.cpp @@ -40,8 +40,8 @@ PMView::PMView( PMPart* part, TQWidget* parent, const char* name ) setBackgroundMode( PaletteBase ); TQVBoxLayout* layout = new TQVBoxLayout( this ); - m_pMainSplitter = new TQSplitter( Qt::Horizontal, this, "MainSplitter" ); - m_pTreeEditSplitter = new TQSplitter( Qt::Vertical, m_pMainSplitter, + m_pMainSplitter = new TQSplitter( TQt::Horizontal, this, "MainSplitter" ); + m_pTreeEditSplitter = new TQSplitter( TQt::Vertical, m_pMainSplitter, "TreeEditSplitter" ); diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp index a3eb400b..92cab2e7 100644 --- a/kpovmodeler/pmviewlayoutmanager.cpp +++ b/kpovmodeler/pmviewlayoutmanager.cpp @@ -520,7 +520,7 @@ void PMViewLayout::recursiveExtractColumns( if( w->inherits( "PMDockSplitter" ) ) { PMDockSplitter* sp = ( PMDockSplitter* ) w; - if( sp->splitterOrientation( ) == Qt::Vertical ) + if( sp->splitterOrientation( ) == TQt::Vertical ) { colStart = false; // vertical splitter, split up the current column -- cgit v1.2.1