summaryrefslogtreecommitdiffstats
path: root/libk3b
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-09-03 17:53:48 +0200
committerSlávek Banko <slavek.banko@axis.cz>2016-09-03 17:53:48 +0200
commitdfbb57e394367376ae6ce7bddfd05912cf520ba4 (patch)
tree41493b8be8b3afc16bb1830c2d26ac66a55124de /libk3b
parent2164bb72754cab251c2b7faca5032ae69aac0313 (diff)
downloadk3b-dfbb57e394367376ae6ce7bddfd05912cf520ba4.tar.gz
k3b-dfbb57e394367376ae6ce7bddfd05912cf520ba4.zip
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'libk3b')
-rw-r--r--libk3b/core/k3bglobals.cpp2
-rw-r--r--libk3b/projects/k3bcdrdaowriter.cpp2
-rw-r--r--libk3b/tools/k3bwavefilewriter.cpp22
3 files changed, 13 insertions, 13 deletions
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index 29ef523..2e542e3 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -594,7 +594,7 @@ bool K3b::mount( K3bDevice::Device* dev )
#if KDE_IS_VERSION(3,4,0)
// first try to mount it the standard way
- if( TDEIO::NetAccess::synchronousRun( TDEIO::mount( true, 0, mntDev, false ), 0 ) )
+ if( TDEIO::NetAccess::synchronousRun( TDEIO::mount( true, 0, mntDev, 0, false ), 0 ) )
return true;
#endif
diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp
index 863e2a8..42174c7 100644
--- a/libk3b/projects/k3bcdrdaowriter.cpp
+++ b/libk3b/projects/k3bcdrdaowriter.cpp
@@ -936,7 +936,7 @@ void K3bCdrdaoWriter::parseCdrdaoWrote( const TQString& line )
void K3bCdrdaoWriter::parseCdrdaoMessage()
{
- static const char msgSync[] = { 0xff, 0x00, 0xff, 0x00 };
+ static const char msgSync[] = { '\xff', '\x00', '\xff', '\x00' };
unsigned int avail = m_comSock->bytesAvailable();
unsigned int msgs = avail / ( sizeof(msgSync)+d->progressMsgSize );
unsigned int count = 0;
diff --git a/libk3b/tools/k3bwavefilewriter.cpp b/libk3b/tools/k3bwavefilewriter.cpp
index 31ad6e0..fc067aa 100644
--- a/libk3b/tools/k3bwavefilewriter.cpp
+++ b/libk3b/tools/k3bwavefilewriter.cpp
@@ -112,17 +112,17 @@ void K3bWaveFileWriter::writeEmptyHeader()
{
static const char riffHeader[] =
{
- 0x52, 0x49, 0x46, 0x46, // 0 "RIFF"
- 0x00, 0x00, 0x00, 0x00, // 4 wavSize
- 0x57, 0x41, 0x56, 0x45, // 8 "WAVE"
- 0x66, 0x6d, 0x74, 0x20, // 12 "fmt "
- 0x10, 0x00, 0x00, 0x00, // 16
- 0x01, 0x00, 0x02, 0x00, // 20
- 0x44, 0xac, 0x00, 0x00, // 24
- 0x10, 0xb1, 0x02, 0x00, // 28
- 0x04, 0x00, 0x10, 0x00, // 32
- 0x64, 0x61, 0x74, 0x61, // 36 "data"
- 0x00, 0x00, 0x00, 0x00 // 40 byteCount
+ '\x52', '\x49', '\x46', '\x46', // 0 "RIFF"
+ '\x00', '\x00', '\x00', '\x00', // 4 wavSize
+ '\x57', '\x41', '\x56', '\x45', // 8 "WAVE"
+ '\x66', '\x6d', '\x74', '\x20', // 12 "fmt "
+ '\x10', '\x00', '\x00', '\x00', // 16
+ '\x01', '\x00', '\x02', '\x00', // 20
+ '\x44', '\xac', '\x00', '\x00', // 24
+ '\x10', '\xb1', '\x02', '\x00', // 28
+ '\x04', '\x00', '\x10', '\x00', // 32
+ '\x64', '\x61', '\x74', '\x61', // 36 "data"
+ '\x00', '\x00', '\x00', '\x00' // 40 byteCount
};
m_outputStream.writeRawBytes( riffHeader, 44 );