summaryrefslogtreecommitdiffstats
path: root/libk3b/projects/videocd
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/projects/videocd
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/projects/videocd')
-rw-r--r--libk3b/projects/videocd/k3bvcddoc.cpp8
-rw-r--r--libk3b/projects/videocd/k3bvcddoc.h8
-rw-r--r--libk3b/projects/videocd/k3bvcdjob.cpp2
-rw-r--r--libk3b/projects/videocd/k3bvcdoptions.cpp4
-rw-r--r--libk3b/projects/videocd/k3bvcdoptions.h6
-rw-r--r--libk3b/projects/videocd/k3bvcdtrack.cpp2
-rw-r--r--libk3b/projects/videocd/k3bvcdtrack.h2
7 files changed, 16 insertions, 16 deletions
diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp
index 42b3170..d28e942 100644
--- a/libk3b/projects/videocd/k3bvcddoc.cpp
+++ b/libk3b/projects/videocd/k3bvcddoc.cpp
@@ -95,7 +95,7 @@ TQString K3bVcdDoc::name() const
}
-KIO::filesize_t K3bVcdDoc::calcTotalSize() const
+TDEIO::filesize_t K3bVcdDoc::calcTotalSize() const
{
unsigned long long sum = 0;
if ( m_tracks ) {
@@ -106,7 +106,7 @@ KIO::filesize_t K3bVcdDoc::calcTotalSize() const
return sum;
}
-KIO::filesize_t K3bVcdDoc::size() const
+TDEIO::filesize_t K3bVcdDoc::size() const
{
// mode2 -> mode1 int(( n+2047 ) / 2048) * 2352
// mode1 -> mode2 int(( n+2351 ) / 2352) * 2048
@@ -114,7 +114,7 @@ KIO::filesize_t K3bVcdDoc::size() const
return tracksize + ISOsize();
}
-KIO::filesize_t K3bVcdDoc::ISOsize() const
+TDEIO::filesize_t K3bVcdDoc::ISOsize() const
{
// 136000b for vcd iso reseved
long long iso_size = 136000;
@@ -841,7 +841,7 @@ bool K3bVcdDoc::saveDocumentData( TQDomElement * docElem )
++iterTrack;
TQDomElement trackElem = doc.createElement( "track" );
- trackElem.setAttribute( "url", KIO::decodeFileName( track->absPath() ) );
+ trackElem.setAttribute( "url", TDEIO::decodeFileName( track->absPath() ) );
trackElem.setAttribute( "playtime", track->getPlayTime() );
trackElem.setAttribute( "waittime", track->getWaitTime() );
trackElem.setAttribute( "reactivity", track->Reactivity() );
diff --git a/libk3b/projects/videocd/k3bvcddoc.h b/libk3b/projects/videocd/k3bvcddoc.h
index f9dd6ed..e752a98 100644
--- a/libk3b/projects/videocd/k3bvcddoc.h
+++ b/libk3b/projects/videocd/k3bvcddoc.h
@@ -41,7 +41,7 @@ class TQWidget;
class TQTimer;
class TQDomDocument;
class TQDomElement;
-class KConfig;
+class TDEConfig;
@@ -106,7 +106,7 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc
}
/** get the current size of the project */
- KIO::filesize_t size() const;
+ TDEIO::filesize_t size() const;
K3b::Msf length() const;
K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* parent );
@@ -178,8 +178,8 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc
TQTimer* m_urlAddingTimer;
TQPtrList<K3bVcdTrack>* m_tracks;
- KIO::filesize_t calcTotalSize() const;
- KIO::filesize_t ISOsize() const;
+ TDEIO::filesize_t calcTotalSize() const;
+ TDEIO::filesize_t ISOsize() const;
bool isImage( const KURL& url );
diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp
index fe62515..7b2d4ff 100644
--- a/libk3b/projects/videocd/k3bvcdjob.cpp
+++ b/libk3b/projects/videocd/k3bvcdjob.cpp
@@ -558,7 +558,7 @@ TQString K3bVcdJob::jobDetails() const
{
return ( i18n( "1 MPEG (%1)",
"%n MPEGs (%1)",
- m_doc->tracks() ->count() ).arg( KIO::convertSize( m_doc->size() ) )
+ m_doc->tracks() ->count() ).arg( TDEIO::convertSize( m_doc->size() ) )
+ ( m_doc->copies() > 1
? i18n( " - %n copy", " - %n copies", m_doc->copies() )
: TQString() ) );
diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp
index 9b80a8d..f963be8 100644
--- a/libk3b/projects/videocd/k3bvcdoptions.cpp
+++ b/libk3b/projects/videocd/k3bvcdoptions.cpp
@@ -82,7 +82,7 @@ bool K3bVcdOptions::checkCdiFiles()
return true;
}
-void K3bVcdOptions::save( KConfigBase* c )
+void K3bVcdOptions::save( TDEConfigBase* c )
{
c->writeEntry( "volume_id", m_volumeID );
c->writeEntry( "album_id", m_albumID );
@@ -109,7 +109,7 @@ void K3bVcdOptions::save( KConfigBase* c )
}
-K3bVcdOptions K3bVcdOptions::load( KConfigBase* c )
+K3bVcdOptions K3bVcdOptions::load( TDEConfigBase* c )
{
K3bVcdOptions options;
diff --git a/libk3b/projects/videocd/k3bvcdoptions.h b/libk3b/projects/videocd/k3bvcdoptions.h
index 420e593..cfa382f 100644
--- a/libk3b/projects/videocd/k3bvcdoptions.h
+++ b/libk3b/projects/videocd/k3bvcdoptions.h
@@ -19,7 +19,7 @@
#include <tqstring.h>
#include "k3b_export.h"
-class KConfigBase;
+class TDEConfigBase;
class LIBK3B_EXPORT K3bVcdOptions
{
@@ -242,9 +242,9 @@ class LIBK3B_EXPORT K3bVcdOptions
}
bool checkCdiFiles();
- void save( KConfigBase* c );
+ void save( TDEConfigBase* c );
- static K3bVcdOptions load( KConfigBase* c );
+ static K3bVcdOptions load( TDEConfigBase* c );
static K3bVcdOptions defaults();
void setPbcEnabled( const bool& b )
diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp
index 3ed27f9..59d6387 100644
--- a/libk3b/projects/videocd/k3bvcdtrack.cpp
+++ b/libk3b/projects/videocd/k3bvcdtrack.cpp
@@ -58,7 +58,7 @@ K3bVcdTrack::~K3bVcdTrack()
{}
-KIO::filesize_t K3bVcdTrack::size() const
+TDEIO::filesize_t K3bVcdTrack::size() const
{
return m_file.size();
}
diff --git a/libk3b/projects/videocd/k3bvcdtrack.h b/libk3b/projects/videocd/k3bvcdtrack.h
index c48be55..f36eb8c 100644
--- a/libk3b/projects/videocd/k3bvcdtrack.h
+++ b/libk3b/projects/videocd/k3bvcdtrack.h
@@ -42,7 +42,7 @@ class LIBK3B_EXPORT K3bVcdTrack
{
return TQFileInfo( m_file ).absFilePath();
}
- KIO::filesize_t size() const;
+ TDEIO::filesize_t size() const;
int index() const;
const TQString& title() const