diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:37:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:37:49 -0600 |
| commit | f8069e2ea048f2657cc417d83820576ec55c181b (patch) | |
| tree | cbc5bf540866934a91e0f33b260fc7a25e191fad /kbabel/common/catalog.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/catalog.cpp')
| -rw-r--r-- | kbabel/common/catalog.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp index d2f2f8ac..adf845fe 100644 --- a/kbabel/common/catalog.cpp +++ b/kbabel/common/catalog.cpp @@ -893,7 +893,7 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package) TQString target; ConversionStatus error = OK; - if(KIO::NetAccess::download(url, target, NULL)) + if(TDEIO::NetAccess::download(url, target, NULL)) { CatalogImportPlugin* filter=0; @@ -912,7 +912,7 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package) if( !ptr ) { kdDebug(KBABEL) << "No plugin for PO files, giving up" << endl; - KIO::NetAccess::removeTempFile(target); + TDEIO::NetAccess::removeTempFile(target); return NO_PLUGIN; } } @@ -922,7 +922,7 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package) if (!factory) { kdDebug(KBABEL) << "No factory" << endl; - KIO::NetAccess::removeTempFile(target); + TDEIO::NetAccess::removeTempFile(target); return OS_ERROR; } @@ -997,7 +997,7 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons TQString target; ConversionStatus error = OK; - if(KIO::NetAccess::download(openUrl, target, NULL)) + if(TDEIO::NetAccess::download(openUrl, target, NULL)) { CatalogImportPlugin* filter=0; @@ -1010,7 +1010,7 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons if( !ptr ) { kdDebug(KBABEL) << "No plugin for this type" << endl; - KIO::NetAccess::removeTempFile(target); + TDEIO::NetAccess::removeTempFile(target); return NO_PLUGIN; } @@ -1019,7 +1019,7 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons if (!factory) { kdDebug(KBABEL) << "No factory" << endl; - KIO::NetAccess::removeTempFile(target); + TDEIO::NetAccess::removeTempFile(target); return OS_ERROR; } @@ -1047,7 +1047,7 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons if( error == STOPPED ) { delete filter; - KIO::NetAccess::removeTempFile(target); + TDEIO::NetAccess::removeTempFile(target); return STOPPED; } @@ -1061,7 +1061,7 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons // KBabel cannot work correctly with not any entry kdWarning() << k_funcinfo << " No entries! Assuming parse error!" << endl; delete filter; - KIO::NetAccess::removeTempFile(target); + TDEIO::NetAccess::removeTempFile(target); return NO_ENTRY_ERROR; } @@ -1083,7 +1083,7 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons delete filter; // and remove the temp file - KIO::NetAccess::removeTempFile(target); + TDEIO::NetAccess::removeTempFile(target); return error; } @@ -2004,7 +2004,7 @@ ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite) if(status == OK) { - if( !KIO::NetAccess::upload( tempFile, targetURL, NULL ) ) + if( !TDEIO::NetAccess::upload( tempFile, targetURL, NULL ) ) { status = OS_ERROR; } |