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

diff --git a/kword/KWordDocIface.cpp b/kword/KWordDocIface.cpp
index f2a1e850..40736b4e 100644
--- a/kword/KWordDocIface.cpp
+++ b/kword/KWordDocIface.cpp
@@ -70,7 +70,7 @@ double KWordDocIface::ptPageTop( int pgNum )const
     return doc->pageManager()->topOfPage(pgNum);
 }
 
-QString KWordDocIface::unitName()const
+TQString KWordDocIface::unitName()const
 {
     return doc->unitName();
 }
@@ -86,7 +86,7 @@ void KWordDocIface::recalcVariables(int _var)
     doc->recalcVariables(_var);
 }
 
-void KWordDocIface::recalcVariables(const QString &varName)
+void KWordDocIface::recalcVariables(const TQString &varName)
 {
     if(varName=="VT_DATE")
         doc->recalcVariables(0);
@@ -203,7 +203,7 @@ void KWordDocIface::setDisplayLink(bool b)
     doc->recalcVariables(VT_LINK);
 }
 
-bool KWordDocIface::setCustomVariableValue(const QString & varname, const QString & value)
+bool KWordDocIface::setCustomVariableValue(const TQString & varname, const TQString & value)
 {
     bool exist=doc->variableCollection()->customVariableExist(varname);
     if(exist)
@@ -217,11 +217,11 @@ bool KWordDocIface::setCustomVariableValue(const QString & varname, const QStrin
 }
 
 
-QString KWordDocIface::customVariableValue(const QString & varname)const
+TQString KWordDocIface::customVariableValue(const TQString & varname)const
 {
     if(doc->variableCollection()->customVariableExist(varname))
         return doc->variableCollection()->getVariableValue( varname );
-    return QString::null;
+    return TQString();
 }
 
 void KWordDocIface::initConfig()
@@ -479,17 +479,17 @@ void KWordDocIface::setConfigAutoSuperScript( bool b)
     doc->autoFormat()->configAutoSuperScript( b );
 }
 
-void KWordDocIface::addIgnoreWordAll( const QString &word )
+void KWordDocIface::addIgnoreWordAll( const TQString &word )
 {
     doc->addSpellCheckIgnoreWord( word );
 }
 
 void KWordDocIface::clearIgnoreWordAll( )
 {
-    doc->setSpellCheckIgnoreList( QStringList() );
+    doc->setSpellCheckIgnoreList( TQStringList() );
 }
 
-QStringList KWordDocIface::spellListIgnoreAll() const
+TQStringList KWordDocIface::spellListIgnoreAll() const
 {
     return doc->spellCheckIgnoreList();
 }
@@ -524,10 +524,10 @@ int KWordDocIface::footNoteSeparatorLineLength() const
 void KWordDocIface::setFootNoteSeparatorLineLength( int _length)
 {
     doc->setFootNoteSeparatorLineLength( _length );
-    doc->repaintAllViews();
+    doc->tqrepaintAllViews();
 }
 
-void KWordDocIface::setFootNoteSeparatorLinePosition( const QString &pos)
+void KWordDocIface::setFootNoteSeparatorLinePosition( const TQString &pos)
 {
     SeparatorLinePos tmp=SLP_LEFT;
     if ( pos.lower()=="left")
@@ -537,20 +537,20 @@ void KWordDocIface::setFootNoteSeparatorLinePosition( const QString &pos)
     else if ( pos.lower()=="right")
         tmp=SLP_RIGHT;
     doc->setFootNoteSeparatorLinePosition( tmp);
-    doc->repaintAllViews();
+    doc->tqrepaintAllViews();
 }
 
-QString KWordDocIface::footNoteSeparatorLinePosition()const
+TQString KWordDocIface::footNoteSeparatorLinePosition()const
 {
-    QString tmp=QString::null;
+    TQString tmp=TQString();
     switch( doc->footNoteSeparatorLinePosition() )
     {
     case SLP_LEFT:
-        return QString("left");
+        return TQString("left");
     case SLP_RIGHT:
-        return QString("right");
+        return TQString("right");
     case SLP_CENTERED:
-        return QString("centered");
+        return TQString("centered");
     }
     return tmp;
 }
@@ -563,26 +563,26 @@ double KWordDocIface::footNoteSeparatorLineWidth() const
 void KWordDocIface::setFootNoteSeparatorLineWidth( double _width)
 {
     doc->setFootNoteSeparatorLineWidth( _width );
-    doc->repaintAllViews();
+    doc->tqrepaintAllViews();
 }
 
-void KWordDocIface::deleteBookMark(const QString &_name)
+void KWordDocIface::deleteBookMark(const TQString &_name)
 {
     doc->deleteBookmark( _name );
 }
 
-void KWordDocIface::renameBookMark(const QString &_oldname, const QString &_newName)
+void KWordDocIface::renameBookMark(const TQString &_oldname, const TQString &_newName)
 {
     doc->renameBookmark( _oldname, _newName);
 }
 
-QStringList KWordDocIface::listOfBookmarkName()const
+TQStringList KWordDocIface::listOfBookmarkName()const
 {
     //return all list
     return doc->listOfBookmarkName(0L);
 }
 
-QString KWordDocIface::configAutoFormatLanguage( )const
+TQString KWordDocIface::configAutoFormatLanguage( )const
 {
     return doc->autoFormat()->getConfigAutoFormatLanguage( );
 }
@@ -620,12 +620,12 @@ double KWordDocIface::gridY() const
 void KWordDocIface::setGridX( double _gridX )
 {
 
-    doc->setGridX( QMAX( 0.1, _gridX ) );
+    doc->setGridX( TQMAX( 0.1, _gridX ) );
 }
 
 void KWordDocIface::setGridY( double _gridY )
 {
-    doc->setGridY( QMAX( 0.1, _gridY ) );
+    doc->setGridY( TQMAX( 0.1, _gridY ) );
 }
 
 void KWordDocIface::setShowGrid( bool _b )