From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/libkopete/networkstatuscommon.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kopete/libkopete/networkstatuscommon.cpp') diff --git a/kopete/libkopete/networkstatuscommon.cpp b/kopete/libkopete/networkstatuscommon.cpp index 87c18a14..acf53f96 100644 --- a/kopete/libkopete/networkstatuscommon.cpp +++ b/kopete/libkopete/networkstatuscommon.cpp @@ -1,32 +1,32 @@ #include "networkstatuscommon.h" #include -TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p ) +TQDataStream & operator<< ( TQDataStream & s, const NetworktqStatus::Properties p ) { kdDebug() << k_funcinfo << "status is: " << (int)p.status << endl; s << (int)p.status; s << (int)p.onDemandPolicy; s << p.service; s << ( p.internet ? 1 : 0 ); - s << p.netmasks; + s << p.nettqmasks; return s; } -TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p ) +TQDataStream & operator>> ( TQDataStream & s, NetworktqStatus::Properties &p ) { int status, onDemandPolicy, internet; s >> status; kdDebug() << k_funcinfo << "status is: " << status << endl; - p.status = ( NetworkStatus::EnumStatus )status; + p.status = ( NetworktqStatus::EnumtqStatus )status; s >> onDemandPolicy; - p.onDemandPolicy = ( NetworkStatus::EnumOnDemandPolicy )onDemandPolicy; + p.onDemandPolicy = ( NetworktqStatus::EnumOnDemandPolicy )onDemandPolicy; s >> p.service; s >> internet; if ( internet ) p.internet = true; else p.internet = false; - s >> p.netmasks; + s >> p.nettqmasks; kdDebug() << k_funcinfo << "enum converted status is: " << p.status << endl; return s; } -- cgit v1.2.1