diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:06:28 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:06:28 -0600 |
commit | 83b79bb29aaa412caec6abcdb42ca21d248b3b3a (patch) | |
tree | f48e8ae855d4a0be0c3ecf912a92168a829ff8c5 /libk3b/projects/movixcd | |
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/movixcd')
-rw-r--r-- | libk3b/projects/movixcd/k3bmovixdoc.h | 2 | ||||
-rw-r--r-- | libk3b/projects/movixcd/k3bmovixjob.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libk3b/projects/movixcd/k3bmovixdoc.h b/libk3b/projects/movixcd/k3bmovixdoc.h index 0ceb8c3..1436eba 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.h +++ b/libk3b/projects/movixcd/k3bmovixdoc.h @@ -28,7 +28,7 @@ class TQDomElement; class K3bFileItem; class K3bMovixFileItem; class K3bDataItem; -class KConfig; +class TDEConfig; class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc diff --git a/libk3b/projects/movixcd/k3bmovixjob.cpp b/libk3b/projects/movixcd/k3bmovixjob.cpp index eb8b276..70a639d 100644 --- a/libk3b/projects/movixcd/k3bmovixjob.cpp +++ b/libk3b/projects/movixcd/k3bmovixjob.cpp @@ -123,7 +123,7 @@ TQString K3bMovixJob::jobDetails() const { return ( i18n("1 file (%1) and about 8 MB eMovix data", "%n files (%1) and about 8 MB eMovix data", - m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) + m_doc->movixFileItems().count()).arg(TDEIO::convertSize(m_doc->size())) + ( m_doc->copies() > 1 ? i18n(" - %n copy", " - %n copies", m_doc->copies()) : TQString() ) ); |