From a2277b6bc715464e83882b90c2a058139b8a6b54 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 23 Jun 2011 01:42:07 +0000
Subject: TQt4 port kdeutils This enables compilation under both Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1238125 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 klaptopdaemon/krichtextlabel.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'klaptopdaemon/krichtextlabel.cpp')

diff --git a/klaptopdaemon/krichtextlabel.cpp b/klaptopdaemon/krichtextlabel.cpp
index 089635d..a604b0d 100644
--- a/klaptopdaemon/krichtextlabel.cpp
+++ b/klaptopdaemon/krichtextlabel.cpp
@@ -35,20 +35,20 @@ static TQString qrichtextify( const TQString& text )
     *it = TQStyleSheet::convertFromPlainText( *it, TQStyleSheetItem::WhiteSpaceNormal );
   }
 
-  return lines.join(TQString::null);
+  return lines.join(TQString());
 }
 
-KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
- : TQLabel ( parent, name ) {
-  m_defaultWidth = QMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
-  setAlignment( Qt::WordBreak );
+KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *tqparent, const char *name )
+ : TQLabel ( tqparent, name ) {
+  m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+  tqsetAlignment( TQt::WordBreak );
   setText(text);
 }
 
-KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
- : TQLabel ( parent, name ) {
-  m_defaultWidth = QMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
-  setAlignment( Qt::WordBreak );
+KRichTextLabel::KRichTextLabel( TQWidget *tqparent, const char *name )
+ : TQLabel ( tqparent, name ) {
+  m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+  tqsetAlignment( TQt::WordBreak );
 }
 
 void KRichTextLabel::setDefaultWidth(int defaultWidth)
@@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const
   return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
 }
 
-TQSize KRichTextLabel::minimumSizeHint() const
+TQSize KRichTextLabel::tqminimumSizeHint() const
 {
   TQString qt_text = qrichtextify( text() );
   int pref_width = 0;
@@ -97,9 +97,9 @@ TQSize KRichTextLabel::minimumSizeHint() const
   return TQSize(pref_width, rt.height());
 }
 
-TQSize KRichTextLabel::sizeHint() const
+TQSize KRichTextLabel::tqsizeHint() const
 {
-  return minimumSizeHint();
+  return tqminimumSizeHint();
 }
 
 void KRichTextLabel::setText( const TQString &text ) {
-- 
cgit v1.2.1