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, 21 insertions, 19 deletions

diff --git a/src/newbasketdialog.h b/src/newbasketdialog.h
index 9e9477f..579077a 100644
--- a/src/newbasketdialog.h
+++ b/src/newbasketdialog.h
@@ -23,12 +23,12 @@
 
 #include <kdialogbase.h>
 #include <kiconview.h>
-#include <qmap.h>
+#include <tqmap.h>
 
 class KIconButton;
-class QLineEdit;
-class QDragObject;
-class QListViewItem;
+class TQLineEdit;
+class TQDragObject;
+class TQListViewItem;
 
 class Basket;
 
@@ -41,15 +41,16 @@ class KColorCombo2;
 class SingleSelectionKIconView : public KIconView
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-	SingleSelectionKIconView(QWidget *parent = 0, const char *name = 0, WFlags f = 0);
-	QDragObject* dragObject();
-	QIconViewItem* selectedItem() { return m_lastSelected; }
+	SingleSelectionKIconView(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0);
+	TQDragObject* dragObject();
+	TQIconViewItem* selectedItem() { return m_lastSelected; }
   private slots:
-	void slotSelectionChanged(QIconViewItem *item);
+	void slotSelectionChanged(TQIconViewItem *item);
 	void slotSelectionChanged();
   private:
-	QIconViewItem *m_lastSelected;
+	TQIconViewItem *m_lastSelected;
 };
 
 /** Struct to store default properties of a new basket.
@@ -61,10 +62,10 @@ class SingleSelectionKIconView : public KIconView
   */
 struct NewBasketDefaultProperties
 {
-	QString icon;
-	QString backgroundImage;
-	QColor  backgroundColor;
-	QColor  textColor;
+	TQString icon;
+	TQString backgroundImage;
+	TQColor  backgroundColor;
+	TQColor  textColor;
 	bool    freeLayout;
 	int     columnCount;
 
@@ -77,24 +78,25 @@ struct NewBasketDefaultProperties
 class NewBasketDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-	NewBasketDialog(Basket *parentBasket, const NewBasketDefaultProperties &defaultProperties, QWidget *parent = 0);
+	NewBasketDialog(Basket *tqparentBasket, const NewBasketDefaultProperties &defaultProperties, TQWidget *tqparent = 0);
 	~NewBasketDialog();
 	void polish();
   protected slots:
 	void slotOk();
 	void returnPressed();
 	void manageTemplates();
-	void nameChanged(const QString &newName);
+	void nameChanged(const TQString &newName);
   private:
-	int populateBasketsList(QListViewItem *item, int indent, int index);
+	int populateBasketsList(TQListViewItem *item, int indent, int index);
 	NewBasketDefaultProperties  m_defaultProperties;
 	KIconButton                *m_icon;
-	QLineEdit                  *m_name;
+	TQLineEdit                  *m_name;
 	KColorCombo2               *m_backgroundColor;
 	KIconView                  *m_templates;
-	QComboBox                  *m_createIn;
-	QMap<int, Basket*>          m_basketsMap;
+	TQComboBox                  *m_createIn;
+	TQMap<int, Basket*>          m_basketsMap;
 };
 
 #endif // NEWBASKETDIALOG_H