Rename old tq methods that no longer need a unique name

12 files changed, 29 insertions, 29 deletions

diff --git a/filters/kpresenter/kword/kprkword.cc b/filters/kpresenter/kword/kprkword.cc
index d40cd608..8dd96c5f 100644
--- a/filters/kpresenter/kword/kprkword.cc
+++ b/filters/kpresenter/kword/kprkword.cc
@@ -41,7 +41,7 @@ KprKword::KprKword(KoFilter *, const char *, const TQStringList&) :
 // This filter can act as an import filter for KWord and as an export
 // filter for KPresenter (isn't our architecture really nice ? :)
 // This is why we use the file-to-file method, not a TQDomDoc one.
-KoFilter::ConversiontqStatus KprKword::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus KprKword::convert( const TQCString& from, const TQCString& to )
 {
     if(to!="application/x-kword" || from!="application/x-kpresenter")
         return KoFilter::NotImplemented;
diff --git a/filters/kpresenter/kword/kprkword.h b/filters/kpresenter/kword/kprkword.h
index f4141a09..30932652 100644
--- a/filters/kpresenter/kword/kprkword.h
+++ b/filters/kpresenter/kword/kprkword.h
@@ -33,7 +33,7 @@ public:
 
     virtual ~KprKword() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 
 protected:
     void convert();
diff --git a/filters/kpresenter/libimageexport/imageexport.cpp b/filters/kpresenter/libimageexport/imageexport.cpp
index b87b8635..c4ceb243 100644
--- a/filters/kpresenter/libimageexport/imageexport.cpp
+++ b/filters/kpresenter/libimageexport/imageexport.cpp
@@ -42,7 +42,7 @@ ImageExport::~ImageExport()
 }
 
 
-KoFilter::ConversiontqStatus
+KoFilter::ConversionStatus
 ImageExport::convert(const TQCString& from, const TQCString& to)
 {
     KoDocument * document = m_chain->inputDocument();
diff --git a/filters/kpresenter/libimageexport/imageexport.h b/filters/kpresenter/libimageexport/imageexport.h
index 23f45e28..5cb89622 100644
--- a/filters/kpresenter/libimageexport/imageexport.h
+++ b/filters/kpresenter/libimageexport/imageexport.h
@@ -32,7 +32,7 @@ public:
     ImageExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~ImageExport();
 
-    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
     virtual bool extraImageAttribute() { return true;};
     virtual bool saveImage( TQString fileName) = 0;
     virtual const char* exportFormat() = 0;
diff --git a/filters/kpresenter/ooimpress/ooimpressexport.cc b/filters/kpresenter/ooimpress/ooimpressexport.cc
index 0e4771cf..be986d92 100644
--- a/filters/kpresenter/ooimpress/ooimpressexport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressexport.cc
@@ -54,7 +54,7 @@ OoImpressExport::~OoImpressExport()
     delete m_storeinp;
 }
 
