From 0a6e0958c03e41c87b15557b6f407874f20c2f8d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:39:55 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1157642 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kig/objects/object_drawer.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'kig/objects/object_drawer.cc') diff --git a/kig/objects/object_drawer.cc b/kig/objects/object_drawer.cc index 0989d4f2..f92fabe7 100644 --- a/kig/objects/object_drawer.cc +++ b/kig/objects/object_drawer.cc @@ -20,8 +20,8 @@ #include "object_imp.h" #include "../misc/kigpainter.h" -#include -#include +#include +#include #include #include @@ -33,7 +33,7 @@ void ObjectDrawer::draw( const ObjectImp& imp, KigPainter& p, bool sel ) const { p.setBrushStyle( Qt::NoBrush ); p.setBrushColor( sel ? Qt::red : ( mshown?mcolor:Qt::gray ) ); - p.setPen( QPen ( sel ? Qt::red : ( mshown?mcolor:Qt::gray ), 1) ); + p.setPen( TQPen ( sel ? Qt::red : ( mshown?mcolor:Qt::gray ), 1) ); p.setWidth( mwidth ); p.setStyle( mstyle ); p.setPointStyle( mpointstyle ); @@ -52,7 +52,7 @@ bool ObjectDrawer::shown( ) const return mshown; } -QColor ObjectDrawer::color() const +TQColor ObjectDrawer::color() const { return mcolor; } @@ -68,7 +68,7 @@ ObjectDrawer* ObjectDrawer::getCopyShown( bool s ) const return ret; } -ObjectDrawer* ObjectDrawer::getCopyColor( const QColor& c ) const +ObjectDrawer* ObjectDrawer::getCopyColor( const TQColor& c ) const { ObjectDrawer* ret = new ObjectDrawer; ret->mcolor = c; @@ -127,7 +127,7 @@ int ObjectDrawer::pointStyle() const return mpointstyle; } -ObjectDrawer::ObjectDrawer( const QColor& color, int width, bool shown, Qt::PenStyle style, int pointStyle ) +ObjectDrawer::ObjectDrawer( const TQColor& color, int width, bool shown, Qt::PenStyle style, int pointStyle ) : mcolor( color ), mshown( shown ), mwidth( width ), mstyle( style ), mpointstyle( pointStyle ) { } @@ -142,7 +142,7 @@ bool ObjectDrawer::inRect( const ObjectImp& imp, const Rect& r, const KigWidget& return mshown && imp.inRect( r, mwidth, w ); } -int ObjectDrawer::pointStyleFromString( const QString& style ) +int ObjectDrawer::pointStyleFromString( const TQString& style ) { if ( style == "Round" ) return 0; @@ -157,7 +157,7 @@ int ObjectDrawer::pointStyleFromString( const QString& style ) return 0; } -QString ObjectDrawer::pointStyleToString() const +TQString ObjectDrawer::pointStyleToString() const { if ( mpointstyle == 0 ) return "Round"; @@ -170,10 +170,10 @@ QString ObjectDrawer::pointStyleToString() const else if ( mpointstyle == 4 ) return "Cross"; assert( false ); - return QString::null; + return TQString::null; } -Qt::PenStyle ObjectDrawer::styleFromString( const QString& style ) +Qt::PenStyle ObjectDrawer::styleFromString( const TQString& style ) { if ( style == "SolidLine" ) return Qt::SolidLine; @@ -188,7 +188,7 @@ Qt::PenStyle ObjectDrawer::styleFromString( const QString& style ) else return Qt::SolidLine; } -QString ObjectDrawer::styleToString() const +TQString ObjectDrawer::styleToString() const { if ( mstyle == Qt::SolidLine ) return "SolidLine"; -- cgit v1.2.1