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

16 files changed, 174 insertions, 170 deletions

diff --git a/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl b/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl
index e619bf21..b8bb24de 100644
--- a/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl
+++ b/filters/xsltfilter/export/xsl/kword/xslfo/main.xsl
@@ -39,7 +39,7 @@
 	<xsl:value-of select="@editor"/>
 	</xsl:comment>
 	<fo:root>
-	<fo:layout-master-set>
+	<fo:tqlayout-master-set>
         <fo:simple-page-master
 		margin-right="0.5cm" margin-left="0.5cm" margin-bottom="0.5cm" margin-top="0.75cm"
 		page-width="21cm" page-height="29.7cm" master-name="first">
@@ -61,7 +61,7 @@
 				<fo:conditional-page-master-reference master-name="rest" />
 			</fo:repeatable-page-master-alternatives>
 		</fo:page-sequence-master>
-    </fo:layout-master-set>
+    </fo:tqlayout-master-set>
 	<xsl:apply-templates select="FRAMESETS"/> 
 	</fo:root>
 </xsl:template>
diff --git a/filters/xsltfilter/export/xsltdialog.ui b/filters/xsltfilter/export/xsltdialog.ui
index ac4bc72b..cacf710f 100644
--- a/filters/xsltfilter/export/xsltdialog.ui
+++ b/filters/xsltfilter/export/xsltdialog.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>XSLTDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>XSLTDialog</cstring>
     </property>
@@ -28,7 +28,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -45,11 +45,11 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QListBox">
+                <widget class="TQListBox">
                     <property name="name">
                         <cstring>xsltList</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>200</height>
@@ -64,7 +64,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -81,7 +81,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>recentBox</cstring>
                     </property>
@@ -104,14 +104,14 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>chooseBtn</cstring>
                     </property>
@@ -121,7 +121,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout37</cstring>
             </property>
@@ -145,14 +145,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>OkBtn</cstring>
                     </property>
@@ -163,7 +163,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>CancelBtn</cstring>
                     </property>
@@ -210,12 +210,12 @@
 <includes>
     <include location="local" impldecl="in implementation">xsltdialog.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>cancelSlot()</slot>
     <slot>chooseRecentSlot()</slot>
     <slot>chooseSlot()</slot>
     <slot>chooseCommonSlot()</slot>
     <slot>okSlot()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/filters/xsltfilter/export/xsltexport.cc b/filters/xsltfilter/export/xsltexport.cc
index 50d40ffb..545ffde2 100644
--- a/filters/xsltfilter/export/xsltexport.cc
+++ b/filters/xsltfilter/export/xsltexport.cc
@@ -36,11 +36,11 @@ extern "C" {
 }
 
 