-KoFilter::ConversiontqStatus OoImpressExport::convert( const TQCString & from,
+KoFilter::ConversionStatus OoImpressExport::convert( const TQCString & from,
                                                      const TQCString & to )
 {
     kdDebug(30518) << "Entering Ooimpress Export filter: " << from << " - " << to << endl;
@@ -66,10 +66,10 @@ KoFilter::ConversiontqStatus OoImpressExport::convert( const TQCString & from,
     }
 
     // read in the KPresenter file
-    KoFilter::ConversiontqStatus pretqStatus = openFile();
+    KoFilter::ConversionStatus preStatus = openFile();
 
-    if ( pretqStatus != KoFilter::OK )
-        return pretqStatus;
+    if ( preStatus != KoFilter::OK )
+        return preStatus;
 
     TQDomImplementation impl;
     TQDomDocument meta( impl.createDocumentType( "office:document-meta",
@@ -178,7 +178,7 @@ KoFilter::ConversiontqStatus OoImpressExport::convert( const TQCString & from,
     return KoFilter::OK;
 }
 
-KoFilter::ConversiontqStatus OoImpressExport::openFile()
+KoFilter::ConversionStatus OoImpressExport::openFile()
 {
     m_storeinp = KoStore::createStore( m_chain->inputFile(), KoStore::Read );
 
diff --git a/filters/kpresenter/ooimpress/ooimpressexport.h b/filters/kpresenter/ooimpress/ooimpressexport.h
index ac369192..dec5ec4c 100644
--- a/filters/kpresenter/ooimpress/ooimpressexport.h
+++ b/filters/kpresenter/ooimpress/ooimpressexport.h
@@ -37,11 +37,11 @@ public:
     OoImpressExport( KoFilter * parent, const char * name, const TQStringList & );
     virtual ~OoImpressExport();
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString & from,
+    virtual KoFilter::ConversionStatus convert( const TQCString & from,
                                                 const TQCString & to );
 
 private:
-    KoFilter::ConversiontqStatus openFile();
+    KoFilter::ConversionStatus openFile();
 
     void exportBody( TQDomDocument & doccontent, TQDomElement & body );
     void createDocumentMeta( TQDomDocument & docmeta );
diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cc
index 1dab566d..f7322342 100644
--- a/filters/kpresenter/ooimpress/ooimpressimport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressimport.cc
@@ -67,7 +67,7 @@ OoImpressImport::~OoImpressImport()
     m_animations.clear();
 }
 
-KoFilter::ConversiontqStatus OoImpressImport::convert( TQCString const & from, TQCString const & to )
+KoFilter::ConversionStatus OoImpressImport::convert( TQCString const & from, TQCString const & to )
 {
     kdDebug(30518) << "Entering Ooimpress Import filter: " << from << " - " << to << endl;
 
@@ -87,13 +87,13 @@ KoFilter::ConversiontqStatus OoImpressImport::convert( TQCString const & from, T
         return KoFilter::FileNotFound;
     }
 
-    KoFilter::ConversiontqStatus pretqStatus = openFile();
+    KoFilter::ConversionStatus preStatus = openFile();
 
-    if ( pretqStatus != KoFilter::OK )
+    if ( preStatus != KoFilter::OK )
     {
         m_zip->close();
         delete m_zip;
-        return pretqStatus;
+        return preStatus;
     }
 
     TQDomDocument docinfo;
@@ -129,9 +129,9 @@ KoFilter::ConversiontqStatus OoImpressImport::convert( TQCString const & from, T
 }
 
 // Very related to OoWriterImport::openFile()
-KoFilter::ConversiontqStatus OoImpressImport::openFile()
+KoFilter::ConversionStatus OoImpressImport::openFile()
 {
-    KoFilter::ConversiontqStatus status = loadAndParse( "content.xml", m_content );
+    KoFilter::ConversionStatus status = loadAndParse( "content.xml", m_content );
     if ( status != KoFilter::OK )
     {
         kdError(30518) << "Content.xml could not be parsed correctly! Aborting!" << endl;
@@ -150,7 +150,7 @@ KoFilter::ConversiontqStatus OoImpressImport::openFile()
     return KoFilter::OK;
 }
 
-KoFilter::ConversiontqStatus OoImpressImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
+KoFilter::ConversionStatus OoImpressImport::loadAndParse(const TQString& filename, TQDomDocument& doc)
 {
     return OoUtils::loadAndParse( filename, doc, m_zip);
 }
@@ -1154,7 +1154,7 @@ void OoImpressImport::appendImage( TQDomDocument& doc, TQDomElement& e, TQDomEle
 
     // create a key for the picture
     TQTime time = TQTime::currentTime();
-    TQDate date = TQDate::tqcurrentDate();
+    TQDate date = TQDate::currentDate();
 
     TQDomElement image = doc.createElement( "KEY" );
     image.setAttribute( "msec", time.msec() );
@@ -1214,7 +1214,7 @@ void OoImpressImport::appendBackgroundImage( TQDomDocument& doc, TQDomElement& e
 
     // create a key for the picture
     TQTime time = TQTime::currentTime();
-    TQDate date = TQDate::tqcurrentDate();
+    TQDate date = TQDate::currentDate();
 
     TQDomElement image = doc.createElement( "BACKPICTUREKEY" );
     image.setAttribute( "msec", time.msec() );
@@ -2161,7 +2161,7 @@ void OoImpressImport::appendField(TQDomDocument& doc, TQDomElement& e, const TQD
         bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true");
 
         if (!dt.isValid()) {
-            dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :)
+            dt = TQDateTime::currentDateTime(); // OOo docs say so :)
             fixed = false;
         }
 
@@ -2196,7 +2196,7 @@ void OoImpressImport::appendField(TQDomDocument& doc, TQDomElement& e, const TQD
         bool fixed = (object.hasAttributeNS( ooNS::text, "fixed") && object.attributeNS( ooNS::text, "fixed", TQString())=="true");
 
         if (!dt.isValid()) {
-            dt = TQDateTime::tqcurrentDateTime(); // OOo docs say so :)
+            dt = TQDateTime::currentDateTime(); // OOo docs say so :)
             fixed = false;
         }
 
diff --git a/filters/kpresenter/ooimpress/ooimpressimport.h b/filters/kpresenter/ooimpress/ooimpressimport.h
index 596ca703..b187d189 100644
--- a/filters/kpresenter/ooimpress/ooimpressimport.h
+++ b/filters/kpresenter/ooimpress/ooimpressimport.h
@@ -46,7 +46,7 @@ public:
     OoImpressImport( KoFilter * parent, const char * name, const TQStringList & );
     virtual ~OoImpressImport();
 
-    virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to );
+    virtual KoFilter::ConversionStatus convert( TQCString const & from, TQCString const & to );
 
 private:
     void createDocumentInfo( TQDomDocument &docinfo );
@@ -96,8 +96,8 @@ private:
     bool parseSettings( TQDomDocument &doc, TQDomElement &helpLineElement, TQDomElement &attributeElement );
     void parseHelpLine( TQDomDocument &doc,TQDomElement &helpLineElement, const TQString &text );
 
-    KoFilter::ConversiontqStatus openFile();
-    KoFilter::ConversiontqStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
+    KoFilter::ConversionStatus openFile();
+    KoFilter::ConversionStatus loadAndParse(const TQString& filename, TQDomDocument& doc);
 
     int m_numPicture;
     int m_numSound;
diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cc
index 4f41aac7..0b89e187 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.cc
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc
@@ -80,7 +80,7 @@ PowerPointImport::~PowerPointImport()
   delete d;
 }
 
-KoFilter::ConversiontqStatus PowerPointImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus PowerPointImport::convert( const TQCString& from, const TQCString& to )
 {
   if ( from != "application/mspowerpoint" )
     return KoFilter::NotImplemented; 
diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.h b/filters/kpresenter/powerpoint/import/powerpointimport.h
index ca3e7365..6b75cfb3 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.h
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.h
@@ -39,7 +39,7 @@ Q_OBJECT
 public:
   PowerPointImport ( TQObject *parent, const char* name, const TQStringList& );
   virtual ~PowerPointImport();
-  virtual KoFilter::ConversiontqStatus convert( const TQCString& from, 
+  virtual KoFilter::ConversionStatus convert( const TQCString& from, 
         const TQCString& to );
 
 private:
diff --git a/filters/kpresenter/svg/svgexport.cc b/filters/kpresenter/svg/svgexport.cc
index 990d12cd..9eae5cd8 100644
--- a/filters/kpresenter/svg/svgexport.cc
+++ b/filters/kpresenter/svg/svgexport.cc
@@ -48,7 +48,7 @@ SvgExport::~SvgExport()
 }
 
 
-KoFilter::ConversiontqStatus
+KoFilter::ConversionStatus
 SvgExport::convert(const TQCString& from, const TQCString& to)
 {
     KoDocument * document = m_chain->inputDocument();
diff --git a/filters/kpresenter/svg/svgexport.h b/filters/kpresenter/svg/svgexport.h
index eafdd792..17e3d79f 100644
--- a/filters/kpresenter/svg/svgexport.h
+++ b/filters/kpresenter/svg/svgexport.h
@@ -32,7 +32,7 @@ public:
     SvgExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~SvgExport();
 
-    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // __SVGEXPORT_H__