From 99a2774ca6f1cab334de5d43fe36fc44ae889a4c Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 12 Jun 2011 01:36:19 +0000 Subject: TQt4 convert kdesdk This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- umbrello/umbrello/classifierwidget.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'umbrello/umbrello/classifierwidget.cpp') diff --git a/umbrello/umbrello/classifierwidget.cpp b/umbrello/umbrello/classifierwidget.cpp index 8105818f..24da6833 100644 --- a/umbrello/umbrello/classifierwidget.cpp +++ b/umbrello/umbrello/classifierwidget.cpp @@ -558,14 +558,14 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { p.setPen(pen); p.drawRect( offsetX + width() - templatesBoxSize.width(), offsetY, templatesBoxSize.width(), templatesBoxSize.height() ); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); font.setBold(false); p.setFont(font); const int x = offsetX + width() - templatesBoxSize.width() + MARGIN; int y = offsetY + MARGIN; for ( UMLTemplate *t = tlist.first(); t; t = tlist.next() ) { TQString text = t->toString(); - p.drawText(x, y, fm.size(0,text).width(), fontHeight, Qt::AlignVCenter, text); + p.drawText(x, y, fm.size(0,text).width(), fontHeight, TQt::AlignVCenter, text); y += fontHeight; } } @@ -573,7 +573,7 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { const int textX = offsetX + MARGIN; const int textWidth = w - MARGIN * 2; - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); // draw stereotype font.setBold(true); @@ -587,7 +587,7 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { } else if (showStereotype) { p.setFont(font); stereo = m_pObject->getStereotype(true); - p.drawText(textX, m_bodyOffsetY, textWidth, fontHeight, Qt::AlignCenter, stereo); + p.drawText(textX, m_bodyOffsetY, textWidth, fontHeight, TQt::AlignCenter, stereo); m_bodyOffsetY += fontHeight; } @@ -600,12 +600,12 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { } font.setItalic( m_pObject->getAbstract() ); p.setFont(font); - p.drawText(textX, m_bodyOffsetY, textWidth, nameHeight, Qt::AlignCenter, name); + p.drawText(textX, m_bodyOffsetY, textWidth, nameHeight, TQt::AlignCenter, name); if (!showNameOnly) { m_bodyOffsetY += fontHeight; UMLWidget::setPen(p); p.drawLine(offsetX, m_bodyOffsetY, offsetX + w - 1, m_bodyOffsetY); - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); } font.setBold(false); font.setItalic(false); @@ -626,7 +626,7 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { m_bodyOffsetY += fontHeight * numAtts; UMLWidget::setPen(p); p.drawLine(offsetX, m_bodyOffsetY, offsetX + w - 1, m_bodyOffsetY); - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); } // draw operations @@ -652,11 +652,11 @@ void ClassifierWidget::drawAsCircle(TQPainter& p, int offsetX, int offsetY) { } p.drawEllipse(offsetX + w/2 - CIRCLE_SIZE/2, offsetY, CIRCLE_SIZE, CIRCLE_SIZE); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); TQFont font = UMLWidget::getFont(); p.setFont(font); - p.drawText(offsetX, offsetY + CIRCLE_SIZE, w, fontHeight, Qt::AlignCenter, name); + p.drawText(offsetX, offsetY + CIRCLE_SIZE, w, fontHeight, TQt::AlignCenter, name); if (m_bSelected) { drawSelected(&p, offsetX, offsetY); @@ -697,7 +697,7 @@ void ClassifierWidget::drawMembers(TQPainter & p, Uml::Object_Type ot, Uml::Sign f.setUnderline( obj->getStatic() ); p.setFont( f ); TQFontMetrics fontMetrics(f); - p.drawText(x, y, fontMetrics.size(0,text).width(), fontHeight, Qt::AlignVCenter, text); + p.drawText(x, y, fontMetrics.size(0,text).width(), fontHeight, TQt::AlignVCenter, text); f.setItalic(false); f.setUnderline(false); p.setFont(f); -- cgit v1.2.3