summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-03 21:59:12 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-03 21:59:12 +0000
commit7deab5d97506cf854c13e28a2df48ce8002b9825 (patch)
tree07e4cd726d815eac8b4afd8b418518a582dc70f9
parentec9d21ce2256b58305528c51569af0d23d086128 (diff)
downloadtqtinterface-7deab5d97506cf854c13e28a2df48ce8002b9825.tar.gz
tqtinterface-7deab5d97506cf854c13e28a2df48ce8002b9825.zip
Fix FTBFS
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1226996 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--qtinterface/tqapplication.cpp10
-rw-r--r--qtinterface/tqapplication.h9
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 <tqt.h>
#include <tqapplication.h>
+#include <X11/X.h>
+
#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 <qapplication.h>
-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