diff options
Diffstat (limited to 'kommander/editor')
-rw-r--r-- | kommander/editor/actiondnd.cpp | 44 | ||||
-rw-r--r-- | kommander/editor/formwindow.cpp | 18 | ||||
-rw-r--r-- | kommander/editor/layout.cpp | 22 | ||||
-rw-r--r-- | kommander/editor/mainwindow.cpp | 2 | ||||
-rw-r--r-- | kommander/editor/propertyeditor.cpp | 14 | ||||
-rw-r--r-- | kommander/editor/resource.cpp | 6 | ||||
-rw-r--r-- | kommander/editor/sizehandle.cpp | 6 | ||||
-rw-r--r-- | kommander/editor/widgetfactory.cpp | 20 | ||||
-rw-r--r-- | kommander/editor/workspace.cpp | 10 |
9 files changed, 71 insertions, 71 deletions
diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp index 1f73a8e0..333ffc8f 100644 --- a/kommander/editor/actiondnd.cpp +++ b/kommander/editor/actiondnd.cpp @@ -72,19 +72,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; } @@ -98,7 +98,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 ); @@ -109,7 +109,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(), @@ -226,7 +226,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; } @@ -304,7 +304,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 ) { @@ -391,10 +391,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 ) { @@ -430,7 +430,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; @@ -583,7 +583,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; @@ -637,7 +637,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 ); @@ -769,7 +769,7 @@ void QDesignerMenuBar::mousePressEvent( TQMouseEvent *e ) lastIndicatorPos = TQPoint( -1, -1 ); insertAt = -1; mousePressed = true; - if ( e->button() == Qt::MidButton || e->button() == Qt::RightButton ) + if ( e->button() == TQt::MidButton || e->button() == TQt::RightButton ) return; dragStartPos = e->pos(); @@ -778,7 +778,7 @@ void QDesignerMenuBar::mousePressEvent( TQMouseEvent *e ) void QDesignerMenuBar::mouseMoveEvent( TQMouseEvent *e ) { - if ( !mousePressed || e->state() == Qt::NoButton ) { + if ( !mousePressed || e->state() == TQt::NoButton ) { TQMenuBar::mouseMoveEvent( e ); return; } @@ -847,12 +847,12 @@ void QDesignerMenuBar::dragMoveEvent( TQDragMoveEvent *e ) e->provides( "application/x-designer-actiongroup" ) || e->provides( "application/x-designer-separator" ) ) { int item = itemAtPos( e->pos() ); - bool uieffect = TQApplication::isEffectEnabled( Qt::UI_AnimateMenu ); - TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, false ); + bool uieffect = TQApplication::isEffectEnabled( TQt::UI_AnimateMenu ); + TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, false ); if ( !tqApp->activePopupWidget() ) actItem = -1; activateItemAt( item ); - TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, uieffect ); + TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, uieffect ); if ( item == -1 ) hidePopups(); } else { @@ -977,7 +977,7 @@ void QDesignerPopupMenu::contextMenuEvent( TQContextMenuEvent *e ) { #if defined( TQ_WS_MAC ) //the mac needs us to use context menu rather than right click e->accept(); - TQMouseEvent me( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), Qt::RightButton, Qt::RightButton ); + TQMouseEvent me( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), TQt::RightButton, TQt::RightButton ); mousePressEvent(&me); #else Q_UNUSED( e ); @@ -986,10 +986,10 @@ void QDesignerPopupMenu::contextMenuEvent( TQContextMenuEvent *e ) void QDesignerPopupMenu::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::MidButton ) + if ( e->button() == TQt::MidButton ) return; - if ( e->button() == Qt::RightButton ) { + if ( e->button() == TQt::RightButton ) { // A popup for a popup, we only need one, so make sure that // we don't create multiple. The timer keeps the event loop sane. popupPos = e->globalPos(); @@ -1054,7 +1054,7 @@ void QDesignerPopupMenu::createPopupMenu() void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e ) { - if ( !mousePressed || e->state() == Qt::NoButton ) { + if ( !mousePressed || e->state() == TQt::NoButton ) { TQPopupMenu::mouseMoveEvent( e ); return; } diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index 717bc9c9..ec8bb247 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -295,7 +295,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()); @@ -303,7 +303,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; } TQWidget *w = WidgetFactory::create(currTool, insertParent, 0, true, &currRect, orient); @@ -540,7 +540,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) tqApp->processEvents(); } if (((e->state() & ControlButton) || (e->state() & ShiftButton)) && - sel && e->button() == Qt::LeftButton) + sel && e->button() == TQt::LeftButton) { // control pressed and selected, unselect widget selectWidget(TQT_TQOBJECT(w), false); break; @@ -555,7 +555,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) || !insertedWidgets.find(w))) w = w->parentWidget(); - if (e->button() == Qt::LeftButton) + 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()); @@ -574,7 +574,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) } else { // press was on the formwindow - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { // left button: start rubber selection and show formwindow properties drawRubber = true; if (!((e->state() & ControlButton) || (e->state() & ShiftButton))) @@ -591,7 +591,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) } break; case CONNECT_TOOL: - if (e->button() != Qt::LeftButton) + if (e->button() != TQt::LeftButton) break; saveBackground(); mainWindow()->statusBar()->message(i18n("Connect '%1' with...").arg(w->name())); @@ -625,7 +625,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 @@ -685,7 +685,7 @@ void FormWindow::handleMouseDblClick(TQMouseEvent *, TQWidget *w) void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) { - if ((e->state() & Qt::LeftButton) != Qt::LeftButton) + if ((e->state() & TQt::LeftButton) != TQt::LeftButton) return; TQWidget *newReceiver = (TQWidget*)connectReceiver, *oldReceiver = (TQWidget*)connectReceiver, *wid; @@ -822,7 +822,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) { - if (e->button() != Qt::LeftButton) + if (e->button() != TQt::LeftButton) return; switch (currTool) diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp index 4fe32309..1cedfc32 100644 --- a/kommander/editor/layout.cpp +++ b/kommander/editor/layout.cpp @@ -320,7 +320,7 @@ void HorizontalLayout::doLayout() } if ( layoutBase->inherits( "TQSplitter" ) ) - ( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal ); + ( (TQSplitter*)layoutBase )->setOrientation( TQt::Horizontal ); finishLayout( needMove, layout ); } @@ -384,7 +384,7 @@ void VerticalLayout::doLayout() } if ( layoutBase->inherits( "TQSplitter" ) ) - ( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical ); + ( (TQSplitter*)layoutBase )->setOrientation( TQt::Vertical ); finishLayout( needMove, layout ); } @@ -803,7 +803,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 ); @@ -814,7 +814,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; @@ -853,7 +853,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 ) ); @@ -870,7 +870,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 ); @@ -880,14 +880,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; } @@ -901,7 +901,7 @@ TQSize Spacer::sizeHint() const { TQSize s = sh.expandedTo( TQSize(0,0) ); if ( sizeType() == Expanding ) - if ( orient ==Qt::Horizontal ) + if ( orient ==TQt::Horizontal ) s.rheight() = 0; else s.rwidth() = 0; @@ -917,12 +917,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/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 4fbc4ff5..c584e3f9 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -561,7 +561,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) } break; case TQEvent::MouseButtonPress: - if (((TQMouseEvent*)e)->button() == Qt::MidButton && dynamic_cast<KommanderWidget *>(o)) + if (((TQMouseEvent*)e)->button() == TQt::MidButton && dynamic_cast<KommanderWidget *>(o)) { AssocTextEditor *editor = new AssocTextEditor((TQWidget*)o, formWindow(), propertyEditor, m_partManager, this, "AssocTextEditor", false); //deletes itself! diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index bdcc563a..3877b8c8 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -891,13 +891,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 ); @@ -966,13 +966,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 ); @@ -1041,13 +1041,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 ); @@ -2957,7 +2957,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/kommander/editor/resource.cpp b/kommander/editor/resource.cpp index c33cf46d..29cac0e0 100644 --- a/kommander/editor/resource.cpp +++ b/kommander/editor/resource.cpp @@ -538,7 +538,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 ); @@ -1370,7 +1370,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" ) { @@ -1596,7 +1596,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/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp index 8aa6fdc7..37dde0aa 100644 --- a/kommander/editor/sizehandle.cpp +++ b/kommander/editor/sizehandle.cpp @@ -102,7 +102,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() ); @@ -110,7 +110,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; @@ -222,7 +222,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/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp index fe38face..a3482bcb 100644 --- a/kommander/editor/widgetfactory.cpp +++ b/kommander/editor/widgetfactory.cpp @@ -640,7 +640,7 @@ int EditorToolBox::count() const 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); //tqDebug("Trying to create '%s'", n.latin1()); @@ -705,7 +705,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou if ( !layout && widget && widget->inherits( "TQGroupBox" ) ) { TQGroupBox *gb = (TQGroupBox*)widget; - gb->setColumnLayout( 0, Qt::Vertical ); + gb->setColumnLayout( 0, TQt::Vertical ); gb->layout()->setMargin( 0 ); gb->layout()->setSpacing( 0 ); TQLayout *l; @@ -834,7 +834,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") { @@ -1030,9 +1030,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); @@ -1052,7 +1052,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; @@ -1064,7 +1064,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; @@ -1087,7 +1087,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") { @@ -1248,7 +1248,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; @@ -1282,7 +1282,7 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay w = ((TQWidgetStack*)w)->visibleWidget(); if ( w && w->inherits( "TQSplitter" ) ) - 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/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp index e03f4fda..5ca2da26 100644 --- a/kommander/editor/workspace.cpp +++ b/kommander/editor/workspace.cpp @@ -583,7 +583,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(); @@ -699,7 +699,7 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) break; #endif case OPEN_SOURCE: - itemClicked( Qt::LeftButton, i, pos ); + itemClicked( TQt::LeftButton, i, pos ); break; #ifndef KOMMANDER case REMOVE_FORM: // FIXME @@ -707,10 +707,10 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) break; #endif case OPEN_FORM: - itemClicked( Qt::LeftButton, i, pos ); + itemClicked( TQt::LeftButton, i, pos ); break; case OPEN_FORM_SOURCE: - itemClicked( Qt::LeftButton, i, pos ); + itemClicked( TQt::LeftButton, i, pos ); break; default: break; @@ -764,7 +764,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; |