From 7deab5d97506cf854c13e28a2df48ce8002b9825 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 3 Apr 2011 21:59:12 +0000 Subject: Fix FTBFS git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1226996 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- qtinterface/tqapplication.cpp | 10 ++++++---- qtinterface/tqapplication.h | 9 +++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/qtinterface/tqapplication.cpp b/qtinterface/tqapplication.cpp index eb3ada7..26a20d6 100644 --- a/qtinterface/tqapplication.cpp +++ b/qtinterface/tqapplication.cpp @@ -22,23 +22,25 @@ Boston, MA 02110-1301, USA. #include #include +#include + #ifdef USE_QT3 extern Time qt_x_time; extern Time qt_x_user_time; -void set_tqt_x_time(Time x) { +void set_tqt_x_time(unsigned long x) { qt_x_time = x; } -Time get_tqt_x_time(void) { +unsigned long get_tqt_x_time(void) { return qt_x_time; } -void set_tqt_x_user_time(Time x) { +void set_tqt_x_user_time(unsigned long x) { qt_x_user_time = x; } -Time get_tqt_x_user_time(void) { +unsigned long get_tqt_x_user_time(void) { return qt_x_user_time; } #endif diff --git a/qtinterface/tqapplication.h b/qtinterface/tqapplication.h index 4bd9404..8ecec4d 100644 --- a/qtinterface/tqapplication.h +++ b/qtinterface/tqapplication.h @@ -32,10 +32,11 @@ Boston, MA 02110-1301, USA. #include -void set_tqt_x_time(Time x); -Time get_tqt_x_time(void); -void set_tqt_x_user_time(Time x); -Time get_tqt_x_user_time(void); +// X11/X.h defines Time as unsigned long +void set_tqt_x_time(unsigned long x); +unsigned long get_tqt_x_time(void); +void set_tqt_x_user_time(unsigned long x); +unsigned long get_tqt_x_user_time(void); #endif // USE_QT3 -- cgit v1.2.1