From 6b0cf55d6252a256d9fc5bcb89837bec7f21f40d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 7 Nov 2023 19:27:29 +0900 Subject: Replace Qt with TQt Signed-off-by: Michele Calgaro --- kdevdesigner/designer/actiondnd.cpp | 26 +++++++++++++------------- kdevdesigner/designer/actiondnd.h | 8 ++++---- kdevdesigner/designer/formwindow.cpp | 20 ++++++++++---------- kdevdesigner/designer/layout.cpp | 22 +++++++++++----------- kdevdesigner/designer/listboxdnd.cpp | 2 +- kdevdesigner/designer/listboxrename.cpp | 2 +- kdevdesigner/designer/listdnd.cpp | 2 +- kdevdesigner/designer/listviewdnd.cpp | 2 +- kdevdesigner/designer/mainwindow.cpp | 2 +- kdevdesigner/designer/mainwindowactions.cpp | 4 ++-- kdevdesigner/designer/menubareditor.cpp | 2 +- kdevdesigner/designer/popupmenueditor.cpp | 2 +- kdevdesigner/designer/propertyeditor.cpp | 16 ++++++++-------- kdevdesigner/designer/resource.cpp | 6 +++--- kdevdesigner/designer/resource.h | 2 +- kdevdesigner/designer/sizehandle.cpp | 6 +++--- kdevdesigner/designer/widgetfactory.cpp | 18 +++++++++--------- kdevdesigner/designer/workspace.cpp | 6 +++--- 18 files changed, 74 insertions(+), 74 deletions(-) (limited to 'kdevdesigner/designer') diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp index 66dd89ea..9388b668 100644 --- a/kdevdesigner/designer/actiondnd.cpp +++ b/kdevdesigner/designer/actiondnd.cpp @@ -131,19 +131,19 @@ void QDesignerAction::remove() widgetToInsert->reparent( 0, TQPoint( 0, 0 ), FALSE ); } -QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *parent, +QDesignerToolBarSeparator::QDesignerToolBarSeparator(TQt::Orientation o , TQToolBar *parent, const char* name ) : TQWidget( parent, name ) { - connect( parent, TQT_SIGNAL(orientationChanged(Qt::Orientation)), - this, TQT_SLOT(setOrientation(Qt::Orientation)) ); + connect( parent, TQT_SIGNAL(orientationChanged(TQt::Orientation)), + this, TQT_SLOT(setOrientation(TQt::Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); } -void QDesignerToolBarSeparator::setOrientation( Qt::Orientation o ) +void QDesignerToolBarSeparator::setOrientation( TQt::Orientation o ) { orient = o; } @@ -157,7 +157,7 @@ TQSize QDesignerToolBarSeparator::sizeHint() const { int extent = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); - if ( orient ==Qt::Horizontal ) + if ( orient ==TQt::Horizontal ) return TQSize( extent, 0 ); else return TQSize( 0, extent ); @@ -168,7 +168,7 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * ) TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; - if ( orientation() ==Qt::Horizontal ) + if ( orientation() ==TQt::Horizontal ) flags |= TQStyle::Style_Horizontal; style().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), @@ -285,7 +285,7 @@ bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) return TQToolBar::eventFilter( o, e ); if ( o == this && e->type() == TQEvent::MouseButtonPress && - ( ( TQMouseEvent*)e )->button() == Qt::LeftButton ) { + ( ( TQMouseEvent*)e )->button() == TQt::LeftButton ) { mousePressEvent( (TQMouseEvent*)e ); return TRUE; } @@ -359,7 +359,7 @@ void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e ) void QDesignerToolBar::mousePressEvent( TQMouseEvent *e ) { widgetInserting = FALSE; - if ( e->button() == Qt::LeftButton && + if ( e->button() == TQt::LeftButton && MainWindow::self->currentTool() != POINTER_TOOL && MainWindow::self->currentTool() != ORDER_TOOL && MainWindow::self->currentTool() != CONNECT_TOOL && @@ -440,10 +440,10 @@ void QDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * ) { widgetInserting = FALSE; - if ( e->button() == Qt::MidButton ) + if ( e->button() == TQt::MidButton ) return; - if ( e->button() == Qt::LeftButton && + if ( e->button() == TQt::LeftButton && MainWindow::self->currentTool() != POINTER_TOOL && MainWindow::self->currentTool() != ORDER_TOOL && MainWindow::self->currentTool() != CONNECT_TOOL && @@ -474,7 +474,7 @@ void QDesignerToolBar::removeWidget( TQWidget *w ) void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) { - if ( widgetInserting || ( e->state() & Qt::LeftButton ) == 0 ) + if ( widgetInserting || ( e->state() & TQt::LeftButton ) == 0 ) return; if ( TQABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() ) return; @@ -611,7 +611,7 @@ void QDesignerToolBar::actionRemoved() TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos ) { - if ( orientation() ==Qt::Horizontal ) { + if ( orientation() ==TQt::Horizontal ) { TQPoint pnt( width() - 2, 0 ); insertAnchor = 0; afterAnchor = TRUE; @@ -665,7 +665,7 @@ void QDesignerToolBar::drawIndicator( const TQPoint &pos ) if ( lastIndicatorPos == pos ) return; bool wasVsisible = indicator->isVisible(); - if ( orientation() ==Qt::Horizontal ) { + if ( orientation() ==TQt::Horizontal ) { indicator->resize( 3, height() ); if ( pos != TQPoint( -1, -1 ) ) indicator->move( pos.x() - 1, 0 ); diff --git a/kdevdesigner/designer/actiondnd.h b/kdevdesigner/designer/actiondnd.h index 6173f7ad..62166ffe 100644 --- a/kdevdesigner/designer/actiondnd.h +++ b/kdevdesigner/designer/actiondnd.h @@ -158,17 +158,17 @@ class QDesignerToolBarSeparator : public TQWidget public: - QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 ); + QDesignerToolBarSeparator( TQt::Orientation, TQToolBar *parent, const char* name=0 ); TQSize sizeHint() const; - Qt::Orientation orientation() const { return orient; } + TQt::Orientation orientation() const { return orient; } public slots: - void setOrientation( Qt::Orientation ); + void setOrientation( TQt::Orientation ); protected: void styleChange( TQStyle& ); void paintEvent( TQPaintEvent * ); private: - Qt::Orientation orient; + TQt::Orientation orient; }; diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp index 8bc3ed27..c25d5927 100644 --- a/kdevdesigner/designer/formwindow.cpp +++ b/kdevdesigner/designer/formwindow.cpp @@ -353,7 +353,7 @@ void FormWindow::insertWidget() return; bool useSizeHint = !oldRectValid || ( currRect.width() < 2 && currRect.height() < 2 ); - Qt::Orientation orient =Qt::Horizontal; + TQt::Orientation orient =TQt::Horizontal; TQString n = WidgetDatabase::className( currTool ); if ( useSizeHint && ( n == "Spacer" || n == "TQSlider" || n == "Line" || n == "TQScrollBar" ) ) { TQPopupMenu m( mainWindow() ); @@ -361,7 +361,7 @@ void FormWindow::insertWidget() int ver = m.insertItem( i18n( "&Vertical" ) ); int r = m.exec( TQCursor::pos() ); if ( r == ver ) - orient =Qt::Vertical; + orient =TQt::Vertical; } @@ -408,7 +408,7 @@ void FormWindow::insertWidget() if ( useSizeHint ) { if ( n == "Spacer" ) { - if ( orient ==Qt::Vertical ) { + if ( orient ==TQt::Vertical ) { r.setWidth( 20 ); r.setHeight( 40 ); } else { @@ -609,7 +609,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) tqApp->processEvents(); } if ( ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) && - sel && e->button() == Qt::LeftButton ) { // control pressed and selected, unselect widget + sel && e->button() == TQt::LeftButton ) { // control pressed and selected, unselect widget selectWidget( TQT_TQOBJECT(w), FALSE ); break; } @@ -622,7 +622,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) ) w = w->parentWidget(); - if ( e->button() == Qt::LeftButton ) { // left button: store original geometry and more as the widget might start moving + if ( e->button() == TQt::LeftButton ) { // left button: store original geometry and more as the widget might start moving widgetPressed = TRUE; widgetGeom = TQRect( w->pos(), w->size() ); oldPressPos = w->mapFromGlobal( e->globalPos() ); @@ -636,7 +636,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) } } } else { // press was on the formwindow - if ( e->button() == Qt::LeftButton ) { // left button: start rubber selection and show formwindow properties + if ( e->button() == TQt::LeftButton ) { // left button: start rubber selection and show formwindow properties drawRubber = TRUE; if ( !( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) ) { clearSelection( FALSE ); @@ -652,7 +652,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) break; case CONNECT_TOOL: case BUDDY_TOOL: - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) break; validForBuddy = FALSE; if ( currTool == BUDDY_TOOL ) { @@ -691,7 +691,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) } break; default: // any insert widget tool - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default parent for new widget is the formwindow if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press was not on formwindow, check if we can find another parent TQWidget *wid = w; @@ -746,7 +746,7 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w ) void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) { CHECK_MAINWINDOW; - if ( ( e->state() & Qt::LeftButton ) != Qt::LeftButton ) + if ( ( e->state() & TQt::LeftButton ) != TQt::LeftButton ) return; TQWidget *newendWidget = endWidget, *oldendWidget = endWidget, *wid; @@ -922,7 +922,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) { CHECK_MAINWINDOW; - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; switch ( currTool ) { diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp index e4f772fc..f2198a36 100644 --- a/kdevdesigner/designer/layout.cpp +++ b/kdevdesigner/designer/layout.cpp @@ -328,7 +328,7 @@ void HorizontalLayout::doLayout() } if ( ::tqqt_cast(layoutBase) ) - ( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal ); + ( (TQSplitter*)layoutBase )->setOrientation( TQt::Horizontal ); finishLayout( needMove, layout ); } @@ -392,7 +392,7 @@ void VerticalLayout::doLayout() } if ( ::tqqt_cast(layoutBase) ) - ( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical ); + ( (TQSplitter*)layoutBase )->setOrientation( TQt::Vertical ); finishLayout( needMove, layout ); } @@ -865,7 +865,7 @@ void GridLayout::buildGrid() Spacer::Spacer( TQWidget *parent, const char *name ) : TQWidget( parent, name, WMouseNoMask ), - orient(Qt::Vertical ), interactive(TRUE), sh( TQSize(20,20) ) + orient(TQt::Vertical ), interactive(TRUE), sh( TQSize(20,20) ) { setSizeType( Expanding ); setAutoMask( TRUE ); @@ -876,7 +876,7 @@ void Spacer::paintEvent( TQPaintEvent * ) TQPainter p( this ); p.setPen( TQt::blue ); - if ( orient ==Qt::Horizontal ) { + if ( orient ==TQt::Horizontal ) { const int dist = 3; const int amplitude = TQMIN( 3, height() / 3 ); const int base = height() / 2; @@ -915,7 +915,7 @@ void Spacer::resizeEvent( TQResizeEvent* e) void Spacer::updateMask() { TQRegion r( rect() ); - if ( orient ==Qt::Horizontal ) { + if ( orient ==TQt::Horizontal ) { const int amplitude = TQMIN( 3, height() / 3 ); const int base = height() / 2; r = r.subtract( TQRect(1, 0, width() - 2, base - amplitude ) ); @@ -932,7 +932,7 @@ void Spacer::updateMask() void Spacer::setSizeType( SizeType t ) { TQSizePolicy sizeP; - if ( orient ==Qt::Vertical ) + if ( orient ==TQt::Vertical ) sizeP = TQSizePolicy( TQSizePolicy::Minimum, (TQSizePolicy::SizeType)t ); else sizeP = TQSizePolicy( (TQSizePolicy::SizeType)t, TQSizePolicy::Minimum ); @@ -942,14 +942,14 @@ void Spacer::setSizeType( SizeType t ) Spacer::SizeType Spacer::sizeType() const { - if ( orient ==Qt::Vertical ) + if ( orient ==TQt::Vertical ) return (SizeType)sizePolicy().verData(); return (SizeType)sizePolicy().horData(); } int Spacer::alignment() const { - if ( orient ==Qt::Vertical ) + if ( orient ==TQt::Vertical ) return AlignHCenter; return AlignVCenter; } @@ -958,7 +958,7 @@ TQSize Spacer::minimumSize() const { TQSize s = TQSize( 20,20 ); if ( sizeType() == Expanding ) - if ( orient ==Qt::Vertical ) + if ( orient ==TQt::Vertical ) s.rheight() = 0; else s.rwidth() = 0; @@ -979,12 +979,12 @@ void Spacer::setSizeHint( const TQSize &s ) updateGeometry(); } -Qt::Orientation Spacer::orientation() const +TQt::Orientation Spacer::orientation() const { return orient; } -void Spacer::setOrientation( Qt::Orientation o ) +void Spacer::setOrientation( TQt::Orientation o ) { if ( orient == o ) return; diff --git a/kdevdesigner/designer/listboxdnd.cpp b/kdevdesigner/designer/listboxdnd.cpp index 54498478..4e8a7822 100644 --- a/kdevdesigner/designer/listboxdnd.cpp +++ b/kdevdesigner/designer/listboxdnd.cpp @@ -81,7 +81,7 @@ bool ListBoxDnd::dropEvent( TQDropEvent * event ) bool ListBoxDnd::mouseMoveEvent( TQMouseEvent * event ) { - if ( event->state() & Qt::LeftButton ) { + if ( event->state() & TQt::LeftButton ) { if ( ( event->pos() - mousePressPos ).manhattanLength() > 3 ) { ListBoxItemList list; diff --git a/kdevdesigner/designer/listboxrename.cpp b/kdevdesigner/designer/listboxrename.cpp index 0a32d292..e5b705b9 100644 --- a/kdevdesigner/designer/listboxrename.cpp +++ b/kdevdesigner/designer/listboxrename.cpp @@ -75,7 +75,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event ) case TQEvent::MouseMove: - if ( ((TQMouseEvent *) event)->state() & Qt::LeftButton ) { + if ( ((TQMouseEvent *) event)->state() & TQt::LeftButton ) { activity = TRUE; // drag } break; diff --git a/kdevdesigner/designer/listdnd.cpp b/kdevdesigner/designer/listdnd.cpp index 8431fd18..2e3206ae 100644 --- a/kdevdesigner/designer/listdnd.cpp +++ b/kdevdesigner/designer/listdnd.cpp @@ -119,7 +119,7 @@ bool ListDnd::dropEvent( TQDropEvent * ) bool ListDnd::mousePressEvent( TQMouseEvent * event ) { - if ( event->button() == Qt::LeftButton ) + if ( event->button() == TQt::LeftButton ) mousePressPos = event->pos(); return FALSE; } diff --git a/kdevdesigner/designer/listviewdnd.cpp b/kdevdesigner/designer/listviewdnd.cpp index 32dcc6d5..f5f89d4d 100644 --- a/kdevdesigner/designer/listviewdnd.cpp +++ b/kdevdesigner/designer/listviewdnd.cpp @@ -92,7 +92,7 @@ bool ListViewDnd::dropEvent( TQDropEvent * event ) bool ListViewDnd::mouseMoveEvent( TQMouseEvent * event ) { - if ( event->state() & Qt::LeftButton ) { + if ( event->state() & TQt::LeftButton ) { if ( ( event->pos() - mousePressPos ).manhattanLength() > 3 ) { ListViewItemList list; diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp index c6072c81..319505b7 100644 --- a/kdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -470,7 +470,7 @@ void MainWindow::setupToolbox() setDockEnabled( dw, TQt::DockBottom, FALSE ); commonWidgetsToolBar = new TQToolBar( "Common Widgets", 0, toolBox, FALSE, "Common Widgets" ); commonWidgetsToolBar->setFrameStyle( TQFrame::NoFrame ); - commonWidgetsToolBar->setOrientation( Qt::Vertical ); + commonWidgetsToolBar->setOrientation( TQt::Vertical ); commonWidgetsToolBar->setBackgroundMode(PaletteBase); toolBox->addItem( commonWidgetsToolBar, "Common Widgets" ); } diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp index 6f6ff3ad..9ea32977 100644 --- a/kdevdesigner/designer/mainwindowactions.cpp +++ b/kdevdesigner/designer/mainwindowactions.cpp @@ -520,7 +520,7 @@ void MainWindow::setupToolActions() TQToolBar *tb2 = new TQToolBar( grp, 0, toolBox, FALSE, grp.latin1() ); tb2->setFrameStyle( TQFrame::NoFrame ); - tb2->setOrientation( Qt::Vertical ); + tb2->setOrientation( TQt::Vertical ); tb2->setBackgroundMode( PaletteBase ); toolBox->addItem( tb2, grp ); @@ -596,7 +596,7 @@ void MainWindow::setupToolActions() TQToolBar *tb2 = new TQToolBar( "Custom Widgets", 0, toolBox, FALSE, "Custom Widgets" ); tb2->setBackgroundMode(PaletteBase); - tb2->setOrientation( Qt::Vertical ); + tb2->setOrientation( TQt::Vertical ); tb2->setFrameStyle( TQFrame::NoFrame ); toolBox->addItem( tb2, "Custom Widgets" ); customWidgetToolBar2 = tb2; diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp index 4d14e59e..19f2057e 100644 --- a/kdevdesigner/designer/menubareditor.cpp +++ b/kdevdesigner/designer/menubareditor.cpp @@ -616,7 +616,7 @@ void MenuBarEditor::mouseDoubleClickEvent( TQMouseEvent * e ) void MenuBarEditor::mouseMoveEvent( TQMouseEvent * e ) { - if ( e->state() & Qt::LeftButton ) { + if ( e->state() & TQt::LeftButton ) { if ( ( e->pos() - mousePressPos ).manhattanLength() > 3 ) { bool itemCreated = FALSE; bool isSeparator = FALSE; diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp index 429b3f3b..8c835b95 100644 --- a/kdevdesigner/designer/popupmenueditor.cpp +++ b/kdevdesigner/designer/popupmenueditor.cpp @@ -761,7 +761,7 @@ void PopupMenuEditor::mouseDoubleClickEvent( TQMouseEvent * ) void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e ) { - if ( e->state() & Qt::LeftButton ) { + if ( e->state() & TQt::LeftButton ) { if ( ( e->pos() - mousePressPos ).manhattanLength() > 3 ) { draggedItem = itemAt( mousePressPos.y() ); if ( draggedItem == &addItem ) { diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp index ee3afe75..cd1c1696 100644 --- a/kdevdesigner/designer/propertyeditor.cpp +++ b/kdevdesigner/designer/propertyeditor.cpp @@ -910,13 +910,13 @@ void PropertyDateItem::setValue( const TQVariant &v ) lined()->setDate( v.toDate() ); lined()->blockSignals( FALSE ); } - setText( 1, v.toDate().toString( ::Qt::ISODate ) ); + setText( 1, v.toDate().toString( ::TQt::ISODate ) ); PropertyItem::setValue( v ); } void PropertyDateItem::setValue() { - setText( 1, lined()->date().toString( ::Qt::ISODate ) ); + setText( 1, lined()->date().toString( ::TQt::ISODate ) ); TQVariant v; v = lined()->date(); PropertyItem::setValue( v ); @@ -985,13 +985,13 @@ void PropertyTimeItem::setValue( const TQVariant &v ) lined()->setTime( v.toTime() ); lined()->blockSignals( FALSE ); } - setText( 1, v.toTime().toString( ::Qt::ISODate ) ); + setText( 1, v.toTime().toString( ::TQt::ISODate ) ); PropertyItem::setValue( v ); } void PropertyTimeItem::setValue() { - setText( 1, lined()->time().toString( ::Qt::ISODate ) ); + setText( 1, lined()->time().toString( ::TQt::ISODate ) ); TQVariant v; v = lined()->time(); PropertyItem::setValue( v ); @@ -1060,13 +1060,13 @@ void PropertyDateTimeItem::setValue( const TQVariant &v ) lined()->setDateTime( v.toDateTime() ); lined()->blockSignals( FALSE ); } - setText( 1, v.toDateTime().toString( ::Qt::ISODate ) ); + setText( 1, v.toDateTime().toString( ::TQt::ISODate ) ); PropertyItem::setValue( v ); } void PropertyDateTimeItem::setValue() { - setText( 1, lined()->dateTime().toString( ::Qt::ISODate ) ); + setText( 1, lined()->dateTime().toString( ::TQt::ISODate ) ); TQVariant v; v = lined()->dateTime(); PropertyItem::setValue( v ); @@ -2735,7 +2735,7 @@ void EnumBox::popup() void EnumBox::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, @@ -3582,7 +3582,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) break; case TQEvent::MouseMove: me = (TQMouseEvent*)e; - if ( me && me->state() & Qt::LeftButton && mousePressed) { + if ( me && me->state() & TQt::LeftButton && mousePressed) { i = (PropertyListItem*) itemAt( me->pos() ); if ( i && i == pressItem ) { diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp index 8f74f39a..134f6c72 100644 --- a/kdevdesigner/designer/resource.cpp +++ b/kdevdesigner/designer/resource.cpp @@ -825,7 +825,7 @@ void Resource::paste( const TQString &cb, TQWidget *parent ) w->move( x, y ); formwindow->selectWidget( TQT_TQOBJECT(w) ); } else if ( firstWidget.tagName() == "spacer" ) { - TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal ); + TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? TQt::Vertical : TQt::Horizontal ); if ( !w ) continue; widgets.append( w ); @@ -1883,7 +1883,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay while ( !n.isNull() ) { if ( n.tagName() == "spacer" ) { - createSpacer( n, w, layout, Qt::Horizontal ); + createSpacer( n, w, layout, TQt::Horizontal ); } else if ( n.tagName() == "widget" ) { createObject( n, w, layout ); } else if ( n.tagName() == "hbox" ) { @@ -2139,7 +2139,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } } -TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o ) +TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, TQt::Orientation o ) { TQDomElement n = e.firstChild().toElement(); int row = e.attribute( "row" ).toInt(); diff --git a/kdevdesigner/designer/resource.h b/kdevdesigner/designer/resource.h index 4926e004..7d32cf65 100644 --- a/kdevdesigner/designer/resource.h +++ b/kdevdesigner/designer/resource.h @@ -111,7 +111,7 @@ private: void savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStream &ts, int indent ); TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout = 0 ); - TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o ); + TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, TQt::Orientation o ); void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 ); void createColumn( const TQDomElement &e, TQWidget *widget ); void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e); diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp index d60f223b..62d95bc7 100644 --- a/kdevdesigner/designer/sizehandle.cpp +++ b/kdevdesigner/designer/sizehandle.cpp @@ -107,7 +107,7 @@ void SizeHandle::paintEvent( TQPaintEvent * ) void SizeHandle::mousePressEvent( TQMouseEvent *e ) { - if ( !widget || e->button() != Qt::LeftButton || !active ) + if ( !widget || e->button() != TQt::LeftButton || !active ) return; oldPressPos = e->pos(); geom = origGeom = TQRect( widget->pos(), widget->size() ); @@ -115,7 +115,7 @@ void SizeHandle::mousePressEvent( TQMouseEvent *e ) void SizeHandle::mouseMoveEvent( TQMouseEvent *e ) { - if ( !widget || ( e->state() & Qt::LeftButton ) != Qt::LeftButton || !active ) + if ( !widget || ( e->state() & TQt::LeftButton ) != TQt::LeftButton || !active ) return; TQPoint rp = mapFromGlobal( e->globalPos() ); TQPoint d = oldPressPos - rp; @@ -227,7 +227,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e ) void SizeHandle::mouseReleaseEvent( TQMouseEvent *e ) { - if ( e->button() != Qt::LeftButton || !active ) + if ( e->button() != TQt::LeftButton || !active ) return; formWindow->sizePreview()->hide(); diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp index 2ac16034..8c58a328 100644 --- a/kdevdesigner/designer/widgetfactory.cpp +++ b/kdevdesigner/designer/widgetfactory.cpp @@ -522,7 +522,7 @@ void WidgetFactory::saveChangedProperties( TQObject *w, int id ) created. */ -TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) +TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, TQt::Orientation orient ) { TQString n = WidgetDatabase::className( id ); if ( n.isEmpty() ) @@ -591,7 +591,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou int align = 0; if ( !layout && ::tqqt_cast(widget) ) { TQGroupBox *gb = (TQGroupBox*)widget; - gb->setColumnLayout( 0, Qt::Vertical ); + gb->setColumnLayout( 0, TQt::Vertical ); layout = gb->layout(); layout->setMargin( 0 ); layout->setSpacing( 0 ); @@ -684,7 +684,7 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) */ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, - const TQRect *r, Qt::Orientation orient ) + const TQRect *r, TQt::Orientation orient ) { if ( className == "TQPushButton" ) { TQPushButton *b = 0; @@ -877,9 +877,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) s->setOrientation( orient ); else if ( r->width() < r->height() ) - s->setOrientation( Qt::Vertical ); + s->setOrientation( TQt::Vertical ); else - s->setOrientation( Qt::Horizontal ); + s->setOrientation( TQt::Horizontal ); return s; } else if ( className == "TQLCDNumber" ) return new TQLCDNumber( parent, name ); @@ -898,7 +898,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) s->setOrientation( orient ); else if ( r->width() > r->height() ) - s->setOrientation( Qt::Horizontal ); + s->setOrientation( TQt::Horizontal ); MetaDataBase::addEntry( TQT_TQOBJECT(s) ); MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE ); return s; @@ -909,7 +909,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) s->setOrientation( orient ); else if ( r->width() > r->height() ) - s->setOrientation( Qt::Horizontal ); + s->setOrientation( TQt::Horizontal ); MetaDataBase::addEntry( TQT_TQOBJECT(s) ); MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE ); return s; @@ -930,7 +930,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if ( !r->isValid() || r->width() < 2 && r->height() < 2 ) l->setOrientation( orient ); else if ( r->width() < r->height() ) - l->setOrientation( Qt::Vertical ); + l->setOrientation( TQt::Vertical ); return l; } else if ( className == "TQMainWindow" ) { TQMainWindow *mw = new TQMainWindow( parent, name, 0 ); @@ -1014,7 +1014,7 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay w = ((TQToolBox*)w)->currentItem(); if ( ::tqqt_cast(w) ) - return ( (TQSplitter*)w )->orientation() ==Qt::Horizontal ? HBox : VBox; + return ( (TQSplitter*)w )->orientation() ==TQt::Horizontal ? HBox : VBox; if ( !w || !w->layout() ) return NoLayout; diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp index 27fb6e57..17bc3153 100644 --- a/kdevdesigner/designer/workspace.cpp +++ b/kdevdesigner/designer/workspace.cpp @@ -523,7 +523,7 @@ void Workspace::itemDoubleClicked( TQListViewItem *i ) void Workspace::itemClicked( int button, TQListViewItem *i, const TQPoint& ) { - if ( !i || button != Qt::LeftButton ) + if ( !i || button != TQt::LeftButton ) return; closeAutoOpenItems(); @@ -640,7 +640,7 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) case OPEN_SOURCE: case OPEN_FORM: case OPEN_FORM_SOURCE: - itemClicked( Qt::LeftButton, i, pos ); + itemClicked( TQt::LeftButton, i, pos ); break; } } @@ -689,7 +689,7 @@ void Workspace::bufferChosen( const TQString &buffer ) TQListViewItemIterator it( this ); while ( it.current() ) { if ( ( (WorkspaceItem*)it.current())->checkCompletion( buffer ) ) { - itemClicked( Qt::LeftButton, it.current(), TQPoint() ); + itemClicked( TQt::LeftButton, it.current(), TQPoint() ); break; } ++it; -- cgit v1.2.3