diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-08 11:05:10 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-08 11:13:41 +0900 |
commit | 1a7a57976491e8df569198d8e903bf9e57e233f0 (patch) | |
tree | a45ca34d705aeeacfcb9fb2abf9c254d4ebf8269 /umbrello | |
parent | ff5a38ceb1f92082da2f5f65913bf590c20ccbc3 (diff) | |
download | tdesdk-1a7a57976491e8df569198d8e903bf9e57e233f0.tar.gz tdesdk-1a7a57976491e8df569198d8e903bf9e57e233f0.zip |
Replace Qt with TQt
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'umbrello')
-rw-r--r-- | umbrello/umbrello/aligntoolbar.cpp | 2 | ||||
-rw-r--r-- | umbrello/umbrello/associationwidget.cpp | 12 | ||||
-rw-r--r-- | umbrello/umbrello/classifierwidget.cpp | 2 | ||||
-rw-r--r-- | umbrello/umbrello/dialogs/activitypage.cpp | 4 | ||||
-rw-r--r-- | umbrello/umbrello/dialogs/classifierlistpage.cpp | 4 | ||||
-rw-r--r-- | umbrello/umbrello/dialogs/umloperationdialog.cpp | 2 | ||||
-rw-r--r-- | umbrello/umbrello/kplayerslideraction.cpp | 36 | ||||
-rw-r--r-- | umbrello/umbrello/kplayerslideraction.h | 6 | ||||
-rw-r--r-- | umbrello/umbrello/messagewidget.cpp | 2 | ||||
-rw-r--r-- | umbrello/umbrello/toolbarstate.cpp | 2 | ||||
-rw-r--r-- | umbrello/umbrello/toolbarstatearrow.cpp | 4 | ||||
-rw-r--r-- | umbrello/umbrello/toolbarstateassociation.cpp | 4 | ||||
-rw-r--r-- | umbrello/umbrello/toolbarstatemessages.cpp | 2 | ||||
-rw-r--r-- | umbrello/umbrello/toolbarstateother.cpp | 2 | ||||
-rw-r--r-- | umbrello/umbrello/umldoc.cpp | 2 | ||||
-rw-r--r-- | umbrello/umbrello/umllistview.cpp | 12 | ||||
-rw-r--r-- | umbrello/umbrello/umlwidgetcontroller.cpp | 20 | ||||
-rw-r--r-- | umbrello/umbrello/worktoolbar.cpp | 4 |
18 files changed, 61 insertions, 61 deletions
diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp index bbff1aa6..756283d4 100644 --- a/umbrello/umbrello/aligntoolbar.cpp +++ b/umbrello/umbrello/aligntoolbar.cpp @@ -46,7 +46,7 @@ AlignToolBar::AlignToolBar(TQMainWindow* parentWindow, const char* ) insertButton(m_Pixmaps[alac_align_vertical_distribute], alac_align_vertical_distribute, true, i18n("Align Vertical Distribute")); insertButton(m_Pixmaps[alac_align_horizontal_distribute], alac_align_horizontal_distribute, true, i18n("Align Horizontal Distribute")); - setOrientation( Qt::Vertical ); + setOrientation( TQt::Vertical ); setVerticalStretchable( true ); // gets called whenever a button in the toolbar is clicked diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp index 0e2ec525..aa0e1683 100644 --- a/umbrello/umbrello/associationwidget.cpp +++ b/umbrello/umbrello/associationwidget.cpp @@ -916,14 +916,14 @@ TQString AssociationWidget::toString() { } void AssociationWidget::mouseDoubleClickEvent(TQMouseEvent * me) { - if (me->button() != Qt::RightButton && me->button() != Qt::LeftButton) + if (me->button() != TQt::RightButton && me->button() != TQt::LeftButton) return; int i = m_LinePath.onLinePath(me->pos()); if (i == -1) { m_LinePath.setSelected(false); return; } - if (me->button() != Qt::LeftButton) + if (me->button() != TQt::LeftButton) return; const TQPoint mp(me->pos()); /* if there is no point around the mouse pointer, we insert a new one */ @@ -2169,7 +2169,7 @@ void AssociationWidget::selectAssocClassLine(bool sel /* =true */) { void AssociationWidget::mousePressEvent(TQMouseEvent * me) { m_nMovingPoint = -1; //make sure we should be here depending on the button - if(me -> button() != Qt::RightButton && me->button() != Qt::LeftButton) + if(me -> button() != TQt::RightButton && me->button() != TQt::LeftButton) return; TQPoint mep = me->pos(); // See if `mep' is on the connecting line to the association class @@ -2187,7 +2187,7 @@ void AssociationWidget::mousePressEvent(TQMouseEvent * me) { } void AssociationWidget::mouseReleaseEvent(TQMouseEvent * me) { - if(me -> button() != Qt::RightButton && me->button() != Qt::LeftButton) { + if(me -> button() != TQt::RightButton && me->button() != TQt::LeftButton) { setSelected( false ); return; } @@ -2208,7 +2208,7 @@ void AssociationWidget::mouseReleaseEvent(TQMouseEvent * me) { m_nMovingPoint = -1; const TQPoint p = me->pos(); - if (me->button() != Qt::RightButton) { + if (me->button() != TQt::RightButton) { return; } @@ -2500,7 +2500,7 @@ void AssociationWidget::checkPoints(const TQPoint &p) { } void AssociationWidget::mouseMoveEvent(TQMouseEvent* me) { - if( me->state() != Qt::LeftButton) { + if( me->state() != TQt::LeftButton) { return; } diff --git a/umbrello/umbrello/classifierwidget.cpp b/umbrello/umbrello/classifierwidget.cpp index 24da6833..3482a69f 100644 --- a/umbrello/umbrello/classifierwidget.cpp +++ b/umbrello/umbrello/classifierwidget.cpp @@ -554,7 +554,7 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { if ( tlist.count() > 0 ) { UMLWidget::setPen(p); TQPen pen = p.pen(); - pen.setStyle(Qt::DotLine); + pen.setStyle(TQt::DotLine); p.setPen(pen); p.drawRect( offsetX + width() - templatesBoxSize.width(), offsetY, templatesBoxSize.width(), templatesBoxSize.height() ); diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp index 71cef4e0..9262949e 100644 --- a/umbrello/umbrello/dialogs/activitypage.cpp +++ b/umbrello/umbrello/dialogs/activitypage.cpp @@ -59,11 +59,11 @@ void ActivityPage::setupPage() { m_pUpArrowB -> setEnabled( false ); buttonLayout -> addWidget( m_pUpArrowB ); - m_pDownArrowB = new KArrowButton( m_pActivityGB, Qt::DownArrow ); + m_pDownArrowB = new KArrowButton( m_pActivityGB, TQt::DownArrow ); m_pDownArrowB -> setEnabled( false ); buttonLayout -> addWidget( m_pDownArrowB ); - m_pBottomArrowB = new KArrowButton( m_pActivityGB, Qt::DownArrow ); + m_pBottomArrowB = new KArrowButton( m_pActivityGB, TQt::DownArrow ); m_pBottomArrowB -> setEnabled( false ); buttonLayout -> addWidget( m_pBottomArrowB ); diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp index 4d44b44d..b4028f18 100644 --- a/umbrello/umbrello/dialogs/classifierlistpage.cpp +++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp @@ -85,11 +85,11 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi m_pUpArrowB->setEnabled( false ); buttonLayout->addWidget( m_pUpArrowB ); - m_pDownArrowB = new KArrowButton( m_pItemListGB, Qt::DownArrow ); + m_pDownArrowB = new KArrowButton( m_pItemListGB, TQt::DownArrow ); m_pDownArrowB->setEnabled( false ); buttonLayout->addWidget( m_pDownArrowB ); - m_pBottomArrowB = new KArrowButton( m_pItemListGB, Qt::DownArrow ); + m_pBottomArrowB = new KArrowButton( m_pItemListGB, TQt::DownArrow ); m_pBottomArrowB->setEnabled( false ); buttonLayout->addWidget( m_pBottomArrowB ); diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp index 4ac471a8..76b224c0 100644 --- a/umbrello/umbrello/dialogs/umloperationdialog.cpp +++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp @@ -133,7 +133,7 @@ void UMLOperationDialog::setupDialog() { m_pUpButton->setEnabled( false ); buttonLayout->addWidget( m_pUpButton ); - m_pDownButton = new KArrowButton( m_pParmsGB, Qt::DownArrow ); + m_pDownButton = new KArrowButton( m_pParmsGB, TQt::DownArrow ); m_pDownButton->setEnabled( false ); buttonLayout->addWidget( m_pDownButton ); diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp index 767aae23..9df37596 100644 --- a/umbrello/umbrello/kplayerslideraction.cpp +++ b/umbrello/umbrello/kplayerslideraction.cpp @@ -73,7 +73,7 @@ KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text, m_frame = new KPlayerPopupFrame; m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised); m_frame -> setLineWidth (2); - m_slider = new KPlayerSlider (Qt::Vertical, m_frame); + m_slider = new KPlayerSlider (TQt::Vertical, m_frame); m_frame -> resize (36, m_slider -> sizeHint().height() + 4); m_slider -> setGeometry (m_frame -> contentsRect()); //CHANGED kdDebug() << "Popup slider size " << m_slider -> width() << "x" << m_slider -> height() << "\n"; @@ -159,7 +159,7 @@ void KPlayerPopupSliderAction::slotActivated (void) KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TDEActionCollection* parent, const char* name) - : KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, parent, name) + : KWidgetAction (new KPlayerSlider (TQt::Horizontal, 0, name), text, cut, receiver, slot, parent, name) //: TDEAction (text, 0, parent, name) { setAutoSized (true); @@ -187,7 +187,7 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index) return result; TDEToolBar* toolbar = (TDEToolBar*) widget; //int id = getToolButtonID(); - //kdDebug() << "Qt::Orientation: " << toolbar -> orientation() << "\n"; + //kdDebug() << "TQt::Orientation: " << toolbar -> orientation() << "\n"; //m_slider -> reparent (toolbar, TQPoint()); //toolbar -> insertWidget (id, 0, m_slider, index); //toolbar -> setItemAutoSized (id, true); @@ -199,7 +199,7 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index) //addContainer (toolbar, id); //setupToolbar (toolbar -> orientation(), toolbar); orientationChanged (toolbar -> orientation()); - connect (toolbar, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation))); + connect (toolbar, TQT_SIGNAL (orientationChanged (TQt::Orientation)), this, TQT_SLOT (orientationChanged (TQt::Orientation))); //connect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed())); //if ( parentCollection() ) // parentCollection() -> connectHighlight (toolbar, this); @@ -216,7 +216,7 @@ void KPlayerSliderAction::unplug (TQWidget* widget) if ( ! slider() || ! isPlugged() || widget != slider() -> parent() ) return; //TDEToolBar* toolbar = (TDEToolBar*) widget; - disconnect (widget, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation))); + disconnect (widget, TQT_SIGNAL (orientationChanged (TQt::Orientation)), this, TQT_SLOT (orientationChanged (TQt::Orientation))); //disconnect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed())); //m_slider -> reparent (0, TQPoint()); /*int index = findContainer (toolbar); @@ -226,9 +226,9 @@ void KPlayerSliderAction::unplug (TQWidget* widget) removeContainer (index);*/ } -/*void KPlayerSliderAction::setupToolbar (Qt::Orientation orientation, TDEToolBar* toolbar) +/*void KPlayerSliderAction::setupToolbar (TQt::Orientation orientation, TDEToolBar* toolbar) { - if ( orientation == Qt::Horizontal ) + if ( orientation == TQt::Horizontal ) { // toolbar -> setMinimumWidth (300); // toolbar -> setMinimumHeight (0); @@ -248,7 +248,7 @@ void KPlayerSliderAction::unplug (TQWidget* widget) } }*/ -void KPlayerSliderAction::orientationChanged (Qt::Orientation orientation) +void KPlayerSliderAction::orientationChanged (TQt::Orientation orientation) { //if ( sender() && sender() -> inherits ("TDEToolBar") ) // setupToolbar (orientation, (TDEToolBar*) sender()); @@ -264,7 +264,7 @@ void KPlayerSliderAction::orientationChanged (Qt::Orientation orientation) m_slider -> reparent (0, TQPoint()); }*/ -KPlayerSlider::KPlayerSlider (Qt::Orientation orientation, TQWidget* parent, const char* name) +KPlayerSlider::KPlayerSlider (TQt::Orientation orientation, TQWidget* parent, const char* name) //CHANGED : TQSlider (orientation, parent, name) : TQSlider (300, 2200, 400, 1000, orientation, parent, name) { @@ -283,7 +283,7 @@ TQSize KPlayerSlider::sizeHint() const TQSize hint = TQSlider::sizeHint(); //CHANGED int length = kPlayerSettings() -> preferredSliderLength(); int length = 200; - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) { if ( hint.width() < length ) hint.setWidth (length); @@ -302,7 +302,7 @@ TQSize KPlayerSlider::minimumSizeHint() const TQSize hint = TQSlider::minimumSizeHint(); //CHANGED int length = kPlayerSettings() -> minimumSliderLength(); int length = 200; - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) { if ( hint.width() < length ) hint.setWidth (length); @@ -315,7 +315,7 @@ TQSize KPlayerSlider::minimumSizeHint() const return hint; } -void KPlayerSlider::setOrientation (Qt::Orientation o) +void KPlayerSlider::setOrientation (TQt::Orientation o) { if ( o == orientation() ) return; @@ -332,14 +332,14 @@ void KPlayerSlider::setOrientation (Qt::Orientation o) int KPlayerSlider::minValue (void) const { - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) return TQSlider::minValue(); return - TQSlider::maxValue(); } void KPlayerSlider::setMinValue (int minValue) { - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) TQSlider::setMinValue (minValue); else TQSlider::setMaxValue (- minValue); @@ -347,14 +347,14 @@ void KPlayerSlider::setMinValue (int minValue) int KPlayerSlider::maxValue (void) const { - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) return TQSlider::maxValue(); return - TQSlider::minValue(); } void KPlayerSlider::setMaxValue (int maxValue) { - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) TQSlider::setMaxValue (maxValue); else TQSlider::setMinValue (- maxValue); @@ -383,14 +383,14 @@ void KPlayerSlider::setPageStep (int pageStep) int KPlayerSlider::value (void) const { - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) return TQSlider::value(); return - TQSlider::value(); } void KPlayerSlider::setValue (int value, int) { - if ( orientation() == Qt::Horizontal ) + if ( orientation() == TQt::Horizontal ) TQSlider::setValue (value); else TQSlider::setValue (- value); diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h index e77c1b4e..40b73e50 100644 --- a/umbrello/umbrello/kplayerslideraction.h +++ b/umbrello/umbrello/kplayerslideraction.h @@ -31,7 +31,7 @@ class KPlayerSlider : public TQSlider public: /** The KPlayerSlider constructor. Parameters are passed on to TQSlider. */ - explicit KPlayerSlider (Qt::Orientation, TQWidget* parent = 0, const char* name = 0); + explicit KPlayerSlider (TQt::Orientation, TQWidget* parent = 0, const char* name = 0); /** The KPlayerSlider destructor. Does nothing. */ virtual ~KPlayerSlider(); @@ -79,7 +79,7 @@ public: void setup (int minValue, int maxValue, int value, int pageStep, int lineStep = 1); /** Sets the slider orientation. */ - virtual void setOrientation (Qt::Orientation); + virtual void setOrientation (TQt::Orientation); signals: /** Emitted when the slider value changes. @@ -195,7 +195,7 @@ public: protected slots: /** Changes the slider orientation when the toolbar orientation changes. */ - void orientationChanged (Qt::Orientation); + void orientationChanged (TQt::Orientation); protected: /** The slider. diff --git a/umbrello/umbrello/messagewidget.cpp b/umbrello/umbrello/messagewidget.cpp index f3227c31..09906491 100644 --- a/umbrello/umbrello/messagewidget.cpp +++ b/umbrello/umbrello/messagewidget.cpp @@ -120,7 +120,7 @@ void MessageWidget::drawArrow(TQPainter& p, int x, int y, int w, // draw arrow line if (useDottedLine) { TQPen pen = p.pen(); - pen.setStyle(Qt::DotLine); + pen.setStyle(TQt::DotLine); p.setPen(pen); } p.drawLine(x, y, x + w, y); diff --git a/umbrello/umbrello/toolbarstate.cpp b/umbrello/umbrello/toolbarstate.cpp index bf0ae9f0..cae6acf8 100644 --- a/umbrello/umbrello/toolbarstate.cpp +++ b/umbrello/umbrello/toolbarstate.cpp @@ -221,7 +221,7 @@ void ToolBarState::mouseMoveEmpty() { } void ToolBarState::changeTool() { - if (m_pMouseEvent->state() == Qt::RightButton) { + if (m_pMouseEvent->state() == TQt::RightButton) { UMLApp::app()->getWorkToolBar()->setDefaultTool(); } } diff --git a/umbrello/umbrello/toolbarstatearrow.cpp b/umbrello/umbrello/toolbarstatearrow.cpp index cbcbc20f..a24c4353 100644 --- a/umbrello/umbrello/toolbarstatearrow.cpp +++ b/umbrello/umbrello/toolbarstatearrow.cpp @@ -42,7 +42,7 @@ void ToolBarStateArrow::mousePressWidget() { } void ToolBarStateArrow::mousePressEmpty() { - if (m_pMouseEvent->button() != Qt::LeftButton) { + if (m_pMouseEvent->button() != TQt::LeftButton) { // Leave widgets selected upon RMB press on empty diagram area. // The popup menu is activated upon RMB release. return; @@ -76,7 +76,7 @@ void ToolBarStateArrow::mouseReleaseWidget() { void ToolBarStateArrow::mouseReleaseEmpty() { if (m_selectionRect.count() == 4) { m_selectionRect.clear(); - } else if (m_pMouseEvent->button() == Qt::RightButton) { + } else if (m_pMouseEvent->button() == TQt::RightButton) { m_pUMLView->setMenu(); } } diff --git a/umbrello/umbrello/toolbarstateassociation.cpp b/umbrello/umbrello/toolbarstateassociation.cpp index 36017912..9129740a 100644 --- a/umbrello/umbrello/toolbarstateassociation.cpp +++ b/umbrello/umbrello/toolbarstateassociation.cpp @@ -72,7 +72,7 @@ void ToolBarStateAssociation::slotWidgetRemoved(UMLWidget* widget) { } void ToolBarStateAssociation::mouseReleaseAssociation() { - if (m_pMouseEvent->button() != Qt::LeftButton || + if (m_pMouseEvent->button() != TQt::LeftButton || !m_firstWidget || m_firstWidget->getBaseType() != Uml::wt_Class) { cleanAssociation(); return; @@ -85,7 +85,7 @@ void ToolBarStateAssociation::mouseReleaseAssociation() { } void ToolBarStateAssociation::mouseReleaseWidget() { - if (m_pMouseEvent->button() != Qt::LeftButton) { + if (m_pMouseEvent->button() != TQt::LeftButton) { cleanAssociation(); return; } diff --git a/umbrello/umbrello/toolbarstatemessages.cpp b/umbrello/umbrello/toolbarstatemessages.cpp index f8e5930a..47c5a387 100644 --- a/umbrello/umbrello/toolbarstatemessages.cpp +++ b/umbrello/umbrello/toolbarstatemessages.cpp @@ -85,7 +85,7 @@ void ToolBarStateMessages::setCurrentElement() { void ToolBarStateMessages::mouseReleaseWidget() { //TODO When an association between UMLObjects of invalid types is made, an error message //is shown. Shouldn't also a message be used here? - if (m_pMouseEvent->button() != Qt::LeftButton || + if (m_pMouseEvent->button() != TQt::LeftButton || getCurrentWidget()->getBaseType() != Uml::wt_Object) { cleanMessage(); return; diff --git a/umbrello/umbrello/toolbarstateother.cpp b/umbrello/umbrello/toolbarstateother.cpp index 718ac456..736afa17 100644 --- a/umbrello/umbrello/toolbarstateother.cpp +++ b/umbrello/umbrello/toolbarstateother.cpp @@ -42,7 +42,7 @@ void ToolBarStateOther::setCurrentElement() { } void ToolBarStateOther::mouseReleaseEmpty() { - if (m_pMouseEvent->button() == Qt::LeftButton) { + if (m_pMouseEvent->button() == TQt::LeftButton) { if (!newWidget()) { // Is UMLObject? diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp index b0d6e5fd..7e0ba7ec 100644 --- a/umbrello/umbrello/umldoc.cpp +++ b/umbrello/umbrello/umldoc.cpp @@ -1214,7 +1214,7 @@ void UMLDoc::saveToXMI(TQIODevice& file) { TQDomElement root = doc.createElement( "XMI" ); root.setAttribute( "xmi.version", "1.2" ); TQDateTime now = TQDateTime::currentDateTime(); - root.setAttribute( "timestamp", now.toString(Qt::ISODate)); + root.setAttribute( "timestamp", now.toString(TQt::ISODate)); root.setAttribute( "verified", "false"); root.setAttribute( "xmlns:UML", "http://schema.omg.org/spec/UML/1.3"); doc.appendChild( root ); diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp index 9753b81a..cf38403c 100644 --- a/umbrello/umbrello/umllistview.cpp +++ b/umbrello/umbrello/umllistview.cpp @@ -145,7 +145,7 @@ bool UMLListView::eventFilter(TQObject *o, TQEvent *e) { if (e->type() != TQEvent::MouseButtonPress || !o->isA("TQHeader")) return TQListView::eventFilter(o, e); TQMouseEvent *me = TQT_TQMOUSEEVENT(e); - if (me->button() == Qt::RightButton) { + if (me->button() == TQt::RightButton) { if (m_pMenu) { m_pMenu->hide(); disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupMenuSel(int))); @@ -169,19 +169,19 @@ void UMLListView::contentsMousePressEvent(TQMouseEvent *me) { UMLListViewItem * item = (UMLListViewItem*)itemAt(pt); const TQt::ButtonState button = me->button(); - if (!item || (button != Qt::RightButton && button != Qt::LeftButton)) { + if (!item || (button != TQt::RightButton && button != TQt::LeftButton)) { UMLApp::app()->getDocWindow()->updateDocumentation(true); return; } - if (button == Qt::LeftButton) { + if (button == TQt::LeftButton) { UMLObject *o = item->getUMLObject(); if (o) UMLApp::app()->getDocWindow()->showDocumentation(o, false); else UMLApp::app()->getDocWindow()->updateDocumentation(true); } - if (button == Qt::RightButton) { + if (button == TQt::RightButton) { if(m_pMenu != 0) { m_pMenu->hide(); disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupMenuSel(int))); @@ -198,7 +198,7 @@ void UMLListView::contentsMousePressEvent(TQMouseEvent *me) { } void UMLListView::contentsMouseReleaseEvent(TQMouseEvent *me) { - if (me->button() != Qt::LeftButton) { + if (me->button() != TQt::LeftButton) { this->TDEListView::contentsMouseReleaseEvent(me); return; } @@ -1041,7 +1041,7 @@ void UMLListView::setView(UMLView * v) { void UMLListView::contentsMouseDoubleClickEvent(TQMouseEvent * me) { UMLListViewItem * item = static_cast<UMLListViewItem *>( currentItem() ); - if( !item || me -> button() != Qt::LeftButton ) + if( !item || me -> button() != TQt::LeftButton ) return; //see if on view Uml::ListView_Type lvType = item -> getType(); diff --git a/umbrello/umbrello/umlwidgetcontroller.cpp b/umbrello/umbrello/umlwidgetcontroller.cpp index efd0e4a3..d647f397 100644 --- a/umbrello/umbrello/umlwidgetcontroller.cpp +++ b/umbrello/umbrello/umlwidgetcontroller.cpp @@ -59,9 +59,9 @@ void UMLWidgetController::mousePressEvent(TQMouseEvent *me) { return; } - if (me->button() == Qt::LeftButton) { + if (me->button() == TQt::LeftButton) { m_leftButtonDown = true; - } else if (me->button() == Qt::RightButton) { + } else if (me->button() == TQt::RightButton) { m_rightButtonDown = true; } else { m_middleButtonDown = true; @@ -77,7 +77,7 @@ void UMLWidgetController::mousePressEvent(TQMouseEvent *me) { if (me->state() == TQt::ShiftButton || me->state() == TQt::ControlButton) { m_shiftPressed = true; - if (me->button() == Qt::LeftButton) { + if (me->button() == TQt::LeftButton) { m_inMoveArea = true; } @@ -92,7 +92,7 @@ void UMLWidgetController::mousePressEvent(TQMouseEvent *me) { m_shiftPressed = false; int count = m_widget->m_pView->getSelectCount(true); - if (me->button() == Qt::LeftButton) { + if (me->button() == TQt::LeftButton) { if (m_widget->m_bSelected && count > 1) { //Single selection is made in release event if the widget wasn't moved m_inMoveArea = true; @@ -189,12 +189,12 @@ void UMLWidgetController::mouseMoveEvent(TQMouseEvent* me) { } void UMLWidgetController::mouseReleaseEvent(TQMouseEvent *me) { - if (me->button() != Qt::LeftButton && me->button() != Qt::RightButton) { + if (me->button() != TQt::LeftButton && me->button() != TQt::RightButton) { if (m_middleButtonDown) { m_middleButtonDown = false; resetSelection(); } - } else if (me->button() == Qt::LeftButton) { + } else if (me->button() == TQt::LeftButton) { if (m_leftButtonDown) { m_leftButtonDown = false; @@ -238,7 +238,7 @@ void UMLWidgetController::mouseReleaseEvent(TQMouseEvent *me) { m_inMoveArea = false; } } - } else if (me->button() == Qt::RightButton) { + } else if (me->button() == TQt::RightButton) { if (m_rightButtonDown) { m_rightButtonDown = false; showPopupMenu(me); @@ -246,11 +246,11 @@ void UMLWidgetController::mouseReleaseEvent(TQMouseEvent *me) { //Cancel move/edit TQMouseEvent move(TQMouseEvent::MouseMove, TQPoint(m_oldX + m_pressOffsetX, m_oldY + m_pressOffsetY), - Qt::LeftButton, Qt::NoButton); + TQt::LeftButton, TQt::NoButton); mouseMoveEvent(&move); TQMouseEvent release(TQMouseEvent::MouseButtonRelease, TQPoint(m_oldX + m_pressOffsetX, m_oldY + m_pressOffsetY), - Qt::LeftButton, Qt::NoButton); + TQt::LeftButton, TQt::NoButton); mouseReleaseEvent(&release); } } @@ -267,7 +267,7 @@ void UMLWidgetController::mouseReleaseEvent(TQMouseEvent *me) { } void UMLWidgetController::mouseDoubleClickEvent(TQMouseEvent *me) { - if (me->button() != Qt::LeftButton) { + if (me->button() != TQt::LeftButton) { return; } diff --git a/umbrello/umbrello/worktoolbar.cpp b/umbrello/umbrello/worktoolbar.cpp index f1af2dbd..66cc931a 100644 --- a/umbrello/umbrello/worktoolbar.cpp +++ b/umbrello/umbrello/worktoolbar.cpp @@ -32,7 +32,7 @@ WorkToolBar::WorkToolBar(TQMainWindow *parentWindow, const char*name) loadPixmaps(); m_Type = Uml::dt_Class; /* first time in just want it to load arrow, needs anything but dt_Undefined */ - setOrientation( Qt::Vertical ); + setOrientation( TQt::Vertical ); setVerticalStretchable( true ); // initialize old tool map, everything starts with select tool (arrow) m_map.insert(Uml::dt_UseCase,tbb_Arrow); @@ -210,7 +210,7 @@ void WorkToolBar::slotResetToolBar() { emit sigButtonChanged(m_CurrentButtonID); TQCursor curs; - curs.setShape(Qt::ArrowCursor); + curs.setShape(TQt::ArrowCursor); UMLView* view = UMLApp::app()->getCurrentView(); if (view != NULL) { |