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/plugins/smpppdcs/smpppdcsplugin.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'kopete/plugins/smpppdcs/smpppdcsplugin.cpp') diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp index f17f2ca9..14f133c1 100644 --- a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp +++ b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp @@ -37,9 +37,9 @@ typedef KGenericFactory SMPPPDCSPluginFactory; K_EXPORT_COMPONENT_FACTORY(kopete_smpppdcs, SMPPPDCSPluginFactory("kopete_smpppdcs")) -SMPPPDCSPlugin::SMPPPDCSPlugin(TQObject *parent, const char * name, const TQStringList& /* args */) - : DCOPObject("SMPPPDCSIface"), Kopete::Plugin(SMPPPDCSPluginFactory::instance(), parent, name), - m_detectorSMPPPD(NULL), m_detectorNetstat(NULL), m_detectorNetworkStatus(NULL), m_timer(NULL), +SMPPPDCSPlugin::SMPPPDCSPlugin(TQObject *tqparent, const char * name, const TQStringList& /* args */) + : DCOPObject("SMPPPDCSIface"), Kopete::Plugin(SMPPPDCSPluginFactory::instance(), tqparent, name), + m_detectorSMPPPD(NULL), m_detectorNetstat(NULL), m_detectorNetworktqStatus(NULL), m_timer(NULL), m_onlineInquiry(NULL) { kdDebug(14312) << k_funcinfo << endl; @@ -51,7 +51,7 @@ m_onlineInquiry(NULL) { m_detectorNetstat = new DetectorNetstat(this); // experimental, not used yet - m_detectorNetworkStatus = new DetectorNetworkStatus(this); + m_detectorNetworktqStatus = new DetectorNetworktqStatus(this); // we wait for the allPluginsLoaded signal, to connect // as early as possible after startup, but not before @@ -72,7 +72,7 @@ SMPPPDCSPlugin::~SMPPPDCSPlugin() { delete m_timer; delete m_detectorSMPPPD; delete m_detectorNetstat; - delete m_detectorNetworkStatus; + delete m_detectorNetworktqStatus; delete m_onlineInquiry; } @@ -80,7 +80,7 @@ void SMPPPDCSPlugin::allPluginsLoaded() { if(Kopete::PluginManager::self()->isAllPluginsLoaded()) { m_timer = new TQTimer(); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus())); + connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotChecktqStatus())); if(SMPPPDCSConfig::self()->useSmpppd()) { m_timer->start(30000); @@ -90,7 +90,7 @@ void SMPPPDCSPlugin::allPluginsLoaded() { m_timer->start(60000); } - slotCheckStatus(); + slotChecktqStatus(); } } @@ -98,19 +98,19 @@ bool SMPPPDCSPlugin::isOnline() const { return m_onlineInquiry->isOnline(SMPPPDCSConfig::self()->useSmpppd()); } -void SMPPPDCSPlugin::slotCheckStatus() { +void SMPPPDCSPlugin::slotChecktqStatus() { // reread config to get changes SMPPPDCSConfig::self()->readConfig(); if(SMPPPDCSConfig::self()->useSmpppd()) { - m_detectorSMPPPD->checkStatus(); + m_detectorSMPPPD->checktqStatus(); } else { - m_detectorNetstat->checkStatus(); + m_detectorNetstat->checktqStatus(); } } -void SMPPPDCSPlugin::setConnectedStatus( bool connected ) { +void SMPPPDCSPlugin::setConnectedtqStatus( bool connected ) { kdDebug(14312) << k_funcinfo << connected << endl; // We have to handle a few cases here. First is the machine is connected, and the plugin thinks @@ -153,7 +153,7 @@ void SMPPPDCSPlugin::connectAllowed() { } #endif - if(!list.contains(it.current()->protocol()->pluginId() + "_" + it.current()-> + if(!list.tqcontains(it.current()->protocol()->pluginId() + "_" + it.current()-> accountId())) { it.current()->connect(); } @@ -178,7 +178,7 @@ void SMPPPDCSPlugin::disconnectAllowed() { } #endif - if(!list.contains(it.current()->protocol()->pluginId() + "_" + it.current()->accountId())) { + if(!list.tqcontains(it.current()->protocol()->pluginId() + "_" + it.current()->accountId())) { it.current()->disconnect(); } } -- cgit v1.2.1