From 560378aaca1784ba19806a0414a32b20c744de39 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 04:12:51 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- networkstatus/network.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'networkstatus/network.cpp') diff --git a/networkstatus/network.cpp b/networkstatus/network.cpp index fcb4a6f51..6d34950c1 100644 --- a/networkstatus/network.cpp +++ b/networkstatus/network.cpp @@ -23,29 +23,29 @@ #include "network.h" -Network::Network( const TQString name, NetworkStatus::Properties properties ) +Network::Network( const TQString name, NetworktqStatus::Properties properties ) : m_name( name ) { kdDebug() << k_funcinfo << "constructing network '" << name << "', status: " << properties.status << endl; m_status = properties.status; - m_netmasks = properties.netmasks; + m_nettqmasks = properties.nettqmasks; m_internet = properties.internet; m_service = properties.service; m_onDemandPolicy = properties.onDemandPolicy; } -NetworkStatus::EnumStatus Network::reachabilityFor( const TQString & host ) +NetworktqStatus::EnumtqStatus Network::reachabilityFor( const TQString & host ) { // initially assume all networks are internet // TODO: compute reachability properly Q_UNUSED( host ); if ( true /*nss.properties.internet && notPrivateNetwork( host )*/ ) { - NetworkStatus::EnumStatus status; - if ( m_status == NetworkStatus::Establishing || m_status == NetworkStatus::Online ) - status = NetworkStatus::Online; - else if ( m_status == NetworkStatus::ShuttingDown || m_status == NetworkStatus::Offline ) - status = NetworkStatus::Offline; + NetworktqStatus::EnumtqStatus status; + if ( m_status == NetworktqStatus::Establishing || m_status == NetworktqStatus::Online ) + status = NetworktqStatus::Online; + else if ( m_status == NetworktqStatus::ShuttingDown || m_status == NetworktqStatus::Offline ) + status = NetworktqStatus::Offline; else status = m_status; @@ -82,7 +82,7 @@ void Network::unregisterUsage( const TQCString appId, const TQString host ) } } -void Network::setStatus( NetworkStatus::EnumStatus status ) +void Network::setStatus( NetworktqStatus::EnumtqStatus status ) { m_status = status; } -- cgit v1.2.1