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

diff --git a/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp
index f29fee68..2965ee74 100644
--- a/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp
@@ -29,7 +29,7 @@ KivioGroupStencil::KivioGroupStencil()
     : KivioStencil(),
     m_pGroupList(NULL)
 {
-    m_pGroupList = new QPtrList<KivioStencil>;
+    m_pGroupList = new TQPtrList<KivioStencil>;
     m_pGroupList->setAutoDelete(true);
 
     m_x = m_y = 1000000000000.0f;
@@ -83,7 +83,7 @@ void KivioGroupStencil::paintConnectorTargets( KivioIntraStencilData *pData )
     }
 }
 
-void KivioGroupStencil::setFGColor( QColor c )
+void KivioGroupStencil::setFGColor( TQColor c )
 {
     // Draw the group in outline mode
     KivioStencil *pStencil = m_pGroupList->first();
@@ -95,7 +95,7 @@ void KivioGroupStencil::setFGColor( QColor c )
     }
 }
 
-void KivioGroupStencil::setBGColor( QColor c )
+void KivioGroupStencil::setBGColor( TQColor c )
 {
     // Draw the group in outline mode
     KivioStencil *pStencil = m_pGroupList->first();
@@ -202,15 +202,15 @@ KivioStencil *KivioGroupStencil::duplicate()
     return pGroup;
 }
 
-bool KivioGroupStencil::loadXML( const QDomElement &e, KivioLayer *pLayer )
+bool KivioGroupStencil::loadXML( const TQDomElement &e, KivioLayer *pLayer )
 {
-    QDomNode node;
+    TQDomNode node;
     KivioStencil *pStencil;
 
     node = e.firstChild();
     while( !node.isNull() )
     {
-        QString name = node.nodeName();
+        TQString name = node.nodeName();
 
         if( name == "KivioGroupStencil" )
         {
@@ -255,11 +255,11 @@ bool KivioGroupStencil::loadXML( const QDomElement &e, KivioLayer *pLayer )
     return true;
 }
 
-QDomElement KivioGroupStencil::saveXML( QDomDocument &doc )
+TQDomElement KivioGroupStencil::saveXML( TQDomDocument &doc )
 {
-    QDomElement e = doc.createElement("KivioGroupStencil");
+    TQDomElement e = doc.createElement("KivioGroupStencil");
 
-    QDomElement stencilE;
+    TQDomElement stencilE;
     KivioStencil *pStencil = m_pGroupList->first();
     while( pStencil )
     {
@@ -503,13 +503,13 @@ void KivioGroupStencil::searchForConnections( KivioPage *p )
         pStencil->searchForConnections( p );
 
         // Restore it
-        m_pGroupList->find( pCur );
+        m_pGroupList->tqfind( pCur );
 
         pStencil = m_pGroupList->next();
     }
 }
 
-void KivioGroupStencil::setTextColor( QColor c )
+void KivioGroupStencil::setTextColor( TQColor c )
 {
     KivioStencil *pStencil = m_pGroupList->first();
     while( pStencil )
@@ -520,7 +520,7 @@ void KivioGroupStencil::setTextColor( QColor c )
     }
 }
 
-void KivioGroupStencil::setText( const QString &text )
+void KivioGroupStencil::setText( const TQString &text )
 {
     KivioStencil *pStencil = m_pGroupList->first();
     while( pStencil )
@@ -531,12 +531,12 @@ void KivioGroupStencil::setText( const QString &text )
     }
 }
 
-QString KivioGroupStencil::text()
+TQString KivioGroupStencil::text()
 {
     KivioStencil *pStencil = m_pGroupList->first();
 
     if( !pStencil )
-        return QString("");
+        return TQString("");
 
     return pStencil->text();
 }
@@ -557,7 +557,7 @@ int KivioGroupStencil::hTextAlign()
     KivioStencil *pStencil = m_pGroupList->first();
 
     if( !pStencil )
-        return Qt::AlignHCenter;
+        return TQt::AlignHCenter;
 
     return pStencil->hTextAlign();
 }
@@ -578,12 +578,12 @@ int KivioGroupStencil::vTextAlign()
     KivioStencil *pStencil = m_pGroupList->first();
 
     if( !pStencil )
-        return Qt::AlignVCenter;
+        return TQt::AlignVCenter;
 
     return pStencil->vTextAlign();
 }
 
