summaryrefslogtreecommitdiffstats
path: root/kopete/plugins/smpppdcs
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:33:51 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:33:51 -0600
commit089118c18533dfa3e6ce5065dbebdd4db94051f1 (patch)
treece014fb2326a80fcfafa2362b7ff88486aa17c96 /kopete/plugins/smpppdcs
parent83677e35509b4dafac63b76995652bdf3b49f209 (diff)
downloadtdenetwork-089118c18533dfa3e6ce5065dbebdd4db94051f1.tar.gz
tdenetwork-089118c18533dfa3e6ce5065dbebdd4db94051f1.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kopete/plugins/smpppdcs')
-rw-r--r--kopete/plugins/smpppdcs/Changelog.smpppdcs2
-rw-r--r--kopete/plugins/smpppdcs/detector.h2
-rw-r--r--kopete/plugins/smpppdcs/detectornetstat.cpp6
-rw-r--r--kopete/plugins/smpppdcs/detectornetstat.h2
-rw-r--r--kopete/plugins/smpppdcs/detectornetworkstatus.cpp28
-rw-r--r--kopete/plugins/smpppdcs/detectornetworkstatus.h14
-rw-r--r--kopete/plugins/smpppdcs/detectorsmpppd.cpp12
-rw-r--r--kopete/plugins/smpppdcs/detectorsmpppd.h2
-rw-r--r--kopete/plugins/smpppdcs/iconnector.h4
-rw-r--r--kopete/plugins/smpppdcs/onlineinquiry.cpp6
-rw-r--r--kopete/plugins/smpppdcs/onlineinquiry.h2
-rw-r--r--kopete/plugins/smpppdcs/smpppdcsplugin.cpp18
-rw-r--r--kopete/plugins/smpppdcs/smpppdcsplugin.h6
-rw-r--r--kopete/plugins/smpppdcs/smpppdcsprefs.ui8
-rw-r--r--kopete/plugins/smpppdcs/smpppdlocationui.ui2
-rw-r--r--kopete/plugins/smpppdcs/smpppdsearcher.cpp4
16 files changed, 59 insertions, 59 deletions
diff --git a/kopete/plugins/smpppdcs/Changelog.smpppdcs b/kopete/plugins/smpppdcs/Changelog.smpppdcs
index 4884da4f..80854a86 100644
--- a/kopete/plugins/smpppdcs/Changelog.smpppdcs
+++ b/kopete/plugins/smpppdcs/Changelog.smpppdcs
@@ -19,7 +19,7 @@ Changelog
* using KConfigXT for configuration
* using dcopidl2cpp stub generated from kinternetiface.h (from kinternet package),
no more own implementation
-* experimental implementation of the the KDED-NetworktqStatus (not active, yet)
+* experimental implementation of the the KDED-NetworkStatus (not active, yet)
* significantly speeded up automatic detection of a SMPPPD
* BUGFIX: reloading the plugin in a already running Kopete will no more
result in an inactive plugin
diff --git a/kopete/plugins/smpppdcs/detector.h b/kopete/plugins/smpppdcs/detector.h
index 1889a84f..094de9e5 100644
--- a/kopete/plugins/smpppdcs/detector.h
+++ b/kopete/plugins/smpppdcs/detector.h
@@ -48,7 +48,7 @@ public:
*/
virtual ~Detector() {}
- virtual void checktqStatus() const = 0;
+ virtual void checkStatus() const = 0;
virtual void smpppdServerChange() {}
diff --git a/kopete/plugins/smpppdcs/detectornetstat.cpp b/kopete/plugins/smpppdcs/detectornetstat.cpp
index ca800e7f..f1ed21b5 100644
--- a/kopete/plugins/smpppdcs/detectornetstat.cpp
+++ b/kopete/plugins/smpppdcs/detectornetstat.cpp
@@ -27,7 +27,7 @@ DetectorNetstat::~DetectorNetstat() {
delete m_process;
}
-void DetectorNetstat::checktqStatus() const {
+void DetectorNetstat::checkStatus() const {
kdDebug(14312) << k_funcinfo << endl;
if(m_process) {
@@ -59,14 +59,14 @@ void DetectorNetstat::checktqStatus() const {
void DetectorNetstat::slotProcessStdout(KProcess *, char *buffer, int buflen) {
// Look for a default gateway
kdDebug(14312) << k_funcinfo << endl;
- m_buffer += TQString::tqfromLatin1(buffer, buflen);
+ m_buffer += TQString::fromLatin1(buffer, buflen);
kdDebug(14312) << m_buffer << endl;
}
void DetectorNetstat::slotProcessExited(KProcess *process) {
kdDebug(14312) << k_funcinfo << m_buffer << endl;
if(process == m_process) {
- m_connector->setConnectedtqStatus(m_buffer.contains("default"));
+ m_connector->setConnectedStatus(m_buffer.contains("default"));
m_buffer = TQString();
delete m_process;
m_process = 0L;
diff --git a/kopete/plugins/smpppdcs/detectornetstat.h b/kopete/plugins/smpppdcs/detectornetstat.h
index 1f6d1161..548b903f 100644
--- a/kopete/plugins/smpppdcs/detectornetstat.h
+++ b/kopete/plugins/smpppdcs/detectornetstat.h
@@ -38,7 +38,7 @@ public:
DetectorNetstat(IConnector* connector);
virtual ~DetectorNetstat();
- virtual void checktqStatus() const;
+ virtual void checkStatus() const;
private slots:
// Original cs-plugin code
diff --git a/kopete/plugins/smpppdcs/detectornetworkstatus.cpp b/kopete/plugins/smpppdcs/detectornetworkstatus.cpp
index e8af4158..e2b1ae19 100644
--- a/kopete/plugins/smpppdcs/detectornetworkstatus.cpp
+++ b/kopete/plugins/smpppdcs/detectornetworkstatus.cpp
@@ -22,44 +22,44 @@
#include "iconnector.h"
#include "detectornetworkstatus.h"
-DetectorNetworktqStatus::DetectorNetworktqStatus(IConnector* connector)
+DetectorNetworkStatus::DetectorNetworkStatus(IConnector* connector)
: Detector(connector), m_connManager(NULL) {
m_connManager = ConnectionManager::self();
- connect(m_connManager, TQT_SIGNAL(statusChanged(const TQString&, NetworktqStatus::EnumtqStatus)),
- this, TQT_SLOT(statusChanged(const TQString&, NetworktqStatus::EnumtqStatus)));
+ connect(m_connManager, TQT_SIGNAL(statusChanged(const TQString&, NetworkStatus::EnumStatus)),
+ this, TQT_SLOT(statusChanged(const TQString&, NetworkStatus::EnumStatus)));
}
-DetectorNetworktqStatus::~DetectorNetworktqStatus() {}
+DetectorNetworkStatus::~DetectorNetworkStatus() {}
-void DetectorNetworktqStatus::checktqStatus() const {
+void DetectorNetworkStatus::checkStatus() const {
// needs to do nothing
}
-void DetectorNetworktqStatus::statusChanged(const TQString& host, NetworktqStatus::EnumtqStatus status) {
+void DetectorNetworkStatus::statusChanged(const TQString& host, NetworkStatus::EnumStatus status) {
switch(status) {
- case NetworktqStatus::Offline:
+ case NetworkStatus::Offline:
kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Offline" << endl;
break;
- case NetworktqStatus::OfflineFailed:
+ case NetworkStatus::OfflineFailed:
kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::OfflineFailed" << endl;
break;
- case NetworktqStatus::OfflineDisconnected:
+ case NetworkStatus::OfflineDisconnected:
kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::OfflineDisconnected" << endl;
break;
- case NetworktqStatus::ShuttingDown:
+ case NetworkStatus::ShuttingDown:
kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::ShuttingDown" << endl;
break;
- case NetworktqStatus::Establishing:
+ case NetworkStatus::Establishing:
kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Establishing" << endl;
break;
- case NetworktqStatus::Online:
+ case NetworkStatus::Online:
kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Online" << endl;
break;
- case NetworktqStatus::NoNetworks:
+ case NetworkStatus::NoNetworks:
kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::NoNetworks" << endl;
break;
- case NetworktqStatus::Unreachable:
+ case NetworkStatus::Unreachable:
kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Unreachable" << endl;
break;
}
diff --git a/kopete/plugins/smpppdcs/detectornetworkstatus.h b/kopete/plugins/smpppdcs/detectornetworkstatus.h
index 1c1896e6..850be008 100644
--- a/kopete/plugins/smpppdcs/detectornetworkstatus.h
+++ b/kopete/plugins/smpppdcs/detectornetworkstatus.h
@@ -27,22 +27,22 @@ class ConnectionManager;
/**
@author Heiko Sch&auml;fer <heiko@rangun.de>
*/
-class DetectorNetworktqStatus : protected TQObject, public Detector
+class DetectorNetworkStatus : protected TQObject, public Detector
{
Q_OBJECT
TQ_OBJECT
- DetectorNetworktqStatus(const DetectorNetworktqStatus&);
- DetectorNetworktqStatus& operator=(const DetectorNetworktqStatus&);
+ DetectorNetworkStatus(const DetectorNetworkStatus&);
+ DetectorNetworkStatus& operator=(const DetectorNetworkStatus&);
public:
- DetectorNetworktqStatus(IConnector* connector);
- virtual ~DetectorNetworktqStatus();
+ DetectorNetworkStatus(IConnector* connector);
+ virtual ~DetectorNetworkStatus();
- virtual void checktqStatus() const;
+ virtual void checkStatus() const;
protected slots:
- void statusChanged(const TQString& host, NetworktqStatus::EnumtqStatus status);
+ void statusChanged(const TQString& host, NetworkStatus::EnumStatus status);
private:
ConnectionManager * m_connManager;
diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.cpp b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
index 1b932d6d..772090d9 100644
--- a/kopete/plugins/smpppdcs/detectorsmpppd.cpp
+++ b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
@@ -31,9 +31,9 @@ DetectorSMPPPD::DetectorSMPPPD(IConnector * connector)
DetectorSMPPPD::~DetectorSMPPPD() {}
/*!
- \fn DetectorSMPPPD::checktqStatus()
+ \fn DetectorSMPPPD::checkStatus()
*/
-void DetectorSMPPPD::checktqStatus() const {
+void DetectorSMPPPD::checkStatus() const {
kdDebug(14312) << k_funcinfo << "Checking for online status..." << endl;
#ifndef NOKINTERNETDCOP
@@ -41,10 +41,10 @@ void DetectorSMPPPD::checktqStatus() const {
if(kapp->dcopClient() && m_kinternetApp != "") {
switch(getConnectionStatusDCOP()) {
case CONNECTED:
- m_connector->setConnectedtqStatus(true);
+ m_connector->setConnectedStatus(true);
return;
case DISCONNECTED:
- m_connector->setConnectedtqStatus(false);
+ m_connector->setConnectedStatus(false);
return;
default:
break;
@@ -63,9 +63,9 @@ void DetectorSMPPPD::checktqStatus() const {
c.setPassword(SMPPPDCSConfig::self()->password().utf8());
if(c.connect(server, port)) {
- m_connector->setConnectedtqStatus(c.isOnline());
+ m_connector->setConnectedStatus(c.isOnline());
} else {
kdDebug(14312) << k_funcinfo << "not connected to smpppd => I'll try again later" << endl;
- m_connector->setConnectedtqStatus(false);
+ m_connector->setConnectedStatus(false);
}
}
diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.h b/kopete/plugins/smpppdcs/detectorsmpppd.h
index cba377e0..197fe65b 100644
--- a/kopete/plugins/smpppdcs/detectorsmpppd.h
+++ b/kopete/plugins/smpppdcs/detectorsmpppd.h
@@ -39,7 +39,7 @@ public:
DetectorSMPPPD(IConnector* connector);
virtual ~DetectorSMPPPD();
- virtual void checktqStatus() const;
+ virtual void checkStatus() const;
};
diff --git a/kopete/plugins/smpppdcs/iconnector.h b/kopete/plugins/smpppdcs/iconnector.h
index ab63ec71..c4846862 100644
--- a/kopete/plugins/smpppdcs/iconnector.h
+++ b/kopete/plugins/smpppdcs/iconnector.h
@@ -37,9 +37,9 @@ public:
* This method needs to get reimplemented at classes which implement
* this interface.
*
- * @param newtqStatus the status of the internet connection, <code>TRUE</code> if there is a connection, otherwise <code>FALSE</code>
+ * @param newStatus the status of the internet connection, <code>TRUE</code> if there is a connection, otherwise <code>FALSE</code>
*/
- virtual void setConnectedtqStatus(bool newtqStatus) = 0;
+ virtual void setConnectedStatus(bool newStatus) = 0;
};
#endif
diff --git a/kopete/plugins/smpppdcs/onlineinquiry.cpp b/kopete/plugins/smpppdcs/onlineinquiry.cpp
index 99dc7d5c..4cab45d7 100644
--- a/kopete/plugins/smpppdcs/onlineinquiry.cpp
+++ b/kopete/plugins/smpppdcs/onlineinquiry.cpp
@@ -35,11 +35,11 @@ bool OnlineInquiry::isOnline(bool useSMPPPD) {
m_detector = new DetectorNetstat(this);
}
- m_detector->checktqStatus();
+ m_detector->checkStatus();
return m_online;
}
-void OnlineInquiry::setConnectedtqStatus(bool newtqStatus) {
- m_online = newtqStatus;
+void OnlineInquiry::setConnectedStatus(bool newStatus) {
+ m_online = newStatus;
}
diff --git a/kopete/plugins/smpppdcs/onlineinquiry.h b/kopete/plugins/smpppdcs/onlineinquiry.h
index 7a0fcef2..278c1e9f 100644
--- a/kopete/plugins/smpppdcs/onlineinquiry.h
+++ b/kopete/plugins/smpppdcs/onlineinquiry.h
@@ -35,7 +35,7 @@ public:
bool isOnline(bool useSMPPPD);
- virtual void setConnectedtqStatus(bool newtqStatus);
+ virtual void setConnectedStatus(bool newStatus);
private:
Detector * m_detector;
diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp
index 0aad71d0..f17f2ca9 100644
--- a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp
@@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY(kopete_smpppdcs, SMPPPDCSPluginFactory("kopete_smpppd
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_detectorNetworktqStatus(NULL), m_timer(NULL),
+ m_detectorSMPPPD(NULL), m_detectorNetstat(NULL), m_detectorNetworkStatus(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_detectorNetworktqStatus = new DetectorNetworktqStatus(this);
+ m_detectorNetworkStatus = new DetectorNetworkStatus(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_detectorNetworktqStatus;
+ delete m_detectorNetworkStatus;
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(slotChecktqStatus()));
+ connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus()));
if(SMPPPDCSConfig::self()->useSmpppd()) {
m_timer->start(30000);
@@ -90,7 +90,7 @@ void SMPPPDCSPlugin::allPluginsLoaded() {
m_timer->start(60000);
}
- slotChecktqStatus();
+ slotCheckStatus();
}
}
@@ -98,19 +98,19 @@ bool SMPPPDCSPlugin::isOnline() const {
return m_onlineInquiry->isOnline(SMPPPDCSConfig::self()->useSmpppd());
}
-void SMPPPDCSPlugin::slotChecktqStatus() {
+void SMPPPDCSPlugin::slotCheckStatus() {
// reread config to get changes
SMPPPDCSConfig::self()->readConfig();
if(SMPPPDCSConfig::self()->useSmpppd()) {
- m_detectorSMPPPD->checktqStatus();
+ m_detectorSMPPPD->checkStatus();
} else {
- m_detectorNetstat->checktqStatus();
+ m_detectorNetstat->checkStatus();
}
}
-void SMPPPDCSPlugin::setConnectedtqStatus( bool connected ) {
+void SMPPPDCSPlugin::setConnectedStatus( 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
diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.h b/kopete/plugins/smpppdcs/smpppdcsplugin.h
index 24697ca7..5214ecc5 100644
--- a/kopete/plugins/smpppdcs/smpppdcsplugin.h
+++ b/kopete/plugins/smpppdcs/smpppdcsplugin.h
@@ -77,7 +77,7 @@ public:
*
* @see SMPPPDCSPrefs
*/
- virtual void setConnectedtqStatus( bool newtqStatus );
+ virtual void setConnectedStatus( bool newStatus );
virtual TQString detectionMethod() const;
@@ -87,7 +87,7 @@ public slots:
void smpppdServerChanged(const TQString& server);
private slots:
- void slotChecktqStatus();
+ void slotCheckStatus();
void allPluginsLoaded();
private:
@@ -99,7 +99,7 @@ private:
Detector * m_detectorSMPPPD;
Detector * m_detectorNetstat;
- Detector * m_detectorNetworktqStatus;
+ Detector * m_detectorNetworkStatus;
bool m_pluginConnected;
TQTimer * m_timer;
OnlineInquiry * m_onlineInquiry;
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
index 1bbb6664..f8be184a 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui
+++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui
@@ -54,7 +54,7 @@
<cstring>csMethod</cstring>
</property>
<property name="title">
- <string>Method of Connection tqStatus Detection</string>
+ <string>Method of Connection Status Detection</string>
</property>
<vbox>
<property name="name">
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>341</width>
<height>20</height>
@@ -168,7 +168,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -203,7 +203,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>6</height>
diff --git a/kopete/plugins/smpppdcs/smpppdlocationui.ui b/kopete/plugins/smpppdcs/smpppdlocationui.ui
index 6b22e3f9..7c88f07f 100644
--- a/kopete/plugins/smpppdcs/smpppdlocationui.ui
+++ b/kopete/plugins/smpppdcs/smpppdlocationui.ui
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.cpp b/kopete/plugins/smpppdcs/smpppdsearcher.cpp
index cfb103c2..a06e30a9 100644
--- a/kopete/plugins/smpppdcs/smpppdsearcher.cpp
+++ b/kopete/plugins/smpppdcs/smpppdsearcher.cpp
@@ -64,7 +64,7 @@ void SMPPPDSearcher::searchNetwork() {
void SMPPPDSearcher::slotStdoutReceivedIfconfig(KProcess * /* proc */, char * buf, int len) {
kdDebug(14312) << k_funcinfo << endl;
- TQString myBuf = TQString::tqfromLatin1(buf,len);
+ TQString myBuf = TQString::fromLatin1(buf,len);
TQRegExp rex("^[ ]{10}.*inet addr:([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}).*Mask:([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3})");
// tokenize the string into lines
TQStringList toks = TQStringList::split("\n", myBuf);
@@ -82,7 +82,7 @@ void SMPPPDSearcher::slotStdoutReceivedNetstat(KProcess * /* proc */, char * buf
kdDebug(14312) << k_funcinfo << endl;
TQRegExp rexGW(".*\\n0.0.0.0[ ]*([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}).*");
- TQString myBuf = TQString::tqfromLatin1(buf,len);
+ TQString myBuf = TQString::fromLatin1(buf,len);
if(!(rexGW.exactMatch(myBuf) && scan(rexGW.cap(1), "255.255.255.255"))) {
// if netstat -r found no gateway we search the network