[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs=5D_kdecore/compression=3A_compile?=
From:       Olivier Trichet <nive () nivalis ! org>
Date:       2011-06-16 12:56:03
Message-ID: 20110616125603.21D66A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 50047a49322e85d4c544374cbfad62bbe8acbd88 by Olivier Trichet.
Committed on 16/06/2011 at 14:45.
Pushed by otrichet into branch 'master'.

compile

M  +7    -7    kdecore/compression/kxzfilter.cpp     

http://commits.kde.org/kdelibs/50047a49322e85d4c544374cbfad62bbe8acbd88

diff --git a/kdecore/compression/kxzfilter.cpp b/kdecore/compression/kxzfilter.cpp
index 439ad95..0f323fd 100644
--- a/kdecore/compression/kxzfilter.cpp
+++ b/kdecore/compression/kxzfilter.cpp
@@ -80,7 +80,7 @@ void KXzFilter::init( int mode )
         result = lzma_easy_encoder(&d->zStream, LZMA_PRESET_DEFAULT, \
LZMA_CHECK_CRC32);  //kDebug(7131) << "lzma_easy_encoder returned " << result;
     } else
-        kWarning(7131) << "Unsupported mode " << mode << ". Only QIODevice::ReadOnly \
and QIODevice::WriteOnly supported"; +        qWarning() << "Unsupported mode " << \
mode << ". Only QIODevice::ReadOnly and QIODevice::WriteOnly supported";  d->mode = \
mode;  d->isInitialized = true;
 }
@@ -95,7 +95,7 @@ void KXzFilter::terminate()
     if (d->mode == QIODevice::ReadOnly || d->mode == QIODevice::WriteOnly) {
         lzma_end(&d->zStream);
     } else {
-        kWarning(7131) << "Unsupported mode " << d->mode << ". Only \
QIODevice::ReadOnly and QIODevice::WriteOnly supported"; +        qWarning() << \
"Unsupported mode " << d->mode << ". Only QIODevice::ReadOnly and \
QIODevice::WriteOnly supported";  }
     d->isInitialized = false;
 }
@@ -103,7 +103,7 @@ void KXzFilter::terminate()
 
 void KXzFilter::reset()
 {
-    kDebug(7131) << "KXzFilter::reset";
+    //kDebug(7131) << "KXzFilter::reset";
     // liblzma doesn't have a reset call...
     terminate();
     init( d->mode );
@@ -137,8 +137,8 @@ KXzFilter::Result KXzFilter::uncompress()
     lzma_ret result = lzma_code(&d->zStream, LZMA_RUN);
     if ( result != LZMA_OK )
     {
-        kDebug(7131) << "lzma_code returned " << result;
-        kDebug(7131) << "KXzFilter::uncompress " << ( result == LZMA_STREAM_END ? \
KFilterBase::End : KFilterBase::Error ); +        qDebug() << "lzma_code returned " \
<< result; +        qDebug() << "KXzFilter::uncompress " << ( result == \
LZMA_STREAM_END ? KFilterBase::End : KFilterBase::Error );  }
 
     switch (result) {
@@ -161,11 +161,11 @@ KXzFilter::Result KXzFilter::compress( bool finish )
                 return KFilterBase::Ok;
                 break;
         case LZMA_STREAM_END:
-                kDebug(7131) << "  lzma_code returned " << result;
+                qDebug() << "  lzma_code returned " << result;
                 return KFilterBase::End;
 		break;
         default:
-                kDebug(7131) << "  lzma_code returned " << result;
+                qDebug() << "  lzma_code returned " << result;
                 return KFilterBase::Error;
                 break;
     }


[prev in list] [next in list] [prev in thread] [next in thread]