From 0a80cfd57d271dd44221467efb426675fa470356 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 28 Jun 2011 18:31:12 +0000 Subject: TQt4 port kvirc This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/modules/options/optw_texticons.h | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'src/modules/options/optw_texticons.h') diff --git a/src/modules/options/optw_texticons.h b/src/modules/options/optw_texticons.h index 652c7da9..fe4e2f12 100644 --- a/src/modules/options/optw_texticons.h +++ b/src/modules/options/optw_texticons.h @@ -32,18 +32,18 @@ -#include +#include #include "kvi_tal_popupmenu.h" #include "kvi_tal_hbox.h" #ifdef COMPILE_USE_QT4 -#include +#include #define KviTalTable Q3Table #define KviTalTableItem Q3TableItem #else -#include -#define KviTalTable QTable -#define KviTalTableItem QTableItem +#include +#define KviTalTable TQTable +#define KviTalTableItem TQTableItem #endif class KviTextIconTableItem; @@ -51,15 +51,16 @@ class KviTextIconTableItem; class KviTextIconEditor : public KviTalHBox { Q_OBJECT + TQ_OBJECT public: - KviTextIconEditor(QWidget * par,KviTextIcon * icon,KviTextIconTableItem* item); + KviTextIconEditor(TQWidget * par,KviTextIcon * icon,KviTextIconTableItem* item); ~KviTextIconEditor(); protected: KviTextIconTableItem *m_pTableItem; KviTextIcon *m_pIcon; KviTalPopupMenu *m_pPopup; - QToolButton *m_pIconButton; - QToolButton *m_pBrowseButton; + TQToolButton *m_pIconButton; + TQToolButton *m_pBrowseButton; public: void updateIcon(); KviTextIcon* icon() { return m_pIcon; }; @@ -80,20 +81,21 @@ protected: public: KviTextIcon * icon() { return m_pIcon; }; void setId(int id); - virtual QWidget * createEditor() const; - virtual void setContentFromEditor(QWidget * w); + virtual TQWidget * createEditor() const; + virtual void setContentFromEditor(TQWidget * w); }; class KviTextIconsOptionsWidget : public KviOptionsWidget { Q_OBJECT + TQ_OBJECT public: - KviTextIconsOptionsWidget(QWidget * parent); + KviTextIconsOptionsWidget(TQWidget * tqparent); ~KviTextIconsOptionsWidget(); protected: KviTalTable * m_pTable; - QPushButton * m_pAdd; - QPushButton * m_pDel; + TQPushButton * m_pAdd; + TQPushButton * m_pDel; public: virtual void commit(); protected slots: -- cgit v1.2.1