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

11 files changed, 214 insertions, 212 deletions

diff --git a/filters/kspread/excel/excelexport.cc b/filters/kspread/excel/excelexport.cc
index 74ad7758..2e2c50e7 100644
--- a/filters/kspread/excel/excelexport.cc
+++ b/filters/kspread/excel/excelexport.cc
@@ -9,11 +9,11 @@ typedef KGenericFactory<ExcelExport, KoFilter> ExcelExportFactory;
 //K_EXPORT_COMPONENT_FACTORY(libkspreadexcelexport, ExcelExportFactory("excelexport"))
 
 
-ExcelExport::ExcelExport(KoFilter *, const char *, const QStringList&) : KoFilter() {
+ExcelExport::ExcelExport(KoFilter *, const char *, const TQStringList&) : KoFilter() {
 }
 
 
-KoFilter::ConversionStatus ExcelExport::convert(const QCString& from, const QCString& to) {
+KoFilter::ConversiontqStatus ExcelExport::convert(const TQCString& from, const TQCString& to) {
 	// Double check that's we really what we want to do
 	if ( ( (to != "application/excel") && (to != "application/msexcel") ) || from != "application/x-kspread") {
 		kdWarning(0) << "Invalid mimetypes " << to << ", " << from << endl;
@@ -28,37 +28,37 @@ KoFilter::ConversionStatus ExcelExport::convert(const QCString& from, const QCSt
 
 
 /*
-KoFilter::ConversionStatus ExcelWorker::startDocument(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startDocument(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startInfoLog(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startInfoLog(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startInfoAuthor(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startInfoAuthor(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startInfoAbout(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startInfoAbout(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startSpreadBook(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startSpreadBook(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startSpreadSheet(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startSpreadSheet(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 
 
-KoFilter::ConversionStatus ExcelWorker::startSpreadCell(KSpreadFilterProperty property) {
+KoFilter::ConversiontqStatus ExcelWorker::startSpreadCell(KSpreadFilterProperty property) {
 	return KoFilter::OK;
 }
 */
diff --git a/filters/kspread/excel/excelexport.h b/filters/kspread/excel/excelexport.h
index 28e1b41e..946a1b09 100644
--- a/filters/kspread/excel/excelexport.h
+++ b/filters/kspread/excel/excelexport.h
@@ -10,25 +10,26 @@
 
 class ExcelExport : public KoFilter {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	ExcelExport(KoFilter *parent, const char*name, const QStringList&);
+	ExcelExport(KoFilter *tqparent, const char*name, const TQStringList&);
 	virtual ~ExcelExport() {}
 
-	virtual KoFilter::ConversionStatus convert(const QCString& from, const QCString& to);
+	virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 
 class ExcelWorker : public KSpreadBaseWorker {
 public:
 	// Implement those
-	//KoFilter::ConversionStatus startDocument(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startInfoLog(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startInfoAuthor(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startInfoAbout(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startSpreadBook(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startSpreadSheet(KSpreadFilterProperty property);
-	//KoFilter::ConversionStatus startSpreadCell(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startDocument(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startInfoLog(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startInfoAuthor(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startInfoAbout(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startSpreadBook(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startSpreadSheet(KSpreadFilterProperty property);
+	//KoFilter::ConversiontqStatus startSpreadCell(KSpreadFilterProperty property);
 };
 
 #endif
diff --git a/filters/kspread/excel/import/excelimport.cc b/filters/kspread/excel/import/excelimport.cc
index 3ff38717..88a20e33 100644
--- a/filters/kspread/excel/import/excelimport.cc
+++ b/filters/kspread/excel/import/excelimport.cc
@@ -27,13 +27,13 @@
 #include <excelimport.h>
 #include <excelimport.moc>
 
-#include <qbuffer.h>
-#include <qcstring.h>
-#include <qdatetime.h>
-#include <qfile.h>
-#include <qmap.h>
-#include <qstring.h>
-#include <qtextstream.h>
+#include <tqbuffer.h>
+#include <tqcstring.h>
+#include <tqdatetime.h>
+#include <tqfile.h>
+#include <tqmap.h>
+#include <tqstring.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <KoFilterChain.h>
@@ -51,11 +51,11 @@ typedef KGenericFactory<ExcelImport, KoFilter> ExcelImportFactory;
 K_EXPORT_COMPONENT_FACTORY( libexcelimport, ExcelImportFactory( "kofficefilters" ) )
 
 
-// UString -> QConstString conversion. Use .string() to get the QString.
-// Always store the QConstString into a variable first, to avoid a deep copy.
-inline QConstString string( const Swinder::UString& str ) {
-   // Let's hope there's no copying of the QConstString happening...
-   return QConstString( reinterpret_cast<const QChar*>( str.data() ), str.length() );
+// UString -> TQConstString conversion. Use .string() to get the TQString.
+// Always store the TQConstString into a variable first, to avoid a deep copy.
+inline TQConstString string( const Swinder::UString& str ) {
+   // Let's hope there's no copying of the TQConstString happening...
+   return TQConstString( reinterpret_cast<const TQChar*>( str.data() ), str.length() );
 }
 
 using namespace Swinder;
@@ -63,8 +63,8 @@ using namespace Swinder;
 class ExcelImport::Private
 {
 public:
-  QString inputFile;
-  QString outputFile;
+  TQString inputFile;
+  TQString outputFile;
 
   Workbook *workbook;  
 
@@ -76,10 +76,10 @@ public:
   int columnFormatIndex;
   int rowFormatIndex;
 
-  QMap<int,bool> styleFormats;
-  QMap<int,bool> isPercentageStyle;
-  QMap<int,bool> isDateStyle;
-  QMap<int,bool> isTimeStyle;
+  TQMap<int,bool> styleFormats;
+  TQMap<int,bool> isPercentageStyle;
+  TQMap<int,bool> isDateStyle;
+  TQMap<int,bool> isTimeStyle;
   
   void processWorkbookForBody( Workbook* workbook, KoXmlWriter* xmlWriter );
   void processWorkbookForStyle( Workbook* workbook, KoXmlWriter* xmlWriter );
@@ -92,11 +92,11 @@ public:
   void processCellForBody( Cell* cell, KoXmlWriter* xmlWriter );
   void processCellForStyle( Cell* cell, KoXmlWriter* xmlWriter );
   void processFormat( const Format* format, KoXmlWriter* xmlWriter );
-  void processValueFormat( QString valueFormat, QString refName, KoXmlWriter* xmlWriter );
+  void processValueFormat( TQString valueFormat, TQString refName, KoXmlWriter* xmlWriter );
 };
 
 
-ExcelImport::ExcelImport ( QObject*, const char*, const QStringList& )
+ExcelImport::ExcelImport ( TQObject*, const char*, const TQStringList& )
     : KoFilter()
 {
   d = new Private;
@@ -107,7 +107,7 @@ ExcelImport::~ExcelImport()
   delete d;
 }
 
-KoFilter::ConversionStatus ExcelImport::convert( const QCString& from, const QCString& to )
+KoFilter::ConversiontqStatus ExcelImport::convert( const TQCString& from, const TQCString& to )
 {
   if ( from != "application/msexcel" )
     return KoFilter::NotImplemented; 
@@ -118,7 +118,7 @@ KoFilter::ConversionStatus ExcelImport::convert( const QCString& from, const QCS
   d->inputFile = m_chain->inputFile();
   d->outputFile = m_chain->outputFile();
 
-  QTime time;
+  TQTime time;
   time.start();
 
   // open inputFile
@@ -194,8 +194,8 @@ KoFilter::ConversionStatus ExcelImport::convert( const QCString& from, const QCS
   // we are done!
   delete d->workbook;
   delete storeout;
-  d->inputFile = QString::null;
-  d->outputFile = QString::null;
+  d->inputFile = TQString();
+  d->outputFile = TQString();
   d->workbook = 0;
 
 
@@ -348,7 +348,7 @@ void ExcelImport::Private::processSheetForBody( Sheet* sheet, KoXmlWriter* xmlWr
   xmlWriter->addAttribute( "table:name", string( sheet->name() ).string() );
   xmlWriter->addAttribute( "table:print", "false" );
   xmlWriter->addAttribute( "table:protected", "false" );
-  xmlWriter->addAttribute( "table:style-name", QString("ta%1").arg(sheetFormatIndex));
+  xmlWriter->addAttribute( "table:style-name", TQString("ta%1").tqarg(sheetFormatIndex));
   sheetFormatIndex++;
   
   unsigned ci = 0;
@@ -397,7 +397,7 @@ void ExcelImport::Private::processSheetForStyle( Sheet* sheet, KoXmlWriter* xmlW
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:family", "table" );  
   xmlWriter->addAttribute( "style:master-page-name", "Default" );  
-  xmlWriter->addAttribute( "style:name", QString("ta%1").arg(sheetFormatIndex) );  
+  xmlWriter->addAttribute( "style:name", TQString("ta%1").tqarg(sheetFormatIndex) );  
   sheetFormatIndex++;
   
   xmlWriter->startElement( "style:table-properties" );
@@ -450,7 +450,7 @@ void ExcelImport::Private::processColumnForBody( Column* column, int repeat, KoX
   xmlWriter->addAttribute( "table:default-style-name", "Default" );  
   xmlWriter->addAttribute( "table:visibility", column->visible() ? "visible" : "collapse" );  
   if(repeat > 1) xmlWriter->addAttribute( "table:number-columns-repeated", repeat );  
-  xmlWriter->addAttribute( "table:style-name", QString("co%1").arg(columnFormatIndex) );  
+  xmlWriter->addAttribute( "table:style-name", TQString("co%1").tqarg(columnFormatIndex) );  
   columnFormatIndex++;
 
   xmlWriter->endElement();  // table:table-column
@@ -463,12 +463,12 @@ void ExcelImport::Private::processColumnForStyle( Column* column, int /*repeat*/
   
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:family", "table-column" );  
-  xmlWriter->addAttribute( "style:name", QString("co%1").arg(columnFormatIndex) );  
+  xmlWriter->addAttribute( "style:name", TQString("co%1").tqarg(columnFormatIndex) );  
   columnFormatIndex++;
   
   xmlWriter->startElement( "style:table-column-properties" );
   xmlWriter->addAttribute( "fo:break-before", "auto" );
-  xmlWriter->addAttribute( "style:column-width", QString("%1in").arg(column->width()/27) );
+  xmlWriter->addAttribute( "style:column-width", TQString("%1in").tqarg(column->width()/27) );
   xmlWriter->endElement();  // style:table-column-properties
   
   xmlWriter->endElement();  // style:style
@@ -494,7 +494,7 @@ void ExcelImport::Private::processRowForBody( Row* row, int /*repeat*/, KoXmlWri
   
   xmlWriter->startElement( "table:table-row" );
   xmlWriter->addAttribute( "table:visibility", row->visible() ? "visible" : "collapse" );  
-  xmlWriter->addAttribute( "table:style-name", QString("ro%1").arg(rowFormatIndex) );  
+  xmlWriter->addAttribute( "table:style-name", TQString("ro%1").tqarg(rowFormatIndex) );  
   rowFormatIndex++;
   
   for( int i = 0; i <= lastCol; i++ )
@@ -530,12 +530,12 @@ void ExcelImport::Private::processRowForStyle( Row* row, int repeat, KoXmlWriter
   xmlWriter->startElement( "style:style" );
   xmlWriter->addAttribute( "style:family", "table-row" );  
   if(repeat > 1) xmlWriter->addAttribute( "table:number-rows-repeated", repeat );  
-  xmlWriter->addAttribute( "style:name", QString("ro%1").arg(rowFormatIndex) );  
+  xmlWriter->addAttribute( "style:name", TQString("ro%1").tqarg(rowFormatIndex) );  
   rowFormatIndex++;
   
   xmlWriter->startElement( "style:table-row-properties" );
   xmlWriter->addAttribute( "fo:break-before", "auto" );
-  xmlWriter->addAttribute( "style:row-height", QString("%1pt").arg(row->height()) );
+  xmlWriter->addAttribute( "style:row-height", TQString("%1pt").tqarg(row->height()) );
   xmlWriter->endElement();  // style:table-row-properties
   
   xmlWriter->endElement();  // style:style
@@ -548,16 +548,16 @@ void ExcelImport::Private::processRowForStyle( Row* row, int repeat, KoXmlWriter
   }
 }
 
-static bool isPercentageFormat( const QString& valueFormat )
+static bool isPercentageFormat( const TQString& valueFormat )
 {
   if( valueFormat.isEmpty() ) return false;
   if( valueFormat.length() < 1 ) return false;
-  return valueFormat[valueFormat.length()-1] == QChar('%');
+  return valueFormat[valueFormat.length()-1] == TQChar('%');
 }
 
-static bool isDateFormat( const QString& valueFormat )
+static bool isDateFormat( const TQString& valueFormat )
 {
-  QString vfu = valueFormat.upper();
+  TQString vfu = valueFormat.upper();
   
   if( vfu == "M/D/YY" ) return true;
   if( vfu == "M/D/YYYY" ) return true;
@@ -587,9 +587,9 @@ static bool isDateFormat( const QString& valueFormat )
   return false;
 }
 
-static bool isTimeFormat( const QString& valueFormat )
+static bool isTimeFormat( const TQString& valueFormat )
 {
-  QString vf = valueFormat;
+  TQString vf = valueFormat;
   
   if( vf == "h:mm AM/PM" ) return true;
   if( vf == "h:mm:ss AM/PM" ) return true;
@@ -608,19 +608,19 @@ static bool isTimeFormat( const QString& valueFormat )
   return false;
 }
 
-static QString convertDate( double serialNo )
+static TQString convertDate( double serialNo )
 {
   // reference is midnight 30 Dec 1899
-  QDate dd( 1899, 12, 30 );
+  TQDate dd( 1899, 12, 30 );
   dd = dd.addDays( (int) serialNo );
   return dd.toString( "yyyy-MM-dd" );
 }
 
-static QString convertTime( double serialNo )
+static TQString convertTime( double serialNo )
 {
   // reference is midnight 30 Dec 1899
-  QTime tt;
-  tt = tt.addMSecs( qRound( (serialNo-(int)serialNo) * 86400 * 1000 ) );
+  TQTime tt;
+  tt = tt.addMSecs( tqRound( (serialNo-(int)serialNo) * 86400 * 1000 ) );
   return tt.toString( "PThhHmmMss,zzz0S" );
 }  
 
@@ -631,14 +631,14 @@ void ExcelImport::Private::processCellForBody( Cell* cell, KoXmlWriter* xmlWrite
 
   int formatIndex = cell->formatIndex();
   
-  QString styleName("ce");
-  styleName.append( QString::number( formatIndex ) );
+  TQString styleName("ce");
+  styleName.append( TQString::number( formatIndex ) );
   xmlWriter->startElement( "table:table-cell" );
   xmlWriter->addAttribute( "table:style-name", styleName );  
 
   if( !cell->formula().isEmpty() )
   {
-    QString formula = string( cell->formula() ).string();
+    TQString formula = string( cell->formula() ).string();
     xmlWriter->addAttribute( "table:formula", formula.prepend("=") );
   }
 
@@ -654,7 +654,7 @@ void ExcelImport::Private::processCellForBody( Cell* cell, KoXmlWriter* xmlWrite
     if( isPercentageStyle[formatIndex] )
     {
       xmlWriter->addAttribute( "office:value-type", "percentage" );
-      xmlWriter->addAttribute( "office:value", QString::number( value.asFloat(), 'g', 15 ) );
+      xmlWriter->addAttribute( "office:value", TQString::number( value.asFloat(), 'g', 15 ) );
     }
     else if( isDateStyle[formatIndex] )
     {
@@ -670,12 +670,12 @@ void ExcelImport::Private::processCellForBody( Cell* cell, KoXmlWriter* xmlWrite
     {
       // fallback, just write as normal number
       xmlWriter->addAttribute( "office:value-type", "float" );
-      xmlWriter->addAttribute( "office:value", QString::number( value.asFloat(), 'g', 15 ) );
+      xmlWriter->addAttribute( "office:value", TQString::number( value.asFloat(), 'g', 15 ) );
     }
   }
   else if( value.isString() )
   {
-    QString str = string( value.asString() ).string();
+    TQString str = string( value.asString() ).string();
     xmlWriter->addAttribute( "office:value-type", "string" );
     xmlWriter->addAttribute( "office:string-value", str );
     xmlWriter->startElement( "text:p" );
@@ -692,24 +692,24 @@ void ExcelImport::Private::processCellForStyle( Cell* cell, KoXmlWriter* xmlWrit
   if( !xmlWriter ) return;
 
   // only IF automatic style for this format has not been already created yet
-  if( !styleFormats.contains( cell->formatIndex() ) ) 
+  if( !styleFormats.tqcontains( cell->formatIndex() ) ) 
   {
     styleFormats[ cell->formatIndex() ] = true;
 
     const Format& format = cell->sheet()->workbook()->format( cell->formatIndex() );  
     
     // handle data format, e.g. number style
-    QString refName;
+    TQString refName;
     const UString& valueFormat = format.valueFormat();
     if( !valueFormat.isEmpty() )
     {
-      refName = QString("N%1").arg(cell->formatIndex());
-      QString numformat = string( valueFormat ).string();
+      refName = TQString("N%1").tqarg(cell->formatIndex());
+      TQString numformat = string( valueFormat ).string();
       processValueFormat( numformat, refName, xmlWriter );
     }
 
     // later for writing the value
-    QString numformat = string( valueFormat ).string();
+    TQString numformat = string( valueFormat ).string();
     isPercentageStyle[ cell->formatIndex() ] = isPercentageFormat( numformat );
     isDateStyle[ cell->formatIndex() ] = isDateFormat( numformat );
     isTimeStyle[ cell->formatIndex() ] = isTimeFormat( numformat );
@@ -717,7 +717,7 @@ void ExcelImport::Private::processCellForStyle( Cell* cell, KoXmlWriter* xmlWrit
     // now the real table-cell  
     xmlWriter->startElement( "style:style" );
     xmlWriter->addAttribute( "style:family", "table-cell" );  
-    xmlWriter->addAttribute( "style:name", QString("ce%1").arg( cell->formatIndex() ) );  
+    xmlWriter->addAttribute( "style:name", TQString("ce%1").tqarg( cell->formatIndex() ) );  
     if( !refName.isEmpty() )
       xmlWriter->addAttribute( "style:data-style-name", refName );  
     
@@ -727,18 +727,18 @@ void ExcelImport::Private::processCellForStyle( Cell* cell, KoXmlWriter* xmlWrit
   }
 }
 
-QString convertColor( const Color& color )
+TQString convertColor( const Color& color )
 {
   char buf[8];
   sprintf( buf, "#%02x%02x%02x", color.red, color.green, color.blue );
-  return QString( buf );
+  return TQString( buf );
 }
 
-QString convertBorder( const Pen& pen )
+TQString convertBorder( const Pen& pen )
 {
   if( pen.style == Pen::NoLine || pen.width == 0 ) return "none";
   
-  QString result = QString::number( pen.width );
+  TQString result = TQString::number( pen.width );
   result += "pt ";
   
   switch( pen.style )
@@ -759,7 +759,7 @@ void ExcelImport::Private::processFormat( const Format* format, KoXmlWriter* xml
   if( !xmlWriter ) return;
   
   const FormatFont& font = format->font();
-  const FormatAlignment& align = format->alignment();
+  const FormatAlignment& align = format->tqalignment();
   const FormatBackground& back = format->background();
   const FormatBorders& borders = format->borders();
   
@@ -792,7 +792,7 @@ void ExcelImport::Private::processFormat( const Format* format, KoXmlWriter* xml
     if( !font.fontFamily().isEmpty() )
       xmlWriter->addAttribute( "style:font-name", string(font.fontFamily()).string() );
       
-    xmlWriter->addAttribute( "fo:font-size", QString("%1pt").arg(font.fontSize()) );  
+    xmlWriter->addAttribute( "fo:font-size", TQString("%1pt").tqarg(font.fontSize()) );  
     
     xmlWriter->addAttribute( "fo:color", convertColor( font.color() ) );
     
@@ -844,12 +844,12 @@ void ExcelImport::Private::processFormat( const Format* format, KoXmlWriter* xml
     }
     
     if( align.indentLevel() != 0 )
-      xmlWriter->addAttribute( "fo:margin-left", QString::number( align.indentLevel() ) + "0pt" );
+      xmlWriter->addAttribute( "fo:margin-left", TQString::number( align.indentLevel() ) + "0pt" );
   }
   xmlWriter->endElement(); // style:paragraph-properties
 }
 
-void ExcelImport::Private::processValueFormat( QString valueFormat, QString refName, 
+void ExcelImport::Private::processValueFormat( TQString valueFormat, TQString refName, 
 KoXmlWriter* xmlWriter )
 {
   /*int decimalPlaces = 2;
diff --git a/filters/kspread/excel/import/excelimport.h b/filters/kspread/excel/import/excelimport.h
index e3cc3f0e..77e7b747 100644
--- a/filters/kspread/excel/import/excelimport.h
+++ b/filters/kspread/excel/import/excelimport.h
@@ -23,18 +23,19 @@
 #include <KoFilter.h>
 #include <KoStore.h>
 
-#include <qcstring.h>
+#include <tqcstring.h>
 
 class ExcelImport : public KoFilter {
 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    ExcelImport ( QObject *parent, const char* name, const QStringList& );
+    ExcelImport ( TQObject *tqparent, const char* name, const TQStringList& );
     virtual ~ExcelImport();
 
-    virtual KoFilter::ConversionStatus convert( const QCString& from, const QCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 
 private:
   class Private;
diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp
index e7c57972..99ac0eaa 100644
--- a/filters/kspread/excel/sidewinder/excel.cpp
+++ b/filters/kspread/excel/sidewinder/excel.cpp
@@ -185,7 +185,7 @@ static Value errorAsValue( int errorCode )
 class EString::Private
 {
 public:
-  bool unicode;
+  bool tqunicode;
   bool richText;
   UString str;
   unsigned size;
@@ -194,7 +194,7 @@ public:
 EString::EString()
 {
   d = new EString::Private();
-  d->unicode  = false;
+  d->tqunicode  = false;
   d->richText = false;
   d->str      = UString::null;
   d->size     = 0;
@@ -208,7 +208,7 @@ EString::EString( const EString& es )
 
 EString& EString::operator=( const EString& es )
 {
-  d->unicode  = es.d->unicode;
+  d->tqunicode  = es.d->tqunicode;
   d->richText = es.d->richText;
   d->size     = es.d->size;
   d->str      = es.d->str;
@@ -220,14 +220,14 @@ EString::~EString()
   delete d;
 }
 
-bool EString::unicode() const
+bool EString::tqunicode() const
 {
-  return d->unicode;
+  return d->tqunicode;
 }
 
 void EString::setUnicode( bool u )
 {
-  d->unicode = u;
+  d->tqunicode = u;
 }
 
 bool EString::richText() const
@@ -271,7 +271,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
   unsigned char flag = data[ offset ];
   offset++; // for flag (1 byte)
   
-  bool unicode = flag & 0x01;
+  bool tqunicode = flag & 0x01;
   bool richText = flag & 0x08;
   unsigned formatRuns = 0;
   
@@ -283,10 +283,10 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
   
   // find out total bytes used in this string
   unsigned size = offset + len; // string data
-  if( unicode ) size += len; // because unicode takes 2-bytes char
+  if( tqunicode ) size += len; // because tqunicode takes 2-bytes char
   if( richText ) size += (formatRuns*4);
   
-  if( !unicode )
+  if( !tqunicode )
   {
     char* buffer = new char[ len+1 ];
     memcpy( buffer, data + offset, len );
@@ -303,7 +303,7 @@ EString EString::fromUnicodeString( const void* p, bool longString, unsigned /*
   }
   
   EString result;
-  result.setUnicode( unicode );
+  result.setUnicode( tqunicode );
   result.setRichText( richText );
   result.setSize( size );
   result.setStr( str );
@@ -351,14 +351,14 @@ EString EString::fromSheetName( const void* p, unsigned datasize )
   
   unsigned len = data[0];
   unsigned flag = data[1];
-  bool unicode = flag & 1;
+  bool tqunicode = flag & 1;
   
   if( len > datasize-2 ) len = datasize-2;
   if( len == 0 ) return EString();
   
   unsigned offset = 2;
   
-  if( !unicode )
+  if( !tqunicode )
   {
     char* buffer = new char[ len+1 ];
     memcpy( buffer, data + offset, len );
@@ -376,7 +376,7 @@ EString EString::fromSheetName( const void* p, unsigned datasize )
   }
   
   EString result;
-  result.setUnicode( unicode );
+  result.setUnicode( tqunicode );
   result.setRichText( richText );
   result.setSize( datasize );
   result.setStr( str );
@@ -1005,7 +1005,7 @@ static const FunctionEntry FunctionEntries[] =
   { "ZTEST",           0 },     // 324
   { "LARGE",           2 },     // 325
   { "SMALL",           2 },     // 326
-  { "QUARTILE",        2 },     // 327
+  { "TQUARTILE",        2 },     // 327
   { "PERCENTILE",      2 },     // 328
   { "PERCENTRANK",     0 },     // 329
   { "MODALVALUE",      0 },     // 330
@@ -2012,7 +2012,7 @@ void BoundSheetRecord::setData( unsigned size, const unsigned char* data )
   d->visibility = data[4];
   d->type = data[5];
   
-  /* FIXME: it turned out that sheet name is not normal unicode string
+  /* FIXME: it turned out that sheet name is not normal tqunicode string
      where the first two bytes specifies string length, but instead
      only the first specifies it.
      the next byte could be correctly interpreted as flag.
@@ -4175,7 +4175,7 @@ public:
   unsigned formatIndex;
   bool locked;
   bool formulaHidden;
-  unsigned parentStyle;
+  unsigned tqparentStyle;
   unsigned horizontalAlignment;
   unsigned verticalAlignment;
   bool textWrap;
@@ -4207,7 +4207,7 @@ XFRecord::XFRecord():  Record()
   d->formatIndex         = 0;
   d->locked              = false;
   d->formulaHidden       = false;
-  d->parentStyle         = 0;
+  d->tqparentStyle         = 0;
   d->horizontalAlignment = Left;
   d->verticalAlignment   = VCentered;
   d->textWrap            = false;
@@ -4249,7 +4249,7 @@ XFRecord& XFRecord::operator=( const XFRecord& xf )
   d->formatIndex         = xf.formatIndex();
   d->locked              = xf.locked();
   d->formulaHidden       = xf.formulaHidden();
-  d->parentStyle         = xf.parentStyle();
+  d->tqparentStyle         = xf.tqparentStyle();
   d->horizontalAlignment = xf.horizontalAlignment();
   d->verticalAlignment   = xf.verticalAlignment();
   d->textWrap            = xf.textWrap();
@@ -4315,14 +4315,14 @@ void XFRecord::setFormulaHidden( bool f )
   d->formulaHidden = f;
 }
 
-unsigned XFRecord::parentStyle() const
+unsigned XFRecord::tqparentStyle() const
 {
-  return d->parentStyle;
+  return d->tqparentStyle;
 }
 
 void XFRecord::setParentStyle( unsigned p )
 {
-  d->parentStyle = p;
+  d->tqparentStyle = p;
 }
 
 unsigned XFRecord::horizontalAlignment() const
@@ -4657,13 +4657,13 @@ void XFRecord::setData( unsigned size, const unsigned char* data )
 void XFRecord::dump( std::ostream& out ) const
 {
   out << "XF" << std::endl;
-  out << "       Parent Style : " << parentStyle() << std::endl;
+  out << "       Parent Style : " << tqparentStyle() << std::endl;
   out << "         Font Index : " << fontIndex() << std::endl;
   out << "       Format Index : " << formatIndex() << std::endl;
   out << "             Locked : " << (locked()?"Yes":"No") << std::endl;
   out << " Formula Visibility : " << (formulaHidden()?"Hidden":"Visible") << std::endl;
-  out << "   Horizontal Align : " << horizontalAlignmentAsString() << std::endl;
-  out << "     Vertical Align : " << verticalAlignmentAsString() << std::endl;
+  out << "  Qt::Horizontal Align : " << horizontalAlignmentAsString() << std::endl;
+  out << "    Qt::Vertical Align : " << verticalAlignmentAsString() << std::endl;
   out << "          Text Wrap : " << ( textWrap() ? "yes" : "no" ) << std::endl;
   out << "          Rotation  : " << rotationAngle() << std::endl;
   out << "    Stacked Letters : " << ( stackedLetters() ? "yes" : "no" ) << std::endl;
@@ -5113,31 +5113,31 @@ bool ExcelReader::load( Workbook* workbook, const char* filename )
       
     format.setFont( convertFont( xf.fontIndex() ) );
     
-    FormatAlignment alignment;
+    FormatAlignment tqalignment;
     switch( xf.horizontalAlignment() )
     {
       case XFRecord::Left:     
-        alignment.setAlignX( Format::Left ); break;
+        tqalignment.setAlignX( Format::Left ); break;
       case XFRecord::Right:    
-        alignment.setAlignX( Format::Right ); break;
+        tqalignment.setAlignX( Format::Right ); break;
       case XFRecord::Centered: 
-        alignment.setAlignX( Format::Center ); break;
+        tqalignment.setAlignX( Format::Center ); break;
       default: break;
       // FIXME still unsupported: Repeat, Justified, Filled, Distributed
     };
     switch( xf.verticalAlignment() )
     {
       case XFRecord::Top:
-        alignment.setAlignY( Format::Top ); break;
+        tqalignment.setAlignY( Format::Top ); break;
       case XFRecord::VCentered:
-        alignment.setAlignY( Format::Middle ); break;
+        tqalignment.setAlignY( Format::Middle ); break;
       case XFRecord::Bottom:
-        alignment.setAlignY( Format::Bottom ); break;
+        tqalignment.setAlignY( Format::Bottom ); break;
       default: break;
       // FIXME still unsupported: Justified, Distributed
     }
-    alignment.setWrap( xf.textWrap() );
-    format.setAlignment( alignment );
+    tqalignment.setWrap( xf.textWrap() );
+    format.tqsetAlignment( tqalignment );
   
     FormatBorders borders;
       
@@ -5520,11 +5520,11 @@ void ExcelReader::handleFooter( FooterRecord* record )
   int pos = -1, len = 0;
 
   // left part
-  pos = footer.find( UString("&L") );
+  pos = footer.tqfind( UString("&L") );
   if( pos >= 0 )
   {
     pos += 2;
-    len = footer.find( UString("&C") ) - pos;
+    len = footer.tqfind( UString("&C") ) - pos;
     if( len > 0 )
     {
       left = footer.substr( pos, len );
@@ -5533,11 +5533,11 @@ void ExcelReader::handleFooter( FooterRecord* record )
   }
 
   // center part
-  pos = footer.find( UString("&C") );
+  pos = footer.tqfind( UString("&C") );
   if( pos >= 0 )
   {
     pos += 2;
-    len = footer.find( UString("&R") ) - pos;
+    len = footer.tqfind( UString("&R") ) - pos;
     if( len > 0 )
     {
       center = footer.substr( pos, len );
@@ -5546,7 +5546,7 @@ void ExcelReader::handleFooter( FooterRecord* record )
   }
 
   // right part
-  pos = footer.find( UString("&R") );
+  pos = footer.tqfind( UString("&R") );
   if( pos >= 0 )
   {
     pos += 2;
@@ -5569,11 +5569,11 @@ void ExcelReader::handleHeader( HeaderRecord* record )
   int pos = -1, len = 0;
 
   // left part of the header
-  pos = header.find( UString("&L") );
+  pos = header.tqfind( UString("&L") );
   if( pos >= 0 )
   {
     pos += 2;
-    len = header.find( UString("&C") ) - pos;
+    len = header.tqfind( UString("&C") ) - pos;
     if( len > 0 )
     {
       left = header.substr( pos, len );
@@ -5582,11 +5582,11 @@ void ExcelReader::handleHeader( HeaderRecord* record )
   }
 
   // center part of the header
-  pos = header.find( UString("&C") );
+  pos = header.tqfind( UString("&C") );
   if( pos >= 0 )
   {
     pos += 2;
-    len = header.find( UString("&R") ) - pos;
+    len = header.tqfind( UString("&R") ) - pos;
     if( len > 0 )
     {
       center = header.substr( pos, len );
@@ -5595,7 +5595,7 @@ void ExcelReader::handleHeader( HeaderRecord* record )
   }
 
   // right part of the header
-  pos = header.find( UString("&R") );
+  pos = header.tqfind( UString("&R") );
   if( pos >= 0 )
   {
     pos += 2;
@@ -5929,31 +5929,31 @@ Format ExcelReader::convertFormat( unsigned xfIndex )
     
   format.setFont( convertFont( xf.fontIndex() ) );
   
-  FormatAlignment alignment;
+  FormatAlignment tqalignment;
   switch( xf.horizontalAlignment() )
   {
     case XFRecord::Left:     
-      alignment.setAlignX( Format::Left ); break;
+      tqalignment.setAlignX( Format::Left ); break;
     case XFRecord::Right:    
-      alignment.setAlignX( Format::Right ); break;
+      tqalignment.setAlignX( Format::Right ); break;
     case XFRecord::Centered: 
-      alignment.setAlignX( Format::Center ); break;
+      tqalignment.setAlignX( Format::Center ); break;
     default: break;
     // FIXME still unsupported: Repeat, Justified, Filled, Distributed
   };
   switch( xf.verticalAlignment() )
   {
     case XFRecord::Top:
-      alignment.setAlignY( Format::Top ); break;
+      tqalignment.setAlignY( Format::Top ); break;
     case XFRecord::VCentered:
-      alignment.setAlignY( Format::Middle ); break;
+      tqalignment.setAlignY( Format::Middle ); break;
     case XFRecord::Bottom:
-      alignment.setAlignY( Format::Bottom ); break;
+      tqalignment.setAlignY( Format::Bottom ); break;
     default: break;
     // FIXME still unsupported: Justified, Distributed
   }
-  alignment.setWrap( xf.textWrap() );
-  format.setAlignment( alignment );
+  tqalignment.setWrap( xf.textWrap() );
+  format.tqsetAlignment( tqalignment );
 
   FormatBorders borders;
     
diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h
index 5221b518..51c9efcd 100644
--- a/filters/kspread/excel/sidewinder/excel.h
+++ b/filters/kspread/excel/sidewinder/excel.h
@@ -36,7 +36,7 @@ enum { UnknownExcel = 0, Excel95, Excel97, Excel2000 };
 
 class Record;
 
-// rich-text, unicode, far-east support Excel string
+// rich-text, tqunicode, far-east support Excel string
 
 class EString
 {
@@ -50,7 +50,7 @@ public:
   
   ~EString();
   
-  bool unicode() const;
+  bool tqunicode() const;
   
   void setUnicode( bool u );
   
@@ -1838,7 +1838,7 @@ private:
 
 
 /**
-  Class MergedCellsRecord represents MergedCells record, which contains
+  Class MergedCellsRecord represents MergedCells record, which tqcontains
   a list of all merged cells in the current sheets. Each entry in this list
   define the range of cells that should be merged, namely firstRow, lastRow, 
   firstColumn and lastColumn.
@@ -2777,20 +2777,20 @@ public:
   void setFormulaHidden( bool f );
   
   /**
-   * Returns the index of the parent stlye of this format.
+   * Returns the index of the tqparent stlye of this format.
    * This refers to the index of the XFormat table which is constructed 
    * from a series of XFormat records.
    *
    * \sa setParentStyle
    */  
-  unsigned parentStyle() const;
+  unsigned tqparentStyle() const;
   
   /**
-   * Sets the index of the parent stlye of this format.
+   * Sets the index of the tqparent stlye of this format.
    * This refers to the index of the XFormat table which is constructed 
    * from a series of XFormat records.
    *
-   * \sa parentStyle
+   * \sa tqparentStyle
    */  
   void setParentStyle( unsigned ps );
 
@@ -2805,17 +2805,17 @@ public:
     Distributed };
   
   /**
-   * Gets the horizontal alignment, e.g Left.
+   * Gets the horizontal tqalignment, e.g Left.
    */
   unsigned horizontalAlignment() const;
   
   /**
-   * Sets the horizontal alignment, e.g Left.
+   * Sets the horizontal tqalignment, e.g Left.
    */
   void setHorizontalAlignment( unsigned ha );
   
   /**
-   * Returns human-readable string representation of the horizontal alignment.
+   * Returns human-readable string representation of the horizontal tqalignment.
      For example, XFRecord::Left will return "Left".
    */
   const char* horizontalAlignmentAsString() const; 
@@ -2828,21 +2828,21 @@ public:
     VDistributed = 4 };
   
   /**
-   * Gets the vertical alignment, e.g Bottom.
+   * Gets the vertical tqalignment, e.g Bottom.
    *
    * \sa setVerticalAlignment
    */
   unsigned verticalAlignment() const;
   
   /**
-   * Sets the vertical alignment, e.g Top.
+   * Sets the vertical tqalignment, e.g Top.
    *
    * \sa verticalAlignment
    */
   void setVerticalAlignment( unsigned va );
   
   /**
-   * Returns human-readable string representation of the vertical alignment.
+   * Returns human-readable string representation of the vertical tqalignment.
      For example, XFRecord::Top will return "Top".
    */
   const char* verticalAlignmentAsString() const; 
diff --git a/filters/kspread/excel/sidewinder/format.cpp b/filters/kspread/excel/sidewinder/format.cpp
index 8ce69f24..29481fd0 100644
--- a/filters/kspread/excel/sidewinder/format.cpp
+++ b/filters/kspread/excel/sidewinder/format.cpp
@@ -271,7 +271,7 @@ FormatAlignment& FormatAlignment::operator=( const FormatAlignment& align )
   return assign( align );
 }
 
-// assign from another alignment
+// assign from another tqalignment
 FormatAlignment& FormatAlignment::assign( const FormatAlignment& align )
 {
   d->null          = align.isNull();
@@ -398,7 +398,7 @@ FormatBackground& FormatBackground::operator=( const FormatBackground& backgroun
   return assign( background );
 }
 
-// assign from another alignment
+// assign from another tqalignment
 FormatBackground& FormatBackground::assign( const FormatBackground& background )
 {
   d->null         = background.isNull();
@@ -498,7 +498,7 @@ FormatBorders& FormatBorders::operator=( const FormatBorders& border )
   return assign( border );
 }
 
-// assign from another alignment
+// assign from another tqalignment
 FormatBorders& FormatBorders::assign( const FormatBorders& border )
 {
   d->null         = border.isNull();
@@ -581,7 +581,7 @@ class Format::Private
 {
 public:
   FormatFont font;
-  FormatAlignment alignment;
+  FormatAlignment tqalignment;
   FormatBorders borders;
   FormatBackground background;
   UString valueFormat;
@@ -617,7 +617,7 @@ Format& Format::operator=( const Format& f )
 Format& Format::assign( const Format& f )
 {
   d->font = f.font();
-  d->alignment = f.alignment();
+  d->tqalignment = f.tqalignment();
   d->borders = f.borders();
   d->valueFormat = f.valueFormat();
   d->background = f.background();
@@ -626,7 +626,7 @@ Format& Format::assign( const Format& f )
 
 bool Format::isNull() const
 {
-  return d->font.isNull() && d->alignment.isNull() && d->borders.isNull();
+  return d->font.isNull() && d->tqalignment.isNull() && d->borders.isNull();
 }
 
 FormatFont& Format::font() const
@@ -639,14 +639,14 @@ void Format::setFont( const FormatFont& font )
   d->font = font;
 }
 
-FormatAlignment& Format::alignment() const
+FormatAlignment& Format::tqalignment() const
 {
-  return d->alignment;
+  return d->tqalignment;
 }
 
-void Format::setAlignment( const FormatAlignment& alignment )
+void Format::tqsetAlignment( const FormatAlignment& tqalignment )
 {
-  d->alignment = alignment;
+  d->tqalignment = tqalignment;
 }
 
 FormatBorders& Format::borders() const
@@ -682,8 +682,8 @@ void Format::setValueFormat( const UString& valueFormat )
 // merge f into current format
 Format& Format::apply( const Format& f )
 {
-  if( !f.alignment().isNull() )
-    alignment() = f.alignment();
+  if( !f.tqalignment().isNull() )
+    tqalignment() = f.tqalignment();
   if( !f.font().isNull() )
     font() = f.font();
   if( !f.borders().isNull() )
@@ -700,7 +700,7 @@ bool Format::operator==(const Format& format) const
 {
 	return 
     d->font == format.d->font &&
-    d->alignment == format.d->alignment &&
+    d->tqalignment == format.d->tqalignment &&
     d->borders == format.d->borders &&
     d->background == format.d->background &&
     d->valueFormat == format.d->valueFormat;
@@ -710,7 +710,7 @@ bool Format::operator!=(const Format& format) const
 {
 	return 
     d->font != format.d->font ||
-    d->alignment != format.d->alignment ||
+    d->tqalignment != format.d->tqalignment ||
     d->borders != format.d->borders ||
     d->background != format.d->background ||
     d->valueFormat != format.d->valueFormat;
diff --git a/filters/kspread/excel/sidewinder/format.h b/filters/kspread/excel/sidewinder/format.h
index 55fab762..dcadc1c2 100644
--- a/filters/kspread/excel/sidewinder/format.h
+++ b/filters/kspread/excel/sidewinder/format.h
@@ -266,9 +266,9 @@ private:
 
 
 /**
- * Defines alignment information for cell format.
+ * Defines tqalignment information for cell format.
  *
- * Class FormatAlignment defines the horizontal and vertical alignment
+ * Class FormatAlignment defines the horizontal and vertical tqalignment
  * for the text inside a cell.
  * 
  */
@@ -278,37 +278,37 @@ class FormatAlignment
 public:
 
   /**
-   * Creates a default alignment information.
+   * Creates a default tqalignment information.
    */
   FormatAlignment();
   
   /**
-   * Destroys the alignment information
+   * Destroys the tqalignment information
    */
   ~FormatAlignment();
   
   /**
-   * Creates a copy of alignment information.
+   * Creates a copy of tqalignment information.
    */
   FormatAlignment( const FormatAlignment& );
   
   /**
-   * Assigns from another alignment information.
+   * Assigns from another tqalignment information.
    */
   FormatAlignment& operator=( const FormatAlignment& );
   
   /**
-   * Assigns from another alignment information.
+   * Assigns from another tqalignment information.
    */
   FormatAlignment& assign( const FormatAlignment& );
   
   /**
-   * Returns true if it is a default alignment information.
+   * Returns true if it is a default tqalignment information.
    */
   bool isNull() const;
   
   /**
-   * Returns horizontal alignment. Possible values are
+   * Returns horizontal tqalignment. Possible values are
    * Format::Left, Format::Right and Format::Center.
    *
    * \sa setAlignX
@@ -316,14 +316,14 @@ public:
   unsigned alignX() const;
   
   /**
-   * Sets the horizontal alignment.
+   * Sets the horizontal tqalignment.
    *
    * \sa alignX
    */
   void setAlignX( unsigned xa );
   
   /**
-   * Returns horizontal alignment. Possible values are
+   * Returns horizontal tqalignment. Possible values are
    * Format::Top, Format::Middle and Format::Bottom.
    *
    * \sa setAlignY
@@ -331,7 +331,7 @@ public:
   unsigned alignY() const;
   
   /**
-   * Sets the horizontal alignment.
+   * Sets the horizontal tqalignment.
    *
    * \sa alignY
    */
@@ -380,12 +380,12 @@ public:
    void setRotationAngle( unsigned r );
        
   /**
-   * Returns true if this alignment is equal to f; otherwise returns false.
+   * Returns true if this tqalignment is equal to f; otherwise returns false.
    */
   bool operator==(const FormatAlignment& f) const;
 
   /**
-   * Returns true if this alignment is not equal to f; otherwise returns false.
+   * Returns true if this tqalignment is not equal to f; otherwise returns false.
    */
   bool operator!=(const FormatAlignment& f) const;
 
@@ -441,8 +441,8 @@ public:
     Dense6Pattern,
     Dense7Pattern,
     HorPattern,		// Horizonatal lines
-    VerPattern,		// Vertical lines
-    CrossPattern,	// Horizontal and Vertical lines
+    VerPattern,		//Qt::Vertical lines
+    CrossPattern,	//Qt::Horizontal andQt::Vertical lines
     BDiagPattern,	// Left-bottom to right-top diagonal lines
     FDiagPattern,	// Left-top to right-bottom diagonal lines
     DiagCrossPattern,	// Crossing diagonal lines
@@ -683,14 +683,14 @@ public:
   void setFont( const FormatFont& font );
   
   /** 
-   * Returns a constant reference to the alignment information of this format.
+   * Returns a constant reference to the tqalignment information of this format.
    */
-  FormatAlignment& alignment() const;
+  FormatAlignment& tqalignment() const;
   
   /** 
-   * Sets new alignment information for this format.
+   * Sets new tqalignment information for this format.
    */
-  void setAlignment( const FormatAlignment& alignment );
+  void tqsetAlignment( const FormatAlignment& tqalignment );
   
   /** 
    * Returns a reference to the borders information of this format.
diff --git a/filters/kspread/excel/sidewinder/pole.cpp b/filters/kspread/excel/sidewinder/pole.cpp
index e4090cd9..fac4aa62 100644
--- a/filters/kspread/excel/sidewinder/pole.cpp
+++ b/filters/kspread/excel/sidewinder/pole.cpp
@@ -95,7 +95,7 @@ class DirEntry
 {
   public:
     bool valid;            // false if invalid (should be skipped)
-    std::string name;      // the name, not in unicode anymore
+    std::string name;      // the name, not in tqunicode anymore
     bool dir;              // true if directory
     unsigned long size;    // size (not valid if directory)
     unsigned long start;   // starting block
@@ -114,9 +114,9 @@ class DirTree
     DirEntry* entry( unsigned index );
     DirEntry* entry( const std::string& name, bool create=false );
     int indexOf( DirEntry* e );
-    int parent( unsigned index );
+    int tqparent( unsigned index );
     std::string fullName( unsigned index );
-    std::vector<unsigned> children( unsigned index );
+    std::vector<unsigned> tqchildren( unsigned index );
     void load( unsigned char* buffer, unsigned len );
     void save( unsigned char* buffer );
     unsigned size();
@@ -507,13 +507,13 @@ int DirTree::indexOf( DirEntry* e )
   return -1;
 }
 
-int DirTree::parent( unsigned index )
+int DirTree::tqparent( unsigned index )
 {
-  // brute-force, basically we iterate for each entries, find its children
-  // and check if one of the children is 'index'
+  // brute-force, basically we iterate for each entries, find its tqchildren
+  // and check if one of the tqchildren is 'index'
   for( unsigned j=0; j<entryCount(); j++ )
   {
-    std::vector<unsigned> chi = children( j );
+    std::vector<unsigned> chi = tqchildren( j );
     for( unsigned i=0; i<chi.size();i++ )
       if( chi[i] == index )
         return j;
@@ -529,7 +529,7 @@ std::string DirTree::fullName( unsigned index )
 
   std::string result = entry( index )->name;
   result.insert( 0,  "/" );
-  int p = parent( index );
+  int p = tqparent( index );
   DirEntry * _entry = 0;
   while( p > 0 )
   {
@@ -577,8 +577,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
 
    for( it = names.begin(); it != names.end(); ++it )
    {
-     // find among the children of index
-     std::vector<unsigned> chi = children( index );
+     // find among the tqchildren of index
+     std::vector<unsigned> chi = tqchildren( index );
      unsigned child = 0;
      for( unsigned i = 0; i < chi.size(); i++ )
      {
@@ -593,11 +593,11 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
      if( child > 0 ) index = child;
      else
      {
-       // not found among children
+       // not found among tqchildren
        if( !create ) return (DirEntry*)0;
 
        // create a new entry
-       unsigned parent = index;
+       unsigned tqparent = index;
        entries.push_back( DirEntry() );
        index = entryCount()-1;
        DirEntry* e = entry( index );
@@ -608,8 +608,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create )
        e->start = 0;
        e->child = End;
        e->prev = End;
-       e->next = entry(parent)->child;
-       entry(parent)->child = index;
+       e->next = entry(tqparent)->child;
+       entry(tqparent)->child = index;
      }
    }
 
@@ -650,7 +650,7 @@ void dirtree_find_siblings( DirTree* dirtree, std::vector<unsigned>& result,
   }
 }
 
-std::vector<unsigned> DirTree::children( unsigned index )
+std::vector<unsigned> DirTree::tqchildren( unsigned index )
 {
   std::vector<unsigned> result;
 
@@ -1138,7 +1138,7 @@ StreamIO::StreamIO( StorageIO* s, DirEntry* e)
   updateCache();
 }
 
-// FIXME tell parent we're gone
+// FIXME tell tqparent we're gone
 StreamIO::~StreamIO()
 {
   delete[] cache_data;
@@ -1285,10 +1285,10 @@ std::list<std::string> Storage::entries( const std::string& path )
   DirEntry* e = dt->entry( path, false );
   if( e  && e->dir )
   {
-    unsigned parent = dt->indexOf( e );
-    std::vector<unsigned> children = dt->children( parent );
-    for( unsigned i = 0; i < children.size(); i++ )
-      result.push_back( dt->entry( children[i] )->name );
+    unsigned tqparent = dt->indexOf( e );
+    std::vector<unsigned> tqchildren = dt->tqchildren( tqparent );
+    for( unsigned i = 0; i < tqchildren.size(); i++ )
+      result.push_back( dt->entry( tqchildren[i] )->name );
   }
 
   return result;
@@ -1307,7 +1307,7 @@ Stream::Stream( Storage* storage, const std::string& name )
   io = storage->io->streamIO( name );
 }
 
-// FIXME tell parent we're gone
+// FIXME tell tqparent we're gone
 Stream::~Stream()
 {
   delete io;
diff --git a/filters/kspread/excel/sidewinder/ustring.cpp b/filters/kspread/excel/sidewinder/ustring.cpp
index 304fed18..497bc586 100644
--- a/filters/kspread/excel/sidewinder/ustring.cpp
+++ b/filters/kspread/excel/sidewinder/ustring.cpp
@@ -39,7 +39,7 @@ UString UString::null;
 static char *statBuffer = 0L;
 
 UChar::UChar(const UCharReference &c)
-    : uc( c.unicode() )
+    : uc( c.tqunicode() )
 {
 }
 
@@ -492,7 +492,7 @@ UString UString::substr(int pos, int len) const
   return result;
 }
 
-int UString::find(const UString &f, int pos) const
+int UString::tqfind(const UString &f, int pos) const
 {
   if (isNull())
     return -1;
@@ -579,7 +579,7 @@ bool Swinder::operator<(const UString& s1, const UString& s2)
     l++;
   }
   if (l < lmin)
-    return (c1->unicode() < c2->unicode());
+    return (c1->tqunicode() < c2->tqunicode());
 
   return (l1 < l2);
 }
diff --git a/filters/kspread/excel/sidewinder/ustring.h b/filters/kspread/excel/sidewinder/ustring.h
index 04600003..0643400d 100644
--- a/filters/kspread/excel/sidewinder/ustring.h
+++ b/filters/kspread/excel/sidewinder/ustring.h
@@ -32,8 +32,8 @@ namespace Swinder {
    * @short Unicode character.
    *
    * UChar represents a 16 bit Unicode character. It's internal data
-   * representation is compatible to XChar2b and QChar. It's therefore
-   * possible to exchange data with X and Qt with shallow copies.
+   * representation is compatible to XChar2b and TQChar. It's therefore
+   * possible to exchange data with X and TQt with shallow copies.
    */
   struct UChar {
     /**
@@ -68,7 +68,7 @@ namespace Swinder {
     /**
      * @return the 16 bit Unicode value of the character
      */
-    unsigned short unicode() const { return uc; }
+    unsigned short tqunicode() const { return uc; }
   public:
     /**
      * A static instance of UChar(0).
@@ -120,7 +120,7 @@ namespace Swinder {
     /**
      * @return Unicode value.
      */
-    unsigned short unicode() const { return ref().uc; }
+    unsigned short tqunicode() const { return ref().uc; }
     /**
      * @return Lower byte.
      */
@@ -333,7 +333,7 @@ namespace Swinder {
      * @return Position of first occurence of f starting at position pos.
      * -1 if the search was not successful.
      */
-    int find(const UString &f, int pos = 0) const;
+    int tqfind(const UString &f, int pos = 0) const;
 
     /**
      * Static instance of a null string.