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

1 files changed, 17 insertions, 16 deletions

diff --git a/lib/koproperty/editors/pixmapedit.h b/lib/koproperty/editors/pixmapedit.h
index 7b0268bf..61f75fba 100644
--- a/lib/koproperty/editors/pixmapedit.h
+++ b/lib/koproperty/editors/pixmapedit.h
@@ -23,28 +23,29 @@
 #define KPROPERTY_PIXMAPEDIT_H
 
 #include "../widget.h"
-#include <qpixmap.h>
-#include <qvariant.h>
+#include <tqpixmap.h>
+#include <tqvariant.h>
 
-class QLabel;
-class QPushButton;
+class TQLabel;
+class TQPushButton;
 
 namespace KoProperty {
 
 class KOPROPERTY_EXPORT PixmapEdit : public Widget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		PixmapEdit(Property *property, QWidget *parent=0, const char *name=0);
+		PixmapEdit(Property *property, TQWidget *tqparent=0, const char *name=0);
 		virtual ~PixmapEdit();
 
-		virtual QVariant value() const;
-		virtual void setValue(const QVariant &value, bool emitChange=true);
-		virtual void drawViewer(QPainter *p, const QColorGroup &cg, const QRect &r, const QVariant &value);
+		virtual TQVariant value() const;
+		virtual void setValue(const TQVariant &value, bool emitChange=true);
+		virtual void drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value);
 
-		void resizeEvent(QResizeEvent *ev);
-		bool eventFilter(QObject *o, QEvent *ev);
+		void resizeEvent(TQResizeEvent *ev);
+		bool eventFilter(TQObject *o, TQEvent *ev);
 
 	protected:
 		virtual void setReadOnlyInternal(bool readOnly);
@@ -54,17 +55,17 @@ class KOPROPERTY_EXPORT PixmapEdit : public Widget
 		 Selected path will be stored in "lastVisitedImagePath" config entry within "Recent Dirs" 
 		 config group of application's settings. This entry can be later reused when file dialogs 
 		 are opened for selecting image files. */
-		QString selectPixmapFileName();
+		TQString selectPixmapFileName();
 
 		/*! Selects a new pixmap using "open" file dialog. Can be reimplemented. */
 		virtual void selectPixmap();
 
 	protected:
-		QLabel *m_edit;
-		QLabel *m_popup;
-		QPushButton *m_button;
-		QVariant m_recentlyPainted;
-		QPixmap m_pixmap, m_scaledPixmap, m_previewPixmap;
+		TQLabel *m_edit;
+		TQLabel *m_popup;
+		TQPushButton *m_button;
+		TQVariant m_recentlyPainted;
+		TQPixmap m_pixmap, m_scaledPixmap, m_previewPixmap;
 };
 
 }