summaryrefslogtreecommitdiffstats
path: root/src/projects/kostore
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:28 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:28 -0600
commit83b79bb29aaa412caec6abcdb42ca21d248b3b3a (patch)
treef48e8ae855d4a0be0c3ecf912a92168a829ff8c5 /src/projects/kostore
parent2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (diff)
downloadk3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.tar.gz
k3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/projects/kostore')
-rw-r--r--src/projects/kostore/koStore.cc12
-rw-r--r--src/projects/kostore/koZipStore.cc8
2 files changed, 10 insertions, 10 deletions
diff --git a/src/projects/kostore/koStore.cc b/src/projects/kostore/koStore.cc
index 08268dc..4f645e0 100644
--- a/src/projects/kostore/koStore.cc
+++ b/src/projects/kostore/koStore.cc
@@ -132,7 +132,7 @@ KoStore* KoStore::createStore( TQWidget* window, const KURL& url, Mode mode, con
else
{
const bool downloaded =
- KIO::NetAccess::download( url, tmpFile, window );
+ TDEIO::NetAccess::download( url, tmpFile, window );
if (!downloaded)
{
@@ -194,14 +194,14 @@ bool KoStore::open( const TQString & _name )
if ( m_bIsOpen )
{
kdWarning(s_area) << "KoStore: File is already opened" << endl;
- //return KIO::ERR_INTERNAL;
+ //return TDEIO::ERR_INTERNAL;
return false;
}
if ( m_sName.length() > 512 )
{
kdError(s_area) << "KoStore: Filename " << m_sName << " is too long" << endl;
- //return KIO::ERR_MALFORMED_URL;
+ //return TDEIO::ERR_MALFORMED_URL;
return false;
}
@@ -211,7 +211,7 @@ bool KoStore::open( const TQString & _name )
if ( m_strFiles.findIndex( m_sName ) != -1 ) // just check if it's there
{
kdWarning(s_area) << "KoStore: Duplicate filename " << m_sName << endl;
- //return KIO::ERR_FILE_ALREADY_EXIST;
+ //return TDEIO::ERR_FILE_ALREADY_EXIST;
return false;
}
@@ -228,7 +228,7 @@ bool KoStore::open( const TQString & _name )
return false;
}
else
- //return KIO::ERR_UNSUPPORTED_ACTION;
+ //return TDEIO::ERR_UNSUPPORTED_ACTION;
return false;
m_bIsOpen = true;
@@ -247,7 +247,7 @@ bool KoStore::close()
if ( !m_bIsOpen )
{
kdWarning(s_area) << "KoStore: You must open before closing" << endl;
- //return KIO::ERR_INTERNAL;
+ //return TDEIO::ERR_INTERNAL;
return false;
}
diff --git a/src/projects/kostore/koZipStore.cc b/src/projects/kostore/koZipStore.cc
index 1f1a526..cd393eb 100644
--- a/src/projects/kostore/koZipStore.cc
+++ b/src/projects/kostore/koZipStore.cc
@@ -98,11 +98,11 @@ KoZipStore::~KoZipStore()
// Now we have still some job to do for remote files.
if ( m_fileMode == KoStoreBase::RemoteRead )
{
- KIO::NetAccess::removeTempFile( m_localFileName );
+ TDEIO::NetAccess::removeTempFile( m_localFileName );
}
else if ( m_fileMode == KoStoreBase::RemoteWrite )
{
- KIO::NetAccess::upload( m_localFileName, m_url, m_window );
+ TDEIO::NetAccess::upload( m_localFileName, m_url, m_window );
// ### FIXME: delete temp file
}
}
@@ -148,13 +148,13 @@ bool KoZipStore::openRead( const TQString& name )
if ( entry == 0L )
{
//kdWarning(s_area) << "Unknown filename " << name << endl;
- //return KIO::ERR_DOES_NOT_EXIST;
+ //return TDEIO::ERR_DOES_NOT_EXIST;
return false;
}
if ( entry->isDirectory() )
{
kdWarning(s_area) << name << " is a directory !" << endl;
- //return KIO::ERR_IS_DIRECTORY;
+ //return TDEIO::ERR_IS_DIRECTORY;
return false;
}
// Must cast to KZipFileEntry, not only KArchiveFile, because device() isn't virtual!