diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-07 19:27:29 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-09 10:21:35 +0900 |
| commit | 521604defa90ca9cf8cdcf0c8e3c8f2579bb8092 (patch) | |
| tree | aca33c8a5d0b537d70889e2f43cb34610c35d68b | |
| parent | baf125d9b448d63fd97e63f9855d2094aa8d015c (diff) | |
| download | tdevelop-521604de.tar.gz tdevelop-521604de.zip | |
Replace Qt with TQt
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 6b0cf55d6252a256d9fc5bcb89837bec7f21f40d)
71 files changed, 220 insertions, 220 deletions
diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index 2c98ed35..aa4c9e34 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -87,7 +87,7 @@ AutoProjectWidget::AutoProjectWidget( AutoProjectPart *part, bool kde ) m_choosenTarget = 0; m_makefileHandler = new MakefileHandler(); - TQSplitter *splitter = new TQSplitter(Qt::Vertical, this); + TQSplitter *splitter = new TQSplitter(TQt::Vertical, this); initOverview ( splitter ); initDetailview ( splitter ); diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index cc39aa07..7d03ad3e 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -75,7 +75,7 @@ ConfigureOptionsWidget::ConfigureOptionsWidget(AutoProjectPart *part, TQWidget * config_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); m_part = part; - env_groupBox->setColumnLayout( 1, Qt::Vertical ); + env_groupBox->setColumnLayout( 1, TQt::Vertical ); TQDomDocument &dom = *part->projectDom(); m_environmentVariablesWidget = new EnvironmentVariablesWidget(dom, "/kdevautoproject/general/envvars", env_groupBox); diff --git a/buildtools/custommakefiles/custommakeconfigwidget.cpp b/buildtools/custommakefiles/custommakeconfigwidget.cpp index 6a12cdfb..ceebb999 100644 --- a/buildtools/custommakefiles/custommakeconfigwidget.cpp +++ b/buildtools/custommakefiles/custommakeconfigwidget.cpp @@ -46,7 +46,7 @@ CustomMakeConfigWidget::CustomMakeConfigWidget(CustomProjectPart* part, const TQ envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D[^\\s]*"), TQT_TQOBJECT(this))); m_allEnvironments = m_part->allMakeEnvironments(); m_currentEnvironment = m_part->currentMakeEnvironment(); - env_var_group->setColumnLayout( 1, Qt::Vertical ); + env_var_group->setColumnLayout( 1, TQt::Vertical ); m_envWidget = new EnvironmentVariablesWidget(m_dom, m_configGroup + "/make/environments/" + m_currentEnvironment, env_var_group); envs_combo->insertStringList(m_allEnvironments); envs_combo->setEditText(m_currentEnvironment); diff --git a/buildtools/custommakefiles/customotherconfigwidget.cpp b/buildtools/custommakefiles/customotherconfigwidget.cpp index 8049d37a..c7778a74 100644 --- a/buildtools/custommakefiles/customotherconfigwidget.cpp +++ b/buildtools/custommakefiles/customotherconfigwidget.cpp @@ -41,7 +41,7 @@ CustomOtherConfigWidget::CustomOtherConfigWidget(CustomProjectPart* part, const envs_combo->setValidator(new TQRegExpValidator(TQRegExp("^\\D.*"), TQT_TQOBJECT(this))); m_allEnvironments = m_part->allMakeEnvironments(); m_currentEnvironment = m_part->currentMakeEnvironment(); - env_var_group->setColumnLayout( 1, Qt::Vertical ); + env_var_group->setColumnLayout( 1, TQt::Vertical ); m_envWidget = new EnvironmentVariablesWidget(m_dom, m_configGroup + "/other/environments/" + m_currentEnvironment, env_var_group); envs_combo->insertStringList(m_allEnvironments); envs_combo->setEditText(m_currentEnvironment); diff --git a/buildtools/lib/widgets/makeoptionswidget.cpp b/buildtools/lib/widgets/makeoptionswidget.cpp index ef901cc8..c15b5a7a 100644 --- a/buildtools/lib/widgets/makeoptionswidget.cpp +++ b/buildtools/lib/widgets/makeoptionswidget.cpp @@ -33,7 +33,7 @@ MakeOptionsWidget::MakeOptionsWidget(TQDomDocument &dom, const TQString &configG : MakeOptionsWidgetBase(parent, name), m_dom(dom), m_configGroup(configGroup) { - env_var_group->setColumnLayout( 1, Qt::Vertical ); + env_var_group->setColumnLayout( 1, TQt::Vertical ); m_environmentVariablesWidget = new EnvironmentVariablesWidget( dom, configGroup + "/make/envvars", env_var_group ); abort_box->setChecked(DomUtil::readBoolEntry(dom, configGroup + "/make/abortonerror", true )); diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp index 6836ee77..717e9573 100644 --- a/buildtools/lib/widgets/runoptionswidget.cpp +++ b/buildtools/lib/widgets/runoptionswidget.cpp @@ -44,7 +44,7 @@ RunOptionsWidget::RunOptionsWidget(TQDomDocument &dom, const TQString &configGro m_dom(dom), m_configGroup(configGroup) { // Create the "Environment Variables" GUI - env_var_group->setColumnLayout( 1, Qt::Vertical ); + env_var_group->setColumnLayout( 1, TQt::Vertical ); m_environmentVariablesWidget = new EnvironmentVariablesWidget( dom, configGroup + "/run/envvars", env_var_group ); mainprogram_edit->completionObject()->setMode(KURLCompletion::FileCompletion); diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index ca369c1f..551dcf27 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -84,7 +84,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) m_rootScope ( 0 ), m_part ( part ), m_configDlg( 0 ), m_filesCached(false) { - TQSplitter * splitter = new TQSplitter(Qt::Vertical, this ); + TQSplitter * splitter = new TQSplitter(TQt::Vertical, this ); ////////////////// // PROJECT VIEW // diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook index b75978ff..fc21e33a 100644 --- a/doc/kdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -878,7 +878,7 @@ stored in it are a style, a color, a join style and a cap style. <para> The pen style is member of the enum -<ulink url="kdeapi:qt/Qt#PenStyle-enum">Qt::PenStyle</ulink>. +<ulink url="kdeapi:qt/Qt#PenStyle-enum">TQt::PenStyle</ulink>. and can take one of the following values: </para> @@ -888,7 +888,7 @@ and can take one of the following values: <para> The join style is a member of the enum -<ulink url="kdeapi:qt/Qt#PenJoinStyle-enum">Qt::PenJoinStyle</ulink>. +<ulink url="kdeapi:qt/Qt#PenJoinStyle-enum">TQt::PenJoinStyle</ulink>. It specifies how the junction between multiple lines which are attached to each other is drawn. It takes one of the following values: </para> @@ -918,7 +918,7 @@ other is drawn. It takes one of the following values: <para> The cap style is a member of the enum -<ulink url="kdeapi:qt/Qt#PenCapStyle-enum">Qt::PenCapStyle</ulink>and specifies how the end points of lines are drawn. It takes one of the values +<ulink url="kdeapi:qt/Qt#PenCapStyle-enum">TQt::PenCapStyle</ulink>and specifies how the end points of lines are drawn. It takes one of the values from the following table: </para> @@ -978,7 +978,7 @@ brush with the custom pattern you give as second parameter.</para> <para> A default brush style is from the enum -<ulink url="kdeapi:qt/Qt#BrushStyle-enum">Qt::BrushStyle</ulink>. +<ulink url="kdeapi:qt/Qt#BrushStyle-enum">TQt::BrushStyle</ulink>. Here is a picture of all predefined patterns: </para> @@ -1126,9 +1126,9 @@ Text can be drawn with one of the overloaded variants of the method QPainter::drawText(). These draw a TQString either at a given point or in a given rectangle, using the font set by QPainter::setFont(). There is also a parameter which takes an ORed combination of some flags from the enums -<ulink url="kdeapi:qt/Qt#AlignmentFlags-enum">Qt::AlignmentFlags</ulink> +<ulink url="kdeapi:qt/Qt#AlignmentFlags-enum">TQt::AlignmentFlags</ulink> and -<ulink url="kdeapi:qt/Qt#TextFlags-enum">Qt::TextFlags</ulink> +<ulink url="kdeapi:qt/Qt#TextFlags-enum">TQt::TextFlags</ulink> </para> <para> 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<TQSplitter*>(layoutBase) ) - ( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal ); + ( (TQSplitter*)layoutBase )->setOrientation( TQt::Horizontal ); finishLayout( needMove, layout ); } @@ -392,7 +392,7 @@ void VerticalLayout::doLayout() } if ( ::tqqt_cast<TQSplitter*>(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<TQGroupBox*>(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<TQSplitter*>(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; diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp index 4c49b34c..25f436f2 100644 --- a/kdevdesigner/uilib/qwidgetfactory.cpp +++ b/kdevdesigner/uilib/qwidgetfactory.cpp @@ -1753,7 +1753,7 @@ TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* layout, int align = 0; if ( !layout && widget && widget->inherits( "TQGroupBox" ) ) { TQGroupBox *gb = (TQGroupBox*)widget; - gb->setColumnLayout( 0, Qt::Vertical ); + gb->setColumnLayout( 0, TQt::Vertical ); layout = gb->layout(); layout->setMargin( 0 ); layout->setSpacing( 0 ); @@ -1925,7 +1925,7 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) int rowspan = e.attribute( "rowspan" ).toInt(); int colspan = e.attribute( "colspan" ).toInt(); - Qt::Orientation orient = Qt::Horizontal; + TQt::Orientation orient = TQt::Horizontal; int w = 0, h = 0; TQSizePolicy::SizeType sizeType = TQSizePolicy::Preferred; while ( !n.isNull() ) { @@ -1933,9 +1933,9 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) TQString prop = n.attribute( "name" ); if ( prop == "orientation" ) { if ( n.firstChild().firstChild().toText().data() == "Horizontal" ) - orient = Qt::Horizontal; + orient = TQt::Horizontal; else - orient = Qt::Vertical; + orient = TQt::Vertical; } else if ( prop == "sizeType" ) { sizeType = stringToSizeType( n.firstChild().firstChild().toText().data() ); } else if ( prop == "sizeHint" ) { @@ -1950,14 +1950,14 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) rowspan = 1; if ( colspan < 1 ) colspan = 1; - TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum, - orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum ); + TQSpacerItem *item = new TQSpacerItem( w, h, orient == TQt::Horizontal ? sizeType : TQSizePolicy::Minimum, + orient == TQt::Vertical ? sizeType : TQSizePolicy::Minimum ); if ( layout ) { if ( layout->inherits( "TQBoxLayout" ) ) ( (TQBoxLayout*)layout )->addItem( item ); else ( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1, - orient == Qt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter ); + orient == TQt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter ); } } diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp index 150e829d..89ad08e5 100644 --- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp +++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp @@ -74,9 +74,9 @@ connect(mPopup, TQT_SIGNAL(clicked()), TQT_SLOT(popup())); - mVolume=new L33tSlider(0,100,10,0,Qt::Horizontal, this); + mVolume=new L33tSlider(0,100,10,0,TQt::Horizontal, this); mVolume->setValue(napp->player()->volume()); - mSeeker=new L33tSlider(0,1000,10,0,Qt::Horizontal, this); + mSeeker=new L33tSlider(0,1000,10,0,TQt::Horizontal, this); mStatusBar=new KStatusBar(this); diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui index 398e785b..49b6c553 100644 --- a/languages/cpp/ccconfigwidgetbase.ui +++ b/languages/cpp/ccconfigwidgetbase.ui @@ -637,7 +637,7 @@ navigate the header and vice versa</string> <bool>false</bool> </property> <property name="title"> - <string>Qt::Orientation</string> + <string>Orientation</string> </property> <property name="exclusive"> <bool>true</bool> diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index c7e0ad13..f04db100 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -1171,7 +1171,7 @@ void CppNewClassDialog::setAccessForBase( TQString baseclass, TQString newAccess void CppNewClassDialog::access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint &p, int /*c*/ ) { - if ( item && ( ( button == Qt::LeftButton ) || ( button == Qt::RightButton ) ) && ( item->depth() > 1 ) ) + if ( item && ( ( button == TQt::LeftButton ) || ( button == TQt::RightButton ) ) && ( item->depth() > 1 ) ) { accessMenu->setItemEnabled( 1, true ); accessMenu->setItemEnabled( 2, true ); @@ -1196,7 +1196,7 @@ void CppNewClassDialog::access_view_mouseButtonPressed( int button, TQListViewIt void CppNewClassDialog::methods_view_mouseButtonPressed( int button , TQListViewItem * item, const TQPoint&p , int /*c*/ ) { - if ( item && ( button == Qt::RightButton ) && ( item->depth() > 1 ) && ( ! item->text( 1 ).isEmpty() ) ) + if ( item && ( button == TQt::RightButton ) && ( item->depth() > 1 ) && ( ! item->text( 1 ).isEmpty() ) ) { overMenu->exec( p ); } diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index e444bfea..c1cf0132 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -1393,13 +1393,13 @@ bool CppSupportPart::shouldSplitDocument(const KURL &url) return false; } -Qt::Orientation CppSupportPart::splitOrientation() const +TQt::Orientation CppSupportPart::splitOrientation() const { TQString o = splitHeaderSourceConfig()->orientation(); if ( o == "Vertical" ) - return Qt::Vertical; + return TQt::Vertical; else - return Qt::Horizontal; + return TQt::Horizontal; } void CppSupportPart::slotNewClass() @@ -2082,9 +2082,9 @@ void CppSupportPart::splitHeaderSourceConfigStored( ) { TQString o = splitHeaderSourceConfig()->orientation(); if ( o == "Vertical" ) - emit splitOrientationChanged( Qt::Vertical ); + emit splitOrientationChanged( TQt::Vertical ); else if ( o == "Horizontal" ) - emit splitOrientationChanged( Qt::Horizontal ); + emit splitOrientationChanged( TQt::Horizontal ); } void CppSupportPart::removeWithReferences( const TQString & fileName ) diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h index 58e451ad..dc4d4451 100644 --- a/languages/cpp/cppsupportpart.h +++ b/languages/cpp/cppsupportpart.h @@ -289,7 +289,7 @@ protected: virtual TQString formatClassName( const TQString &name ); virtual TQString unformatClassName( const TQString &name ); virtual bool shouldSplitDocument( const KURL &url ); - virtual Qt::Orientation splitOrientation() const; + virtual TQt::Orientation splitOrientation() const; virtual void addMethod( ClassDom klass ); virtual void addAttribute( ClassDom klass ); diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index 718345a1..63f6229b 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -73,7 +73,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) topLayout->addWidget(pids_); pids_->setFont(TDEGlobalSettings::fixedFont()); - KButtonBox *buttonbox = new KButtonBox(this, Qt::Horizontal); + KButtonBox *buttonbox = new KButtonBox(this, TQt::Horizontal); buttonbox->addStretch(); TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index 9fa8289d..f7d23b0c 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -107,7 +107,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) if (moving_) return; - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { TDEPopupMenu *menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), @@ -233,13 +233,13 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e) return; switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: { // Not really a click, but it'll hold for the time being !!! emit clicked(); break; } - case Qt::RightButton: + case TQt::RightButton: { TDEPopupMenu* menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp index 47904817..c777226a 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.cpp +++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp @@ -686,7 +686,7 @@ void GDBBreakpointWidget::slotRemoveAllBreakpoints() void GDBBreakpointWidget::slotRowDoubleClicked(int row, int col, int btn, const TQPoint &) { - if ( btn == Qt::LeftButton ) + if ( btn == TQt::LeftButton ) { // kdDebug(9012) << "in slotRowSelected row=" << row << endl; BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(row, Control); diff --git a/languages/ruby/app_templates/kapp/app.rb b/languages/ruby/app_templates/kapp/app.rb index 37a00d8b..af807fe9 100644 --- a/languages/ruby/app_templates/kapp/app.rb +++ b/languages/ruby/app_templates/kapp/app.rb @@ -181,13 +181,13 @@ class %{APPNAMESC} < KDE::MainWindow if @printer.nil? then @printer = KDE::Printer.new end if @printer.setup(self) # setup the printer. with Qt, you always "print" to a - # Qt::Painter.. whether the output medium is a pixmap, a screen, + # TQt::Painter.. whether the output medium is a pixmap, a screen, # or paper - p = Qt::Painter.new + p = TQt::Painter.new p.begin(@printer) # we let our view do the actual printing - metrics = Qt::PaintDeviceMetrics.new(@printer) + metrics = TQt::PaintDeviceMetrics.new(@printer) @view.print(p, metrics.height(), metrics.width()) # and send the result to the printer diff --git a/languages/ruby/app_templates/kapp/appview.rb b/languages/ruby/app_templates/kapp/appview.rb index e75ca6bc..3fed1ce1 100644 --- a/languages/ruby/app_templates/kapp/appview.rb +++ b/languages/ruby/app_templates/kapp/appview.rb @@ -10,7 +10,7 @@ @author %{AUTHOR} <%{EMAIL}> @version %{VERSION} =end -class %{APPNAMESC}View < Qt::Widget +class %{APPNAMESC}View < TQt::Widget # # Use this signal to change the content of the statusbar @@ -32,7 +32,7 @@ class %{APPNAMESC}View < Qt::Widget @dcop = %{APPNAMESC}Iface.new(self) # setup our layout manager to automatically add our widgets - top_layout = Qt::HBoxLayout.new(self) + top_layout = TQt::HBoxLayout.new(self) top_layout.setAutoAdd(true) # we want to look for all components that satisfy our needs. the diff --git a/languages/ruby/app_templates/kapp/pref.rb b/languages/ruby/app_templates/kapp/pref.rb index 98669ad2..cf8339e9 100644 --- a/languages/ruby/app_templates/kapp/pref.rb +++ b/languages/ruby/app_templates/kapp/pref.rb @@ -15,24 +15,24 @@ class %{APPNAMESC}Preferences < KDE::DialogBase end end -class %{APPNAMESC}PrefPageOne < Qt::Frame +class %{APPNAMESC}PrefPageOne < TQt::Frame def initialize(parent) super(parent) - layout = Qt::HBoxLayout.new(self) + layout = TQt::HBoxLayout.new(self) layout.setAutoAdd(true) - Qt::Label.new(i18n("Add something here"), self) + TQt::Label.new(i18n("Add something here"), self) end end -class %{APPNAMESC}PrefPageTwo < Qt::Frame +class %{APPNAMESC}PrefPageTwo < TQt::Frame def initialize(parent) super(parent) - layout = Qt::HBoxLayout.new(self) + layout = TQt::HBoxLayout.new(self) layout.setAutoAdd(true) - Qt::Label.new(i18n("Add something here"), self) + TQt::Label.new(i18n("Add something here"), self) end end diff --git a/languages/ruby/app_templates/qtruby/app.rb b/languages/ruby/app_templates/qtruby/app.rb index da817328..68156edd 100755 --- a/languages/ruby/app_templates/qtruby/app.rb +++ b/languages/ruby/app_templates/qtruby/app.rb @@ -2,8 +2,8 @@ require 'Qt' -app = Qt::Application.new(ARGV) -widget = Qt::Widget.new +app = TQt::Application.new(ARGV) +widget = TQt::Widget.new widget.setGeometry(50, 500, 400, 400) widget.caption = "Hello World!" diff --git a/languages/ruby/app_templates/qtrubyapp/main.rb b/languages/ruby/app_templates/qtrubyapp/main.rb index 6f4bceae..431ea442 100644 --- a/languages/ruby/app_templates/qtrubyapp/main.rb +++ b/languages/ruby/app_templates/qtrubyapp/main.rb @@ -1,7 +1,7 @@ require 'Qt' require '%{APPNAMELC}.rb' -a = Qt::Application.new( ARGV ) +a = TQt::Application.new( ARGV ) mw = %{APPNAMESC}.new mw.caption = "%{APPNAMESC}" mw.show diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb index 26b0b378..df98824d 100644 --- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb +++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb @@ -1,4 +1,4 @@ -class %{APPNAMESC} < Qt::MainWindow +class %{APPNAMESC} < TQt::MainWindow Q_SLOTS 'newDoc()', 'choose()', @@ -11,61 +11,61 @@ class %{APPNAMESC} < Qt::MainWindow def initialize() super( nil, "%{APPNAMESC}", WDestructiveClose ) - @printer = Qt::Printer.new + @printer = TQt::Printer.new - fileTools = Qt::ToolBar.new( self, "file operations" ) + fileTools = TQt::ToolBar.new( self, "file operations" ) fileTools.setLabel( tr("File Operations") ) - openIcon = Qt::Pixmap.new( "fileopen.xpm" ) - fileOpen = Qt::ToolButton.new( Qt::IconSet.new(openIcon), tr("Open File"), nil, + openIcon = TQt::Pixmap.new( "fileopen.xpm" ) + fileOpen = TQt::ToolButton.new( TQt::IconSet.new(openIcon), tr("Open File"), nil, self, SLOT('choose()'), fileTools, "open file" ) - saveIcon = Qt::Pixmap.new( "filesave.xpm" ) - fileSave = Qt::ToolButton.new( Qt::IconSet.new(saveIcon), tr("Save File"), nil, + saveIcon = TQt::Pixmap.new( "filesave.xpm" ) + fileSave = TQt::ToolButton.new( TQt::IconSet.new(saveIcon), tr("Save File"), nil, self, SLOT('save()'), fileTools, "save file" ) - printIcon = Qt::Pixmap.new( "fileprint.xpm" ) - filePrint = Qt::ToolButton.new( Qt::IconSet.new(printIcon), tr("Print File"), nil, + printIcon = TQt::Pixmap.new( "fileprint.xpm" ) + filePrint = TQt::ToolButton.new( TQt::IconSet.new(printIcon), tr("Print File"), nil, self, SLOT('print()'), fileTools, "print file" ) - Qt::WhatsThis.whatsThisButton( fileTools ) + TQt::WhatsThis.whatsThisButton( fileTools ) fileOpenText = tr('<p><img source="fileopen"> ' + "Click this button to open a <em>new file</em>. <br>" + "You can also select the <b>Open</b> command " + "from the <b>File</b> menu.</p>") - Qt::WhatsThis.add( fileOpen, fileOpenText ) + TQt::WhatsThis.add( fileOpen, fileOpenText ) - Qt::MimeSourceFactory.defaultFactory().setPixmap( "fileopen", openIcon ) + TQt::MimeSourceFactory.defaultFactory().setPixmap( "fileopen", openIcon ) fileSaveText = tr("<p>Click this button to save the file you " + "are editing. You will be prompted for a file name.\n" + "You can also select the <b>Save</b> command " + "from the <b>File</b> menu.</p>") - Qt::WhatsThis.add( fileSave, fileSaveText ) + TQt::WhatsThis.add( fileSave, fileSaveText ) filePrintText = tr("Click this button to print the file you " + "are editing.\n You can also select the Print " + "command from the File menu.") - Qt::WhatsThis.add( filePrint, filePrintText ) + TQt::WhatsThis.add( filePrint, filePrintText ) - file = Qt::PopupMenu.new( self ) + file = TQt::PopupMenu.new( self ) menuBar().insertItem( tr("&File"), file ) - file.insertItem( tr("&New"), self, SLOT('newDoc()'), Qt::KeySequence.new(CTRL+Key_N) ) + file.insertItem( tr("&New"), self, SLOT('newDoc()'), TQt::KeySequence.new(CTRL+Key_N) ) - id = file.insertItem( Qt::IconSet.new(openIcon), tr("&Open..."), - self, SLOT('choose()'), Qt::KeySequence.new(CTRL+Key_O) ) + id = file.insertItem( TQt::IconSet.new(openIcon), tr("&Open..."), + self, SLOT('choose()'), TQt::KeySequence.new(CTRL+Key_O) ) file.setWhatsThis( id, fileOpenText ) - id = file.insertItem( Qt::IconSet.new(saveIcon), tr("&Save"), - self, SLOT('save()'), Qt::KeySequence.new(CTRL+Key_S) ) + id = file.insertItem( TQt::IconSet.new(saveIcon), tr("&Save"), + self, SLOT('save()'), TQt::KeySequence.new(CTRL+Key_S) ) file.setWhatsThis( id, fileSaveText ) id = file.insertItem( tr("Save &As..."), self, SLOT('saveAs()') ) @@ -73,27 +73,27 @@ class %{APPNAMESC} < Qt::MainWindow file.insertSeparator() - id = file.insertItem( Qt::IconSet.new(printIcon), tr("&Print..."), - self, SLOT('print()'), Qt::KeySequence.new(CTRL+Key_P) ) + id = file.insertItem( TQt::IconSet.new(printIcon), tr("&Print..."), + self, SLOT('print()'), TQt::KeySequence.new(CTRL+Key_P) ) file.setWhatsThis( id, filePrintText ) file.insertSeparator() - file.insertItem( tr("&Close"), self, SLOT('close()'), Qt::KeySequence.new(CTRL+Key_W) ) + file.insertItem( tr("&Close"), self, SLOT('close()'), TQt::KeySequence.new(CTRL+Key_W) ) - file.insertItem( tr("&Quit"), $tqApp, SLOT( 'closeAllWindows()' ), Qt::KeySequence.new(CTRL+Key_Q) ) + file.insertItem( tr("&Quit"), $tqApp, SLOT( 'closeAllWindows()' ), TQt::KeySequence.new(CTRL+Key_Q) ) menuBar().insertSeparator() - help = Qt::PopupMenu.new( self ) + help = TQt::PopupMenu.new( self ) menuBar().insertItem( tr("&Help"), help ) - help.insertItem( tr("&About"), self, SLOT('about()'), Qt::KeySequence.new(Key_F1) ) + help.insertItem( tr("&About"), self, SLOT('about()'), TQt::KeySequence.new(Key_F1) ) help.insertItem( tr("About &Qt"), self, SLOT('aboutQt()') ) help.insertSeparator() - help.insertItem( tr("What's &This"), self, SLOT('whatsThis()'), Qt::KeySequence.new(SHIFT+Key_F1) ) + help.insertItem( tr("What's &This"), self, SLOT('whatsThis()'), TQt::KeySequence.new(SHIFT+Key_F1) ) - @e = Qt::TextEdit.new( self, "editor" ) + @e = TQt::TextEdit.new( self, "editor" ) @e.setFocus() setCentralWidget( @e ) statusBar().message( tr("Ready"), 2000 ) @@ -110,7 +110,7 @@ class %{APPNAMESC} < Qt::MainWindow end def choose() - fn = Qt::FileDialog.getOpenFileName( nil, nil, + fn = TQt::FileDialog.getOpenFileName( nil, nil, self) if !fn.nil? load( fn ) @@ -121,12 +121,12 @@ class %{APPNAMESC} < Qt::MainWindow def load( filename ) - f = Qt::File.new( filename ) - if !f.open( Qt::IO_ReadOnly ) + f = TQt::File.new( filename ) + if !f.open( TQt::IO_ReadOnly ) return end - ts = Qt::TextStream.new( f ) + ts = TQt::TextStream.new( f ) @e.setText( ts.read() ) @e.setModified( false ) setCaption( filename ) @@ -141,14 +141,14 @@ class %{APPNAMESC} < Qt::MainWindow end text = @e.text() - f = Qt::File.new( @filename ) - if !f.open( Qt::IO_WriteOnly ) + f = TQt::File.new( @filename ) + if !f.open( TQt::IO_WriteOnly ) statusBar().message( tr("Could not write to %s" % @filename), 2000 ) return end - t = Qt::TextStream.new( f ) + t = TQt::TextStream.new( f ) t << text f.close() @@ -161,7 +161,7 @@ class %{APPNAMESC} < Qt::MainWindow def saveAs() - fn = Qt::FileDialog.getSaveFileName( nil, nil, + fn = TQt::FileDialog.getSaveFileName( nil, nil, self ) if !fn.nil? @filename = fn @@ -173,13 +173,13 @@ class %{APPNAMESC} < Qt::MainWindow def print() - # ###### Rewrite to use Qt::SimpleRichText to print here as well + # ###### Rewrite to use TQt::SimpleRichText to print here as well margin = 10 pageNo = 1 if @printer.setup(self) # @printer dialog statusBar().message( tr("Printing...") ) - p = Qt::Painter.new + p = TQt::Painter.new if !p.begin( @printer ) # paint on @printer return end @@ -187,7 +187,7 @@ class %{APPNAMESC} < Qt::MainWindow p.setFont( @e.font() ) yPos = 0 # y-position for each line fm = p.fontMetrics() - metrics = Qt::PaintDeviceMetrics.new( @printer ) # need width/height + metrics = TQt::PaintDeviceMetrics.new( @printer ) # need width/height # of @printer surface for i in 0...@e.lines() do if margin + yPos > metrics.height() - margin @@ -220,7 +220,7 @@ class %{APPNAMESC} < Qt::MainWindow return end - case Qt::MessageBox.information( self, tr("Qt Application Example"), + case TQt::MessageBox.information( self, tr("Qt Application Example"), tr("Do you want to save the changes" + " to the document?"), tr("Yes"), tr("No"), tr("Cancel"), @@ -240,14 +240,14 @@ class %{APPNAMESC} < Qt::MainWindow private def about() - Qt::MessageBox.about( self, tr("Qt Application Example"), + TQt::MessageBox.about( self, tr("Qt Application Example"), tr("This example demonstrates simple use of " + - "Qt::MainWindow,\nQt::MenuBar and Qt::ToolBar.")) + "TQt::MainWindow,\nTQt::MenuBar and TQt::ToolBar.")) end def aboutQt() - Qt::MessageBox.aboutQt( self, tr("Qt Application Example") ) + TQt::MessageBox.aboutQt( self, tr("Qt Application Example") ) end end diff --git a/languages/ruby/debugger/dbgpsdlg.cpp b/languages/ruby/debugger/dbgpsdlg.cpp index 2aa67f51..b012f0be 100644 --- a/languages/ruby/debugger/dbgpsdlg.cpp +++ b/languages/ruby/debugger/dbgpsdlg.cpp @@ -71,7 +71,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) topLayout->addWidget(pids_, 5); pids_->setFont(TDEGlobalSettings::fixedFont()); - KButtonBox *buttonbox = new KButtonBox(this, Qt::Horizontal, 5); + KButtonBox *buttonbox = new KButtonBox(this, TQt::Horizontal, 5); TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); buttonbox->addStretch(); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index 670ee9b4..07c0b415 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -113,7 +113,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) if (moving_) return; - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { TDEPopupMenu *menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), @@ -232,13 +232,13 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e) return; switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: { // Not really a click, but it'll hold for the time being !!! emit clicked(); break; } - case Qt::RightButton: + case TQt::RightButton: { TDEPopupMenu* menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); diff --git a/languages/ruby/debugger/debuggee.rb b/languages/ruby/debugger/debuggee.rb index 38e2dea7..75491f7d 100644 --- a/languages/ruby/debugger/debuggee.rb +++ b/languages/ruby/debugger/debuggee.rb @@ -269,7 +269,7 @@ class Context for c in ary str = debug_inspect(obj.module_eval(c)) if c.to_s != str && - str !~ /^Qt::|^KDE::/ && c.to_s !~ /@@classes$|@@cpp_names$|@@idclass$|@@debug_level$/ && + str !~ /^TQt::|^KDE::/ && c.to_s !~ /@@classes$|@@cpp_names$|@@idclass$|@@debug_level$/ && c.to_s !~ /^DCOPMeta$|^Meta$|SCRIPT_LINES__|TRUE|FALSE|NIL|MatchingData/ && c.to_s !~ /^PLATFORM$|^RELEASE_DATE$|^VERSION$|SilentClient|SilentObject/ && c.to_s !~ /^Client$|^Context$|^DEBUG_LAST_CMD$|^MUTEX$|^Mutex$|^SimpleDelegater$|^Delegater$/ && diff --git a/languages/ruby/debugger/rdbbreakpointwidget.cpp b/languages/ruby/debugger/rdbbreakpointwidget.cpp index f8e86ad7..0c1fea0b 100644 --- a/languages/ruby/debugger/rdbbreakpointwidget.cpp +++ b/languages/ruby/debugger/rdbbreakpointwidget.cpp @@ -634,7 +634,7 @@ void RDBBreakpointWidget::slotRemoveAllBreakpoints() void RDBBreakpointWidget::slotRowDoubleClicked(int row, int col, int btn, const TQPoint &) { - if ( btn == Qt::LeftButton ) + if ( btn == TQt::LeftButton ) { // kdDebug(9012) << "in slotRowSelected row=" << row << endl; BreakpointTableRow* btr = (BreakpointTableRow *) m_table->item(row, Control); diff --git a/lib/interfaces/kdevlanguagesupport.cpp b/lib/interfaces/kdevlanguagesupport.cpp index aa5b560c..a5609cf9 100644 --- a/lib/interfaces/kdevlanguagesupport.cpp +++ b/lib/interfaces/kdevlanguagesupport.cpp @@ -68,9 +68,9 @@ bool KDevLanguageSupport::shouldSplitDocument(const KURL &url) return false; } -Qt::Orientation KDevLanguageSupport::splitOrientation() const +TQt::Orientation KDevLanguageSupport::splitOrientation() const { - return Qt::Vertical; + return TQt::Vertical; } void KDevLanguageSupport::addClass() diff --git a/lib/interfaces/kdevlanguagesupport.h b/lib/interfaces/kdevlanguagesupport.h index f65dcefe..59b160b2 100644 --- a/lib/interfaces/kdevlanguagesupport.h +++ b/lib/interfaces/kdevlanguagesupport.h @@ -135,8 +135,8 @@ public: virtual bool shouldSplitDocument( const KURL &url ); /**Returns the language parts Split View orientation. - By default Qt::Vertical.*/ - virtual Qt::Orientation splitOrientation() const; + By default TQt::Vertical.*/ + virtual TQt::Orientation splitOrientation() const; /**Opens a "New class" dialog and adds the configured class to the sources. Define NewClass feature if you reimplement this method.*/ @@ -255,7 +255,7 @@ signals: void addedSourceInfo( const TQString& fileName ); /**Emitted when the language part changes the Split View orientation.*/ - void splitOrientationChanged( Qt::Orientation orientation ); + void splitOrientationChanged( TQt::Orientation orientation ); }; #endif diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp index cadff807..75682116 100644 --- a/lib/widgets/kdevtabwidget.cpp +++ b/lib/widgets/kdevtabwidget.cpp @@ -50,7 +50,7 @@ void KTabBar::closeOthersSlot() void KTabBar::mousePressEvent(TQMouseEvent *e) { - if(e->button() == Qt::RightButton) { + if(e->button() == TQt::RightButton) { TQTab *tab = selectTab(e->pos() ); if( tab == 0L ) return; diff --git a/lib/widgets/propeditor/pdateedit.cpp b/lib/widgets/propeditor/pdateedit.cpp index ed83dbb2..113ec325 100644 --- a/lib/widgets/propeditor/pdateedit.cpp +++ b/lib/widgets/propeditor/pdateedit.cpp @@ -46,7 +46,7 @@ void PDateEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDate().toString(Qt::LocalDate)); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDate().toString(TQt::LocalDate)); } void PDateEdit::setValue(const TQVariant& value, bool emitChange) diff --git a/lib/widgets/propeditor/pdatetimeedit.cpp b/lib/widgets/propeditor/pdatetimeedit.cpp index 3b8993d3..55a0bdcc 100644 --- a/lib/widgets/propeditor/pdatetimeedit.cpp +++ b/lib/widgets/propeditor/pdatetimeedit.cpp @@ -45,7 +45,7 @@ void PDateTimeEdit::drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRec p->setPen(TQt::NoPen); p->setBrush(cg.background()); p->drawRect(r); - p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDateTime().toString(Qt::LocalDate)); + p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, value.toDateTime().toString(TQt::LocalDate)); } void PDateTimeEdit::setValue(const TQVariant& value, bool emitChange) diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp index 9e564326..1d959d13 100644 --- a/lib/widgets/qcomboview.cpp +++ b/lib/widgets/qcomboview.cpp @@ -466,7 +466,7 @@ void QComboView::paintEvent( TQPaintEvent * ) void QComboView::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; if ( d->discardNextMousePress ) { d->discardNextMousePress = FALSE; @@ -917,7 +917,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event ) } } } - } else if ((e->state() & ( Qt::RightButton | Qt::LeftButton | Qt::MidButton ) ) == 0 && + } else if ((e->state() & ( TQt::RightButton | TQt::LeftButton | TQt::MidButton ) ) == 0 && style().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) { // tqWarning("event filter:: emu"); TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), TRUE ); diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp index c8761861..32d05059 100644 --- a/parts/classview/hierarchydlg.cpp +++ b/parts/classview/hierarchydlg.cpp @@ -51,7 +51,7 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part ) TQPushButton *save_button = new KPushButton(KStdGuiItem::save(), this); TQPushButton *refresh_button = new KPushButton(i18n("Refresh"), this); - TQSplitter *splitter = new TQSplitter(Qt::Vertical, this); + TQSplitter *splitter = new TQSplitter(TQt::Vertical, this); digraph = new DigraphView(splitter, "digraph view"); // member_tree = new ClassToolWidget(part, splitter); diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp index b9b54d97..4225e83a 100644 --- a/parts/ctags2/ctags2_widget.cpp +++ b/parts/ctags2/ctags2_widget.cpp @@ -148,7 +148,7 @@ void CTags2Widget::updateDBDateLabel( ) TQFileInfo tagsdb(tagFiles[0]); if ( tagsdb.exists() ) { - datetime_label->setText( tagsdb.created().date().toString( Qt::ISODate ) ); + datetime_label->setText( tagsdb.created().date().toString( TQt::ISODate ) ); } else { diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp index f626e246..4ec63094 100644 --- a/parts/documentation/bookmarkview.cpp +++ b/parts/documentation/bookmarkview.cpp @@ -268,7 +268,7 @@ void BookmarkView::addBookmark(const TQString &title, const KURL &url) void BookmarkView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp index 3707f318..3c07369c 100644 --- a/parts/documentation/contentsview.cpp +++ b/parts/documentation/contentsview.cpp @@ -73,7 +73,7 @@ void ContentsView::itemExecuted(TQListViewItem *item, const TQPoint &/*p*/, int void ContentsView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index ebddcd4c..85365f69 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -75,7 +75,7 @@ FindDocumentation::~FindDocumentation() void FindDocumentation::buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp index 1b2e67ba..f414e288 100644 --- a/parts/documentation/indexview.cpp +++ b/parts/documentation/indexview.cpp @@ -162,7 +162,7 @@ bool IndexView::eventFilter(TQObject *watched, TQEvent *e) void IndexView::itemMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &pos) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; IndexItem *docItem = dynamic_cast<IndexItem*>(item); if (!docItem) diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index 67dca0ed..080254ae 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -303,7 +303,7 @@ void SearchView::executed(TQListViewItem *item) void SearchView::itemMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int // c ) { - if ((button != Qt::RightButton) || (!item)) + if ((button != TQt::RightButton) || (!item)) return; DocumentationItem *docItem = dynamic_cast<DocumentationItem*>(item); if (!docItem) diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index e9b277f2..4925ec72 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -585,7 +585,7 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect lo->setSpacing( spacing ); // Toolbar - a lot for a little... - TQGroupBox *gbToolbar = new TQGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this ); + TQGroupBox *gbToolbar = new TQGroupBox( 1, TQt::Vertical, i18n("Toolbar"), this ); acSel = new TDEActionSelector( gbToolbar ); acSel->setAvailableLabel( i18n("A&vailable actions:") ); acSel->setSelectedLabel( i18n("S&elected actions:") ); @@ -596,7 +596,7 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect connect( acSel, TQT_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQT_SLOT( slotChanged() ) ); // Sync - TQGroupBox *gbSync = new TQGroupBox( 1, Qt::Horizontal, i18n("Auto Synchronization"), this ); + TQGroupBox *gbSync = new TQGroupBox( 1, TQt::Horizontal, i18n("Auto Synchronization"), this ); cbSyncActive = new TQCheckBox( i18n("When a docu&ment becomes active"), gbSync ); cbSyncOpen = new TQCheckBox( i18n("When a document is o&pened"), gbSync ); cbSyncShow = new TQCheckBox( i18n("When the file selector becomes visible"), gbSync ); @@ -621,7 +621,7 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect connect( sbFilterHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); // Session - TQGroupBox *gbSession = new TQGroupBox( 1, Qt::Horizontal, i18n("Session"), this ); + TQGroupBox *gbSession = new TQGroupBox( 1, TQt::Horizontal, i18n("Session"), this ); cbSesLocation = new TQCheckBox( i18n("Restore loca&tion"), gbSession ); cbSesFilter = new TQCheckBox( i18n("Restore last f&ilter"), gbSession ); lo->addWidget( gbSession ); diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 029efdc6..78b3a386 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -389,7 +389,7 @@ void MakeWidget::prevError() void MakeWidget::contentsMouseReleaseEvent( TQMouseEvent* e ) { TQTextEdit::contentsMouseReleaseEvent(e); - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; searchItem(paragraphAt(e->pos())); } diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp index a85b0818..7a797414 100644 --- a/parts/replace/replaceview.cpp +++ b/parts/replace/replaceview.cpp @@ -112,11 +112,11 @@ void ReplaceView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& po if ( ReplaceItem * item = dynamic_cast<ReplaceItem*>( i ) ) { - if ( btn == Qt::RightButton ) + if ( btn == TQt::RightButton ) { // popup menu? } - else if ( btn == Qt::LeftButton ) + else if ( btn == TQt::LeftButton ) { // map pos to item/column and call ReplacetItem::activate(pos) item->activate( col, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(item).top() ) ); diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp index db2f0acc..c6df3310 100644 --- a/parts/texttools/texttoolswidget.cpp +++ b/parts/texttools/texttoolswidget.cpp @@ -128,7 +128,7 @@ void TextToolsWidget::slotItemPressed(int button, TQListViewItem *item) cursorIface->setCursorPosition(line, col); } - if (button == Qt::MidButton) { + if (button == TQt::MidButton) { KTextEditor::SelectionInterface *selectionIface = dynamic_cast<KTextEditor::SelectionInterface*>(rwpart); if (selectionIface) { @@ -144,7 +144,7 @@ void TextToolsWidget::slotItemPressed(int button, TQListViewItem *item) void TextToolsWidget::slotReturnPressed(TQListViewItem *item) { - slotItemPressed(Qt::LeftButton, item); + slotItemPressed(TQt::LeftButton, item); } diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp index 7a8695ff..52dd0053 100644 --- a/src/languageselectwidget.cpp +++ b/src/languageselectwidget.cpp @@ -63,7 +63,7 @@ void LanguageSelectWidget::init() TQVBoxLayout *layout = new TQVBoxLayout(this); TQGroupBox * groupBox1 = new TQGroupBox( i18n("Additional Language Support"), this ); - groupBox1->setColumnLayout(0, Qt::Vertical ); + groupBox1->setColumnLayout(0, TQt::Vertical ); groupBox1->layout()->setSpacing( 6 ); groupBox1->layout()->setMargin( 11 ); TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->layout() ); @@ -81,7 +81,7 @@ void LanguageSelectWidget::init() layout->addWidget( groupBox1 ); TQGroupBox * groupBox2 = new TQGroupBox( i18n("Description"), this ); - groupBox2->setColumnLayout(0, Qt::Vertical ); + groupBox2->setColumnLayout(0, TQt::Vertical ); groupBox2->layout()->setSpacing( 6 ); groupBox2->layout()->setMargin( 11 ); TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp index 33110d01..2ec9fd44 100644 --- a/src/multibuffer.cpp +++ b/src/multibuffer.cpp @@ -57,12 +57,12 @@ MultiBuffer::MultiBuffer( TQWidget *parent ) API::getInstance() ->languageSupport() ) { setOrientation( lang->splitOrientation() ); - connect( lang, TQT_SIGNAL( splitOrientationChanged( Qt::Orientation ) ), - this, TQT_SLOT( setOrientation( Qt::Orientation ) ) ); + connect( lang, TQT_SIGNAL( splitOrientationChanged( TQt::Orientation ) ), + this, TQT_SLOT( setOrientation( TQt::Orientation ) ) ); } else { - setOrientation( Qt::Vertical ); + setOrientation( TQt::Vertical ); } } @@ -249,7 +249,7 @@ void MultiBuffer::show() TQSplitter::show(); } -void MultiBuffer::setOrientation( Qt::Orientation orientation ) +void MultiBuffer::setOrientation( TQt::Orientation orientation ) { TQSplitter::setOrientation( orientation ); } diff --git a/src/multibuffer.h b/src/multibuffer.h index 9893a7c6..12967e34 100644 --- a/src/multibuffer.h +++ b/src/multibuffer.h @@ -67,7 +67,7 @@ public: public slots: virtual void show(); - virtual void setOrientation( Qt::Orientation ); + virtual void setOrientation( TQt::Orientation ); void activePartChanged( const KURL &url ); protected: diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp index 55fd0a9c..bc50b6f4 100644 --- a/src/newui/dmainwindow.cpp +++ b/src/newui/dmainwindow.cpp @@ -34,7 +34,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name) { loadSettings(); createToolWindows(); - m_central = new Ideal::DockSplitter(Qt::Horizontal, this); + m_central = new Ideal::DockSplitter(TQt::Horizontal, this); m_activeTabWidget = createTab(); m_central->addDock(0, 0, m_activeTabWidget); setCentralWidget(m_central); diff --git a/src/newui/docksplitter.cpp b/src/newui/docksplitter.cpp index 6cfa9445..c3ca883b 100644 --- a/src/newui/docksplitter.cpp +++ b/src/newui/docksplitter.cpp @@ -23,16 +23,16 @@ namespace Ideal { -DockSplitter::DockSplitter(Qt::Orientation orientation, TQWidget *parent, const char *name) +DockSplitter::DockSplitter(TQt::Orientation orientation, TQWidget *parent, const char *name) :TQSplitter(parent, name), m_orientation(orientation) { switch (m_orientation) { - case Qt::Horizontal: - setOrientation(Qt::Vertical); + case TQt::Horizontal: + setOrientation(TQt::Vertical); break; - case Qt::Vertical: - setOrientation(Qt::Horizontal); + case TQt::Vertical: + setOrientation(TQt::Horizontal); break; } setOpaqueResize(true); @@ -73,11 +73,11 @@ void DockSplitter::appendSplitter() { switch (m_orientation) { - case Qt::Horizontal: - m_splitters.append(new TQSplitter(Qt::Horizontal, this)); + case TQt::Horizontal: + m_splitters.append(new TQSplitter(TQt::Horizontal, this)); break; - case Qt::Vertical: - m_splitters.append(new TQSplitter(Qt::Vertical, this)); + case TQt::Vertical: + m_splitters.append(new TQSplitter(TQt::Vertical, this)); break; } m_splitters[m_splitters.size()-1]->setOpaqueResize(true); diff --git a/src/newui/docksplitter.h b/src/newui/docksplitter.h index c28153dc..1d2a2d56 100644 --- a/src/newui/docksplitter.h +++ b/src/newui/docksplitter.h @@ -34,7 +34,7 @@ class DockSplitter: public TQSplitter { TQ_OBJECT public: - DockSplitter(Qt::Orientation orientation, TQWidget *parent = 0, const char *name = 0); + DockSplitter(TQt::Orientation orientation, TQWidget *parent = 0, const char *name = 0); ~DockSplitter(); void addDock(uint row, uint col, TQWidget *dock); @@ -53,7 +53,7 @@ protected: bool isRowEmpty(int row); private: - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; TQValueList<TQSplitter*> m_splitters; TQValueList<TQValueList<TQWidget*> > m_docks; }; diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp index e044db54..1b23e973 100644 --- a/vcs/cvsservice/annotatepage.cpp +++ b/vcs/cvsservice/annotatepage.cpp @@ -227,7 +227,7 @@ void AnnotatePage::parseAnnotateOutput(TQStringList& lines) //so we pass it as TQDateTime to the AnnotateView below TQString dateString = line.mid(23, 9); if( !dateString.isEmpty() ) - logDate.setTime_t(KRFCDate::parseDate(dateString), Qt::UTC); + logDate.setTime_t(KRFCDate::parseDate(dateString), TQt::UTC); rev = line.left(13).stripWhiteSpace(); author = line.mid(14, 8).stripWhiteSpace(); diff --git a/vcs/cvsservice/cvsentry.cpp b/vcs/cvsservice/cvsentry.cpp index 79f83deb..c30e15a8 100644 --- a/vcs/cvsservice/cvsentry.cpp +++ b/vcs/cvsservice/cvsentry.cpp @@ -97,7 +97,7 @@ void CVSEntry::parse( const TQString &aLine, const CVSDir& dir ) { TQDateTime date( TQDateTime::fromString( timeStamp() ) ); TQDateTime fileDateUTC; - fileDateUTC.setTime_t( TQFileInfo(dir, fileName()).lastModified().toTime_t(), Qt::UTC ); + fileDateUTC.setTime_t( TQFileInfo(dir, fileName()).lastModified().toTime_t(), TQt::UTC ); if ( date != fileDateUTC ) m_state = Modified; } diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp index dd5d5720..ebf5f438 100644 --- a/vcs/subversion/svn_logviewwidget.cpp +++ b/vcs/subversion/svn_logviewwidget.cpp @@ -44,7 +44,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) m_layout = new TQGridLayout( this, 1, 1, 11, 6, "SvnLogViewWidgetBaseLayout"); splitter1 = new TQSplitter( this, "splitter1" ); - splitter1->setOrientation( Qt::Horizontal ); + splitter1->setOrientation( TQt::Horizontal ); splitter1->setMargin(1); listView1 = new TQListView( splitter1, "listView1" ); |