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/lib/kotext/KoOasisContext.cpp b/lib/kotext/KoOasisContext.cpp
index 87f4be66..2c9aea8d 100644
--- a/lib/kotext/KoOasisContext.cpp
+++ b/lib/kotext/KoOasisContext.cpp
@@ -33,20 +33,20 @@ KoOasisContext::KoOasisContext( KoDocument* doc, KoVariableCollection& varColl,
 {
 }
 
-static QDomElement findListLevelStyle( const QDomElement& fullListStyle, int level )
+static TQDomElement findListLevelStyle( const TQDomElement& fullListStyle, int level )
 {
-    for ( QDomNode n = fullListStyle.firstChild(); !n.isNull(); n = n.nextSibling() )
+    for ( TQDomNode n = fullListStyle.firstChild(); !n.isNull(); n = n.nextSibling() )
     {
-       const QDomElement listLevelItem = n.toElement();
-       if ( listLevelItem.attributeNS( KoXmlNS::text, "level", QString::null ).toInt() == level )
+       const TQDomElement listLevelItem = n.toElement();
+       if ( listLevelItem.attributeNS( KoXmlNS::text, "level", TQString() ).toInt() == level )
            return listLevelItem;
     }
-    return QDomElement();
+    return TQDomElement();
 }
 
-bool KoOasisContext::pushListLevelStyle( const QString& listStyleName, int level )
+bool KoOasisContext::pushListLevelStyle( const TQString& listStyleName, int level )
 {
-    QDomElement* fullListStyle = oasisStyles().listStyles()[listStyleName];
+    TQDomElement* fullListStyle = oasisStyles().listStyles()[listStyleName];
     if ( !fullListStyle ) {
         kdWarning(32500) << "List style " << listStyleName << " not found!" << endl;
         return false;
@@ -57,16 +57,16 @@ bool KoOasisContext::pushListLevelStyle( const QString& listStyleName, int level
 
 bool KoOasisContext::pushOutlineListLevelStyle( int level )
 {
-    QDomElement outlineStyle = KoDom::namedItemNS( oasisStyles().officeStyle(), KoXmlNS::text, "outline-style" );
+    TQDomElement outlineStyle = KoDom::namedItemNS( oasisStyles().officeStyle(), KoXmlNS::text, "outline-style" );
     return pushListLevelStyle( "<outline-style>", outlineStyle, level );
 }
 
-bool KoOasisContext::pushListLevelStyle( const QString& listStyleName, // for debug only
-                                         const QDomElement& fullListStyle, int level )
+bool KoOasisContext::pushListLevelStyle( const TQString& listStyleName, // for debug only
+                                         const TQDomElement& fullListStyle, int level )
 {
     // Find applicable list-level-style for level
     int i = level;
-    QDomElement listLevelStyle;
+    TQDomElement listLevelStyle;
     while ( i > 0 && listLevelStyle.isNull() ) {
         listLevelStyle = findListLevelStyle( fullListStyle, i );
         --i;
@@ -114,7 +114,7 @@ void KoSavingContext::setCursorPosition( KoTextParag* cursorTextParagraph,
     m_cursorTextIndex = cursorTextIndex;
 }
 
-void KoSavingContext::addFontFace( const QString& fontName )
+void KoSavingContext::addFontFace( const TQString& fontName )
 {
     m_fontFaces[fontName] = true;
 }
@@ -122,8 +122,8 @@ void KoSavingContext::addFontFace( const QString& fontName )
 void KoSavingContext::writeFontFaces( KoXmlWriter& writer )
 {
     writer.startElement( "office:font-face-decls" );
-    const QStringList fontFaces = m_fontFaces.keys();
-    for ( QStringList::const_iterator ffit = fontFaces.begin(), ffend = fontFaces.end() ; ffit != ffend ; ++ffit ) {
+    const TQStringList fontFaces = m_fontFaces.keys();
+    for ( TQStringList::const_iterator ffit = fontFaces.begin(), ffend = fontFaces.end() ; ffit != ffend ; ++ffit ) {
         writer.startElement( "style:font-face" );
         writer.addAttribute( "style:name", *ffit );
         writer.addAttribute( "svg:font-family", *ffit );