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_input_device.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'krita/ui/kis_input_device.h') diff --git a/krita/ui/kis_input_device.h b/krita/ui/kis_input_device.h index 91c5ff4f..d85d4e3f 100644 --- a/krita/ui/kis_input_device.h +++ b/krita/ui/kis_input_device.h @@ -19,14 +19,14 @@ #ifndef KIS_INPUT_DEVICE_H_ #define KIS_INPUT_DEVICE_H_ -#include +#include class KisInputDevice { public: KisInputDevice(); static KisInputDevice allocateInputDevice(); - static QValueVector inputDevices(); + static TQValueVector inputDevices(); friend inline bool operator==(const KisInputDevice&, const KisInputDevice&); friend inline bool operator!=(const KisInputDevice&, const KisInputDevice&); @@ -35,24 +35,24 @@ public: friend inline bool operator>(const KisInputDevice &, const KisInputDevice &); static KisInputDevice mouse(); // Standard mouse - static KisInputDevice stylus(); // Wacom stylus via QTabletEvent - static KisInputDevice eraser(); // Wacom eraser via QTabletEvent - static KisInputDevice puck(); // Wacom puck via QTabletEvent + static KisInputDevice stylus(); // Wacom stylus via TQTabletEvent + static KisInputDevice eraser(); // Wacom eraser via TQTabletEvent + static KisInputDevice puck(); // Wacom puck via TQTabletEvent static KisInputDevice unknown(); private: - KisInputDevice(Q_INT32 id) : m_id(id) {} + KisInputDevice(TQ_INT32 id) : m_id(id) {} - Q_INT32 id() const { return m_id; } + TQ_INT32 id() const { return m_id; } static void allocateDefaultDevicesIfNeeded(); static KisInputDevice allocateNextDevice(); private: - Q_INT32 m_id; + TQ_INT32 m_id; - static Q_INT32 NextInputDeviceID; - static QValueVector InputDevices; + static TQ_INT32 NextInputDeviceID; + static TQValueVector InputDevices; static KisInputDevice Mouse; static KisInputDevice Stylus; -- cgit v1.2.1