diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:06:28 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:06:28 -0600 |
| commit | 83b79bb29aaa412caec6abcdb42ca21d248b3b3a (patch) | |
| tree | f48e8ae855d4a0be0c3ecf912a92168a829ff8c5 /libk3b/projects/mixedcd | |
| parent | 2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (diff) | |
| download | k3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.tar.gz k3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libk3b/projects/mixedcd')
| -rw-r--r-- | libk3b/projects/mixedcd/k3bmixeddoc.cpp | 2 | ||||
| -rw-r--r-- | libk3b/projects/mixedcd/k3bmixeddoc.h | 4 | ||||
| -rw-r--r-- | libk3b/projects/mixedcd/k3bmixedjob.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.cpp b/libk3b/projects/mixedcd/k3bmixeddoc.cpp index 8bd8eac..07e1fcf 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.cpp +++ b/libk3b/projects/mixedcd/k3bmixeddoc.cpp @@ -85,7 +85,7 @@ bool K3bMixedDoc::isModified() const } -KIO::filesize_t K3bMixedDoc::size() const +TDEIO::filesize_t K3bMixedDoc::size() const { return m_dataDoc->size() + m_audioDoc->size(); } diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.h b/libk3b/projects/mixedcd/k3bmixeddoc.h index f302c66..3e55064 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.h +++ b/libk3b/projects/mixedcd/k3bmixeddoc.h @@ -27,7 +27,7 @@ class TQDomElement; class K3bBurnJob; //class K3bView; class TQWidget; -class KConfig; +class TDEConfig; class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc @@ -46,7 +46,7 @@ class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc void setModified( bool m = true ); bool isModified() const; - KIO::filesize_t size() const; + TDEIO::filesize_t size() const; K3b::Msf length() const; int numOfTracks() const; diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp index 556e606..bcbe019 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.cpp +++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp @@ -793,8 +793,8 @@ bool K3bMixedJob::writeTocFile() m_tocFile->close(); // backup for debugging -// KIO::NetAccess::del("/tmp/trueg/tocfile_debug_backup.toc",0L); -// KIO::NetAccess::copy( m_tocFile->name(), "/tmp/trueg/tocfile_debug_backup.toc",0L ); +// TDEIO::NetAccess::del("/tmp/trueg/tocfile_debug_backup.toc",0L); +// TDEIO::NetAccess::copy( m_tocFile->name(), "/tmp/trueg/tocfile_debug_backup.toc",0L ); return success; } @@ -1330,7 +1330,7 @@ TQString K3bMixedJob::jobDetails() const return ( i18n("%1 tracks (%2 minutes audio data, %3 ISO9660 data)") .arg(m_doc->numOfTracks()) .arg(m_doc->audioDoc()->length().toString()) - .arg(KIO::convertSize(m_doc->dataDoc()->size())) + .arg(TDEIO::convertSize(m_doc->dataDoc()->size())) + ( m_doc->copies() > 1 && !m_doc->dummy() ? i18n(" - %n copy", " - %n copies", m_doc->copies()) : TQString() ) ); |