author | ar <ar> | 2004-05-02 17:04:41 (UTC) |
---|---|---|
committer | ar <ar> | 2004-05-02 17:04:41 (UTC) |
commit | 4d3379027557e251201b531896974a69ae4c665a (patch) (side-by-side diff) | |
tree | 6e813be1aa29131f8f8e91f532f38f8a381e38f4 /core/multimedia/opieplayer/modplug/memfile.cpp | |
parent | f8add41b2e0b0371754521b44d95f87fa70a6ff2 (diff) | |
download | opie-4d3379027557e251201b531896974a69ae4c665a.zip opie-4d3379027557e251201b531896974a69ae4c665a.tar.gz opie-4d3379027557e251201b531896974a69ae4c665a.tar.bz2 |
- convert qDebug to odebug
Diffstat (limited to 'core/multimedia/opieplayer/modplug/memfile.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/modplug/memfile.cpp | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/core/multimedia/opieplayer/modplug/memfile.cpp b/core/multimedia/opieplayer/modplug/memfile.cpp index 8a29997..cd243c7 100644 --- a/core/multimedia/opieplayer/modplug/memfile.cpp +++ b/core/multimedia/opieplayer/modplug/memfile.cpp @@ -18,8 +18,12 @@ */ #include "memfile.h" +/* OPIE */ +#include <opie2/odebug.h> + +/* STD */ #include <unistd.h> #include <sys/mman.h> MemFile::MemFile() @@ -46,10 +50,10 @@ void MemFile::unmap() { #if defined(Q_WS_X11) || defined(Q_WS_QWS) if ( m_data.data() ) { - munmap( m_data.data(), m_data.size() ); - m_data.resetRawData( m_data.data(), m_data.size() ); + munmap( m_data.data(), m_data.size() ); + m_data.resetRawData( m_data.data(), m_data.size() ); } #endif } @@ -57,20 +61,20 @@ QByteArray &MemFile::data() { if ( !m_data.data() ) { #if defined(Q_WS_X11) || defined(Q_WS_QWS) - const char *rawData = (const char *)mmap( 0, size(), PROT_READ, - MAP_SHARED, handle(), 0 ); - if ( rawData ) - { - m_data.setRawData( rawData, size() ); - return m_data; - } - else - qDebug( "MemFile: mmap() failed!" ); - // fallback + const char *rawData = (const char *)mmap( 0, size(), PROT_READ, + MAP_SHARED, handle(), 0 ); + if ( rawData ) + { + m_data.setRawData( rawData, size() ); + return m_data; + } + else + odebug << "MemFile: mmap() failed!" << oendl; + // fallback #endif - m_data = readAll(); + m_data = readAll(); } return m_data; } |