-void KivioGroupStencil::setTextFont( const QFont &f )
+void KivioGroupStencil::setTextFont( const TQFont &f )
 {
     KivioStencil *pStencil = m_pGroupList->first();
     while( pStencil )
@@ -594,7 +594,7 @@ void KivioGroupStencil::setTextFont( const QFont &f )
     }
 }
 
-QFont KivioGroupStencil::textFont()
+TQFont KivioGroupStencil::textFont()
 {
   KivioStencil *pStencil = m_pGroupList->first();
 
@@ -604,12 +604,12 @@ QFont KivioGroupStencil::textFont()
   return pStencil->textFont();
 }
 
-QColor KivioGroupStencil::textColor()
+TQColor KivioGroupStencil::textColor()
 {
   KivioStencil *pStencil = m_pGroupList->first();
 
   if( !pStencil )
-    return QColor(0, 0, 0);
+    return TQColor(0, 0, 0);
 
   return pStencil->textColor();
 }
@@ -619,31 +619,31 @@ int KivioGroupStencil::resizeHandlePositions()
     return KIVIO_RESIZE_HANDLE_POSITION_ALL;
 }
 
-QString KivioGroupStencil::getTextBoxName(const KoPoint& p)
+TQString KivioGroupStencil::getTextBoxName(const KoPoint& p)
 {
   int id = checkForCollision(p);
   
   if(id < 0) {
-    return QString::null;
+    return TQString();
   }
   
   KivioStencil* pStencil = m_pGroupList->at(id);
-  QString name = QString::number(id) + "-" + pStencil->getTextBoxName(p);
+  TQString name = TQString::number(id) + "-" + pStencil->getTextBoxName(p);
   return name;
 }
 
-void KivioGroupStencil::setText(const QString& text, const QString& name)
+void KivioGroupStencil::setText(const TQString& text, const TQString& name)
 {
   int id = name.section("-", 0, 0).toInt();
-  QString n = name.section("-", 1);
+  TQString n = name.section("-", 1);
   
   m_pGroupList->at(id)->setText(text, n);
 }
 
-QString KivioGroupStencil::text(const QString& name)
+TQString KivioGroupStencil::text(const TQString& name)
 {
   int id = name.section("-", 0, 0).toInt();
-  QString n = name.section("-", 1);
+  TQString n = name.section("-", 1);
   
   return m_pGroupList->at(id)->text(n);
 }
@@ -683,66 +683,66 @@ bool KivioGroupStencil::hasTextBox() const
   return false;
 }
 
-QColor KivioGroupStencil::textColor(const QString& textBoxName)
+TQColor KivioGroupStencil::textColor(const TQString& textBoxName)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   return m_pGroupList->at(id)->textColor(n);
 }
 
-void KivioGroupStencil::setTextColor(const QString& textBoxName, const QColor& color)
+void KivioGroupStencil::setTextColor(const TQString& textBoxName, const TQColor& color)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   m_pGroupList->at(id)->setTextColor(n, color);
 }
 
-QFont KivioGroupStencil::textFont(const QString& textBoxName)
+TQFont KivioGroupStencil::textFont(const TQString& textBoxName)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   return m_pGroupList->at(id)->textFont(n);
 }
 
-void KivioGroupStencil::setTextFont(const QString& textBoxName, const QFont& font)
+void KivioGroupStencil::setTextFont(const TQString& textBoxName, const TQFont& font)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   m_pGroupList->at(id)->setTextFont(n, font);
 }
 
-int KivioGroupStencil::hTextAlign(const QString& textBoxName)
+int KivioGroupStencil::hTextAlign(const TQString& textBoxName)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   return m_pGroupList->at(id)->hTextAlign(n);
 }
 
-int KivioGroupStencil::vTextAlign(const QString& textBoxName)
+int KivioGroupStencil::vTextAlign(const TQString& textBoxName)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   return m_pGroupList->at(id)->vTextAlign(n);
 }
 
-void KivioGroupStencil::setHTextAlign(const QString& textBoxName, int align)
+void KivioGroupStencil::setHTextAlign(const TQString& textBoxName, int align)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   m_pGroupList->at(id)->setHTextAlign(n, align);
 }
 
-void KivioGroupStencil::setVTextAlign(const QString& textBoxName, int align)
+void KivioGroupStencil::setVTextAlign(const TQString& textBoxName, int align)
 {
   int id = textBoxName.section("-", 0, 0).toInt();
-  QString n = textBoxName.section("-", 1);
+  TQString n = textBoxName.section("-", 1);
 
   m_pGroupList->at(id)->setVTextAlign(n, align);
 }