diff options
Diffstat (limited to 'lib')
8 files changed, 52 insertions, 52 deletions
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp index ba7cfad3..dc6215ec 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp @@ -925,7 +925,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) { if (!parent()) return 0; if (!parent()->inherits("KDockSplitter")) return 0; - Qt::Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ?Qt::Vertical:Qt::Horizontal; + TQt::Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ?TQt::Vertical:TQt::Horizontal; if (((KDockSplitter*)(parent()))->orientation()==orientation) { KDockWidget *neighbor= @@ -1146,8 +1146,8 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, // if to dock not to the center of the target dockwidget, // dock to newDock KDockSplitter* panner = 0L; - if ( dockPos == KDockWidget::DockTop || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_",Qt::Horizontal, spliPos, manager->splitterHighResolution() ); - if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight ) panner = new KDockSplitter( newDock, "_dock_split_",Qt::Vertical , spliPos, manager->splitterHighResolution() ); + if ( dockPos == KDockWidget::DockTop || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_",TQt::Horizontal, spliPos, manager->splitterHighResolution() ); + if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight ) panner = new KDockSplitter( newDock, "_dock_split_",TQt::Vertical , spliPos, manager->splitterHighResolution() ); newDock->setWidget( panner ); panner->setOpaqueResize(manager->splitterOpaqueResize()); @@ -1331,13 +1331,13 @@ void KDockWidget::undock() split->deactivate(); if ( split->getFirst() == parentOfTab ){ split->activate( lastTab ); - if ( ((KDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical ) + if ( ((KDockWidget*)split->parent())->splitterOrientation ==TQt::Vertical ) emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockLeft ); else emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockTop ); } else { split->activate( 0L, lastTab ); - if ( ((KDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical ) + if ( ((KDockWidget*)split->parent())->splitterOrientation ==TQt::Vertical ) emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockRight ); else emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockBottom ); @@ -1703,7 +1703,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) break; case TQEvent::MouseButtonPress: - if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){ if ( curdw->eDocking != (int)KDockWidget::DockNone ){ dropCancel = true; curdw->setFocus(); @@ -1728,7 +1728,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) } break; case TQEvent::MouseButtonRelease: - if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){ if ( dragging ){ if ( !dropCancel ) drop(); @@ -1806,7 +1806,7 @@ bool KDockManager::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)KDockWidget::DockNone) ) { startDrag( curdw); } @@ -2350,7 +2350,7 @@ void KDockManager::readConfig(TQDomElement &base) KDockWidget *second = getDockWidgetFromName(secondName); if (first && second) { obj = first->manualDock(second, - (orientation == (int)Qt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop, + (orientation == (int)TQt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop, separatorPos); if (obj) obj->setName(name.latin1()); @@ -2705,9 +2705,9 @@ void KDockManager::readConfig( TDEConfig* c, TQString group ) KDockWidget* 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 ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos ); + obj = first->manualDock( last, ( p ==TQt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos ); if (obj){ obj->setName( oname.latin1() ); } diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp index b773582f..55b47449 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp @@ -26,7 +26,7 @@ #include <tqtimer.h> #include <tqapplication.h> -KDockSplitter::KDockSplitter(TQWidget *parent, const char *name, Qt::Orientation orient, int pos, bool highResolution) +KDockSplitter::KDockSplitter(TQWidget *parent, const char *name, TQt::Orientation orient, int pos, bool highResolution) : TQWidget(parent, name) { m_dontRecalc=false; @@ -59,7 +59,7 @@ void KDockSplitter::activate(TQWidget *c0, TQWidget *c1) divider->setLineWidth(1); divider->raise(); - if (m_orientation ==Qt::Horizontal) + if (m_orientation ==TQt::Horizontal) divider->setCursor(TQCursor(sizeVerCursor)); else divider->setCursor(TQCursor(sizeHorCursor)); @@ -179,7 +179,7 @@ void KDockSplitter::setupMinMaxSize() { // Set the minimum and maximum sizes int minx, maxx, miny, maxy; - if (m_orientation ==Qt::Horizontal) { + if (m_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(); @@ -238,11 +238,11 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) double factor = (mHighResolution)? 10000.0:100.0; // real resize event, recalculate xpos if (ev && mKeepSize && isVisible()) { -// kdDebug(282)<<"mKeepSize : "<< ((m_orientation ==Qt::Horizontal) ? "Horizontal":"Vertical") <<endl; +// kdDebug(282)<<"mKeepSize : "<< ((m_orientation ==TQt::Horizontal) ? "Horizontal":"Vertical") <<endl; if (ev->oldSize().width() != ev->size().width()) { - if (m_orientation ==Qt::Horizontal) { + if (m_orientation ==TQt::Horizontal) { xpos = tqRound(factor * checkValue( child0->height()+1 ) / height()); } else { xpos = tqRound(factor * checkValue( child0->width()+1 ) / width()); @@ -252,9 +252,9 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) } else { -// kdDebug(282)<<"!mKeepSize : "<< ((m_orientation ==Qt::Horizontal) ? "Horizontal":"Vertical") <<endl; +// kdDebug(282)<<"!mKeepSize : "<< ((m_orientation ==TQt::Horizontal) ? "Horizontal":"Vertical") <<endl; if (/*ev &&*/ isVisible()) { - if (m_orientation ==Qt::Horizontal) { + if (m_orientation ==TQt::Horizontal) { /* if (ev->oldSize().height() != ev->size().height())*/ { if (fixedHeight0!=-1) @@ -287,15 +287,15 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) KDockWidget *c0=(KDockWidget*)child0; KDockWidget *c1=(KDockWidget*)child1; bool stdHandling=false; - if ( ( (m_orientation==Qt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) || - ( (m_orientation==Qt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) { + if ( ( (m_orientation==TQt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) || + ( (m_orientation==TQt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) { if ((c0->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c0->getWidget())) && (dc->m_overlapMode)) { - int position= tqRound((m_orientation ==Qt::Vertical ? width() : height()) * xpos/factor); + int position= tqRound((m_orientation ==TQt::Vertical ? width() : height()) * xpos/factor); position=checkValueOverlapped(position,child0); child0->raise(); divider->raise(); - if (m_orientation ==Qt::Horizontal){ + if (m_orientation ==TQt::Horizontal){ child0->setGeometry(0, 0, width(), position); child1->setGeometry(0, dc->m_nonOverlapSize+4, width(), height()-dc->m_nonOverlapSize-4); @@ -309,11 +309,11 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) } else { if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget())) && (dc->m_overlapMode)) { - int position= tqRound((m_orientation ==Qt::Vertical ? width() : height()) * xpos/factor); + int position= tqRound((m_orientation ==TQt::Vertical ? width() : height()) * xpos/factor); position=checkValueOverlapped(position,child1); child1->raise(); divider->raise(); - if (m_orientation ==Qt::Horizontal){ + if (m_orientation ==TQt::Horizontal){ child0->setGeometry(0, 0, width(), height()-dc->m_nonOverlapSize-4); child1->setGeometry(0, position+4, width(), height()-position-4); @@ -331,8 +331,8 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) else stdHandling=true; if (stdHandling) { - int position = checkValue( tqRound((m_orientation ==Qt::Vertical ? width() : height()) * xpos/factor) ); - if (m_orientation ==Qt::Horizontal){ + int position = checkValue( tqRound((m_orientation ==TQt::Vertical ? width() : height()) * xpos/factor) ); + if (m_orientation ==TQt::Horizontal){ child0->setGeometry(0, 0, width(), position); child1->setGeometry(0, position+4, width(), height()-position-4); divider->setGeometry(0, position, width(), 4); @@ -349,7 +349,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidget) const { if (initialised) { - if (m_orientation ==Qt::Vertical) { + if (m_orientation ==TQt::Vertical) { if (child0==overlappingWidget) { if (position<(child0->minimumSize().width())) position=child0->minimumSize().width(); @@ -358,7 +358,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge position=width()-(child1->minimumSize().width())-4; if (position<0) position=0; } - } else {// orientation ==Qt::Horizontal + } else {// orientation ==TQt::Horizontal if (child0==overlappingWidget) { if (position<(child0->minimumSize().height())) position=child0->minimumSize().height(); @@ -377,7 +377,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge int KDockSplitter::checkValue( int position ) const { if (initialised){ - if (m_orientation ==Qt::Vertical){ + if (m_orientation ==TQt::Vertical){ if (position < (child0->minimumSize().width())) position = child0->minimumSize().width(); if ((width()-4-position) < (child1->minimumSize().width())) @@ -392,9 +392,9 @@ int KDockSplitter::checkValue( int position ) const if (position < 0) position = 0; - if ((m_orientation ==Qt::Vertical) && (position > width())) + if ((m_orientation ==TQt::Vertical) && (position > width())) position = width(); - if ((m_orientation ==Qt::Horizontal) && (position > height())) + if ((m_orientation ==TQt::Horizontal) && (position > height())) position = height(); return position; @@ -411,7 +411,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) mev= (TQMouseEvent*)e; child0->setUpdatesEnabled(mOpaqueResize); child1->setUpdatesEnabled(mOpaqueResize); - if (m_orientation ==Qt::Horizontal) { + if (m_orientation ==TQt::Horizontal) { if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) { handled=true; break; @@ -445,7 +445,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) child0->setUpdatesEnabled(true); child1->setUpdatesEnabled(true); mev= (TQMouseEvent*)e; - if (m_orientation ==Qt::Horizontal){ + if (m_orientation ==TQt::Horizontal){ if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) { handled=true; break; diff --git a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp index fff6b2c1..bca89218 100644 --- a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp @@ -87,7 +87,7 @@ void KTabBar::setTabEnabled( int id, bool enabled ) void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e ) { - if( e->button() != Qt::LeftButton ) + if( e->button() != TQt::LeftButton ) return; TQTab *tab = selectTab( e->pos() ); @@ -100,11 +100,11 @@ void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e ) void KTabBar::mousePressEvent( TQMouseEvent *e ) { - if( e->button() == Qt::LeftButton ) { + if( e->button() == TQt::LeftButton ) { mEnableCloseButtonTimer->stop(); mDragStart = e->pos(); } - else if( e->button() == Qt::RightButton ) { + else if( e->button() == TQt::RightButton ) { TQTab *tab = selectTab( e->pos() ); if( tab ) { emit( contextMenu( indexOf( tab->identifier() ), mapToGlobal( e->pos() ) ) ); @@ -116,7 +116,7 @@ void KTabBar::mousePressEvent( TQMouseEvent *e ) void KTabBar::mouseMoveEvent( TQMouseEvent *e ) { - if ( e->state() == Qt::LeftButton ) { + if ( e->state() == TQt::LeftButton ) { TQTab *tab = selectTab( e->pos() ); if ( mDragSwitchTab && tab != mDragSwitchTab ) { mActivateDragSwitchTabTimer->stop(); @@ -134,7 +134,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } } } - else if ( e->state() == Qt::MidButton ) { + else if ( e->state() == TQt::MidButton ) { if (mReorderStartTab==-1) { int delay = TDEGlobalSettings::dndEventDelay(); TQPoint newPos = e->pos(); @@ -229,7 +229,7 @@ void KTabBar::activateDragSwitchTab() void KTabBar::mouseReleaseEvent( TQMouseEvent *e ) { - if( e->button() == Qt::MidButton ) { + if( e->button() == TQt::MidButton ) { if ( mReorderStartTab==-1 ) { TQTab *tab = selectTab( e->pos() ); if( tab ) { @@ -281,7 +281,7 @@ void KTabBar::dropEvent( TQDropEvent *e ) #ifndef TQT_NO_WHEELEVENT void KTabBar::wheelEvent( TQWheelEvent *e ) { - if ( e->orientation() ==Qt::Horizontal ) + if ( e->orientation() ==TQt::Horizontal ) return; emit( wheelDelta( e->delta() ) ); diff --git a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp index 3b17a43a..139bdd76 100644 --- a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp @@ -316,7 +316,7 @@ void KTabWidget::dropEvent( TQDropEvent *e ) #ifndef TQT_NO_WHEELEVENT void KTabWidget::wheelEvent( TQWheelEvent *e ) { - if ( e->orientation() ==Qt::Horizontal ) + if ( e->orientation() ==TQt::Horizontal ) return; if ( isEmptyTabbarSpace( e->pos() ) ) @@ -344,7 +344,7 @@ void KTabWidget::wheelDelta( int delta ) void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e ) { - if( e->button() != Qt::LeftButton ) + if( e->button() != TQt::LeftButton ) return; if ( isEmptyTabbarSpace( e->pos() ) ) { @@ -356,12 +356,12 @@ void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e ) void KTabWidget::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::RightButton ) { + if ( e->button() == TQt::RightButton ) { if ( isEmptyTabbarSpace( e->pos() ) ) { emit( contextMenu( mapToGlobal( e->pos() ) ) ); return; } - } else if ( e->button() == Qt::MidButton ) { + } else if ( e->button() == TQt::MidButton ) { if ( isEmptyTabbarSpace( e->pos() ) ) { emit( mouseMiddleClick() ); return; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp index 95e3c6b2..1d654392 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp @@ -249,7 +249,7 @@ void KMdiChildArea::resizeEvent( TQResizeEvent* e ) void KMdiChildArea::mousePressEvent( TQMouseEvent *e ) { //Popup the window menu - if ( e->button() & Qt::RightButton ) + if ( e->button() & TQt::RightButton ) emit popupWindowMenu( mapToGlobal( e->pos() ) ); } diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp index aec2b9a5..59a5d37c 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp @@ -283,7 +283,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e ) if ( m_bResizing ) { - if ( !( e->state() & Qt::RightButton ) && !( e->state() & Qt::MidButton ) ) + if ( !( e->state() & TQt::RightButton ) && !( e->state() & TQt::MidButton ) ) { // same as: if no button or left button pressed TQPoint p = parentWidget()->mapFromGlobal( e->globalPos() ); diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp index 8f6858fb..4fd24174 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp @@ -85,7 +85,7 @@ KMdiChildFrmCaption::~KMdiChildFrmCaption() void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { setMouseTracking( false ); if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) @@ -95,7 +95,7 @@ void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e ) m_pParent->m_bDragging = true; m_offset = mapToParent( e->pos() ); } - else if ( e->button() == Qt::RightButton ) + else if ( e->button() == TQt::RightButton ) { m_pParent->systemMenu()->popup( mapToGlobal( e->pos() ) ); } @@ -105,7 +105,7 @@ void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e ) void KMdiChildFrmCaption::mouseReleaseEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) TQApplication::restoreOverrideCursor(); diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp index a9c03157..7bf4fb3b 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp @@ -73,10 +73,10 @@ void KMdiTaskBarButton::mousePressEvent( TQMouseEvent* e ) { switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: emit leftMouseButtonClicked( m_pWindow ); break; - case Qt::RightButton: + case TQt::RightButton: emit rightMouseButtonClicked( m_pWindow ); break; default: @@ -359,7 +359,7 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth ) newButtonWidth = buttonAreaWidth / buttonCount; else newButtonWidth = 0; - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) newButtonWidth = 80; if ( newButtonWidth > 0 ) for ( b = m_pButtonList->first();b;b = m_pButtonList->next() ) |