3d605d8f6d
as __int64_t, and when moc parses and creates the signal string prototype functions, it uses "int64_t", but when the code that calls them is compiled the strings formed are tokenized, so they become "__int64_t" so there is a mismatch. Fixing the NetBSD headers would be TRT to do, but it is too involved. Instead since the use of int64_t is limited in parameter types, define a new pctime_t as int64_t and use that instead. I think that moc functions should use only qt-specified typedefs to avoid portability problems anyway.
40 lines
1.4 KiB
Text
40 lines
1.4 KiB
Text
$NetBSD: patch-af,v 1.1 2012/08/30 18:54:42 christos Exp $
|
|
|
|
--- modules/gui/qt4/input_manager.cpp 2011-10-18 18:56:16.000000000 +0300
|
|
+++ modules/gui/qt4/input_manager.cpp 2012-08-30 17:46:07.000000000 +0300
|
|
@@ -397,7 +397,7 @@
|
|
{
|
|
/* Update position */
|
|
int i_length;
|
|
- int64_t i_time;
|
|
+ putime_t i_time;
|
|
float f_pos;
|
|
i_length = var_GetTime( p_input , "length" ) / 1000000;
|
|
i_time = var_GetTime( p_input , "time");
|
|
@@ -889,21 +889,21 @@
|
|
{
|
|
timeB = var_GetTime( THEMIM->getInput(), "time" );
|
|
var_SetTime( THEMIM->getInput(), "time" , timeA );
|
|
- CONNECT( this, positionUpdated( float, int64_t, int ),
|
|
- this, AtoBLoop( float, int64_t, int ) );
|
|
+ CONNECT( this, positionUpdated( float, putime_t, int ),
|
|
+ this, AtoBLoop( float, putime_t, int ) );
|
|
}
|
|
else
|
|
{
|
|
timeA = 0;
|
|
timeB = 0;
|
|
- disconnect( this, SIGNAL( positionUpdated( float, int64_t, int ) ),
|
|
- this, SLOT( AtoBLoop( float, int64_t, int ) ) );
|
|
+ disconnect( this, SIGNAL( positionUpdated( float, putime_t, int ) ),
|
|
+ this, SLOT( AtoBLoop( float, putime_t, int ) ) );
|
|
}
|
|
emit AtoBchanged( (timeA != 0 ), (timeB != 0 ) );
|
|
}
|
|
|
|
/* Function called regularly when in an AtoB loop */
|
|
-void InputManager::AtoBLoop( float, int64_t i_time, int )
|
|
+void InputManager::AtoBLoop( float, putime_t i_time, int )
|
|
{
|
|
if( timeB )
|
|
{
|