summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/groupwise
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:36:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:36:20 -0600
commitf21aaec952493cb5688c73de6e82a569ddbd7fb2 (patch)
tree78ccb5117063da3e08e3277e11054b912a9f2ae7 /kopete/protocols/groupwise
parentc48e769eb275917717e2b55eb869f7e559293ac8 (diff)
downloadtdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.tar.gz
tdenetwork-f21aaec952493cb5688c73de6e82a569ddbd7fb2.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/groupwise')
-rw-r--r--kopete/protocols/groupwise/gwbytestream.cpp2
-rw-r--r--kopete/protocols/groupwise/gwconnector.cpp4
-rw-r--r--kopete/protocols/groupwise/ui/gweditaccountwidget.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/kopete/protocols/groupwise/gwbytestream.cpp b/kopete/protocols/groupwise/gwbytestream.cpp
index e9c04a21..e12284cf 100644
--- a/kopete/protocols/groupwise/gwbytestream.cpp
+++ b/kopete/protocols/groupwise/gwbytestream.cpp
@@ -113,7 +113,7 @@ void KNetworkByteStream::slotConnectionClosed ()
if ( mClosing )
{
kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << "..by ourselves!" << endl;
- kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "socket error is \"" << socket()->KSocketBase::errorString( socket()->error() ) << "\"" << endl;
+ kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "socket error is \"" << socket()->TDESocketBase::errorString( socket()->error() ) << "\"" << endl;
emit connectionClosed ();
}
else
diff --git a/kopete/protocols/groupwise/gwconnector.cpp b/kopete/protocols/groupwise/gwconnector.cpp
index e5daa9d7..c5a073e3 100644
--- a/kopete/protocols/groupwise/gwconnector.cpp
+++ b/kopete/protocols/groupwise/gwconnector.cpp
@@ -30,7 +30,7 @@ KNetworkConnector::KNetworkConnector ( TQObject *parent, const char */*name*/ )
{
kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "New KNetwork connector." << endl;
- mErrorCode = KNetwork::KSocketBase::NoError;
+ mErrorCode = KNetwork::TDESocketBase::NoError;
mByteStream = new KNetworkByteStream ( this );
@@ -58,7 +58,7 @@ void KNetworkConnector::connectToServer ( const TQString &server )
* For XMPP 1.0, we need to enable this!
*/
- mErrorCode = KNetwork::KSocketBase::NoError;
+ mErrorCode = KNetwork::TDESocketBase::NoError;
if ( !mByteStream->connect ( mHost, TQString::number ( mPort ) ) )
{
diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
index 7f049d7c..de50ba19 100644
--- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
+++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
@@ -55,7 +55,7 @@ GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* parent, Kopete
else
{
// look for a default server and port setting
- KConfig *config = kapp->config();
+ TDEConfig *config = kapp->config();
config->setGroup("GroupWise Messenger");
m_preferencesDialog->m_server->setText( config->readEntry( "DefaultServer" ) );
m_preferencesDialog->m_port->setValue( config->readNumEntry( "DefaultPort", 8300 ) );