From f008adb5a77e094eaf6abf3fc0f36958e66896a5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 25 Jun 2011 05:28:35 +0000 Subject: 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 --- filters/olefilters/olefilter.h | 63 +++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 31 deletions(-) (limited to 'filters/olefilters/olefilter.h') diff --git a/filters/olefilters/olefilter.h b/filters/olefilters/olefilter.h index a1509973..0be2a8ba 100644 --- a/filters/olefilters/olefilter.h +++ b/filters/olefilters/olefilter.h @@ -33,38 +33,39 @@ class KoStore; class OLEFilter : public KoEmbeddingFilter { Q_OBJECT + TQ_OBJECT public: - OLEFilter(KoFilter *parent, const char *name, const QStringList&); + OLEFilter(KoFilter *tqparent, const char *name, const TQStringList&); virtual ~OLEFilter(); - virtual KoFilter::ConversionStatus convert( const QCString& from, const QCString& to ); + virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); public slots: void commSlotDelayStream( const char* delay ); - void commSlotShapeID( unsigned int& shapeID ); + void commSlotShapeID( unsigned int& tqshapeID ); protected slots: // This slot saves the document informations to the KOffice tar storage. void slotSaveDocumentInformation( - const QString &fullName, - const QString &title, - const QString &company, - const QString &email, - const QString &telephone, - const QString &fax, - const QString &postalCode, - const QString &country, - const QString &city, - const QString &street, - const QString &docTitle, - const QString &docAbstract); + const TQString &fullName, + const TQString &title, + const TQString &company, + const TQString &email, + const TQString &telephone, + const TQString &fax, + const TQString &postalCode, + const TQString &country, + const TQString &city, + const TQString &street, + const TQString &docTitle, + const TQString &docAbstract); // This slot saves an embedded Picture to the KOffice tar storage. void slotSavePic( - const QString &nameIN, - QString &storageId, - const QString &extension, + const TQString &nameIN, + TQString &storageId, + const TQString &extension, unsigned int length, const char *data); @@ -73,19 +74,19 @@ protected slots: // that we want to handle as parts rather than using slotSavePic() since OLE // objects are handled by us, and a filter need only call slotPart(). void slotSavePart( - const QString &nameIN, - QString &storageId, - QString &mimeType, - const QString &extension, + const TQString &nameIN, + TQString &storageId, + TQString &mimeType, + const TQString &extension, unsigned int length, const char *data); // Generate a name for a new part to store it in the KOffice tar storage, // or find the name and type of an existing one. void slotPart( - const QString &nameIN, - QString &storageId, - QString &mimeType); + const TQString &nameIN, + TQString &storageId, + TQString &mimeType); // Get another OLE 2 stream for your filter. // Attention: You'll have to delete [] the stream.data ptr! @@ -95,11 +96,11 @@ protected slots: // as the stream names are NOT unique in the OLE 2 file!!! // (Therefore it's searching only in the current dir) // Attention: You'll have to delete [] the stream.data ptr! - void slotGetStream(const QString &name, myFile &stream); + void slotGetStream(const TQString &name, myFile &stream); signals: // Forwarding signals for inter-filter communication - void internalCommShapeID( unsigned int& shapeID ); + void internalCommShapeID( unsigned int& tqshapeID ); void internalCommDelayStream( const char* delay ); private: @@ -108,13 +109,13 @@ private: const OLEFilter &operator=(const OLEFilter &); // Template method, triggered by embedPart calls - virtual void savePartContents( QIODevice* file ); + virtual void savePartContents( TQIODevice* file ); - void convert( const QCString& mimeTypeHint ); + void convert( const TQCString& mimeTypeHint ); void connectCommon(FilterBase **myFilter); - QCString mimeTypeHelper(); + TQCString mimeTypeHelper(); - QMap imageMap; + TQMap imageMap; myFile olefile; int numPic; // for the "unique name generation" -- cgit v1.2.1