summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/gadu
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:36:20 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:36:20 -0600
commitf21aaec952493cb5688c73de6e82a569ddbd7fb2 (patch)
tree78ccb5117063da3e08e3277e11054b912a9f2ae7 /kopete/protocols/gadu
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/gadu')
-rw-r--r--kopete/protocols/gadu/gaduaccount.cpp12
-rw-r--r--kopete/protocols/gadu/gadudcctransaction.cpp18
2 files changed, 15 insertions, 15 deletions
diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp
index 76ec8b4f..c60f4051 100644
--- a/kopete/protocols/gadu/gaduaccount.cpp
+++ b/kopete/protocols/gadu/gaduaccount.cpp
@@ -88,7 +88,7 @@ public:
TQTimer* exportTimer_;
bool exportUserlist;
- KConfigGroup* config;
+ TDEConfigGroup* config;
Kopete::OnlineStatus status;
TQValueList<unsigned int> servers;
KGaduLoginParams loginInfo;
@@ -940,14 +940,14 @@ GaduAccount::slotExportContactsListToFile()
(*tempStream) << list.data();
tempFile.close();
- bool res = KIO::NetAccess::upload(
+ bool res = TDEIO::NetAccess::upload(
tempFile.name() ,
p->saveListDialog->selectedURL() ,
Kopete::UI::Global::mainWidget()
);
if ( !res ) {
// say it failed
- error( KIO::NetAccess::lastErrorString(), i18n( "Save Contacts List Failed" ) );
+ error( TDEIO::NetAccess::lastErrorString(), i18n( "Save Contacts List Failed" ) );
}
}
@@ -977,12 +977,12 @@ GaduAccount::slotImportContactsFromFile()
if ( p->loadListDialog->exec() == TQDialog::Accepted ) {
url = p->loadListDialog->selectedURL();
kdDebug(14100) << "a:" << url << "\nb:" << oname << endl;
- if ( KIO::NetAccess::download( url, oname, Kopete::UI::Global::mainWidget() ) ) {
+ if ( TDEIO::NetAccess::download( url, oname, Kopete::UI::Global::mainWidget() ) ) {
TQFile tempFile( oname );
if ( tempFile.open( IO_ReadOnly ) ) {
list = tempFile.readAll();
tempFile.close();
- KIO::NetAccess::removeTempFile( oname );
+ TDEIO::NetAccess::removeTempFile( oname );
// and store it
kdDebug( 14100 ) << "loaded list:" << endl;
kdDebug( 14100 ) << list << endl;
@@ -996,7 +996,7 @@ GaduAccount::slotImportContactsFromFile()
}
else {
// say, it failed misourably
- error( KIO::NetAccess::lastErrorString(),
+ error( TDEIO::NetAccess::lastErrorString(),
i18n( "Contacts List Load Has Failed" ) );
}
diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp
index 75e71748..a6568ff6 100644
--- a/kopete/protocols/gadu/gadudcctransaction.cpp
+++ b/kopete/protocols/gadu/gadudcctransaction.cpp
@@ -271,7 +271,7 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c
else {
// overwrite by default
if ( localFile_.open( IO_ReadWrite ) == FALSE ) {
- transfer->slotError ( KIO::ERR_COULD_NOT_WRITE, fileName );
+ transfer->slotError ( TDEIO::ERR_COULD_NOT_WRITE, fileName );
closeDCC();
deleteLater ();
return;
@@ -280,7 +280,7 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c
dccSock_->file_fd = localFile_.handle();
}
- connect ( transfer, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotTransferResult() ) );
+ connect ( transfer, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotTransferResult() ) );
// reenable notifiers
enableNotifiers( dccSock_->check );
@@ -290,7 +290,7 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c
void
GaduDCCTransaction::slotTransferResult()
{
- if ( transfer_->error() == KIO::ERR_USER_CANCELED ) {
+ if ( transfer_->error() == TDEIO::ERR_USER_CANCELED ) {
closeDCC();
deleteLater();
}
@@ -405,24 +405,24 @@ GaduDCCTransaction::watcher() {
switch( dccEvent->event.dcc_error ) {
case GG_ERROR_DCC_REFUSED:
- transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "Connection to peer was refused; it possibly does not listen for incoming connections." ) );
+ transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "Connection to peer was refused; it possibly does not listen for incoming connections." ) );
break;
case GG_ERROR_DCC_EOF:
- transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "File transfer transaction was not agreed by peer." ) );
+ transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "File transfer transaction was not agreed by peer." ) );
break;
case GG_ERROR_DCC_HANDSHAKE:
- transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "File-transfer handshake failure." ) );
+ transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "File-transfer handshake failure." ) );
break;
case GG_ERROR_DCC_FILE:
- transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "File transfer had problems with the file." ) );
+ transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "File transfer had problems with the file." ) );
break;
case GG_ERROR_DCC_NET:
- transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "There was network error during file transfer." ) );
+ transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "There was network error during file transfer." ) );
break;
default:
- transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown File-Transfer error." ) );
+ transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "Unknown File-Transfer error." ) );
break;
}
}