1 --- kdelibs/kdefx/kstyle.cpp~ 2011-01-05 00:23:08.000000000 +0200
2 +++ kdelibs/kdefx/kstyle.cpp 2011-01-05 00:23:43.787007235 +0200
5 // HACK for gtk-qt-engine
8 +/* FIXME temp hack to get it compiled
9 +kstyle.cpp: At global scope:
10 +kstyle.cpp:2268:19: error: expected unqualified-id before string constant
11 +make[2]: *** [kstyle.lo] Error 1
16 void kde_kstyle_set_scrollbar_type_windows( void* style )
18 ((KStyle*)style)->setScrollBarType( KStyle::WindowsStyleScrollBar );
19 #--- kdelibs/networkstatus/serviceiface_stub.cpp~ 2011-01-05 01:24:06.000000000 +0200
20 #+++ kdelibs/networkstatus/serviceiface_stub.cpp 2011-01-05 01:24:38.660091691 +0200
22 # TQCString replyType;
23 # TQDataStream arg( data, IO_WriteOnly );
26 #+ // FIXME temp hack to get it compiled
27 #+ // serviceiface_stub.o: In function `ServiceIface_stub::registerNetwork(QString const&, NetworkStatus::Properties)':
28 #+ // serviceiface_stub.cpp:58: undefined reference to `operator<<(QDataStream&, NetworkStatus::Properties)'
29 #+ // collect2: ld returned 1 exit status
30 #+ arg << arg1.status;
31 # if ( dcopClient()->call( app(), obj(), "registerNetwork(TQString,NetworkStatus::Properties)", data, replyType, replyData ) ) {
32 # setStatus( CallSucceeded );
34 --- kdelibs/networkstatus/networkstatuscommon.cpp~ 2010-09-04 21:08:12.000000000 +0300
35 +++ kdelibs/networkstatus/networkstatuscommon.cpp 2011-01-05 01:44:47.862346338 +0200
37 #include "networkstatuscommon.h"
40 -TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p )
41 +TQDataStream & operator<< ( TQDataStream & s, NetworkStatus::Properties p )
43 kdDebug() << k_funcinfo << "status is: " << (int)p.status << endl;
45 --- kdelibs/networkstatus/networkstatuscommon.h~ 2010-09-04 21:08:12.000000000 +0300
46 +++ kdelibs/networkstatus/networkstatuscommon.h 2011-01-05 01:44:57.519989113 +0200
50 TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p );
51 -TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p );
52 +TQDataStream & operator<< ( TQDataStream & s, NetworkStatus::Properties p );