From 298800711f615ef5c3d69cc1b7f8e57c6ab0f191 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 16:32:25 -0600 Subject: [PATCH] Fix FTBFS --- ChangeLog | 2 +- NEWS | 4 ++-- sip/qt/qwindowdefs_x11.sip | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 466d53a..522f510 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3016,7 +3016,7 @@ Added TQt3 support for TQColor, TQCursor, TQObject, TQPaintDevice, TQPixmap and TQSizePolicy. Added TQColor.getHsv(). Added the Display opaque structure. -Added qt_xdisplay(), qt_xscreen() and qt_xrootwin(). +Added tqt_xdisplay(), tqt_xscreen() and tqt_xrootwin(). Added TQPaintDevice.x11Display(), TQPaintDevice.x11AppDisplay, TQPaintDevice.x11SetAppDpiX() and TQPaintDevice.x11SetAppDpiY(). Added the missing TQPixmap.save() variant. diff --git a/NEWS b/NEWS index 882ba5e..283e78d 100644 --- a/NEWS +++ b/NEWS @@ -358,8 +358,8 @@ v2.5 11th August 2001 for different versions of TQt. NULL TQCanvasItemList, TQFileInfoList, TQObjectList, TQStrList and TQWidgetList pointers are now converted to an empty Python list rather than None. Added TQDataStream and the TQDom - classes (thanks to Jim Bublitz). Added the qt_xdisplay(), qt_xscreen() - and qt_xrootwin() functions. Added the TQColor.getHsv(), + classes (thanks to Jim Bublitz). Added the tqt_xdisplay(), tqt_xscreen() + and tqt_xrootwin() functions. Added the TQColor.getHsv(), TQPaintDevice.x11Display(), TQPaintDevice.x11AppDisplay(), TQPaintDevice.x11SetAppDpiX(), TQPaintDevice.x11SetAppDpiY() and TQWidget.customEvent() methods. diff --git a/sip/qt/qwindowdefs_x11.sip b/sip/qt/qwindowdefs_x11.sip index 9b2fdd6..13ca459 100644 --- a/sip/qt/qwindowdefs_x11.sip +++ b/sip/qt/qwindowdefs_x11.sip @@ -34,11 +34,11 @@ typedef unsigned long WId; typedef void Display; -Display *qt_xdisplay(); -int qt_xscreen(); -WId qt_xrootwin(); +Display *tqt_xdisplay(); +int tqt_xscreen(); +WId tqt_xrootwin(); %If (TQt_3_1_0 -) -WId qt_xrootwin(int); +WId tqt_xrootwin(int); %End %If (TQt_3_3_0 -)