From bcee6c3261309f13cf2ca0ad1d9ddc8ee5624d7a Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 6 Nov 2023 11:38:51 +0900 Subject: Replace Qt with TQt Signed-off-by: Michele Calgaro (cherry picked from commit c8e3d1d47df0efdc66fe6b96f8b1c78a2cb18ee6) --- kig/filters/cabri-filter.cpp | 6 +++--- kig/filters/drgeo-filter.cpp | 4 ++-- kig/filters/latexexporter.cpp | 8 ++++---- kig/filters/native-filter.cpp | 2 +- kig/kig/kig_view.cpp | 26 +++++++++++++------------- kig/misc/kigpainter.cpp | 20 ++++++++++---------- kig/misc/kigpainter.h | 8 ++++---- kig/misc/object_constructor.cpp | 2 +- kig/misc/special_constructors.cpp | 8 ++++---- kig/modes/popup.cpp | 14 +++++++------- kig/objects/object_drawer.cpp | 24 ++++++++++++------------ kig/objects/object_drawer.h | 10 +++++----- 12 files changed, 66 insertions(+), 66 deletions(-) (limited to 'kig') diff --git a/kig/filters/cabri-filter.cpp b/kig/filters/cabri-filter.cpp index 0a94f140..f65a0138 100644 --- a/kig/filters/cabri-filter.cpp +++ b/kig/filters/cabri-filter.cpp @@ -343,12 +343,12 @@ KigDocument* KigFilterCabri::load( const TQString& file ) return 0; // reading linestyle - Qt::PenStyle ls = Qt::SolidLine; + TQt::PenStyle ls = TQt::SolidLine; if ( ( obj.lineSegLength > 1 ) && ( obj.lineSegLength < 6 ) && ( obj.lineSegSplit > 1 ) && ( obj.lineSegSplit <= 10 ) ) - ls = Qt::DotLine; + ls = TQt::DotLine; else if ( ( obj.lineSegLength >= 6 ) && ( obj.lineSegSplit > 10 ) ) - ls = Qt::DashLine; + ls = TQt::DashLine; int ps = 0; args.clear(); diff --git a/kig/filters/drgeo-filter.cpp b/kig/filters/drgeo-filter.cpp index 9742fcf5..1c904c3e 100644 --- a/kig/filters/drgeo-filter.cpp +++ b/kig/filters/drgeo-filter.cpp @@ -729,7 +729,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co // Normal -> the medium // Thick -> the biggest one int w = -1; - Qt::PenStyle s = Qt::SolidLine; + TQt::PenStyle s = TQt::SolidLine; if ( domelem.tagName() == "point" ) { if ( domelem.attribute( "thickness" ) == "Normal" ) @@ -740,7 +740,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co else { if ( domelem.attribute( "thickness" ) == "Dashed" ) - s = Qt::DotLine; + s = TQt::DotLine; if ( domelem.attribute( "thickness" ) == "Thick" ) w = 2; } diff --git a/kig/filters/latexexporter.cpp b/kig/filters/latexexporter.cpp index 622a1a49..bbf6144a 100644 --- a/kig/filters/latexexporter.cpp +++ b/kig/filters/latexexporter.cpp @@ -126,7 +126,7 @@ private: * Draws a line (segment) or a vector if vector is true. */ void emitLine( const Coordinate& a, const Coordinate& b, const int width, - const Qt::PenStyle s, bool vector = false ); + const TQt::PenStyle s, bool vector = false ); /** * Sends a new line character ( \n ) to stream. */ @@ -144,7 +144,7 @@ private: /** * Converts a pen style into latex style string. */ - TQString writeStyle( Qt::PenStyle style ); + TQString writeStyle( TQt::PenStyle style ); /** * Plots a generic curve though its points calc'ed with getPoint. */ @@ -157,7 +157,7 @@ void LatexExportImpVisitor::emitCoord( const Coordinate& c ) } void LatexExportImpVisitor::emitLine( const Coordinate& a, const Coordinate& b, - const int width, const Qt::PenStyle s, + const int width, const TQt::PenStyle s, bool vector ) { mstream << "\\psline[linecolor=" << mcurcolorid << ",linewidth=" << width / 100.0 @@ -210,7 +210,7 @@ double LatexExportImpVisitor::dimRealToCoord( int dim ) return fabs( r.width() ); } -TQString LatexExportImpVisitor::writeStyle( Qt::PenStyle style ) +TQString LatexExportImpVisitor::writeStyle( TQt::PenStyle style ) { TQString ret( "linestyle=" ); if ( style == TQt::DashLine ) diff --git a/kig/filters/native-filter.cpp b/kig/filters/native-filter.cpp index cf6521b2..e18f26bb 100644 --- a/kig/filters/native-filter.cpp +++ b/kig/filters/native-filter.cpp @@ -536,7 +536,7 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement& if ( ! ok ) width = -1; tmp = e.attribute( "style" ); - Qt::PenStyle style = ObjectDrawer::styleFromString( tmp ); + TQt::PenStyle style = ObjectDrawer::styleFromString( tmp ); tmp = e.attribute( "point-style" ); int pointstyle = ObjectDrawer::pointStyleFromString( tmp ); diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp index f55f23f3..59df9d79 100644 --- a/kig/kig/kig_view.cpp +++ b/kig/kig/kig_view.cpp @@ -89,32 +89,32 @@ void KigWidget::paintEvent(TQPaintEvent*) void KigWidget::mousePressEvent (TQMouseEvent* e) { - if( e->button() & Qt::LeftButton ) + if( e->button() & TQt::LeftButton ) return mpart->mode()->leftClicked( e, this ); - if ( e->button() & Qt::MidButton ) + if ( e->button() & TQt::MidButton ) return mpart->mode()->midClicked( e, this ); - if ( e->button() & Qt::RightButton ) + if ( e->button() & TQt::RightButton ) return mpart->mode()->rightClicked( e, this ); } void KigWidget::mouseMoveEvent (TQMouseEvent* e) { - if( e->state() & Qt::LeftButton ) + if( e->state() & TQt::LeftButton ) return mpart->mode()->leftMouseMoved( e, this ); - if ( e->state() & Qt::MidButton ) + if ( e->state() & TQt::MidButton ) return mpart->mode()->midMouseMoved( e, this ); - if ( e->state() & Qt::RightButton ) + if ( e->state() & TQt::RightButton ) return mpart->mode()->rightMouseMoved( e, this ); return mpart->mode()->mouseMoved( e, this ); } void KigWidget::mouseReleaseEvent (TQMouseEvent* e) { - if( e->state() & Qt::LeftButton ) + if( e->state() & TQt::LeftButton ) return mpart->mode()->leftReleased( e, this ); - if ( e->state() & Qt::MidButton ) + if ( e->state() & TQt::MidButton ) return mpart->mode()->midReleased( e, this ); - if ( e->state() & Qt::RightButton ) + if ( e->state() & TQt::RightButton ) return mpart->mode()->rightReleased( e, this ); } @@ -297,14 +297,14 @@ KigView::KigView( KigPart* part, connect( part, TQT_SIGNAL( recenterScreen() ), this, TQT_SLOT( slotInternalRecenterScreen() ) ); mlayout = new TQGridLayout( this, 2, 2 ); - mrightscroll = new TQScrollBar(Qt::Vertical, this, "Right Scrollbar" ); + mrightscroll = new TQScrollBar(TQt::Vertical, this, "Right Scrollbar" ); // TODO: make this configurable... mrightscroll->setTracking( true ); connect( mrightscroll, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotRightScrollValueChanged( int ) ) ); connect( mrightscroll, TQT_SIGNAL( sliderReleased() ), this, TQT_SLOT( updateScrollBars() ) ); - mbottomscroll = new TQScrollBar(Qt::Horizontal, this, "Bottom Scrollbar" ); + mbottomscroll = new TQScrollBar(TQt::Horizontal, this, "Bottom Scrollbar" ); connect( mbottomscroll, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotBottomScrollValueChanged( int ) ) ); connect( mbottomscroll, TQT_SIGNAL( sliderReleased() ), @@ -451,8 +451,8 @@ TQSize KigWidget::sizeHint() const void KigWidget::wheelEvent( TQWheelEvent* e ) { int delta = e->delta(); - Qt::Orientation orient = e->orientation(); - if ( orient == Qt::Vertical ) + TQt::Orientation orient = e->orientation(); + if ( orient == TQt::Vertical ) mview->scrollVertical( delta ); else mview->scrollHorizontal( delta ); diff --git a/kig/misc/kigpainter.cpp b/kig/misc/kigpainter.cpp index 4b3ede2e..cbaf57be 100644 --- a/kig/misc/kigpainter.cpp +++ b/kig/misc/kigpainter.cpp @@ -43,10 +43,10 @@ KigPainter::KigPainter( const ScreenInfo& si, TQPaintDevice* device, const KigDocument& doc, bool no ) : mP ( device ), color( TQt::blue ), - style( Qt::SolidLine ), + style( TQt::SolidLine ), pointstyle( 0 ), width( -1 ), - brushStyle( Qt::NoBrush ), + brushStyle( TQt::NoBrush ), brushColor( TQt::blue ), mdoc( doc ), msi( si ), @@ -101,7 +101,7 @@ void KigPainter::drawFatPoint( const Coordinate& p ) case 0: { double radius = twidth * pixelWidth(); - setBrushStyle( Qt::SolidPattern ); + setBrushStyle( TQt::SolidPattern ); Coordinate rad( radius, radius ); rad /= 2; Coordinate tl = p - rad; @@ -115,7 +115,7 @@ void KigPainter::drawFatPoint( const Coordinate& p ) case 1: { double radius = twidth * pixelWidth(); - setBrushStyle( Qt::NoBrush ); + setBrushStyle( TQt::NoBrush ); Coordinate rad( radius, radius ); rad /= 2; Coordinate tl = p - rad; @@ -218,7 +218,7 @@ void KigPainter::setColor( const TQColor& c ) mP.setPen( TQPen( color, width == -1 ? 1 : width, style ) ); } -void KigPainter::setStyle( const Qt::PenStyle c ) +void KigPainter::setStyle( const TQt::PenStyle c ) { style = c; mP.setPen( TQPen( color, width == -1 ? 1 : width, style ) ); @@ -251,7 +251,7 @@ void KigPainter::setBrush( const TQBrush& b ) mP.setBrush( b ); } -void KigPainter::setBrushStyle( const Qt::BrushStyle c ) +void KigPainter::setBrushStyle( const TQt::BrushStyle c ) { brushStyle = c; mP.setBrush( TQBrush( brushColor, brushStyle ) ); @@ -291,7 +291,7 @@ void KigPainter::drawPolygon( const std::vector& pts, TQPen oldpen = mP.pen(); TQBrush oldbrush = mP.brush(); setBrush( TQBrush( color, Dense4Pattern ) ); - setPen( Qt::NoPen ); + setPen( TQt::NoPen ); // i know this isn't really fast, but i blame it all on TQt with its // stupid container classes... what's wrong with the STL ? TQPointArray t( pts.size() ); @@ -314,7 +314,7 @@ void KigPainter::drawArea( const std::vector& pts, bool border ) if ( border ) setPen( TQPen( color, width == -1 ? 1 : width ) ); else - setPen( Qt::NoPen ); + setPen( TQt::NoPen ); TQPointArray t( pts.size() ); int c = 0; for( std::vector::const_iterator i = pts.begin(); i != pts.end(); ++i ) @@ -512,7 +512,7 @@ void KigPainter::drawTextStd( const TQPoint& p, const TQString& s ) int tf = AlignLeft | AlignTop | DontClip | WordBreak; // we need the rect where we're going to paint text setPen(TQPen(TQt::blue, 1, SolidLine)); - setBrush(Qt::NoBrush); + setBrush(TQt::NoBrush); drawText( Rect( msi.fromScreen(p), window().bottomRight() ).normalized(), s, tf ); @@ -643,7 +643,7 @@ void KigPainter::drawAngle( const Coordinate& cpoint, const double dstartangle, // arrow.push_back( end + orthvect + vect ); // arrow.push_back( end + orthvect - vect ); - setBrushStyle( Qt::SolidPattern ); + setBrushStyle( TQt::SolidPattern ); // drawPolygon( arrow ); mP.drawPolygon( arrow, false, 0, -1 ); diff --git a/kig/misc/kigpainter.h b/kig/misc/kigpainter.h index ee3b14c1..60ce119f 100644 --- a/kig/misc/kigpainter.h +++ b/kig/misc/kigpainter.h @@ -59,10 +59,10 @@ protected: mutable TQPainter mP; TQColor color; - Qt::PenStyle style; + TQt::PenStyle style; int pointstyle; int width; - Qt::BrushStyle brushStyle; + TQt::BrushStyle brushStyle; TQColor brushColor; const KigDocument& mdoc; @@ -94,7 +94,7 @@ public: Rect fromScreen( const TQRect& r ) const; // colors and stuff... - void setStyle( const Qt::PenStyle c ); + void setStyle( const TQt::PenStyle c ); void setColor( const TQColor& c ); /** * setting this to -1 means to use the default width for the object @@ -103,7 +103,7 @@ public: void setWidth( const int c ); void setPointStyle( const int p ); void setPen( const TQPen& p ); - void setBrushStyle( const Qt::BrushStyle c ); + void setBrushStyle( const TQt::BrushStyle c ); void setBrush( const TQBrush& b ); void setBrushColor( const TQColor& c ); diff --git a/kig/misc/object_constructor.cpp b/kig/misc/object_constructor.cpp index ae2a37d0..625554a8 100644 --- a/kig/misc/object_constructor.cpp +++ b/kig/misc/object_constructor.cpp @@ -101,7 +101,7 @@ void StandardConstructorBase::handlePrelim( { assert ( margsparser.check( os ) != ArgsParser::Invalid ); std::vector args = margsparser.parse( os ); - p.setBrushStyle( Qt::NoBrush ); + p.setBrushStyle( TQt::NoBrush ); p.setBrushColor( TQt::red ); p.setPen( TQPen ( TQt::red, 1) ); p.setWidth( -1 ); // -1 means the default width for the object being diff --git a/kig/misc/special_constructors.cpp b/kig/misc/special_constructors.cpp index 9618bc90..1cc27ecb 100644 --- a/kig/misc/special_constructors.cpp +++ b/kig/misc/special_constructors.cpp @@ -349,7 +349,7 @@ void PolygonBNPTypeConstructor::handlePrelim( } std::vector args = os; - p.setBrushStyle( Qt::NoBrush ); + p.setBrushStyle( TQt::NoBrush ); p.setBrushColor( TQt::red ); p.setPen( TQPen ( TQt::red, 1) ); p.setWidth( -1 ); // -1 means the default width for the object being @@ -658,7 +658,7 @@ void PolygonBCVConstructor::handlePrelim( args.push_back( ns ); } - p.setBrushStyle( Qt::NoBrush ); + p.setBrushStyle( TQt::NoBrush ); p.setBrushColor( TQt::red ); p.setPen( TQPen ( TQt::red, 1) ); p.setWidth( -1 ); // -1 means the default width for the object being @@ -685,7 +685,7 @@ void PolygonBCVConstructor::handlePrelim( text = TextImp( TQString( "(%1)" ).arg(i), where, false ); text.draw( p ); } - p.setStyle( Qt::DotLine ); + p.setStyle( TQt::DotLine ); p.setWidth( 1 ); double radius = ( v - c ).length(); CircleImp circle = CircleImp( c, radius ); @@ -1178,7 +1178,7 @@ void MeasureTransportConstructor::handlePrelim( const KigDocument& d, const KigWidget& ) const { - p.setBrushStyle( Qt::NoBrush ); + p.setBrushStyle( TQt::NoBrush ); p.setBrushColor( TQt::red ); p.setPen( TQPen ( TQt::red, 1) ); p.setWidth( -1 ); // -1 means the default width for the object being diff --git a/kig/modes/popup.cpp b/kig/modes/popup.cpp index 05dc5d24..c11df7ae 100644 --- a/kig/modes/popup.cpp +++ b/kig/modes/popup.cpp @@ -472,21 +472,21 @@ void BuiltinObjectActionsProvider::fillUpMenu( NormalModePopupObjects& popup, in ScreenInfo si( Rect( -1, -1, 2, 2 ), p.rect() ); KigPainter ptr( si, TQT_TQPAINTDEVICE(&p), popup.part().document(), false ); PointImp pt( Coordinate( 0, 0 ) ); - ObjectDrawer d( color, -1, true, Qt::SolidLine, i ); + ObjectDrawer d( color, -1, true, TQt::SolidLine, i ); d.draw( pt, ptr, false ); popup.addAction( menu, p, nextfree++ ); } else { - Qt::PenStyle penstyles[] = {Qt::SolidLine, Qt::DashLine, Qt::DashDotLine, Qt::DashDotDotLine, Qt::DotLine}; - for ( int i = 0; i < (int) ( sizeof( penstyles ) / sizeof( Qt::PenStyle ) ); ++i ) + TQt::PenStyle penstyles[] = {TQt::SolidLine, TQt::DashLine, TQt::DashDotLine, TQt::DashDotDotLine, TQt::DotLine}; + for ( int i = 0; i < (int) ( sizeof( penstyles ) / sizeof( TQt::PenStyle ) ); ++i ) { TQPixmap p( 50, 20 ); p.fill( popup.eraseColor() ); ScreenInfo si( Rect( -2.5, -1, 5, 2 ), p.rect() ); KigPainter ptr( si, TQT_TQPAINTDEVICE(&p), popup.part().document(), false ); LineImp line( Coordinate( -1, 0 ), Coordinate( 1, 0 ) ); - Qt::PenStyle ps = penstyles[i]; + TQt::PenStyle ps = penstyles[i]; ObjectDrawer d( color, -1, true, ps, 1 ); d.draw( line, ptr, false ); popup.addAction( menu, p, nextfree++ ); @@ -712,9 +712,9 @@ bool BuiltinObjectActionsProvider::executeAction( } else { - Qt::PenStyle penstyles[] = {Qt::SolidLine, Qt::DashLine, Qt::DashDotLine, Qt::DashDotDotLine, Qt::DotLine}; - assert( id < (int)( sizeof( penstyles ) / sizeof( Qt::PenStyle ) ) ); - Qt::PenStyle p = penstyles[id]; + TQt::PenStyle penstyles[] = {TQt::SolidLine, TQt::DashLine, TQt::DashDotLine, TQt::DashDotDotLine, TQt::DotLine}; + assert( id < (int)( sizeof( penstyles ) / sizeof( TQt::PenStyle ) ) ); + TQt::PenStyle p = penstyles[id]; KigCommand* kc = new KigCommand( doc, i18n( "Change Object Style" ) ); for ( std::vector::const_iterator i = os.begin(); i != os.end(); ++i ) if ( ! (*i)->imp()->inherits( PointImp::stype() ) ) diff --git a/kig/objects/object_drawer.cpp b/kig/objects/object_drawer.cpp index d6e41144..f1541f66 100644 --- a/kig/objects/object_drawer.cpp +++ b/kig/objects/object_drawer.cpp @@ -31,7 +31,7 @@ void ObjectDrawer::draw( const ObjectImp& imp, KigPainter& p, bool sel ) const bool nv = p.getNightVision( ); if ( mshown || nv ) { - p.setBrushStyle( Qt::NoBrush ); + p.setBrushStyle( TQt::NoBrush ); p.setBrushColor( sel ? TQt::red : ( mshown?mcolor:TQt::gray ) ); p.setPen( TQPen ( sel ? TQt::red : ( mshown?mcolor:TQt::gray ), 1) ); p.setWidth( mwidth ); @@ -90,7 +90,7 @@ ObjectDrawer* ObjectDrawer::getCopyWidth( int w ) const return ret; } -ObjectDrawer* ObjectDrawer::getCopyStyle( Qt::PenStyle s ) const +ObjectDrawer* ObjectDrawer::getCopyStyle( TQt::PenStyle s ) const { ObjectDrawer* ret = new ObjectDrawer; ret->mcolor = mcolor; @@ -117,7 +117,7 @@ int ObjectDrawer::width() const return mwidth; } -Qt::PenStyle ObjectDrawer::style() const +TQt::PenStyle ObjectDrawer::style() const { return mstyle; } @@ -127,13 +127,13 @@ int ObjectDrawer::pointStyle() const return mpointstyle; } -ObjectDrawer::ObjectDrawer( const TQColor& color, int width, bool shown, Qt::PenStyle style, int pointStyle ) +ObjectDrawer::ObjectDrawer( const TQColor& color, int width, bool shown, TQt::PenStyle style, int pointStyle ) : mcolor( color ), mshown( shown ), mwidth( width ), mstyle( style ), mpointstyle( pointStyle ) { } ObjectDrawer::ObjectDrawer() - : mcolor( TQt::blue ), mshown( true ), mwidth( -1 ), mstyle( Qt::SolidLine ), mpointstyle( 0 ) + : mcolor( TQt::blue ), mshown( true ), mwidth( -1 ), mstyle( TQt::SolidLine ), mpointstyle( 0 ) { } @@ -173,19 +173,19 @@ TQString ObjectDrawer::pointStyleToString() const return TQString(); } -Qt::PenStyle ObjectDrawer::styleFromString( const TQString& style ) +TQt::PenStyle ObjectDrawer::styleFromString( const TQString& style ) { if ( style == "SolidLine" ) - return Qt::SolidLine; + return TQt::SolidLine; else if ( style == "DashLine" ) - return Qt::DashLine; + return TQt::DashLine; else if ( style == "DotLine" ) - return Qt::DotLine; + return TQt::DotLine; else if ( style == "DashDotLine" ) - return Qt::DashDotLine; + return TQt::DashDotLine; else if ( style == "DashDotDotLine" ) - return Qt::DashDotDotLine; - else return Qt::SolidLine; + return TQt::DashDotDotLine; + else return TQt::SolidLine; } TQString ObjectDrawer::styleToString() const diff --git a/kig/objects/object_drawer.h b/kig/objects/object_drawer.h index cbd1374a..b5336a06 100644 --- a/kig/objects/object_drawer.h +++ b/kig/objects/object_drawer.h @@ -48,7 +48,7 @@ class ObjectDrawer TQColor mcolor; bool mshown; int mwidth; - Qt::PenStyle mstyle; + TQt::PenStyle mstyle; int mpointstyle; public: /** @@ -57,7 +57,7 @@ public: * and pointstyle ( 0 ) */ ObjectDrawer(); - ObjectDrawer( const TQColor& color, int width = -1, bool shown = true, Qt::PenStyle = Qt::SolidLine, int pointStyle = 0 ); + ObjectDrawer( const TQColor& color, int width = -1, bool shown = true, TQt::PenStyle = TQt::SolidLine, int pointStyle = 0 ); /** * Draw the object \p imp on kigpainter \p p . If \p selected is true, it is * drawn in red, otherwise in its normal color. @@ -91,7 +91,7 @@ public: /** * return PenStyle for all objects except points */ - Qt::PenStyle style() const; + TQt::PenStyle style() const; /** * return pointStyle for points */ @@ -123,7 +123,7 @@ public: * returns a new ObjectDrawer that is identical to this one.. except * that the PenStyle state is set to \p s .. */ - ObjectDrawer* getCopyStyle( Qt::PenStyle s ) const; + ObjectDrawer* getCopyStyle( TQt::PenStyle s ) const; /** * returns a new ObjectDrawer that is identical to this one.. except * that the pointStyle state is set to \p p .. @@ -140,7 +140,7 @@ public: * given \p style string is unknown. In that case it returns a default * value. */ - static Qt::PenStyle styleFromString( const TQString& style ); + static TQt::PenStyle styleFromString( const TQString& style ); }; #endif -- cgit v1.2.1