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

diff --git a/kword/KWordFrameSetIface.cpp b/kword/KWordFrameSetIface.cpp
index cee12dfcd..928cddb5a 100644
--- a/kword/KWordFrameSetIface.cpp
+++ b/kword/KWordFrameSetIface.cpp
@@ -95,15 +95,15 @@ int KWordFrameSetIface::pageNumber() const
     return m_frame->frame(0)->pageNumber();
 }
 
-QBrush KWordFrameSetIface::backgroundColor() const
+TQBrush KWordFrameSetIface::backgroundColor() const
 {
     return m_frame->frame(0)->backgroundColor();
 }
 
-void KWordFrameSetIface::setBackgroundColor( const QString &_color )
+void KWordFrameSetIface::setBackgroundColor( const TQString &_color )
 {
-    QBrush brush= m_frame->frame(0)->backgroundColor();
-    brush.setColor( QColor( _color ));
+    TQBrush brush= m_frame->frame(0)->backgroundColor();
+    brush.setColor( TQColor( _color ));
     m_frame->frame(0)->setBackgroundColor( brush );
 }
 
@@ -135,43 +135,43 @@ bool KWordFrameSetIface::isCopy()const
 void KWordFrameSetIface::setPtMarginLeft(double val)
 {
     m_frame->frame( 0 )->setPaddingLeft(val);
-    m_frame->kWordDocument()->layout();
+    m_frame->kWordDocument()->tqlayout();
 }
 
 void KWordFrameSetIface::setPtMarginRight(double val)
 {
     m_frame->frame( 0 )->setPaddingRight(val);
-    m_frame->kWordDocument()->layout();
+    m_frame->kWordDocument()->tqlayout();
 
 }
 void KWordFrameSetIface::setPtMarginTop(double val)
 {
     m_frame->frame( 0 )->setPaddingTop(val);
-    m_frame->kWordDocument()->layout();
+    m_frame->kWordDocument()->tqlayout();
 }
 
 void KWordFrameSetIface::setPtMarginBottom(double val)
 {
     m_frame->frame( 0 )->setPaddingBottom(val);
-    m_frame->kWordDocument()->layout();
+    m_frame->kWordDocument()->tqlayout();
 }
 
-QColor KWordFrameSetIface::leftBorderColor() const
+TQColor KWordFrameSetIface::leftBorderColor() const
 {
     return m_frame->frame( 0 )->leftBorder().color;
 }
 
-QColor KWordFrameSetIface::rightBorderColor() const
+TQColor KWordFrameSetIface::rightBorderColor() const
 {
     return m_frame->frame( 0 )->rightBorder().color;
 }
 
-QColor KWordFrameSetIface::topBorderColor() const
+TQColor KWordFrameSetIface::topBorderColor() const
 {
     return m_frame->frame( 0 )->topBorder().color;
 }
 
-QColor KWordFrameSetIface::bottomBorderColor() const
+TQColor KWordFrameSetIface::bottomBorderColor() const
 {
     return m_frame->frame( 0 )->bottomBorder().color;
 }
@@ -186,112 +186,112 @@ void KWordFrameSetIface::setProtectSize( bool _b )
     m_frame->setProtectSize( _b );
 }
 
-QString KWordFrameSetIface::bottomBorderStyle() const
+TQString KWordFrameSetIface::bottomBorderStyle() const
 {
     switch( m_frame->frame( 0 )->bottomBorder().getStyle())
     {
     case KoBorder::SOLID:
-        return QString("SOLID");
+        return TQString("SOLID");
         break;
     case KoBorder::DASH:
-        return QString("DASH");
+        return TQString("DASH");
         break;
     case KoBorder::DOT:
-        return QString("DOT");
+        return TQString("DOT");
         break;
     case KoBorder::DASH_DOT:
-        return QString("DASH DOT");
+        return TQString("DASH DOT");
         break;
     case KoBorder::DASH_DOT_DOT:
-        return QString("DASH DOT DOT");
+        return TQString("DASH DOT DOT");
 
         break;
     case KoBorder::DOUBLE_LINE:
-        return QString("DOUBLE LINE");
+        return TQString("DOUBLE LINE");
         break;
     }
-    return QString::null;
+    return TQString();
 }
 
-QString KWordFrameSetIface::topBorderStyle() const
+TQString KWordFrameSetIface::topBorderStyle() const
 {
     switch( m_frame->frame( 0 )->topBorder().getStyle())
     {
     case KoBorder::SOLID:
-        return QString("SOLID");
+        return TQString("SOLID");
         break;
     case KoBorder::DASH:
-        return QString("DASH");
+        return TQString("DASH");
         break;
     case KoBorder::DOT:
-        return QString("DOT");
+        return TQString("DOT");
         break;
     case KoBorder::DASH_DOT:
-        return QString("DASH DOT");
+        return TQString("DASH DOT");
         break;
     case KoBorder::DASH_DOT_DOT:
-        return QString("DASH DOT DOT");
+        return TQString("DASH DOT DOT");
 
         break;
     case KoBorder::DOUBLE_LINE:
-        return QString("DOUBLE LINE");
+        return TQString("DOUBLE LINE");
         break;
     }
-    return QString::null;
+    return TQString();
 }
 
