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

1 files changed, 25 insertions, 25 deletions

diff --git a/kpresenter/KPrTextObjectIface.cpp b/kpresenter/KPrTextObjectIface.cpp
index 2b53aaf4..0dfc1d79 100644
--- a/kpresenter/KPrTextObjectIface.cpp
+++ b/kpresenter/KPrTextObjectIface.cpp
@@ -50,7 +50,7 @@ bool KPrTextObjectIface::hasSelection() const
     return m_textobject->textObject()->hasSelection();
 }
 
-QString KPrTextObjectIface::selectedText() const
+TQString KPrTextObjectIface::selectedText() const
 {
     return m_textobject->textObject()->selectedText();
 }
@@ -90,7 +90,7 @@ void KPrTextObjectIface::setDoubleUnderlineText(bool b)
     delete cmd;
 }
 
-void KPrTextObjectIface::setUnderlineColor( const QColor & color )
+void KPrTextObjectIface::setUnderlineColor( const TQColor & color )
 {
     KCommand *cmd=m_textobject->textObject()->setUnderlineColorCommand( color );
     delete cmd;
@@ -102,7 +102,7 @@ void KPrTextObjectIface::setStrikeOutText( bool b )
     delete cmd;
 }
 
-void KPrTextObjectIface::setTextColor( const QColor &col )
+void KPrTextObjectIface::setTextColor( const TQColor &col )
 {
     KCommand *cmd=m_textobject->textObject()->setTextColorCommand(col);
     delete cmd;
@@ -132,7 +132,7 @@ void KPrTextObjectIface::setTextDefaultFormat()
     delete cmd;
 }
 
-void KPrTextObjectIface::setTextBackgroundColor(const QColor & col)
+void KPrTextObjectIface::setTextBackgroundColor(const TQColor & col)
 {
     KCommand *cmd=m_textobject->textObject()->setTextBackgroundColorCommand(col);
     delete cmd;
@@ -143,27 +143,27 @@ bool KPrTextObjectIface::textDoubleUnderline()const
     return m_textobject->textObject()->textDoubleUnderline();
 }
 
-QColor KPrTextObjectIface::textUnderlineColor() const
+TQColor KPrTextObjectIface::textUnderlineColor() const
 {
     return m_textobject->textObject()->textUnderlineColor();
 }
 
-QColor KPrTextObjectIface::textColor() const
+TQColor KPrTextObjectIface::textColor() const
 {
     return m_textobject->textObject()->textColor();
 }
 
-QFont KPrTextObjectIface::textFont() const
+TQFont KPrTextObjectIface::textFont() const
 {
     return m_textobject->textObject()->textFont();
 }
 
-QString KPrTextObjectIface::textFontFamily()const
+TQString KPrTextObjectIface::textFontFamily()const
 {
     return m_textobject->textObject()->textFontFamily();
 }
 
-QColor KPrTextObjectIface::textBackgroundColor() const
+TQColor KPrTextObjectIface::textBackgroundColor() const
 {
     return m_textobject->textObject()->textBackgroundColor();
 }
@@ -198,13 +198,13 @@ bool KPrTextObjectIface::textSuperScript() const
     return m_textobject->textObject()->textSuperScript();
 }
 
-void KPrTextObjectIface::setTextFamilyFont(const QString &font)
+void KPrTextObjectIface::setTextFamilyFont(const TQString &font)
 {
     KCommand *cmd=m_textobject->textObject()->setFamilyCommand(font);
     delete cmd;
 }
 
-void KPrTextObjectIface::changeCaseOfText( const QString & caseType)
+void KPrTextObjectIface::changeCaseOfText( const TQString & caseType)
 {
     KCommand *cmd = 0L;
     if( caseType.lower() == "uppercase" )
@@ -218,7 +218,7 @@ void KPrTextObjectIface::changeCaseOfText( const QString & caseType)
     else if( caseType.lower() =="sentencecase" )
         cmd = m_textobject->textObject()->setChangeCaseOfTextCommand( KoChangeCaseDia::SentenceCase );
     else
-        kdDebug(33001)<<"Error in void KWordTextFrameSetIface::changeCaseOfText( const QString & caseType) parameter\n";
+        kdDebug(33001)<<"Error in void KWordTextFrameSetIface::changeCaseOfText( const TQString & caseType) parameter\n";
     delete cmd;
 }
 
@@ -247,25 +247,25 @@ bool KPrTextObjectIface::isProtectContent() const
 void KPrTextObjectIface::setPtMarginLeft(double val)
 {
     m_textobject->setBLeft(val);
-    m_textobject->kPresenterDocument()->layout( m_textobject );
+    m_textobject->kPresenterDocument()->tqlayout( m_textobject );
 }
 
 void KPrTextObjectIface::setPtMarginRight(double val)
 {
     m_textobject->setBRight(val);
-    m_textobject->kPresenterDocument()->layout( m_textobject );
+    m_textobject->kPresenterDocument()->tqlayout( m_textobject );
 }
 
 void KPrTextObjectIface::setPtMarginTop(double val)
 {
     m_textobject->setBTop(val);
-    m_textobject->kPresenterDocument()->layout( m_textobject );
+    m_textobject->kPresenterDocument()->tqlayout( m_textobject );
 }
 
 void KPrTextObjectIface::setPtMarginBottom(double val)
 {
     m_textobject->setBBottom(val);
-    m_textobject->kPresenterDocument()->layout( m_textobject );
+    m_textobject->kPresenterDocument()->tqlayout( m_textobject );
 }
 
 double KPrTextObjectIface::ptMarginLeft()const
@@ -288,7 +288,7 @@ double KPrTextObjectIface::ptMarginBottom()const
     return m_textobject->bBottom();
 }
 
-void KPrTextObjectIface::setVerticalAligment( const QString & type)
+void KPrTextObjectIface::setVerticalAligment( const TQString & type)
 {
     if ( type.lower() =="center" )
         m_textobject->setVerticalAligment( KP_CENTER );
@@ -298,23 +298,23 @@ void KPrTextObjectIface::setVerticalAligment( const QString & type)
         m_textobject->setVerticalAligment( KP_BOTTOM );
 }
 
-QString KPrTextObjectIface::verticalAlignment() const
+TQString KPrTextObjectIface::verticalAlignment() const
 {
     switch( m_textobject->verticalAlignment() )
     {
     case KP_CENTER:
-        return QString("center");
+        return TQString("center");
         break;
     case KP_TOP:
-        return QString("top");
+        return TQString("top");
         break;
     case KP_BOTTOM:
-        return QString("bottom");
+        return TQString("bottom");
         break;
     default:
         break;
     }
-    return QString::null;
+    return TQString();
 }
 
 //bool KPrTextObjectIface::textShadow() const
@@ -350,17 +350,17 @@ void KPrTextObjectIface::setWordByWord( bool _b )
     delete cmd;
 }
 
-QString KPrTextObjectIface::fontAttribute()const
+TQString KPrTextObjectIface::fontAttribute()const
 {
     return KoTextFormat::attributeFontToString( m_textobject->textObject()->fontAttribute() );
 }
 
-QString KPrTextObjectIface::underlineLineStyle() const
+TQString KPrTextObjectIface::underlineLineStyle() const
 {
     return KoTextFormat::underlineStyleToString( m_textobject->textObject()->underlineStyle() );
 }
 
-QString KPrTextObjectIface::strikeOutLineStyle()const
+TQString KPrTextObjectIface::strikeOutLineStyle()const
 {
     return KoTextFormat::strikeOutStyleToString( m_textobject->textObject()->strikeOutStyle() );
 }