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, 19 insertions, 19 deletions

diff --git a/kpresenter/KPrTextObjectIface.h b/kpresenter/KPrTextObjectIface.h
index 1626b3a8..77274c97 100644
--- a/kpresenter/KPrTextObjectIface.h
+++ b/kpresenter/KPrTextObjectIface.h
@@ -24,9 +24,9 @@
 #include <KoDocumentIface.h>
 #include <dcopref.h>
 #include "KPrObject2DIface.h"
-#include <qstring.h>
-#include <qcolor.h>
-#include <qfont.h>
+#include <tqstring.h>
+#include <tqcolor.h>
+#include <tqfont.h>
 class KPrTextObject;
 
 class KPrTextObjectIface : public KPrObject2DIface
@@ -38,7 +38,7 @@ public:
 k_dcop:
     DCOPRef startEditing();
     bool hasSelection() const;
-    QString selectedText() const;
+    TQString selectedText() const;
     void selectAll( bool select );
     void recalcPageNum( );
 
@@ -46,22 +46,22 @@ k_dcop:
     void setItalicText( bool b );
     void setUnderlineText( bool b );
     void setStrikeOutText( bool b );
-    void setTextColor( const QColor &col );
+    void setTextColor( const TQColor &col );
     void setTextPointSize( int s );
     void setTextSubScript( bool b );
     void setTextSuperScript( bool b );
     void setTextDefaultFormat();
-    void setTextBackgroundColor(const QColor & col);
-    void setTextFamilyFont(const QString &font);
-    void changeCaseOfText( const QString & caseType);
+    void setTextBackgroundColor(const TQColor & col);
+    void setTextFamilyFont(const TQString &font);
+    void changeCaseOfText( const TQString & caseType);
     void setDoubleUnderlineText(bool on);
-    void setUnderlineColor( const QColor & color );
+    void setUnderlineColor( const TQColor & color );
 
-    QColor textColor() const;
-    QFont textFont() const;
-    QString textFontFamily()const;
-    QColor textBackgroundColor()const;
-    QColor textUnderlineColor() const;
+    TQColor textColor() const;
+    TQFont textFont() const;
+    TQString textFontFamily()const;
+    TQColor textBackgroundColor()const;
+    TQColor textUnderlineColor() const;
 
     bool textItalic() const;
     bool textBold() const;
@@ -86,8 +86,8 @@ k_dcop:
     void setPtMarginTop(double val);
     void setPtMarginBottom(double val);
 
-    void setVerticalAligment( const QString & type);
-    QString verticalAlignment() const;
+    void setVerticalAligment( const TQString & type);
+    TQString verticalAlignment() const;
 
     //bool textShadow() const;
     //void setTextShadow( bool b );
@@ -98,9 +98,9 @@ k_dcop:
     bool wordByWord() const;
     void setWordByWord( bool _b );
 
-    QString fontAttribute()const;
-    QString underlineLineStyle() const;
-    QString strikeOutLineStyle()const;
+    TQString fontAttribute()const;
+    TQString underlineLineStyle() const;
+    TQString strikeOutLineStyle()const;
 
 
 private: