From 3b34e5cf56262c9f54a3bcf02ee5ad93ca0fb05b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:09 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0. --- kbabel/filters/gettext/gettextexport.cpp | 10 +++++----- kbabel/filters/gettext/gettextexport.h | 2 +- kbabel/filters/gettext/gettextimport.cpp | 28 ++++++++++++++-------------- kbabel/filters/gettext/gettextimport.h | 6 +++--- kbabel/filters/linguist/linguistexport.cpp | 4 ++-- kbabel/filters/linguist/linguistexport.h | 2 +- kbabel/filters/linguist/linguistimport.cpp | 2 +- kbabel/filters/linguist/linguistimport.h | 2 +- kbabel/filters/xliff/xliffexport.cpp | 4 ++-- kbabel/filters/xliff/xliffexport.h | 2 +- kbabel/filters/xliff/xliffimport.cpp | 2 +- kbabel/filters/xliff/xliffimport.h | 2 +- 12 files changed, 33 insertions(+), 33 deletions(-) (limited to 'kbabel/filters') diff --git a/kbabel/filters/gettext/gettextexport.cpp b/kbabel/filters/gettext/gettextexport.cpp index 1543afc8..31cca29f 100644 --- a/kbabel/filters/gettext/gettextexport.cpp +++ b/kbabel/filters/gettext/gettextexport.cpp @@ -41,7 +41,7 @@ #include "kbprojectsettings.h" #include -#include +#include #include #include @@ -56,7 +56,7 @@ GettextExportPlugin::GettextExportPlugin(TQObject* parent, const char* name, con { } -ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQString& mimetype, const Catalog* catalog) +ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const TQString& mimetype, const Catalog* catalog) { // check, whether we know how to handle the extra data if( catalog->importPluginID() != "GNU gettext") @@ -164,7 +164,7 @@ ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQS stream << "\n"; - kapp->processEvents(10); + kapp->tqprocessEvents(10); if( isStopped() ) { return STOPPED; @@ -181,7 +181,7 @@ ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQS { stream << (*oit) << "\n\n"; - kapp->processEvents(10); + kapp->tqprocessEvents(10); if( isStopped() ) { return STOPPED; @@ -196,7 +196,7 @@ ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQS } else { - //emit signalError(i18n("Wasn't able to open file %1").arg(filename.ascii())); + //emit signalError(i18n("Wasn't able to open file %1").tqarg(filename.ascii())); return OS_ERROR; } diff --git a/kbabel/filters/gettext/gettextexport.h b/kbabel/filters/gettext/gettextexport.h index 9732ac73..695105d2 100644 --- a/kbabel/filters/gettext/gettextexport.h +++ b/kbabel/filters/gettext/gettextexport.h @@ -54,7 +54,7 @@ class GettextExportPlugin: public KBabel::CatalogExportPlugin { public: GettextExportPlugin(TQObject* parent, const char* name, const TQStringList &); - virtual KBabel::ConversionStatus save(const TQString& file, const TQString& mimetype, const KBabel::Catalog* catalog); + virtual KBabel::ConversiontqStatus save(const TQString& file, const TQString& mimetype, const KBabel::Catalog* catalog); private: /** diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp index e087490b..a48e327b 100644 --- a/kbabel/filters/gettext/gettextimport.cpp +++ b/kbabel/filters/gettext/gettextimport.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include @@ -57,7 +57,7 @@ GettextImportPlugin::GettextImportPlugin(TQObject* parent, const char* name, con { } -ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQString&) +ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQString&) { kdDebug( KBABEL ) << k_funcinfo << endl; @@ -106,7 +106,7 @@ ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQStr //recoveredErrorInHeader = true; } - TQIODevice *dev = stream.device(); + TQIODevice *dev = stream.tqdevice(); int fileSize = dev->size(); // if somethings goes wrong with the parsing, we don't have deleted the old contents @@ -117,7 +117,7 @@ ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQStr kdDebug(KBABEL) << "start parsing..." << endl; // first read header - const ConversionStatus status = readHeader(stream); + const ConversiontqStatus status = readHeader(stream); if ( status == RECOVERED_PARSE_ERROR ) @@ -173,13 +173,13 @@ ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQStr while( !stream.eof() ) { - kapp->processEvents(10); + kapp->tqprocessEvents(10); if( isStopped() ) { return STOPPED; } - const ConversionStatus success=readEntry(stream); + const ConversiontqStatus success=readEntry(stream); if(success==OK) { @@ -302,7 +302,7 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod stream.setEncoding( TQTextStream::Latin1 ); // first read header - ConversionStatus status = readHeader(stream); + ConversiontqStatus status = readHeader(stream); if(status!=OK && status != RECOVERED_PARSE_ERROR) { kdDebug(KBABEL) << "wasn't able to read header" << endl; @@ -360,18 +360,18 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod return codec; } -ConversionStatus GettextImportPlugin::readHeader(TQTextStream& stream) +ConversiontqStatus GettextImportPlugin::readHeader(TQTextStream& stream) { CatalogItem temp; - int filePos=stream.device()->at(); - ConversionStatus status=readEntry(stream); + int filePos=stream.tqdevice()->at(); + ConversiontqStatus status=readEntry(stream); if(status==OK || status==RECOVERED_PARSE_ERROR) { // test if this is the header if(!_msgid.first().isEmpty()) { - stream.device()->at(filePos); + stream.tqdevice()->at(filePos); } return status; @@ -380,7 +380,7 @@ ConversionStatus GettextImportPlugin::readHeader(TQTextStream& stream) return PARSE_ERROR; } -ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) +ConversiontqStatus GettextImportPlugin::readEntry(TQTextStream& stream) { //kdDebug( KBABEL ) << k_funcinfo << " START" << endl; enum {Begin,Comment,Msgctxt,Msgid,Msgstr} part=Begin; @@ -402,7 +402,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) while( !stream.eof() ) { - const int pos=stream.device()->at(); + const int pos=stream.tqdevice()->at(); line=stream.readLine(); @@ -761,7 +761,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) else if((line.find(TQRegExp("^\\s*msgid")) != -1) || (line.find(TQRegExp("^\\s*#")) != -1)) { // We have read successfully one entry, so end loop. - stream.device()->at(pos);// reset position in stream to beginning of this line + stream.tqdevice()->at(pos);// reset position in stream to beginning of this line break; } else if(line.startsWith("msgstr")) diff --git a/kbabel/filters/gettext/gettextimport.h b/kbabel/filters/gettext/gettextimport.h index e5f81679..fa20aa62 100644 --- a/kbabel/filters/gettext/gettextimport.h +++ b/kbabel/filters/gettext/gettextimport.h @@ -50,13 +50,13 @@ class GettextImportPlugin: public KBabel::CatalogImportPlugin { public: GettextImportPlugin(TQObject* parent, const char* name, const TQStringList &); - virtual KBabel::ConversionStatus load(const TQString& file, const TQString& mimetype); + virtual KBabel::ConversiontqStatus load(const TQString& file, const TQString& mimetype); virtual const TQString id() { return "GNU gettext"; } private: TQTextCodec* codecForArray(TQByteArray& arary, bool* hadCodec); - KBabel::ConversionStatus readHeader(TQTextStream& stream); - KBabel::ConversionStatus readEntry(TQTextStream& stream); + KBabel::ConversiontqStatus readHeader(TQTextStream& stream); + KBabel::ConversiontqStatus readEntry(TQTextStream& stream); // description of the last read entry TQString _msgctxt; diff --git a/kbabel/filters/linguist/linguistexport.cpp b/kbabel/filters/linguist/linguistexport.cpp index 29a9788e..10fc37e2 100644 --- a/kbabel/filters/linguist/linguistexport.cpp +++ b/kbabel/filters/linguist/linguistexport.cpp @@ -40,7 +40,7 @@ #include "tqregexp.h" #include #include -#include +#include #include @@ -58,7 +58,7 @@ LinguistExportPlugin::LinguistExportPlugin( TQObject * parent, const char * name { } -ConversionStatus LinguistExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog ) +ConversiontqStatus LinguistExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog ) { // Check whether we know how to handle the extra data. if ( catalog->importPluginID( ) != "TQt translation source" ) diff --git a/kbabel/filters/linguist/linguistexport.h b/kbabel/filters/linguist/linguistexport.h index 18b52460..d468fce4 100644 --- a/kbabel/filters/linguist/linguistexport.h +++ b/kbabel/filters/linguist/linguistexport.h @@ -52,7 +52,7 @@ class LinguistExportPlugin : public KBabel::CatalogExportPlugin { public: LinguistExportPlugin( TQObject * parent, const char * name, const TQStringList& ); - virtual KBabel::ConversionStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog ); + virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog ); private: const TQString extractComment( TQDomDocument& doc, const TQString& s, bool& fuzzy ); diff --git a/kbabel/filters/linguist/linguistimport.cpp b/kbabel/filters/linguist/linguistimport.cpp index b4476d52..6d8dda81 100644 --- a/kbabel/filters/linguist/linguistimport.cpp +++ b/kbabel/filters/linguist/linguistimport.cpp @@ -60,7 +60,7 @@ LinguistImportPlugin::LinguistImportPlugin( TQObject * parent, const char * name { } -ConversionStatus LinguistImportPlugin::load( const TQString& filename, const TQString& ) +ConversiontqStatus LinguistImportPlugin::load( const TQString& filename, const TQString& ) { if ( filename.isEmpty( ) ) { kdDebug( ) << "fatal error: empty filename to open" << endl; diff --git a/kbabel/filters/linguist/linguistimport.h b/kbabel/filters/linguist/linguistimport.h index 11b5c6d1..b0bc51d9 100644 --- a/kbabel/filters/linguist/linguistimport.h +++ b/kbabel/filters/linguist/linguistimport.h @@ -52,7 +52,7 @@ class LinguistImportPlugin : public KBabel::CatalogImportPlugin public: LinguistImportPlugin( TQObject * parent, const char * name, const TQStringList& ); - virtual KBabel::ConversionStatus load( const TQString& filename, const TQString& mimetype ); + virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype ); virtual const TQString id( ) { return "TQt translation source"; } private: diff --git a/kbabel/filters/xliff/xliffexport.cpp b/kbabel/filters/xliff/xliffexport.cpp index ad0a9f33..c633e8b1 100644 --- a/kbabel/filters/xliff/xliffexport.cpp +++ b/kbabel/filters/xliff/xliffexport.cpp @@ -40,7 +40,7 @@ #include "tqregexp.h" #include #include -#include +#include #include @@ -58,7 +58,7 @@ XLIFFExportPlugin::XLIFFExportPlugin( TQObject * parent, const char * name, cons { } -ConversionStatus XLIFFExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog ) +ConversiontqStatus XLIFFExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog ) { // Check whether we know how to handle the extra data. if ( catalog->importPluginID( ) != "XLIFF 1.1" ) diff --git a/kbabel/filters/xliff/xliffexport.h b/kbabel/filters/xliff/xliffexport.h index ac550ccc..eccc311c 100644 --- a/kbabel/filters/xliff/xliffexport.h +++ b/kbabel/filters/xliff/xliffexport.h @@ -52,7 +52,7 @@ class XLIFFExportPlugin : public KBabel::CatalogExportPlugin { public: XLIFFExportPlugin( TQObject * parent, const char * name, const TQStringList& ); - virtual KBabel::ConversionStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog ); + virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog ); private: TQDomElement extractComment( TQDomDocument& doc, const TQString& s ); diff --git a/kbabel/filters/xliff/xliffimport.cpp b/kbabel/filters/xliff/xliffimport.cpp index 807a624d..246b8c24 100644 --- a/kbabel/filters/xliff/xliffimport.cpp +++ b/kbabel/filters/xliff/xliffimport.cpp @@ -73,7 +73,7 @@ XLIFFImportPlugin::XLIFFImportPlugin( TQObject * parent, const char * name, cons { } -ConversionStatus XLIFFImportPlugin::load( const TQString& filename, const TQString& ) +ConversiontqStatus XLIFFImportPlugin::load( const TQString& filename, const TQString& ) { if ( filename.isEmpty( ) ) { kdDebug( KDEBUG_AREA ) << "fatal error: empty filename to open" << endl; diff --git a/kbabel/filters/xliff/xliffimport.h b/kbabel/filters/xliff/xliffimport.h index 8901afd2..a32a686b 100644 --- a/kbabel/filters/xliff/xliffimport.h +++ b/kbabel/filters/xliff/xliffimport.h @@ -52,7 +52,7 @@ class XLIFFImportPlugin : public KBabel::CatalogImportPlugin public: XLIFFImportPlugin( TQObject * parent, const char * name, const TQStringList& ); - virtual KBabel::ConversionStatus load( const TQString& filename, const TQString& mimetype ); + virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype ); virtual const TQString id( ) { return "XLIFF 1.1"; } private: -- cgit v1.2.1