TQt4 port Gwenview

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/gwenview@1233720 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 24 insertions, 23 deletions

diff --git a/src/gvcore/document.h b/src/gvcore/document.h
index d49811d..36fa235 100644
--- a/src/gvcore/document.h
+++ b/src/gvcore/document.h
@@ -21,10 +21,10 @@ Copyright 2000-2006 Aurelien Gateau
 #ifndef DOCUMENT_H
 #define DOCUMENT_H
 
-// Qt 
-#include <qcstring.h>
-#include <qobject.h>
-#include <qimage.h>
+// TQt 
+#include <tqcstring.h>
+#include <tqobject.h>
+#include <tqimage.h>
 
 // KDE 
 #include <kurl.h>
@@ -52,22 +52,23 @@ class DocumentImpl;
  * - image is being loaded
  * - loaded() is emitted
  */
-class LIBGWENVIEW_EXPORT Document : public QObject {
+class LIBGWENVIEW_EXPORT Document : public TQObject {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	enum CommentState { NONE=0, READ_ONLY=1, WRITABLE=2 };
 	
-	Document(QObject*);
+	Document(TQObject*);
 	~Document();
 
 	// Properties
-	const QImage& image() const;
+	const TQImage& image() const;
 	KURL url() const;
 	KURL dirURL() const;
-	QString filename() const;
-	const QCString& imageFormat() const;
+	TQString filename() const;
+	const TQCString& imageFormat() const;
 	int fileSize() const;
-	QString mimeType() const;
+	TQString mimeType() const;
 	MimeTypeUtils::Kind urlKind() const;
 	bool isModified() const;
 
@@ -82,12 +83,12 @@ public:
 	int height() const { return image().height(); }
 
 	Document::CommentState commentState() const;
-	QString comment() const;
-	void setComment(const QString&);
-	QString aperture() const;
-	QString exposureTime() const;
-	QString iso() const;
-	QString focalLength() const;
+	TQString comment() const;
+	void setComment(const TQString&);
+	TQString aperture() const;
+	TQString exposureTime() const;
+	TQString iso() const;
+	TQString focalLength() const;
 
 	int duration() const;
 	
@@ -143,7 +144,7 @@ signals:
 	/**
 	 * Emitted to show a part of the image must be refreshed
 	 */
-	void rectUpdated(const QRect& rect);
+	void rectUpdated(const TQRect& rect);
 
 	/**
 	 * Emitted when the size is known
@@ -153,7 +154,7 @@ signals:
 	/**
 	 * Emitted when something goes wrong, like when save fails
 	 */
-	void errorHappened(const QString& message);
+	void errorHappened(const TQString& message);
 
 private slots:
 	void slotStatResult(KIO::Job*); 
@@ -169,20 +170,20 @@ private:
 
 	// These methods are used by DocumentImpl and derived
 	void switchToImpl(DocumentImpl*);
-	void setImage(QImage);
-	void setImageFormat(const QCString&);
-	void setMimeType(const QString&);
+	void setImage(TQImage);
+	void setImageFormat(const TQCString&);
+	void setMimeType(const TQString&);
 	void setFileSize(int); 
 	
 	void reset();
 	void load();
-	void doPaint(KPrinter *pPrinter, QPainter *p);
+	void doPaint(KPrinter *pPrinter, TQPainter *p);
 
 	/**
 	 * The returned string is null if the image was successfully saved,
 	 * otherwise it's the translated error message.
 	 */
-	QString saveInternal(const KURL& url, const QCString& format);
+	TQString saveInternal(const KURL& url, const TQCString& format);
 
 	Document(const Document&);
 	Document &operator=(const Document&);