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, 37 insertions, 31 deletions

diff --git a/src/variouswidgets.h b/src/variouswidgets.h
index c579b72..45fde52 100644
--- a/src/variouswidgets.h
+++ b/src/variouswidgets.h
@@ -21,47 +21,49 @@
 #ifndef VARIOUSWIDGETS_H
 #define VARIOUSWIDGETS_H
 
-#include <qwidget.h>
+#include <tqwidget.h>
 #include <kcombobox.h>
-#include <qdialog.h>
+#include <tqdialog.h>
 #include <kurllabel.h>
-#include <qstring.h>
+#include <tqstring.h>
 #include <kdialogbase.h>
 
-class QLineEdit;
+class TQLineEdit;
 class KIconViewItem;
-class QIconViewItem;
+class TQIconViewItem;
 
 class Basket;
 
 /** A widget to select a command to run,
-  * with a QLineEdit and a QPushButton.
+  * with a TQLineEdit and a TQPushButton.
   * @author S�bastien Lao�t
   */
-class RunCommandRequester : public QWidget
+class RunCommandRequester : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-	RunCommandRequester(const QString &runCommand, const QString &message, QWidget *parent = 0, const char *name = 0);
+	RunCommandRequester(const TQString &runCommand, const TQString &message, TQWidget *tqparent = 0, const char *name = 0);
 	~RunCommandRequester();
-	QString runCommand();
-	void setRunCommand(const QString &runCommand);
-	QLineEdit *lineEdit() { return m_runCommand; }
+	TQString runCommand();
+	void setRunCommand(const TQString &runCommand);
+	TQLineEdit *lineEdit() { return m_runCommand; }
   private slots:
 	void slotSelCommand();
   private:
-	QLineEdit *m_runCommand;
-	QString    m_message;
+	TQLineEdit *m_runCommand;
+	TQString    m_message;
 };
 
-/** QComboBox to ask icon size
+/** TQComboBox to ask icon size
   * @author S�bastien Lao�t
   */
-class IconSizeCombo : public QComboBox
+class IconSizeCombo : public TQComboBox
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-	IconSizeCombo(bool rw, QWidget *parent = 0, const char *name = 0);
+	IconSizeCombo(bool rw, TQWidget *tqparent = 0, const char *name = 0);
 	~IconSizeCombo();
 	int iconSize();
 	void setSize(int size);
@@ -71,15 +73,16 @@ class IconSizeCombo : public QComboBox
   * TODO: Create a SizePushButton or even SizeWidget
   * @author S�bastien Lao�t
   */
-class ViewSizeDialog : public QDialog
+class ViewSizeDialog : public TQDialog
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-	ViewSizeDialog(QWidget *parent, int w, int h);
+	ViewSizeDialog(TQWidget *tqparent, int w, int h);
 	~ViewSizeDialog();
   private:
-	virtual void resizeEvent(QResizeEvent *);
-	QWidget *m_sizeGrip;
+	virtual void resizeEvent(TQResizeEvent *);
+	TQWidget *m_sizeGrip;
 };
 
 /** A label displaying a link that, once clicked, offer a What's This messageBox to help users.
@@ -88,17 +91,18 @@ class ViewSizeDialog : public QDialog
 class HelpLabel : public KURLLabel
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-	HelpLabel(const QString &text, const QString &message, QWidget *parent);
+	HelpLabel(const TQString &text, const TQString &message, TQWidget *tqparent);
 	~HelpLabel();
-	QString message()                       { return m_message;    }
+	TQString message()                       { return m_message;    }
   public slots:
-	void setMessage(const QString &message) { m_message = message; }
+	void setMessage(const TQString &message) { m_message = message; }
 	void showMessage();
   protected:
-	void keyPressEvent(QKeyEvent *event);
+	void keyPressEvent(TQKeyEvent *event);
   private:
-	QString m_message;
+	TQString m_message;
 };
 
 /** A dialog to choose the size of an icon.
@@ -107,14 +111,15 @@ class HelpLabel : public KURLLabel
 class IconSizeDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-	IconSizeDialog(const QString &caption, const QString &message, const QString &icon, int iconSize, QWidget *parent);
+	IconSizeDialog(const TQString &caption, const TQString &message, const TQString &icon, int iconSize, TQWidget *tqparent);
 	~IconSizeDialog();
 	int iconSize() { return m_iconSize; } /// << @return the choosen icon size (16, 32, ...) or -1 if canceled!
   protected slots:
 	void slotCancel();
 	void slotSelectionChanged();
-	void choose(QIconViewItem*);
+	void choose(TQIconViewItem*);
   private:
 	KIconViewItem *m_size16;
 	KIconViewItem *m_size22;
@@ -126,24 +131,25 @@ class IconSizeDialog : public KDialogBase
 };
 
 /**
- * A missing class from KDE (and Qt): a combobox to select a font size!
+ * A missing class from KDE (and TQt): a combobox to select a font size!
  */
 class FontSizeCombo : public KComboBox
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-	FontSizeCombo(bool rw, bool withDefault, QWidget *parent = 0, const char *name = 0);
+	FontSizeCombo(bool rw, bool withDefault, TQWidget *tqparent = 0, const char *name = 0);
 	~FontSizeCombo();
 	void setFontSize(int size);
 	int fontSize();
   protected:
-	void keyPressEvent(QKeyEvent *event);
+	void keyPressEvent(TQKeyEvent *event);
   signals:
 	void sizeChanged(int size);
 	void escapePressed();
 	void returnPressed2();
   private slots:
-	void textChangedInCombo(const QString &text);
+	void textChangedInCombo(const TQString &text);
   private:
 	bool m_withDefault;
 };