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, 27 insertions, 27 deletions

diff --git a/lib/koproperty/editoritem.h b/lib/koproperty/editoritem.h
index 4cc1a28e..a3993d86 100644
--- a/lib/koproperty/editoritem.h
+++ b/lib/koproperty/editoritem.h
@@ -26,10 +26,10 @@
 #include <klistview.h>
 
 #define KPROPEDITOR_ITEM_MARGIN 2
-#define KPROPEDITOR_ITEM_BORDER_COLOR QColor(200,200,200) //! \todo custom color?
+#define KPROPEDITOR_ITEM_BORDER_COLOR TQColor(200,200,200) //! \todo custom color?
 
-template<class U> class QAsciiDict;
-class QLabel;
+template<class U> class TQAsciiDict;
+class TQLabel;
 
 namespace KoProperty {
 
@@ -47,18 +47,18 @@ class GroupWidget;
 class EditorItem : public KListViewItem
 {
 	public:
-		typedef QAsciiDict<EditorItem> Dict;
+		typedef TQAsciiDict<EditorItem> Dict;
 
-		/*! Creates an EditorItem child of \a parent, associated to \a property.
+		/*! Creates an EditorItem child of \a tqparent, associated to \a property.
 		 It \a property has not desctiption set, its name (i.e. not i18n'ed) is reused.
 		*/
-		EditorItem(Editor *editor, EditorItem *parent, Property *property,
-			QListViewItem *after=0);
+		EditorItem(Editor *editor, EditorItem *tqparent, Property *property,
+			TQListViewItem *after=0);
 
 		//! Two helper contructors for subclass
-		EditorItem(KListView *parent);
-		EditorItem(EditorItem *parent, const QString &text);
-		EditorItem(EditorItem *parent, EditorItem *after, const QString &text);
+		EditorItem(KListView *tqparent);
+		EditorItem(EditorItem *tqparent, const TQString &text);
+		EditorItem(EditorItem *tqparent, EditorItem *after, const TQString &text);
 
 		virtual ~EditorItem();
 
@@ -69,16 +69,16 @@ class EditorItem : public KListViewItem
 		/*! Reimplemented from KListViewItem to draw custom contents. Properties names are wriiten in bold if
 		    modified. Also takes care of drawing borders around the cells as well as pixmaps or colors if necessary.
 		*/
-		virtual void paintCell(QPainter *p, const QColorGroup & cg, int column, int width, int align);
+		virtual void paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align);
 
 		/*! Reimplemented from KListViewItem to draw custom contents. It takes care of drawing the [+] and [-]
-		    signs only if the item has children.
+		    signs only if the item has tqchildren.
 		*/
-		virtual void paintBranches(QPainter *p, const QColorGroup &cg, int w, int y, int h);
+		virtual void paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, int h);
 
-		virtual void paintFocus(QPainter * p, const QColorGroup & cg, const QRect & r);
+		virtual void paintFocus(TQPainter * p, const TQColorGroup & cg, const TQRect & r);
 
-		virtual int compare( QListViewItem *i, int col, bool ascending ) const;
+		virtual int compare( TQListViewItem *i, int col, bool ascending ) const;
 
 		virtual void setHeight( int height );
 
@@ -90,22 +90,22 @@ class EditorItem : public KListViewItem
 class EditorGroupItem : public EditorItem
 {
 	public:
-		EditorGroupItem(EditorItem *parent, EditorItem *after, const QString &text, 
-			const QString &icon, int sortOrder);
-		EditorGroupItem(EditorItem *parent, const QString &text, 
-			const QString &icon, int sortOrder);
+		EditorGroupItem(EditorItem *tqparent, EditorItem *after, const TQString &text, 
+			const TQString &icon, int sortOrder);
+		EditorGroupItem(EditorItem *tqparent, const TQString &text, 
+			const TQString &icon, int sortOrder);
 		virtual ~EditorGroupItem();
 
-//		void  setLabel(QLabel *label) { m_label = label; }
-		QWidget*  label() const;
+//		void  setLabel(TQLabel *label) { m_label = label; }
+		TQWidget*  label() const;
 
 	protected:
-		virtual void init(const QString &icon);
+		virtual void init(const TQString &icon);
 
 		/*! Reimplemented from KListViewItem to draw custom contents. */
-		virtual void paintCell(QPainter *p, const QColorGroup & cg, int column, int width, int align);
+		virtual void paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align);
 		virtual void setup();
-		virtual int compare( QListViewItem *i, int col, bool ascending ) const;
+		virtual int compare( TQListViewItem *i, int col, bool ascending ) const;
 
 		GroupWidget *m_label;
 		int m_sortOrder;
@@ -115,13 +115,13 @@ class EditorGroupItem : public EditorItem
 class EditorDummyItem : public EditorItem
 {
 	public:
-		EditorDummyItem(KListView *parent);
+		EditorDummyItem(KListView *tqparent);
 		virtual ~EditorDummyItem();
 
 	protected:
 		virtual void setup();
-		/*virtual void paintCell(QPainter *p, const QColorGroup & cg, int column, int width, int align);
-		virtual void paintFocus(QPainter * p, const QColorGroup & cg, const QRect & r);*/
+		/*virtual void paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align);
+		virtual void paintFocus(TQPainter * p, const TQColorGroup & cg, const TQRect & r);*/
 };
 
 }