diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-25 05:28:35 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-25 05:28:35 +0000 |
| commit | f008adb5a77e094eaf6abf3fc0f36958e66896a5 (patch) | |
| tree | 8e9244c4d4957c36be81e15b566b4aa5ea26c982 /krita/ui/kis_cmb_composite.h | |
| parent | 1210f27b660efb7b37ff43ec68763e85a403471f (diff) | |
| download | koffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.tar.gz koffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.zip | |
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
Diffstat (limited to 'krita/ui/kis_cmb_composite.h')
| -rw-r--r-- | krita/ui/kis_cmb_composite.h | 11 |
1 files changed, 6 insertions, 5 deletions
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 <koffice_export.h> -#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: |