TQt4 port basket

This enables compilation under both Qt3 and Qt4


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

1 files changed, 44 insertions, 42 deletions

diff --git a/src/tagsedit.h b/src/tagsedit.h
index 0986bac..1d50d89 100644
--- a/src/tagsedit.h
+++ b/src/tagsedit.h
@@ -23,17 +23,17 @@
 
 #include <kdialogbase.h>
 #include <kcombobox.h>
-#include <qlistview.h>
-#include <qvaluelist.h>
+#include <tqlistview.h>
+#include <tqvaluelist.h>
 
-class QGroupBox;
-class QLineEdit;
-class QCheckBox;
+class TQGroupBox;
+class TQLineEdit;
+class TQCheckBox;
 class KPushButton;
 class KKeyButton;
 class KIconButton;
 class KFontCombo;
-class QLabel;
+class TQLabel;
 class KShortcut;
 
 class KColorCombo2;
@@ -46,7 +46,7 @@ class State;
 class StateCopy
 {
   public:
-	typedef QValueList<StateCopy*> List;
+	typedef TQValueList<StateCopy*> List;
 	StateCopy(State *old = 0);
 	~StateCopy();
 	State *oldState;
@@ -57,7 +57,7 @@ class StateCopy
 class TagCopy
 {
   public:
-	typedef QValueList<TagCopy*> List;
+	typedef TQValueList<TagCopy*> List;
 	TagCopy(Tag *old = 0);
 	~TagCopy();
 	Tag *oldTag;
@@ -67,43 +67,44 @@ class TagCopy
 	bool isMultiState();
 };
 
-class TagListViewItem : public QListViewItem
+class TagListViewItem : public TQListViewItem
 {
   public:
-	TagListViewItem(QListView     *parent, TagCopy *tagCopy);
-	TagListViewItem(QListViewItem *parent, TagCopy *tagCopy);
-	TagListViewItem(QListView     *parent, QListViewItem *after, TagCopy *tagCopy);
-	TagListViewItem(QListViewItem *parent, QListViewItem *after, TagCopy *tagCopy);
-	TagListViewItem(QListView     *parent, StateCopy *stateCopy);
-	TagListViewItem(QListViewItem *parent, StateCopy *stateCopy);
-	TagListViewItem(QListView     *parent, QListViewItem *after, StateCopy *stateCopy);
-	TagListViewItem(QListViewItem *parent, QListViewItem *after, StateCopy *stateCopy);
+	TagListViewItem(TQListView     *tqparent, TagCopy *tagCopy);
+	TagListViewItem(TQListViewItem *tqparent, TagCopy *tagCopy);
+	TagListViewItem(TQListView     *tqparent, TQListViewItem *after, TagCopy *tagCopy);
+	TagListViewItem(TQListViewItem *tqparent, TQListViewItem *after, TagCopy *tagCopy);
+	TagListViewItem(TQListView     *tqparent, StateCopy *stateCopy);
+	TagListViewItem(TQListViewItem *tqparent, StateCopy *stateCopy);
+	TagListViewItem(TQListView     *tqparent, TQListViewItem *after, StateCopy *stateCopy);
+	TagListViewItem(TQListViewItem *tqparent, TQListViewItem *after, StateCopy *stateCopy);
 	~TagListViewItem();
 	TagCopy*   tagCopy()   { return m_tagCopy;   }
 	StateCopy* stateCopy() { return m_stateCopy; }
 	bool isEmblemObligatory();
 	TagListViewItem* lastChild();
 	TagListViewItem* prevSibling();
-	TagListViewItem* parent() const; // Reimplemented to cast the return value
-	int width(const QFontMetrics &fontMetrics, const QListView *listView, int column) const;
+	TagListViewItem* tqparent() const; // Reimplemented to cast the return value
+	int width(const TQFontMetrics &fontMetrics, const TQListView *listView, int column) const;
 	void setup();
-	void paintCell(QPainter *painter, const QColorGroup &colorGroup, int column, int width, int align);
+	void paintCell(TQPainter *painter, const TQColorGroup &tqcolorGroup, int column, int width, int align);
 
   private:
 	TagCopy   *m_tagCopy;
 	StateCopy *m_stateCopy;
 };
 
-class TagListView : public QListView
+class TagListView : public TQListView
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-	TagListView(QWidget *parent = 0, const char *name = 0, WFlags flags = 0);
+	TagListView(TQWidget *tqparent = 0, const char *name = 0, WFlags flags = 0);
 	~TagListView();
-	void keyPressEvent(QKeyEvent *event);
-	void contentsMouseDoubleClickEvent(QMouseEvent *event);
-	void contentsMousePressEvent(QMouseEvent *event);
-	void contentsMouseReleaseEvent(QMouseEvent *event);
+	void keyPressEvent(TQKeyEvent *event);
+	void contentsMouseDoubleClickEvent(TQMouseEvent *event);
+	void contentsMousePressEvent(TQMouseEvent *event);
+	void contentsMouseReleaseEvent(TQMouseEvent *event);
 	TagListViewItem* currentItem() const; // Reimplemented to cast the return value
 	TagListViewItem* firstChild() const; // Reimplemented to cast the return value
 	TagListViewItem* lastItem() const; // Reimplemented to cast the return value
@@ -118,8 +119,9 @@ class TagListView : public QListView
 class TagsEditDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-	TagsEditDialog(QWidget *parent = 0, State *stateToEdit = 0, bool addNewTag = false);
+	TagsEditDialog(TQWidget *tqparent = 0, State *stateToEdit = 0, bool addNewTag = false);
 	~TagsEditDialog();
 	State::List deletedStates() { return m_deletedStates; }
 	State::List addedStates()   { return m_addedStates;   }
@@ -135,7 +137,7 @@ class TagsEditDialog : public KDialogBase
 	void removeShortcut();
 	void removeEmblem();
 	void modified();
-	void currentItemChanged(QListViewItem *item);
+	void currentItemChanged(TQListViewItem *item);
 	void slotCancel();
 	void slotOk();
 	void selectUp();
@@ -154,26 +156,26 @@ class TagsEditDialog : public KDialogBase
 	KPushButton   *m_moveUp;
 	KPushButton   *m_moveDown;
 	KPushButton   *m_deleteTag;
-	QLineEdit     *m_tagName;
+	TQLineEdit     *m_tagName;
 	KKeyButton    *m_shortcut;
-	QPushButton   *m_removeShortcut;
-	QCheckBox     *m_inherit;
-	QGroupBox     *m_tagBox;
-	QGroupBox     *m_stateBox;
-	QLabel        *m_stateNameLabel;
-	QLineEdit     *m_stateName;
+	TQPushButton   *m_removeShortcut;
+	TQCheckBox     *m_inherit;
+	TQGroupBox     *m_tagBox;
+	TQGroupBox     *m_stateBox;
+	TQLabel        *m_stateNameLabel;
+	TQLineEdit     *m_stateName;
 	KIconButton   *m_emblem;
-	QPushButton   *m_removeEmblem;
-	QPushButton   *m_bold;
-	QPushButton   *m_underline;
-	QPushButton   *m_italic;
-	QPushButton   *m_strike;
+	TQPushButton   *m_removeEmblem;
+	TQPushButton   *m_bold;
+	TQPushButton   *m_underline;
+	TQPushButton   *m_italic;
+	TQPushButton   *m_strike;
 	KColorCombo2  *m_textColor;
 	KFontCombo    *m_font;
 	FontSizeCombo *m_fontSize;
 	KColorCombo2  *m_backgroundColor;
-	QLineEdit     *m_textEquivalent;
-	QCheckBox     *m_onEveryLines;
+	TQLineEdit     *m_textEquivalent;
+	TQCheckBox     *m_onEveryLines;
 
 	TagCopy::List m_tagCopies;
 	State::List   m_deletedStates;