Rename old tq methods that no longer need a unique name

4 files changed, 14 insertions, 14 deletions

diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc
index 9e37597cb..828d817ae 100644
--- a/filters/kspread/opencalc/opencalcexport.cc
+++ b/filters/kspread/opencalc/opencalcexport.cc
@@ -83,7 +83,7 @@ OpenCalcExport::OpenCalcExport( KoFilter *, const char *, const TQStringList & )
 {
 }
 
-KoFilter::ConversiontqStatus OpenCalcExport::convert( const TQCString & from,
+KoFilter::ConversionStatus OpenCalcExport::convert( const TQCString & from,
                                                     const TQCString & to )
 {
   /* later...
@@ -91,7 +91,7 @@ KoFilter::ConversiontqStatus OpenCalcExport::convert( const TQCString & from,
      OpenCalcWorker * worker = new OpenCalcWorker();
      leader->setWorker( worker );
 
-     KoFilter::ConversiontqStatus status = leader->convert();
+     KoFilter::ConversionStatus status = leader->convert();
 
      delete worker;
      delete leader;
@@ -227,7 +227,7 @@ bool OpenCalcExport::exportDocInfo( KoStore * store, const Doc* ksdoc )
   data.appendChild( meta.createTextNode( aboutPage->subject() ) );
   officeMeta.appendChild( data );
 
-  const TQDateTime dt ( TQDateTime::tqcurrentDateTime() );
+  const TQDateTime dt ( TQDateTime::currentDateTime() );
   if ( dt.isValid() )
   {
     data = meta.createElement( "dc:date" );
@@ -1073,7 +1073,7 @@ void OpenCalcExport::convertPart( TQString const & part, TQDomDocument & doc,
           TQDomElement t = doc.createElement( "text:date" );
           t.setAttribute( "text:date-value", "0-00-00" );
           // todo: "style:data-style-name", "N2"
-          t.appendChild( doc.createTextNode( TQDate::tqcurrentDate().toString() ) );
+          t.appendChild( doc.createTextNode( TQDate::currentDate().toString() ) );
           parent.appendChild( t );
         }
         else if ( var == "<time>" )
diff --git a/filters/kspread/opencalc/opencalcexport.h b/filters/kspread/opencalc/opencalcexport.h
index 97832a9a5..03cfa245b 100644
--- a/filters/kspread/opencalc/opencalcexport.h
+++ b/filters/kspread/opencalc/opencalcexport.h
@@ -46,7 +46,7 @@ class OpenCalcExport : public KoFilter
   OpenCalcExport( KoFilter * parent, const char * name, const TQStringList & );
   virtual ~OpenCalcExport() {}
 
-  virtual KoFilter::ConversiontqStatus convert( const TQCString & from,
+  virtual KoFilter::ConversionStatus convert( const TQCString & from,
                                               const TQCString & to );
 
  private:
diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc
index 376a8f776..0fbe52e01 100644
--- a/filters/kspread/opencalc/opencalcimport.cc
+++ b/filters/kspread/opencalc/opencalcimport.cc
@@ -2735,7 +2735,7 @@ int OpenCalcImport::readMetaData()
   return result;
 }
 
-KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQCString const & to )
+KoFilter::ConversionStatus OpenCalcImport::convert( TQCString const & from, TQCString const & to )
 {
   kdDebug(30518) << "Entering OpenCalc Import filter: " << from << " - " << to << endl;
 
@@ -2765,10 +2765,10 @@ KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQ
 
   kdDebug(30518) << "Opening file " << endl;
 
-  KoFilter::ConversiontqStatus pretqStatus = openFile();
+  KoFilter::ConversionStatus preStatus = openFile();
 
-  if ( pretqStatus != KoFilter::OK )
-    return pretqStatus;
+  if ( preStatus != KoFilter::OK )
+    return preStatus;
 
   emit sigProgress( 13 );
   int tables = readMetaData();
@@ -2782,7 +2782,7 @@ KoFilter::ConversiontqStatus OpenCalcImport::convert( TQCString const & from, TQ
   return KoFilter::OK;
 }
 
-KoFilter::ConversiontqStatus OpenCalcImport::openFile()
+KoFilter::ConversionStatus OpenCalcImport::openFile()
 {
   KoStore * store = KoStore::createStore( m_chain->inputFile(), KoStore::Read);
 
@@ -2817,7 +2817,7 @@ KoFilter::ConversiontqStatus OpenCalcImport::openFile()
   return KoFilter::OK;
 }
 
-KoFilter::ConversiontqStatus OpenCalcImport::loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store )
+KoFilter::ConversionStatus OpenCalcImport::loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store )
 {
     return OoUtils::loadAndParse( fileName, doc, m_store);
 }
diff --git a/filters/kspread/opencalc/opencalcimport.h b/filters/kspread/opencalc/opencalcimport.h
index cd1f23b63..071a87ffe 100644
--- a/filters/kspread/opencalc/opencalcimport.h
+++ b/filters/kspread/opencalc/opencalcimport.h
@@ -47,7 +47,7 @@ class OpenCalcImport : public KoFilter
   OpenCalcImport( KoFilter * parent, const char * name, const TQStringList & );
   virtual ~OpenCalcImport();
 
-  virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
+  virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to );
 
 
  private:
@@ -111,9 +111,9 @@ class OpenCalcImport : public KoFilter
     void loadOasisConditionValue( const TQString &styleCondition, KSpread::Conditional &newCondition );
     void loadOasisCondition( TQString &valExpression, KSpread::Conditional &newCondition );
     void loadOasisValidationValue( const TQStringList &listVal, KSpread::Conditional &newCondition );
-    KoFilter::ConversiontqStatus loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store );
+    KoFilter::ConversionStatus loadAndParse( TQDomDocument& doc, const TQString& fileName,KoStore *m_store );
 
-  KoFilter::ConversiontqStatus openFile();
+  KoFilter::ConversionStatus openFile();
 };
 
 #endif // OpenCalc_IMPORT_H__