diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:21 -0600 |
| commit | 86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch) | |
| tree | 97d3ac2c2f60780d9a1de4f82caac7cb27534501 /kresources/groupwise/soap | |
| parent | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff) | |
| download | tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kresources/groupwise/soap')
| -rw-r--r-- | kresources/groupwise/soap/groupwiseserver.cpp | 2 | ||||
| -rw-r--r-- | kresources/groupwise/soap/ksslsocket.cpp | 10 | ||||
| -rw-r--r-- | kresources/groupwise/soap/ksslsocket.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp index 9a2f4427..9112fdea 100644 --- a/kresources/groupwise/soap/groupwiseserver.cpp +++ b/kresources/groupwise/soap/groupwiseserver.cpp @@ -284,7 +284,7 @@ GroupwiseServer::GroupwiseServer( const TQString &url, const TQString &user, mSoap->frecv = myReceiveCallback; mSoap->fclose = myClose; - KConfig cfg( "groupwiserc" ); + TDEConfig cfg( "groupwiserc" ); cfg.setGroup( "Debug" ); mLogFile = cfg.readEntry( "LogFile" ); diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp index cd66fc50..90ccf83d 100644 --- a/kresources/groupwise/soap/ksslsocket.cpp +++ b/kresources/groupwise/soap/ksslsocket.cpp @@ -161,14 +161,14 @@ TQString KSSLSocket::metaData( const TQString &key ) } /* -I basically copied the below from tcpKIO::SlaveBase.hpp, with some modificaions and formatting. +I basically copied the below from tcpTDEIO::SlaveBase.hpp, with some modificaions and formatting. * Copyright (C) 2000 Alex Zepeda <zipzippy@sonic.net * Copyright (C) 2001-2003 George Staikos <staikos@kde.org> * Copyright (C) 2001 Dawit Alemayehu <adawit@kde.org> */ -int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption, +int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption, const TQString &buttonYes, const TQString &buttonNo ) { kdDebug(0) << "messageBox " << type << " " << text << " - " << caption << buttonYes << buttonNo << endl; @@ -324,7 +324,7 @@ int KSSLSocket::verifyCertificate() TQString msg = i18n("The IP address of the host %1 " "does not match the one the " "certificate was issued to."); - result = messageBox( KIO::SlaveBase::WarningYesNoCancel, + result = messageBox( TDEIO::SlaveBase::WarningYesNoCancel, msg.arg(ourHost), i18n("Server Authentication"), i18n("&Details"), @@ -334,7 +334,7 @@ int KSSLSocket::verifyCertificate() { TQString msg = i18n("The server certificate failed the " "authenticity test (%1)."); - result = messageBox( KIO::SlaveBase::WarningYesNoCancel, + result = messageBox( TDEIO::SlaveBase::WarningYesNoCancel, msg.arg(ourHost), i18n("Server Authentication"), i18n("&Details"), @@ -348,7 +348,7 @@ int KSSLSocket::verifyCertificate() rc = 1; cp = KSSLCertificateCache::Accept; doAddHost = true; - result = messageBox( KIO::SlaveBase::WarningYesNo, + result = messageBox( TDEIO::SlaveBase::WarningYesNo, i18n("Would you like to accept this " "certificate forever without " "being prompted?"), diff --git a/kresources/groupwise/soap/ksslsocket.h b/kresources/groupwise/soap/ksslsocket.h index a8367236..c19b440a 100644 --- a/kresources/groupwise/soap/ksslsocket.h +++ b/kresources/groupwise/soap/ksslsocket.h @@ -46,7 +46,7 @@ class KSSLSocket : public KExtendedSocket private: int verifyCertificate(); - int messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text, + int messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption, const TQString &buttonYes, const TQString &buttonNo ); |