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

diff --git a/kword/KWFrameStyle.h b/kword/KWFrameStyle.h
index b699cd32..7b398c29 100644
--- a/kword/KWFrameStyle.h
+++ b/kword/KWFrameStyle.h
@@ -25,9 +25,9 @@
 #include <KoUserStyleCollection.h>
 
 #include "KoBorder.h"
-#include <qbrush.h>
+#include <tqbrush.h>
 
-class QDomElement;
+class TQDomElement;
 class KoOasisContext;
 class KoSavingContext;
 class KoGenStyles;
@@ -42,10 +42,10 @@ class KWFrameStyle : public KoUserStyle
 {
 public:
     /** Create a blank framestyle (with default attributes) */
-    KWFrameStyle( const QString & name );
+    KWFrameStyle( const TQString & name );
 
-    KWFrameStyle( const QString & name, KWFrame * frame );
-    KWFrameStyle( QDomElement & parentElem, int docVersion=2 );
+    KWFrameStyle( const TQString & name, KWFrame * frame );
+    KWFrameStyle( TQDomElement & tqparentElem, int docVersion=2 );
 
     /** Copy another framestyle */
     KWFrameStyle( const KWFrameStyle & rhs );
@@ -60,8 +60,8 @@ public:
     int compare( const KWFrameStyle & frameStyle ) const;
 
     // ATTRIBUTES
-    QBrush backgroundColor() const { return m_backgroundColor; }
-    void setBackgroundColor( const QBrush &_color ) { m_backgroundColor = _color; }
+    TQBrush backgroundColor() const { return m_backgroundColor; }
+    void setBackgroundColor( const TQBrush &_color ) { m_backgroundColor = _color; }
 
     const KoBorder & leftBorder() const { return m_borderLeft; }
     void setLeftBorder( KoBorder _left )  { m_borderLeft = _left; }
@@ -76,17 +76,17 @@ public:
     void setBottomBorder( KoBorder _bottom )  { m_borderBottom = _bottom; }
 
     /// save (old xml format)
-    void saveFrameStyle( QDomElement & parentElem );
+    void saveFrameStyle( TQDomElement & tqparentElem );
     /// save (new oasis xml format)
     void saveOasis( KoGenStyles& mainStyles, KoSavingContext& savingContext ) const;
 
     /// load (old xml format)
-    static KWFrameStyle *loadStyle( QDomElement & parentElem, int docVersion=2 );
+    static KWFrameStyle *loadStyle( TQDomElement & tqparentElem, int docVersion=2 );
     /// load (new oasis xml format)
-    void loadOasis( QDomElement & styleElem, KoOasisContext& context );
+    void loadOasis( TQDomElement & styleElem, KoOasisContext& context );
 
 private:
-    QBrush m_backgroundColor;
+    TQBrush m_backgroundColor;
     KoBorder m_borderLeft, m_borderRight, m_borderTop, m_borderBottom;
 };
 
@@ -98,13 +98,13 @@ class KWFrameStyleCollection : public KoUserStyleCollection
 public:
     KWFrameStyleCollection();
 
-    static QString defaultStyleName() { return QString::fromLatin1( "Plain" ); }
+    static TQString defaultStyleName() { return TQString::tqfromLatin1( "Plain" ); }
 
     /**
      * Find style based on the untranslated name @p name.
      * Overloaded for convenience
      */
-    KWFrameStyle* findStyle( const QString & name ) const {
+    KWFrameStyle* findStyle( const TQString & name ) const {
         return static_cast<KWFrameStyle*>( KoUserStyleCollection::findStyle( name, defaultStyleName() ) );
     }
 
@@ -113,7 +113,7 @@ public:
      * This is only for the old XML loading.
      * Overloaded for convenience
      */
-    KWFrameStyle* findStyleByDisplayName( const QString & name ) const {
+    KWFrameStyle* findStyleByDisplayName( const TQString & name ) const {
         return static_cast<KWFrameStyle*>( KoUserStyleCollection::findStyleByDisplayName( name ) );
     }