summaryrefslogtreecommitdiffstats
path: root/amarok/src/metabundlesaver.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-18 03:28:57 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-18 03:28:57 +0000
commit1d9d9f5ce46f0220f7b1b350f5ad4e6dc5079ac6 (patch)
tree728d80ad748a95d7aa27ee020706dbe985e0e8cb /amarok/src/metabundlesaver.cpp
parente9db3e45ed0189bbe18125b120da394a5bc8a832 (diff)
downloadamarok-1d9d9f5ce46f0220f7b1b350f5ad4e6dc5079ac6.tar.gz
amarok-1d9d9f5ce46f0220f7b1b350f5ad4e6dc5079ac6.zip
Finish TQt4 porting of Amarok
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1228394 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'amarok/src/metabundlesaver.cpp')
-rw-r--r--amarok/src/metabundlesaver.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/amarok/src/metabundlesaver.cpp b/amarok/src/metabundlesaver.cpp
index 371b5b51..612d30b9 100644
--- a/amarok/src/metabundlesaver.cpp
+++ b/amarok/src/metabundlesaver.cpp
@@ -39,8 +39,8 @@
MetaBundleSaver::MetaBundleSaver( MetaBundle *bundle )
: TQObject()
, m_bundle( bundle )
- , m_tempSavePath( TQString::null )
- , m_origRenamedSavePath( TQString::null )
+ , m_tempSavePath( TQString() )
+ , m_origRenamedSavePath( TQString() )
, m_tempSaveDigest( 0 )
, m_saveFileref( 0 )
, m_maxlen( 8192 )
@@ -110,7 +110,7 @@ MetaBundleSaver::prepareToSave()
return 0;
}
- Q_LONG actualreadlen, actualwritelen;
+ TQ_LONG actualreadlen, actualwritelen;
while( ( actualreadlen = orig.readBlock( m_databuf, m_maxlen ) ) > 0 )
{
@@ -163,7 +163,7 @@ MetaBundleSaver::doSave()
TQFile origRenamedFile( m_origRenamedSavePath );
KMD5 md5sum( 0, 0 );
- Q_LONG actualreadlen;
+ TQ_LONG actualreadlen;
int errcode;
@@ -292,8 +292,8 @@ MetaBundleSaver::cleanupSave()
}
}
- m_tempSavePath = TQString::null;
- m_origRenamedSavePath = TQString::null;
+ m_tempSavePath = TQString();
+ m_origRenamedSavePath = TQString();
m_tempSaveDigest = TQCString( 0 );
if( m_saveFileref )
{