From f008adb5a77e094eaf6abf3fc0f36958e66896a5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 25 Jun 2011 05:28:35 +0000 Subject: 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 --- krita/ui/kis_cmb_composite.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'krita/ui/kis_cmb_composite.h') diff --git a/krita/ui/kis_cmb_composite.h b/krita/ui/kis_cmb_composite.h index fa930301..cee803c4 100644 --- a/krita/ui/kis_cmb_composite.h +++ b/krita/ui/kis_cmb_composite.h @@ -22,7 +22,7 @@ #define KIS_CMB_COMPOSITE_H_ #include -#include "qcombobox.h" +#include "tqcombobox.h" #include "kis_composite_op.h" /** @@ -36,22 +36,23 @@ * But that's for later... */ -class KRITAUI_EXPORT KisCmbComposite : public QComboBox +class KRITAUI_EXPORT KisCmbComposite : public TQComboBox { - typedef QComboBox super; + typedef TQComboBox super; Q_OBJECT + TQ_OBJECT public: - KisCmbComposite(QWidget * parent = 0, const char * name = 0 ); + KisCmbComposite(TQWidget * tqparent = 0, const char * name = 0 ); virtual ~KisCmbComposite(); KisCompositeOp currentItem() const; void setCompositeOpList(const KisCompositeOpList& list); void setCurrentItem(const KisCompositeOp& op); - void setCurrentText(const QString & s); + void setCurrentText(const TQString & s); signals: -- cgit v1.2.1