-QString KWordFrameSetIface::leftBorderStyle() const
+TQString KWordFrameSetIface::leftBorderStyle() const
 {
     switch( m_frame->frame( 0 )->leftBorder().getStyle())
     {
     case KoBorder::SOLID:
-        return QString("SOLID");
+        return TQString("SOLID");
         break;
     case KoBorder::DASH:
-        return QString("DASH");
+        return TQString("DASH");
         break;
     case KoBorder::DOT:
-        return QString("DOT");
+        return TQString("DOT");
         break;
     case KoBorder::DASH_DOT:
-        return QString("DASH DOT");
+        return TQString("DASH DOT");
         break;
     case KoBorder::DASH_DOT_DOT:
-        return QString("DASH DOT DOT");
+        return TQString("DASH DOT DOT");
 
         break;
     case KoBorder::DOUBLE_LINE:
-        return QString("DOUBLE LINE");
+        return TQString("DOUBLE LINE");
         break;
     }
-    return QString::null;
+    return TQString();
 }
 
-QString KWordFrameSetIface::rightBorderStyle() const
+TQString KWordFrameSetIface::rightBorderStyle() const
 {
     switch( m_frame->frame( 0 )->rightBorder().getStyle())
     {
     case KoBorder::SOLID:
-        return QString("SOLID");
+        return TQString("SOLID");
         break;
     case KoBorder::DASH:
-        return QString("DASH");
+        return TQString("DASH");
         break;
     case KoBorder::DOT:
-        return QString("DOT");
+        return TQString("DOT");
         break;
     case KoBorder::DASH_DOT:
-        return QString("DASH DOT");
+        return TQString("DASH DOT");
         break;
     case KoBorder::DASH_DOT_DOT:
-        return QString("DASH DOT DOT");
+        return TQString("DASH DOT DOT");
 
         break;
     case KoBorder::DOUBLE_LINE:
-        return QString("DOUBLE LINE");
+        return TQString("DOUBLE LINE");
         break;
     }
-    return QString::null;
+    return TQString();
 }
 
 double KWordFrameSetIface::rightBorderWidth() const
@@ -341,7 +341,7 @@ void KWordFrameSetIface::setBottomBorderWitdh( double _width )
     m_frame->frame( 0 )->setBottomBorder(tmp);
 }
 
-void KWordFrameSetIface::setRightBorderStyle(const QString & _style)
+void KWordFrameSetIface::setRightBorderStyle(const TQString & _style)
 {
     KoBorder tmp = m_frame->frame( 0 )->rightBorder();
     if ( _style.lower()=="solid")
@@ -364,7 +364,7 @@ void KWordFrameSetIface::setRightBorderStyle(const QString & _style)
     m_frame->frame( 0 )->setRightBorder(tmp);
 }
 
-void KWordFrameSetIface::setLeftBorderStyle(const QString & _style)
+void KWordFrameSetIface::setLeftBorderStyle(const TQString & _style)
 {
     KoBorder tmp = m_frame->frame( 0 )->leftBorder();
     if ( _style.lower()=="solid")
@@ -388,7 +388,7 @@ void KWordFrameSetIface::setLeftBorderStyle(const QString & _style)
 
 }
 
-void KWordFrameSetIface::setTopBorderStyle(const QString & _style)
+void KWordFrameSetIface::setTopBorderStyle(const TQString & _style)
 {
     KoBorder tmp = m_frame->frame( 0 )->topBorder();
 
@@ -412,7 +412,7 @@ void KWordFrameSetIface::setTopBorderStyle(const QString & _style)
     m_frame->frame( 0 )->setTopBorder(tmp);
 }
 
-void KWordFrameSetIface::setBottomBorderStyle(const QString & _style)
+void KWordFrameSetIface::setBottomBorderStyle(const TQString & _style)
 {
     KoBorder tmp = m_frame->frame( 0 )->bottomBorder();
     if ( _style.lower()=="solid")
@@ -440,41 +440,41 @@ bool KWordFrameSetIface::isFootEndNote() const
     return m_frame->isFootEndNote();
 }
 
-QString KWordFrameSetIface::frameSetInfo() const
+TQString KWordFrameSetIface::frameSetInfo() const
 {
     switch( m_frame->frameSetInfo() )
     {
     case KWFrameSet::FI_BODY:
-        return QString("body");
+        return TQString("body");
         break;
     case KWFrameSet::FI_FIRST_HEADER:
-        return QString("First header");
+        return TQString("First header");
         break;
     case KWFrameSet::FI_ODD_HEADER:
-        return QString("First even header");
+        return TQString("First even header");
         break;
     case KWFrameSet::FI_EVEN_HEADER:
-        return QString("First odd header");
+        return TQString("First odd header");
         break;
     case KWFrameSet::FI_FIRST_FOOTER:
-        return QString("First footer");
+        return TQString("First footer");
         break;
     case KWFrameSet::FI_EVEN_FOOTER:
-        return QString("Odd footer");
+        return TQString("Odd footer");
         break;
     case KWFrameSet::FI_ODD_FOOTER:
-        return QString("Even footer");
+        return TQString("Even footer");
         break;
     case KWFrameSet::FI_FOOTNOTE:
-        return QString("FootNote");
+        return TQString("FootNote");
         break;
     default:
-        return QString::null;
+        return TQString();
         break;
     }
 }
 
-void KWordFrameSetIface::setFrameSetInfo( const QString & _type)
+void KWordFrameSetIface::setFrameSetInfo( const TQString & _type)
 {
     if ( _type.lower() =="body")
     {