diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:49 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:49 -0600 |
commit | f8069e2ea048f2657cc417d83820576ec55c181b (patch) | |
tree | cbc5bf540866934a91e0f33b260fc7a25e191fad /kbabel/common/kbmailer.cpp | |
parent | e6aaa3624cc6179b82a9bfff1760e742a669064c (diff) | |
download | tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.tar.gz tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kbabel/common/kbmailer.cpp')
-rw-r--r-- | kbabel/common/kbmailer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp index 18c679b1..156754d0 100644 --- a/kbabel/common/kbmailer.cpp +++ b/kbabel/common/kbmailer.cpp @@ -80,7 +80,7 @@ void KBabelMailer::sendOneFile(const TQString& fileName) void KBabelMailer::sendOneFile( const KURL& url) { #if KDE_IS_VERSION( 3, 5, 0) - const KURL localUrl( KIO::NetAccess::mostLocalURL( url, m_parent ) ); + const KURL localUrl( TDEIO::NetAccess::mostLocalURL( url, m_parent ) ); #else const KURL localUrl( url ); #endif @@ -99,7 +99,7 @@ void KBabelMailer::sendOneFile( const KURL& url) // ### TODO: the current implementation has the default to possibly overwrite an already existing temporary file TQString tempName( m_tempDir.name() ); tempName += fileName; - if ( KIO::NetAccess::download( url, tempName, m_parent ) ) + if ( TDEIO::NetAccess::download( url, tempName, m_parent ) ) kapp->invokeMailer("", "", "", "", "", "", fileName); else { @@ -184,12 +184,12 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName, for (it = fileList.constBegin(); it != fileList.constEnd(); ++it) { #if KDE_IS_VERSION( 3, 5, 0 ) // Try to get a local URL instead of a remote one - const KURL url( KIO::NetAccess::mostLocalURL( KURL::fromPathOrURL( *it ), m_parent ) ); + const KURL url( TDEIO::NetAccess::mostLocalURL( KURL::fromPathOrURL( *it ), m_parent ) ); #else const KURL url( KURL::fromPathOrURL( *it ) ); #endif TQString poTempName; - if ( !KIO::NetAccess::download( url, poTempName, m_parent ) ) { + if ( !TDEIO::NetAccess::download( url, poTempName, m_parent ) ) { KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").arg( url.prettyURL() ) ); continue; } @@ -208,7 +208,7 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName, KMessageBox::error( m_parent, i18n("Error while trying to copy file %1 into archive.").arg( url.prettyURL() ) ); } - KIO::NetAccess::removeTempFile(poTempName); + TDEIO::NetAccess::removeTempFile(poTempName); } archive.close(); @@ -225,7 +225,7 @@ void KBabelMailer::readConfig() bzipCompression = _settings.useBzip; singleFileCompression = _settings.compressSingleFile; - KConfig* conf = _project->config(); + TDEConfig* conf = _project->config(); conf->setGroup ("Misc"); archiveList = conf->readListEntry("MailArchiveNames"); @@ -236,7 +236,7 @@ void KBabelMailer::readConfig() void KBabelMailer::saveConfig() { // For an explanation see readConfig( ) - KConfig* _config = _project->config(); + TDEConfig* _config = _project->config(); _config->setGroup("Misc"); _config->writeEntry("MailArchiveNames", archiveList); |