-XSLTExport::XSLTExport(KoFilter *, const char *, const QStringList&) :
+XSLTExport::XSLTExport(KoFilter *, const char *, const TQStringList&) :
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus XSLTExport::convert( const QCString& from, const QCString&)
+KoFilter::ConversiontqStatus XSLTExport::convert( const TQCString& from, const TQCString&)
 {
     if(from != "application/x-kword" &&
        from != "application/x-kontour" && from != "application/x-kspread" &&
diff --git a/filters/xsltfilter/export/xsltexport.h b/filters/xsltfilter/export/xsltexport.h
index 3ecbaed0..24ee3044 100644
--- a/filters/xsltfilter/export/xsltexport.h
+++ b/filters/xsltfilter/export/xsltexport.h
@@ -26,11 +26,12 @@ class XSLTExport : public KoFilter
 {
 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    XSLTExport(KoFilter *parent, const char *name, const QStringList&);
+    XSLTExport(KoFilter *tqparent, const char *name, const TQStringList&);
     virtual ~XSLTExport() {}
 
-    virtual KoFilter::ConversionStatus convert( const QCString& from, const QCString& to );
+    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
 };
 #endif /* __XSLTEXPORT_H__ */
diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc
index 02aab19c..2da253aa 100644
--- a/filters/xsltfilter/export/xsltexportdia.cc
+++ b/filters/xsltfilter/export/xsltexportdia.cc
@@ -21,8 +21,8 @@
 #include <xsltexportdia.h>
 #include <xsltproc.h>
 
-#include <qdir.h>
-#include <qcombobox.h>
+#include <tqdir.h>
+#include <tqcombobox.h>
 
 #include <kapplication.h>
 #include <kglobal.h>
@@ -42,14 +42,14 @@
 #endif*/
 
 /*
- *  Constructs a XSLTExportDia which is a child of 'parent', with the
+ *  Constructs a XSLTExportDia which is a child of 'tqparent', with the
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const QCString &format, QWidget* parent,  const char* name_, bool modal, WFlags fl )
-    : XSLTDialog( parent, name_, modal, fl )
+XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidget* tqparent,  const char* name_, bool modal, WFlags fl )
+    : XSLTDialog( tqparent, name_, modal, fl )
 {
 	int i = 0;
 	_in = in;
@@ -61,10 +61,10 @@ XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const QCString &format, QWidget*
 	/* Recent files */
 	_config = new KConfig("xsltdialog");
 	_config->setGroup( "XSLT export filter" );
-	QString value;
+	TQString value;
 	while(i < 10)
 	{
-		value = _config->readPathEntry( QString("Recent%1").arg(i) );
+		value = _config->readPathEntry( TQString("Recent%1").tqarg(i) );
 		kdDebug() << "recent : " << value << endl;
 		if(!value.isEmpty())
 		{
@@ -77,27 +77,27 @@ XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const QCString &format, QWidget*
 	}
 
 	/* Common xslt files box */
-	QString appName = (const char*) KGlobal::instance()->instanceName();
+	TQString appName = (const char*) KGlobal::instance()->instanceName();
 	kdDebug() << "app name = " << appName << endl;
 
-	QString filenames = QString("xsltfilter") + QDir::separator() + QString("export") +
-			QDir::separator() + appName + QDir::separator() + "*/*.xsl";
-	QStringList commonFilesList = KGlobal::dirs()->findAllResources("data", filenames, true);
+	TQString filenames = TQString("xsltfilter") + TQDir::separator() + TQString("export") +
+			TQDir::separator() + appName + TQDir::separator() + "*/*.xsl";
+	TQStringList commonFilesList = KGlobal::dirs()->findAllResources("data", filenames, true);
 	kdDebug() << "There are " << commonFilesList.size() << " entries like  " << filenames << endl;
 
-	QStringList tempList;
-	QString name;
-	QString file;
+	TQStringList tempList;
+	TQString name;
+	TQString file;
 
-	for(QStringList::Iterator it = commonFilesList.begin(); it != commonFilesList.end(); ++it)
+	for(TQStringList::Iterator it = commonFilesList.begin(); it != commonFilesList.end(); ++it)
 	{
-		tempList = QStringList::split("/", (*it));
+		tempList = TQStringList::split("/", (*it));
 		file = tempList.last();
 		tempList.pop_back();
 		name = tempList.last();
 		tempList.pop_back();
 		kdDebug() << name << " " << file << endl;
-		if(!_namesList.contains(name) && file == "main.xsl")
+		if(!_namesList.tqcontains(name) && file == "main.xsl")
 		{
 			_filesList.append(file);
 			_namesList.append(name);
@@ -136,16 +136,16 @@ void XSLTExportDia::chooseSlot()
 {
 
 	/* Use dir from currently selected file */
-    QString dir = QString::null;
-    if ( _currentFile.isLocalFile() && QFile::exists( _currentFile.path() ) )
-        dir = QFileInfo( _currentFile.path() ).absFilePath();
+    TQString dir = TQString();
+    if ( _currentFile.isLocalFile() && TQFile::exists( _currentFile.path() ) )
+        dir = TQFileInfo( _currentFile.path() ).absFilePath();
 
-    KFileDialog *dialog = new KFileDialog(dir, QString::null, 0L, "file dialog", true);
+    KFileDialog *dialog = new KFileDialog(dir, TQString(), 0L, "file dialog", true);
     dialog->setCaption( i18n("Open Document") );
     dialog->setMimeFilter( KoFilterManager::mimeFilter( _format, KoFilterManager::Export ) );
     KURL u;
 
-    if(dialog->exec() == QDialog::Accepted)
+    if(dialog->exec() == TQDialog::Accepted)
     {
         u = dialog->selectedURL();
         KRecentDocument::add(dialog->selectedURL().url(), !dialog->selectedURL().isLocalFile());
@@ -157,16 +157,16 @@ void XSLTExportDia::chooseSlot()
 
     delete dialog;
 
-    QString filename = u.path();
-    QString url = u.url();
+    TQString filename = u.path();
+    TQString url = u.url();
     bool local = u.isLocalFile();
 
     bool ok = !url.isEmpty();
     if (local) // additional checks for local files
-        ok = ok && (QFileInfo( filename ).isFile() ||
-                    (QFileInfo( filename ).isSymLink() &&
-                     !QFileInfo( filename ).readLink().isEmpty() &&
-                     QFileInfo( QFileInfo( filename ).readLink() ).isFile() ) );
+        ok = ok && (TQFileInfo( filename ).isFile() ||
+                    (TQFileInfo( filename ).isSymLink() &&
+                     !TQFileInfo( filename ).readLink().isEmpty() &&
+                     TQFileInfo( TQFileInfo( filename ).readLink() ).isFile() ) );
 
     if ( ok )
     {
@@ -192,8 +192,8 @@ void XSLTExportDia::chooseRecentSlot()
 void XSLTExportDia::chooseCommonSlot()
 {
 	int num = xsltList->currentItem();
-	_currentFile = QDir::separator() + _dirsList[num] + QDir::separator() +
-			xsltList->currentText() + QDir::separator() + _filesList[num];
+	_currentFile = TQDir::separator() + _dirsList[num] + TQDir::separator() +
+			xsltList->currentText() + TQDir::separator() + _filesList[num];
 	kdDebug() << "common slot : " << _currentFile.url() << endl;
 }
 
@@ -207,10 +207,10 @@ void XSLTExportDia::okSlot()
 	if(_currentFile.url().isEmpty())
 		return;
 	kdDebug() << "XSLT FILTER --> BEGIN" << endl;
-	QString stylesheet = _currentFile.directory() + QDir::separator() + _currentFile.fileName();
+	TQString stylesheet = _currentFile.directory() + TQDir::separator() + _currentFile.fileName();
 
 	/* Add the current file in the recent list if is not and save the list. */
-	if(_recentList.contains(stylesheet) == 0)
+	if(_recentList.tqcontains(stylesheet) == 0)
 	{
 		kdDebug() << "Style sheet add to recent list" << endl;
 		/* Remove the older stylesheet used */
@@ -227,9 +227,9 @@ void XSLTExportDia::okSlot()
 		{
 			kdDebug() << "save : " << _recentList.first() << endl;
 #if KDE_IS_VERSION(3,1,3)
-			_config->writePathEntry( QString("Recent%1").arg(i), _recentList.first());
+			_config->writePathEntry( TQString("Recent%1").tqarg(i), _recentList.first());
 #else
-			_config->writeEntry( QString("Recent%1").arg(i), _recentList.first());
+			_config->writeEntry( TQString("Recent%1").tqarg(i), _recentList.first());
 #endif
 			_recentList.pop_front();
 			i = i + 1;
@@ -241,11 +241,11 @@ void XSLTExportDia::okSlot()
 	/* Temp file */
 	KTempFile temp("xsltexport-", "kwd");
 	temp.setAutoDelete(true);
-	QFile* tempFile = temp.file();
+	TQFile* tempFile = temp.file();
 
-	const Q_LONG buflen = 4096;
+	const TQ_LONG buflen = 4096;
 	char buffer[ buflen ];
-	Q_LONG readBytes = _in->readBlock( buffer, buflen );
+	TQ_LONG readBytes = _in->readBlock( buffer, buflen );
 
 	while ( readBytes > 0 )
 	{
diff --git a/filters/xsltfilter/export/xsltexportdia.h b/filters/xsltfilter/export/xsltexportdia.h
index b79c429b..31491d71 100644
--- a/filters/xsltfilter/export/xsltexportdia.h
+++ b/filters/xsltfilter/export/xsltexportdia.h
@@ -21,7 +21,7 @@
 #define __XSLTEXPORTDIA_H__
 
 #include <xsltdialog.h>
-#include <qstringlist.h>
+#include <tqstringlist.h>
 #include <kurl.h>
 
 class KoStoreDevice;
@@ -30,26 +30,27 @@ class KConfig;
 class XSLTExportDia : public XSLTDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
-    QString _fileOut;
+    TQString _fileOut;
     KoStoreDevice* _in;
     /** xslt file current */
     KURL _currentFile;
-    QCString _format;
+    TQCString _format;
     KConfig* _config;
     /** List of the most recent xslt file used. */
-    QStringList _recentList;
+    TQStringList _recentList;
 
     /** Lits use for common xslt files. */
-    QStringList _dirsList;
-    QStringList _filesList;
-    QStringList _namesList;
+    TQStringList _dirsList;
+    TQStringList _filesList;
+    TQStringList _namesList;
 
 public:
-    XSLTExportDia( KoStoreDevice*, const QCString &format, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    XSLTExportDia( KoStoreDevice*, const TQCString &format, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~XSLTExportDia();
 
-    void setOutputFile(QString file) { _fileOut = file; }
+    void setOutputFile(TQString file) { _fileOut = file; }
 
 public slots:
     virtual void cancelSlot();
diff --git a/filters/xsltfilter/export/xsltproc.cc b/filters/xsltfilter/export/xsltproc.cc
index 592c849a..3bd20408 100644
--- a/filters/xsltfilter/export/xsltproc.cc
+++ b/filters/xsltfilter/export/xsltproc.cc
@@ -27,7 +27,7 @@
  */
 #include "xsltproc.h"
 
-#include <qfile.h>
+#include <tqfile.h>
 
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -87,11 +87,11 @@ XSLTProc::XSLTProc(const char* fileIn, const char* fileOut, const char* xsltshee
 }
 #endif
 
-XSLTProc::XSLTProc(QString fileIn, QString fileOut, QString xsltsheet)
+XSLTProc::XSLTProc(TQString fileIn, TQString fileOut, TQString xsltsheet)
 {
-	_fileIn = QFile::encodeName(fileIn);
-	_fileOut = QFile::encodeName(fileOut);
-	_stylesheet = QFile::encodeName(xsltsheet);
+	_fileIn = TQFile::encodeName(fileIn);
+	_fileOut = TQFile::encodeName(fileOut);
+	_stylesheet = TQFile::encodeName(xsltsheet);
 	nbparams = 0;
 	debug = 0;
 	repeat = 0;
@@ -202,7 +202,7 @@ XSLTProc::xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur, const char *filename
     printf("      --profile or --norman : dump profiling informations \n");
 }*/
 
-void XSLTProc::addParam(QString name, QString value)
+void XSLTProc::addParam(TQString name, TQString value)
 {
 	if(nbparams < NB_PARAMETER_MAX)
 	{
diff --git a/filters/xsltfilter/export/xsltproc.h b/filters/xsltfilter/export/xsltproc.h
index 9469b502..b195c163 100644
--- a/filters/xsltfilter/export/xsltproc.h
+++ b/filters/xsltfilter/export/xsltproc.h
@@ -20,7 +20,7 @@
 #ifndef __XSLTPROC_H__
 #define __XSLTPROC_H__
 
-#include <qstring.h>
+#include <tqstring.h>
 
 #include <libexslt/exslt.h>
 #include <libxslt/xsltconfig.h>
@@ -34,9 +34,9 @@
 
 class XSLTProc
 {
-	QCString    _fileIn;
-	QCString    _fileOut;
-	QCString    _stylesheet;
+	TQCString    _fileIn;
+	TQCString    _fileOut;
+	TQCString    _stylesheet;
 
 	const char *params[NB_PARAMETER_MAX + 1];
 	int nbparams;
@@ -54,14 +54,14 @@ class XSLTProc
 		 */
     	XSLTProc(const char* fileIn, const char* fileOut, const char *stylesheet);
     	
-		XSLTProc(QString fileIn, QString fileOut, QString stylesheet);
+		XSLTProc(TQString fileIn, TQString fileOut, TQString stylesheet);
 
 		/**
 		 * Destroy the processor
 		 */
 	    virtual ~XSLTProc() {}
 
-		void addParam(QString name, QString value);
+		void addParam(TQString name, TQString value);
 
 		/** Process fileIn through the stylesheet.
 		 * @return return 0 if no error occurred
diff --git a/filters/xsltfilter/import/xsltdialog.ui b/filters/xsltfilter/import/xsltdialog.ui
index ac4bc72b..cacf710f 100644
--- a/filters/xsltfilter/import/xsltdialog.ui
+++ b/filters/xsltfilter/import/xsltdialog.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>XSLTDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>XSLTDialog</cstring>
     </property>
@@ -28,7 +28,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -45,11 +45,11 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QListBox">
+                <widget class="TQListBox">
                     <property name="name">
                         <cstring>xsltList</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>200</height>
@@ -64,7 +64,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -81,7 +81,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>recentBox</cstring>
                     </property>
@@ -104,14 +104,14 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>chooseBtn</cstring>
                     </property>
@@ -121,7 +121,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout37</cstring>
             </property>
@@ -145,14 +145,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>OkBtn</cstring>
                     </property>
@@ -163,7 +163,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>CancelBtn</cstring>
                     </property>
@@ -210,12 +210,12 @@
 <includes>
     <include location="local" impldecl="in implementation">xsltdialog.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>cancelSlot()</slot>
     <slot>chooseRecentSlot()</slot>
     <slot>chooseSlot()</slot>
     <slot>chooseCommonSlot()</slot>
     <slot>okSlot()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/filters/xsltfilter/import/xsltimport.cc b/filters/xsltfilter/import/xsltimport.cc
index e60208ca..e73bdf18 100644
--- a/filters/xsltfilter/import/xsltimport.cc
+++ b/filters/xsltfilter/import/xsltimport.cc
@@ -24,7 +24,7 @@
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
 #include "xsltimportdia.h"
 
 
@@ -32,13 +32,13 @@ typedef KGenericFactory<XSLTImport, KoFilter> XSLTImportFactory;
 K_EXPORT_COMPONENT_FACTORY( libxsltimport, XSLTImportFactory( "kofficefilters" ) )
 
 
-XSLTImport::XSLTImport(KoFilter *, const char *, const QStringList&) :
+XSLTImport::XSLTImport(KoFilter *, const char *, const TQStringList&) :
                      KoFilter() {
 }
 
-KoFilter::ConversionStatus XSLTImport::convert( const QCString&, const QCString& to )
+KoFilter::ConversiontqStatus XSLTImport::convert( const TQCString&, const TQCString& to )
 {
-    QString config;
+    TQString config;
 
     if(to != "application/x-kword" &&
 		to != "application/x-kontour" && to != "application/x-kspread" &&
@@ -47,7 +47,7 @@ KoFilter::ConversionStatus XSLTImport::convert( const QCString&, const QCString&
         return KoFilter::NotImplemented;
 
     // ## missing appIdentification
-    KoStore* out = KoStore::createStore(QString(m_chain->outputFile()), KoStore::Write);
+    KoStore* out = KoStore::createStore(TQString(m_chain->outputFile()), KoStore::Write);
     if(!out || !out->open("root"))
     {
         kdError() << "Unable to create output file!" << endl;
diff --git a/filters/xsltfilter/import/xsltimport.h b/filters/xsltfilter/import/xsltimport.h
index 8ec64364..22b89941 100644
--- a/filters/xsltfilter/import/xsltimport.h
+++ b/filters/xsltfilter/import/xsltimport.h
@@ -20,10 +20,10 @@
 #ifndef __XSLTIMPORT_H__
 #define __XSLTIMPORT_H__
 
-#include <qstring.h>
-#include <qtextstream.h>
-#include <qfile.h>
-#include <qobject.h>
+#include <tqstring.h>
+#include <tqtextstream.h>
+#include <tqfile.h>
+#include <tqobject.h>
 
 #include <KoFilter.h>
 #include <KoStore.h>
@@ -32,13 +32,14 @@ class XSLTImport : public KoFilter
 {
 
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-    	XSLTImport(KoFilter *parent, const char *name, const QStringList&);
+    	XSLTImport(KoFilter *tqparent, const char *name, const TQStringList&);
 		virtual ~XSLTImport() {}
 
-		virtual KoFilter::ConversionStatus convert( const QCString& from,
-							const QCString& to );
+		virtual KoFilter::ConversiontqStatus convert( const TQCString& from,
+							const TQCString& to );
 };
 
 #endif /* __XSLTIMPORT_H__ */
diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc
index 0486b84e..a72b2b1c 100644
--- a/filters/xsltfilter/import/xsltimportdia.cc
+++ b/filters/xsltfilter/import/xsltimportdia.cc
@@ -22,10 +22,10 @@
 
 //#include <stdio.h>
 
-#include <qcombobox.h>
-#include <qcursor.h>
-#include <qstringlist.h>
-#include <qdir.h>
+#include <tqcombobox.h>
+#include <tqcursor.h>
+#include <tqstringlist.h>
+#include <tqdir.h>
 
 #include <kapplication.h>
 #include <klocale.h>
@@ -39,14 +39,14 @@
 #include <xsltproc.h>
 
 /*
- *  Constructs a XSLTImportDia which is a child of 'parent', with the
+ *  Constructs a XSLTImportDia which is a child of 'tqparent', with the
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-XSLTImportDia::XSLTImportDia(KoStore* out, const QCString &format, QWidget* parent,  const char* name_, bool modal, WFlags fl )
-    : XSLTDialog( parent, name_, modal, fl )
+XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* tqparent,  const char* name_, bool modal, WFlags fl )
+    : XSLTDialog( tqparent, name_, modal, fl )
 {
 	int i = 0;
 	_out = out;
@@ -56,10 +56,10 @@ XSLTImportDia::XSLTImportDia(KoStore* out, const QCString &format, QWidget* pare
 	/* Recent files */
 	_config = new KConfig("xsltdialog");
 	_config->setGroup( "XSLT import filter" );
-	QString value;
+	TQString value;
 	while(i < 10)
 	{
-		value = _config->readPathEntry( QString("Recent%1").arg(i) );
+		value = _config->readPathEntry( TQString("Recent%1").tqarg(i) );
 		kdDebug() << "recent : " << value << endl;
 		if(!value.isEmpty())
 		{
@@ -72,27 +72,27 @@ XSLTImportDia::XSLTImportDia(KoStore* out, const QCString &format, QWidget* pare
 	}
 
 	/* Common xslt files box */
-	QString appName = (const char*) KGlobal::instance()->instanceName();
+	TQString appName = (const char*) KGlobal::instance()->instanceName();
 	kdDebug() << "app name = " << appName << endl;
 	
-	QString filenames = QString("xsltfilter") + QDir::separator() + QString("import") +
-			QDir::separator() + appName + QDir::separator() + "*/*.xsl";
-	QStringList commonFilesList = KGlobal::dirs()->findAllResources("data", filenames, true);
+	TQString filenames = TQString("xsltfilter") + TQDir::separator() + TQString("import") +
+			TQDir::separator() + appName + TQDir::separator() + "*/*.xsl";
+	TQStringList commonFilesList = KGlobal::dirs()->findAllResources("data", filenames, true);
 	kdDebug() << "There are " << commonFilesList.size() << " entries like  " << filenames << endl;
 	
-	QStringList tempList;
-	QString name;
-	QString file;
+	TQStringList tempList;
+	TQString name;
+	TQString file;
 
-	for(QStringList::Iterator it = commonFilesList.begin(); it != commonFilesList.end(); ++it)
+	for(TQStringList::Iterator it = commonFilesList.begin(); it != commonFilesList.end(); ++it)
 	{
-		tempList = QStringList::split("/", (*it));
+		tempList = TQStringList::split("/", (*it));
 		file = tempList.last();
 		tempList.pop_back();
 		name = tempList.last();
 		tempList.pop_back();
 		kdDebug() << name << " " << file << endl;
-		if(!_namesList.contains(name) && file == "main.xsl")
+		if(!_namesList.tqcontains(name) && file == "main.xsl")
 		{
 			_filesList.append(file);
 			_namesList.append(name);
@@ -110,7 +110,7 @@ XSLTImportDia::XSLTImportDia(KoStore* out, const QCString &format, QWidget* pare
  */
 XSLTImportDia::~XSLTImportDia()
 {
-    // no need to delete child widgets, Qt does it all for us
+    // no need to delete child widgets, TQt does it all for us
 	delete _config;
 }
 
@@ -133,16 +133,16 @@ void XSLTImportDia::chooseSlot()
 {
 
 	/* Use dir from currently selected file */
-    QString dir = QString::null;
-    if ( _currentFile.isLocalFile() && QFile::exists( _currentFile.path() ) )
-        dir = QFileInfo( _currentFile.path() ).absFilePath();
+    TQString dir = TQString();
+    if ( _currentFile.isLocalFile() && TQFile::exists( _currentFile.path() ) )
+        dir = TQFileInfo( _currentFile.path() ).absFilePath();
 
-    KFileDialog *dialog = new KFileDialog(dir, QString::null, 0L, "file dialog", true);
+    KFileDialog *dialog = new KFileDialog(dir, TQString(), 0L, "file dialog", true);
     dialog->setCaption( i18n("Open Document") );
     dialog->setMimeFilter( KoFilterManager::mimeFilter( _format, KoFilterManager::Import ) );
 	KURL u;
 
-    if(dialog->exec() == QDialog::Accepted)
+    if(dialog->exec() == TQDialog::Accepted)
     {
         u = dialog->selectedURL();
         KRecentDocument::add(dialog->selectedURL().url(), !dialog->selectedURL().isLocalFile());
@@ -154,16 +154,16 @@ void XSLTImportDia::chooseSlot()
 
     delete dialog;
 
-    QString filename = u.path();
-    QString url = u.url();
+    TQString filename = u.path();
+    TQString url = u.url();
     bool local = u.isLocalFile();
 
     bool ok = !url.isEmpty();
     if (local) // additional checks for local files
-        ok = ok && (QFileInfo( filename ).isFile() ||
-                    (QFileInfo( filename ).isSymLink() &&
-                     !QFileInfo( filename ).readLink().isEmpty() &&
-                     QFileInfo( QFileInfo( filename ).readLink() ).isFile() ) );
+        ok = ok && (TQFileInfo( filename ).isFile() ||
+                    (TQFileInfo( filename ).isSymLink() &&
+                     !TQFileInfo( filename ).readLink().isEmpty() &&
+                     TQFileInfo( TQFileInfo( filename ).readLink() ).isFile() ) );
 
     if ( ok )
     {
@@ -189,8 +189,8 @@ void XSLTImportDia::chooseRecentSlot()
 void XSLTImportDia::chooseCommonSlot()
 {
 	int num = xsltList->currentItem();
-	_currentFile = QDir::separator() + _dirsList[num] + QDir::separator() +
-			xsltList->currentText() + QDir::separator() + _filesList[num];
+	_currentFile = TQDir::separator() + _dirsList[num] + TQDir::separator() +
+			xsltList->currentText() + TQDir::separator() + _filesList[num];
 	kdDebug() << "common slot : " << _currentFile.url() << endl;
 }
 
@@ -200,16 +200,16 @@ void XSLTImportDia::chooseCommonSlot()
  */
 void XSLTImportDia::okSlot()
 {
-  	kapp->setOverrideCursor(QCursor(Qt::WaitCursor));
+  	kapp->setOverrideCursor(TQCursor(TQt::WaitCursor));
 	hide();
 	if(_currentFile.url().isEmpty())
 		return;
 	kdDebug() << "XSLT FILTER --> BEGIN" << endl;
 	_out->open("root");
-	QString stylesheet = _currentFile.directory() + "/" + _currentFile.fileName();
+	TQString stylesheet = _currentFile.directory() + "/" + _currentFile.fileName();
 
 	/* Add the current file in the recent list if is not and save the list. */
-	if(_recentList.contains(stylesheet) == 0)
+	if(_recentList.tqcontains(stylesheet) == 0)
 	{
 		kdDebug() << "Style sheet add to recent list" << endl;
 		/* Remove the older stylesheet used */
@@ -226,9 +226,9 @@ void XSLTImportDia::okSlot()
 		{
 			kdDebug() << "save : " << _recentList.first() << endl;
 #if KDE_IS_VERSION(3,1,3)
-			_config->writePathEntry( QString("Recent%1").arg(i), _recentList.first());
+			_config->writePathEntry( TQString("Recent%1").tqarg(i), _recentList.first());
 #else
-			_config->writeEntry( QString("Recent%1").arg(i), _recentList.first());
+			_config->writeEntry( TQString("Recent%1").tqarg(i), _recentList.first());
 #endif
 			_recentList.pop_front();
 			i = i + 1;
@@ -241,7 +241,7 @@ void XSLTImportDia::okSlot()
 	KTempFile temp("xsltimport-", "kwd");
 	temp.setAutoDelete(true);
 
-	QFile* tempFile = temp.file();
+	TQFile* tempFile = temp.file();
 	tempFile->open(IO_WriteOnly);
 
 	/* Generate the data in the temp file */
diff --git a/filters/xsltfilter/import/xsltimportdia.h b/filters/xsltfilter/import/xsltimportdia.h
index 55b1eab9..1b6a507b 100644
--- a/filters/xsltfilter/import/xsltimportdia.h
+++ b/filters/xsltfilter/import/xsltimportdia.h
@@ -28,29 +28,30 @@
 class XSLTImportDia : public XSLTDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
-	QString _fileIn;
-	QString _fileOut;
-	QByteArray _arrayIn;
+	TQString _fileIn;
+	TQString _fileOut;
+	TQByteArray _arrayIn;
 	KoStore* _out;
 	/** xslt file current */
 	KURL _currentFile;
-	QCString _format;
+	TQCString _format;
 	KConfig* _config;
 	/** List of the most recent xslt file used. */
-	QStringList _recentList;
+	TQStringList _recentList;
 
 	/** Lits use for common xslt files. */
-	QStringList _dirsList;
-	QStringList _filesList;
-	QStringList _namesList;
+	TQStringList _dirsList;
+	TQStringList _filesList;
+	TQStringList _namesList;
 
 public:
-    XSLTImportDia(KoStore*, const QCString &format, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    XSLTImportDia(KoStore*, const TQCString &format, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~XSLTImportDia();
 
-	void setInputFile(QString file)  { _fileIn = file; }
-	void setOutputFile(QString file) { _fileOut = file; }
+	void setInputFile(TQString file)  { _fileIn = file; }
+	void setOutputFile(TQString file) { _fileOut = file; }
 
 public slots:
     virtual void cancelSlot();
diff --git a/filters/xsltfilter/import/xsltproc.cc b/filters/xsltfilter/import/xsltproc.cc
index 592c849a..3bd20408 100644
--- a/filters/xsltfilter/import/xsltproc.cc
+++ b/filters/xsltfilter/import/xsltproc.cc
@@ -27,7 +27,7 @@
  */
 #include "xsltproc.h"
 
-#include <qfile.h>
+#include <tqfile.h>
 
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -87,11 +87,11 @@ XSLTProc::XSLTProc(const char* fileIn, const char* fileOut, const char* xsltshee
 }
 #endif
 
-XSLTProc::XSLTProc(QString fileIn, QString fileOut, QString xsltsheet)
+XSLTProc::XSLTProc(TQString fileIn, TQString fileOut, TQString xsltsheet)
 {
-	_fileIn = QFile::encodeName(fileIn);
-	_fileOut = QFile::encodeName(fileOut);
-	_stylesheet = QFile::encodeName(xsltsheet);
+	_fileIn = TQFile::encodeName(fileIn);
+	_fileOut = TQFile::encodeName(fileOut);
+	_stylesheet = TQFile::encodeName(xsltsheet);
 	nbparams = 0;
 	debug = 0;
 	repeat = 0;
@@ -202,7 +202,7 @@ XSLTProc::xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur, const char *filename
     printf("      --profile or --norman : dump profiling informations \n");
 }*/
 
-void XSLTProc::addParam(QString name, QString value)
+void XSLTProc::addParam(TQString name, TQString value)
 {
 	if(nbparams < NB_PARAMETER_MAX)
 	{
diff --git a/filters/xsltfilter/import/xsltproc.h b/filters/xsltfilter/import/xsltproc.h
index 9469b502..b195c163 100644
--- a/filters/xsltfilter/import/xsltproc.h
+++ b/filters/xsltfilter/import/xsltproc.h
@@ -20,7 +20,7 @@
 #ifndef __XSLTPROC_H__
 #define __XSLTPROC_H__
 
-#include <qstring.h>
+#include <tqstring.h>
 
 #include <libexslt/exslt.h>
 #include <libxslt/xsltconfig.h>
@@ -34,9 +34,9 @@
 
 class XSLTProc
 {
-	QCString    _fileIn;
-	QCString    _fileOut;
-	QCString    _stylesheet;
+	TQCString    _fileIn;
+	TQCString    _fileOut;
+	TQCString    _stylesheet;
 
 	const char *params[NB_PARAMETER_MAX + 1];
 	int nbparams;
@@ -54,14 +54,14 @@ class XSLTProc
 		 */
     	XSLTProc(const char* fileIn, const char* fileOut, const char *stylesheet);
     	
-		XSLTProc(QString fileIn, QString fileOut, QString stylesheet);
+		XSLTProc(TQString fileIn, TQString fileOut, TQString stylesheet);
 
 		/**
 		 * Destroy the processor
 		 */
 	    virtual ~XSLTProc() {}
 
-		void addParam(QString name, QString value);
+		void addParam(TQString name, TQString value);
 
 		/** Process fileIn through the stylesheet.
 		 * @return return 0 if no error occurred
diff --git a/filters/xsltfilter/kword2xslfo.xsl b/filters/xsltfilter/kword2xslfo.xsl
index 4268afba..ea36238b 100644
--- a/filters/xsltfilter/kword2xslfo.xsl
+++ b/filters/xsltfilter/kword2xslfo.xsl
@@ -36,7 +36,7 @@
 	<xsl:value-of select="@editor"/>
 	</xsl:comment>
 	<fo:root>
-	<fo:layout-master-set>
+	<fo:tqlayout-master-set>
         <fo:simple-page-master
 		margin-right="0.5cm" margin-left="0.5cm" margin-bottom="0.5cm" margin-top="0.75cm"
 		page-width="21cm" page-height="29.7cm" master-name="first">
@@ -58,7 +58,7 @@
 				<fo:conditional-page-master-reference master-name="rest" />
 			</fo:repeatable-page-master-alternatives>
 		</fo:page-sequence-master>
-    </fo:layout-master-set>
+    </fo:tqlayout-master-set>
 	<xsl:apply-templates select="FRAMESETS"/> 
 	</fo:root>
 </xsl:template>