summaryrefslogtreecommitdiffstats
path: root/xine_artsplugin
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
commitb1057f437bf65300831a0ccb45b920787c6b318d (patch)
treef8a73db06ca1180d0da0ba6dfbe786197b4f4bc3 /xine_artsplugin
parent4ddfca384ced9ad654213aef9dc2c3973720b980 (diff)
downloadtdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz
tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip
TQt4 port kdemultimedia
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'xine_artsplugin')
-rw-r--r--xine_artsplugin/tools/thumbnail/videocreator.h1
-rw-r--r--xine_artsplugin/xinePlayObject_impl.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/xine_artsplugin/tools/thumbnail/videocreator.h b/xine_artsplugin/tools/thumbnail/videocreator.h
index 3af6d515..691d1ba3 100644
--- a/xine_artsplugin/tools/thumbnail/videocreator.h
+++ b/xine_artsplugin/tools/thumbnail/videocreator.h
@@ -25,6 +25,7 @@
class VideoCreator : public TQObject, public ThumbCreator
{
Q_OBJECT
+ TQ_OBJECT
public:
VideoCreator();
virtual ~VideoCreator();
diff --git a/xine_artsplugin/xinePlayObject_impl.cpp b/xine_artsplugin/xinePlayObject_impl.cpp
index 21e3dff5..9b5cef18 100644
--- a/xine_artsplugin/xinePlayObject_impl.cpp
+++ b/xine_artsplugin/xinePlayObject_impl.cpp
@@ -739,7 +739,7 @@ void xineVideoPlayObject_impl::x11WindowId( long window )
{
XLockDisplay( display );
- // Change window and set event mask of new window
+ // Change window and set event tqmask of new window
visual.d = window;
XSelectInput( display, window, ExposureMask );