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

2 files changed, 7 insertions, 6 deletions

diff --git a/filters/kpresenter/xpm/xpmexport.cpp b/filters/kpresenter/xpm/xpmexport.cpp
index 1456504e..87097f5f 100644
--- a/filters/kpresenter/xpm/xpmexport.cpp
+++ b/filters/kpresenter/xpm/xpmexport.cpp
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <qpixmap.h>
-#include <qpainter.h>
+#include <tqpixmap.h>
+#include <tqpainter.h>
 
 #include <kmessagebox.h>
 
@@ -33,7 +33,7 @@
 typedef KGenericFactory<XpmExport, KoFilter> xpmExportFactory;
 K_EXPORT_COMPONENT_FACTORY( libkpresenterxpmexport, xpmExportFactory( "xpmexport" ) )
 
-XpmExport::XpmExport(KoFilter *fil, const char *name, const QStringList&lst)
+XpmExport::XpmExport(KoFilter *fil, const char *name, const TQStringList&lst)
     : ImageExport(fil,name,lst)
 {
 }
@@ -58,7 +58,7 @@ bool XpmExport::extraImageAttribute()
 }
 
 
-bool XpmExport::saveImage( QString fileName)
+bool XpmExport::saveImage( TQString fileName)
 {
     bool ret = pixmap.save( fileName, "XPM" );
     // Save the image.
diff --git a/filters/kpresenter/xpm/xpmexport.h b/filters/kpresenter/xpm/xpmexport.h
index 8ccec46c..14b14b6c 100644
--- a/filters/kpresenter/xpm/xpmexport.h
+++ b/filters/kpresenter/xpm/xpmexport.h
@@ -25,11 +25,12 @@
 class XpmExport : public ImageExport
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    XpmExport(KoFilter *parent, const char *name, const QStringList&);
+    XpmExport(KoFilter *tqparent, const char *name, const TQStringList&);
     virtual ~XpmExport();
-    virtual bool saveImage( QString fileName);
+    virtual bool saveImage( TQString fileName);
     virtual bool extraImageAttribute();
     virtual const char * exportFormat();
 };