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

diff --git a/kpresenter/KPrDocumentIface.cpp b/kpresenter/KPrDocumentIface.cpp
index f7cd4766b..04235d73e 100644
--- a/kpresenter/KPrDocumentIface.cpp
+++ b/kpresenter/KPrDocumentIface.cpp
@@ -77,7 +77,7 @@ void KPrDocumentIface::recalcVariables(int _var)
     doc->recalcVariables(_var);
 }
 
-void KPrDocumentIface::recalcVariables(const QString &varName)
+void KPrDocumentIface::recalcVariables(const TQString &varName)
 {
     if(varName=="VT_DATE")
         doc->recalcVariables(0);
@@ -121,7 +121,7 @@ void KPrDocumentIface::setDisplayLink(bool b)
     doc->recalcVariables(VT_LINK);
 }
 
-bool KPrDocumentIface::setCustomVariableValue(const QString & varname, const QString & value)
+bool KPrDocumentIface::setCustomVariableValue(const TQString & varname, const TQString & value)
 {
     bool exist=doc->getVariableCollection()->customVariableExist(varname);
     if(exist)
@@ -134,18 +134,18 @@ bool KPrDocumentIface::setCustomVariableValue(const QString & varname, const QSt
     return true;
 }
 
-QString KPrDocumentIface::customVariableValue(const QString & varname)const
+TQString KPrDocumentIface::customVariableValue(const TQString & varname)const
 {
     if(doc->getVariableCollection()->customVariableExist(varname))
         return doc->getVariableCollection()->getVariableValue( varname );
-    return QString::null;
+    return TQString();
 }
 
 bool KPrDocumentIface::insertNewPage(int pos )
 {
     if( pos < 0 || pos > (int)(doc->getPageNums())-1 )
         pos=doc->getPageNums()-1;
-    int ret= doc->insertNewPage( i18n("Insert New Slide"), pos, IP_AFTER, false, QString::null );
+    int ret= doc->insertNewPage( i18n("Insert New Slide"), pos, IP_AFTER, false, TQString() );
     bool state = (ret !=-1);
     return state;
 }
@@ -189,7 +189,7 @@ void KPrDocumentIface::saveConfig()
     doc->saveConfig();
 }
 
-QString KPrDocumentIface::selectedForPrinting()const
+TQString KPrDocumentIface::selectedForPrinting()const
 {
     return doc->selectedForPrinting();
 }
@@ -432,13 +432,13 @@ void KPrDocumentIface::setShowGuideLines( bool b )
 {
     doc->setShowGuideLines( b );
     doc->updateGuideLineButton();
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 void KPrDocumentIface::addGuideLine( bool horizontal, double pos )
 {
     doc->addGuideLine( horizontal ? Qt::Horizontal: Qt::Vertical, pos );
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 unsigned int KPrDocumentIface::nbHorizontalHelpLine() const
@@ -460,7 +460,7 @@ void KPrDocumentIface::setShowGrid ( bool _grid )
 {
     doc->setShowGrid( _grid);
     doc->updateGridButton();
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 double KPrDocumentIface::gridX() const
@@ -472,7 +472,7 @@ void KPrDocumentIface::setGridX(double _x)
 {
     doc->setGridX( _x );
     if( showGrid() )
-        doc->repaint( false );
+        doc->tqrepaint( false );
 }
 
 double KPrDocumentIface::gridY() const
@@ -484,7 +484,7 @@ void KPrDocumentIface::setGridY(double _y)
 {
     doc->setGridY( _y );
     if( showGrid() )
-        doc->repaint( false );
+        doc->tqrepaint( false );
 }
 
 bool KPrDocumentIface::configAutoSuperScript() const
@@ -497,17 +497,17 @@ void KPrDocumentIface::setConfigAutoSuperScript( bool b)
     doc->getAutoFormat()->configAutoSuperScript( b );
 }
 
-void KPrDocumentIface::addIgnoreWordAll( const QString &word)
+void KPrDocumentIface::addIgnoreWordAll( const TQString &word)
 {
     doc->addSpellCheckIgnoreWord( word );
 }
 
 void KPrDocumentIface::clearIgnoreWordAll( )
 {
-    doc->setSpellCheckIgnoreList( QStringList() );
+    doc->setSpellCheckIgnoreList( TQStringList() );
 }
 
-QStringList KPrDocumentIface::spellListIgnoreAll() const
+TQStringList KPrDocumentIface::spellListIgnoreAll() const
 {
     return doc->spellCheckIgnoreList();
 }
@@ -523,7 +523,7 @@ void KPrDocumentIface::setDisplayFieldCode( bool b)
     doc->recalcVariables(VT_ALL);
 }
 
-QString KPrDocumentIface::configAutoFormatLanguage( )const
+TQString KPrDocumentIface::configAutoFormatLanguage( )const
 {
     return doc->getAutoFormat()->getConfigAutoFormatLanguage( );
 }
@@ -539,25 +539,25 @@ void KPrDocumentIface::setConfigCapitalizeNameOfDays( bool b)
     doc->getAutoFormat()->configCapitalizeNameOfDays( b );
 }
 
-QString KPrDocumentIface::presentationName() const
+TQString KPrDocumentIface::presentationName() const
 {
     return doc->presentationName();
 }
 
-void KPrDocumentIface::setPresentationName( const QString &_name )
+void KPrDocumentIface::setPresentationName( const TQString &_name )
 {
     doc->setPresentationName( _name );
 }
 
 
-QStringList KPrDocumentIface::presentationList()
+TQStringList KPrDocumentIface::presentationList()
 {
     return doc->presentationList();
 }
 
-void KPrDocumentIface::repaint()
+void KPrDocumentIface::tqrepaint()
 {
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 void KPrDocumentIface::setConfigToolTipCompletion( bool b )