summaryrefslogtreecommitdiffstats
path: root/libk3b/tools
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 /libk3b/tools
parent2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (diff)
downloadk3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.tar.gz
k3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libk3b/tools')
-rw-r--r--libk3b/tools/k3bdirsizejob.cpp18
-rw-r--r--libk3b/tools/k3bdirsizejob.h8
-rw-r--r--libk3b/tools/k3bfilesplitter.cpp10
-rw-r--r--libk3b/tools/k3bfilesplitter.h2
-rw-r--r--libk3b/tools/k3bmd5job.cpp2
5 files changed, 20 insertions, 20 deletions
diff --git a/libk3b/tools/k3bdirsizejob.cpp b/libk3b/tools/k3bdirsizejob.cpp
index eedca01..131e0ff 100644
--- a/libk3b/tools/k3bdirsizejob.cpp
+++ b/libk3b/tools/k3bdirsizejob.cpp
@@ -105,7 +105,7 @@ public:
}
else if( !S_ISLNK( s.st_mode ) ) {
++totalFiles;
- totalSize += (KIO::filesize_t)s.st_size;
+ totalSize += (TDEIO::filesize_t)s.st_size;
}
}
@@ -121,10 +121,10 @@ public:
KURL::List urls;
bool followSymlinks;
- KIO::filesize_t totalSize;
- KIO::filesize_t totalFiles;
- KIO::filesize_t totalDirs;
- KIO::filesize_t totalSymlinks;
+ TDEIO::filesize_t totalSize;
+ TDEIO::filesize_t totalFiles;
+ TDEIO::filesize_t totalDirs;
+ TDEIO::filesize_t totalSymlinks;
private:
bool m_canceled;
@@ -146,25 +146,25 @@ K3bDirSizeJob::~K3bDirSizeJob()
}
-KIO::filesize_t K3bDirSizeJob::totalSize() const
+TDEIO::filesize_t K3bDirSizeJob::totalSize() const
{
return d->totalSize;
}
-KIO::filesize_t K3bDirSizeJob::totalFiles() const
+TDEIO::filesize_t K3bDirSizeJob::totalFiles() const
{
return d->totalFiles;
}
-KIO::filesize_t K3bDirSizeJob::totalDirs() const
+TDEIO::filesize_t K3bDirSizeJob::totalDirs() const
{
return d->totalDirs;
}
-KIO::filesize_t K3bDirSizeJob::totalSymlinks() const
+TDEIO::filesize_t K3bDirSizeJob::totalSymlinks() const
{
return d->totalSymlinks;
}
diff --git a/libk3b/tools/k3bdirsizejob.h b/libk3b/tools/k3bdirsizejob.h
index 3aa5755..2acce4b 100644
--- a/libk3b/tools/k3bdirsizejob.h
+++ b/libk3b/tools/k3bdirsizejob.h
@@ -37,24 +37,24 @@ class LIBK3B_EXPORT K3bDirSizeJob : public K3bThreadJob
K3bDirSizeJob( TQObject* parent = 0 );
~K3bDirSizeJob();
- KIO::filesize_t totalSize() const;
+ TDEIO::filesize_t totalSize() const;
/**
* Does also include symlinks to files, devices, and fifos
*/
- KIO::filesize_t totalFiles() const;
+ TDEIO::filesize_t totalFiles() const;
/**
* Total number of counted dirs. This does also
* include the first dirs the job was started with.
* Does also include symlinks to dirs.
*/
- KIO::filesize_t totalDirs() const;
+ TDEIO::filesize_t totalDirs() const;
/**
* Includes symlinks to files and folders
*/
- KIO::filesize_t totalSymlinks() const;
+ TDEIO::filesize_t totalSymlinks() const;
public slots:
void setUrls( const KURL::List& urls );
diff --git a/libk3b/tools/k3bfilesplitter.cpp b/libk3b/tools/k3bfilesplitter.cpp
index 7833f86..a4f0553 100644
--- a/libk3b/tools/k3bfilesplitter.cpp
+++ b/libk3b/tools/k3bfilesplitter.cpp
@@ -33,10 +33,10 @@ public:
int counter;
// TQIODevice::Offset is too small on most compilations
- KIO::filesize_t maxFileSize;
+ TDEIO::filesize_t maxFileSize;
- KIO::filesize_t currentOverallPos;
- KIO::filesize_t currentFilePos;
+ TDEIO::filesize_t currentOverallPos;
+ TDEIO::filesize_t currentFilePos;
void determineMaxFileSize() {
if( maxFileSize == 0 ) {
@@ -210,7 +210,7 @@ TQ_LONG K3bFileSplitter::readBlock( char *data, TQ_ULONG maxlen )
TQ_LONG K3bFileSplitter::writeBlock( const char *data, TQ_ULONG len )
{
// We cannot rely on TQFile::at since it uses long on most copmpilations
- TQ_ULONG max = (TQ_ULONG)TQMIN( (KIO::filesize_t)len, d->maxFileSize - d->currentFilePos );
+ TQ_ULONG max = (TQ_ULONG)TQMIN( (TDEIO::filesize_t)len, d->maxFileSize - d->currentFilePos );
TQ_LONG r = d->file.writeBlock( data, max );
@@ -304,7 +304,7 @@ void K3bFileSplitter::remove()
}
-void K3bFileSplitter::setMaxFileSize( KIO::filesize_t size )
+void K3bFileSplitter::setMaxFileSize( TDEIO::filesize_t size )
{
d->maxFileSize = size;
}
diff --git a/libk3b/tools/k3bfilesplitter.h b/libk3b/tools/k3bfilesplitter.h
index 40af5ab..06cef32 100644
--- a/libk3b/tools/k3bfilesplitter.h
+++ b/libk3b/tools/k3bfilesplitter.h
@@ -53,7 +53,7 @@ class LIBK3B_EXPORT K3bFileSplitter : public TQIODevice
*
* Be aware that setName will reset the max file size.
*/
- void setMaxFileSize( KIO::filesize_t size );
+ void setMaxFileSize( TDEIO::filesize_t size );
const TQString& name() const;
diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp
index 7c20a05..1d3d04c 100644
--- a/libk3b/tools/k3bmd5job.cpp
+++ b/libk3b/tools/k3bmd5job.cpp
@@ -62,7 +62,7 @@ public:
int lastProgress;
- KIO::filesize_t imageSize;
+ TDEIO::filesize_t imageSize;
static const int BUFFERSIZE = 2048*10;
};