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

1 files changed, 6 insertions, 6 deletions

diff --git a/umbrello/umbrello/notewidget.cpp b/umbrello/umbrello/notewidget.cpp
index 9badeef5..1826847b 100644
--- a/umbrello/umbrello/notewidget.cpp
+++ b/umbrello/umbrello/notewidget.cpp
@@ -42,7 +42,7 @@ NoteWidget::NoteWidget(UMLView * view, Uml::IDType id)
     m_pEditor->setFrameStyle(TQFrame::NoFrame | TQFrame::Plain);
     m_pEditor->setHScrollBarMode(TQScrollView::AlwaysOff);
     m_pEditor->setVScrollBarMode(TQScrollView::AlwaysOff);
-    m_pEditor->setTextFormat(Qt::RichText);
+    m_pEditor->setTextFormat(TQt::RichText);
     m_pEditor->setShown(true);
     setEditorGeometry();
     connect(m_pView, TQT_SIGNAL(contentsMoving(int, int)),
@@ -201,7 +201,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse
 #if defined (NOTEWIDGET_EMBED_EDITOR)
     m_pEditor->setText( getDoc() );
     m_pEditor->setShown(true);
-    m_pEditor->repaint();
+    m_pEditor->tqrepaint();
 #else
     if (p == NULL)
         return;
@@ -212,7 +212,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse
     if reach height exit and don't print anymore
     start new line on \n character
     */
-    p->setPen( Qt::black );
+    p->setPen( TQt::black );
     TQFont font = UMLWidget::getFont();
     p->setFont( font );
     const TQFontMetrics &fm = getFontMetrics(FT_NORMAL);
@@ -247,7 +247,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse
                 // print "fullLine" in current line, update write position to next line
                 // and decide then on following actions
                 p->drawText(offsetX + textX, offsetY + textY,
-                            textWidth, fontHeight, Qt::AlignLeft, fullLine );
+                            textWidth, fontHeight, TQt::AlignLeft, fullLine );
                 fullLine = word;
                 word = "";
                 // update write position
@@ -260,7 +260,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse
                 if (c == returnChar) {
                     // print "word" - which is now "fullLine" and set to next line
                     p->drawText(offsetX + textX, offsetY + textY,
-                                textWidth, fontHeight, Qt::AlignLeft, fullLine);
+                                textWidth, fontHeight, TQt::AlignLeft, fullLine);
                     fullLine = "";
                     textX = margin;
                     textY += fontHeight;
@@ -271,7 +271,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse
                 // newline found and combination of "fullLine" and "word" fits
                 // in one line
                 p->drawText(offsetX + textX, offsetY + textY,
-                            textWidth, fontHeight, Qt::AlignLeft, testCombineLine);
+                            textWidth, fontHeight, TQt::AlignLeft, testCombineLine);
                 fullLine = word = "";
                 textX = margin;
                 textY += fontHeight;