From f008adb5a77e094eaf6abf3fc0f36958e66896a5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 25 Jun 2011 05:28:35 +0000 Subject: TQt4 port koffice This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kugar/lib/mreportobject.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'kugar/lib/mreportobject.cpp') diff --git a/kugar/lib/mreportobject.cpp b/kugar/lib/mreportobject.cpp index d7e065f5..7fec9dd9 100644 --- a/kugar/lib/mreportobject.cpp +++ b/kugar/lib/mreportobject.cpp @@ -14,9 +14,9 @@ namespace Kugar { /** Constructor */ -MReportObject::MReportObject() : QObject() +MReportObject::MReportObject() : TQObject() { - // Set the object's default geometry + // Set the object's default tqgeometry xpos = 0; ypos = 0; width = 40; @@ -38,7 +38,7 @@ MReportObject::MReportObject() : QObject() } /** Copy constructor */ -MReportObject::MReportObject( const MReportObject& mReportObject ) /*: QObject((QObject &) mReportObject)*/ +MReportObject::MReportObject( const MReportObject& mReportObject ) /*: TQObject((TQObject &) mReportObject)*/ { copy( &mReportObject ); } @@ -53,7 +53,7 @@ MReportObject MReportObject::operator=( const MReportObject& mReportObject ) copy( &mReportObject ); // Copy the base class's data - //((QObject &) *this) = mReportObject; + //((TQObject &) *this) = mReportObject; return *this; } @@ -63,16 +63,16 @@ MReportObject::~MReportObject() {} /** Draws the object to the specified painter & x/y offsets */ -void MReportObject::draw( QPainter* p, int xoffset, int yoffset ) +void MReportObject::draw( TQPainter* p, int xoffset, int yoffset ) { drawBase( p, xoffset, yoffset ); } /** Draws the base object to the specified painter & x/y offsets */ -void MReportObject::drawBase( QPainter* p, int xoffset, int yoffset ) +void MReportObject::drawBase( TQPainter* p, int xoffset, int yoffset ) { - QBrush bgBrush( backgroundColor ); - QPen borderPen( borderColor, borderWidth, ( QPen::PenStyle ) borderStyle ); + TQBrush bgBrush( backgroundColor ); + TQPen borderPen( borderColor, borderWidth, ( TQPen::PenStyle ) borderStyle ); // Set the offsets int xcalc = xpos + xoffset; @@ -80,7 +80,7 @@ void MReportObject::drawBase( QPainter* p, int xoffset, int yoffset ) // Set background in specified color p->setBrush( bgBrush ); - p->setPen( Qt::NoPen ); + p->setPen( TQt::NoPen ); p->drawRect( xcalc, ycalc, width, height ); // Set border @@ -99,7 +99,7 @@ void MReportObject::drawBase( QPainter* p, int xoffset, int yoffset ) } else { - p->setPen( QPen( QColor( 255, 255, 255 ), 1, QPen::SolidLine ) ); + p->setPen( TQPen( TQColor( 255, 255, 255 ), 1, TQPen::SolidLine ) ); p->drawRect( xcalc, ycalc, width, height ); } } @@ -166,7 +166,7 @@ void MReportObject::setBorderStyle( int style ) Used by the copy constructor and assignment operator */ void MReportObject::copy( const MReportObject* mReportObject ) { - // Copy the object's geometry + // Copy the object's tqgeometry xpos = mReportObject->xpos; ypos = mReportObject->ypos; width = mReportObject->width; -- cgit v1.2.1