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

List:       kde-commits
Subject:    KDE/kdemultimedia/kioslave/audiocd
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2009-12-27 0:54:49
Message-ID: 1261875289.674137.7232.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1066409 by aacid:

remove qt3 support


 M  +0 -3      CMakeLists.txt  
 M  +2 -2      plugins/flac/encoderflac.cpp  
 M  +4 -2      plugins/lame/collectingprocess.cpp  
 M  +2 -2      plugins/wav/encodercda.cpp  
 M  +2 -2      plugins/wav/encoderwav.cpp  


--- trunk/KDE/kdemultimedia/kioslave/audiocd/CMakeLists.txt \
#1066408:1066409 @@ -1,8 +1,5 @@
 project(audiocd)
 
-add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
-
-
 MACRO_PUSH_REQUIRED_VARS()
 SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/include/cdda)
 check_struct_member("struct cdrom_drive" "ioctl_device_name" \
                "cdda_interface.h" CDDA_IOCTL_DEVICE_EXISTS)
--- trunk/KDE/kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp \
#1066408:1066409 @@ -66,9 +66,9 @@
     QByteArray output;
 
     if (bytes) {
-       output.setRawData((const char*)buffer, bytes);
+       output = QByteArray::fromRawData((const char*)buffer, bytes);
        d->ioslave->data(output);
-       output.resetRawData((const char*)buffer, bytes);
+       output.clear();
     }
 
     return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
--- trunk/KDE/kdemultimedia/kioslave/audiocd/plugins/lame/collectingprocess.cpp \
#1066408:1066409 @@ -96,7 +96,8 @@
   }
 
   uint offset = 0;
-  QByteArray b( d->stdoutSize );
+  QByteArray b;
+  if (d->stdoutSize > 0) b.fill('\0', d->stdoutSize);
   for ( QList<QByteArray>::const_iterator it = \
d->stdoutBuffer.constBegin();  it != d->stdoutBuffer.constEnd();
         ++it ) {
@@ -116,7 +117,8 @@
   }
 
   uint offset = 0;
-  QByteArray b( d->stderrSize );
+  QByteArray b;
+  if (d->stderrSize > 0) b.fill('\0', d->stderrSize);
   for ( QList<QByteArray>::const_iterator it = \
d->stderrBuffer.constBegin();  it != d->stderrBuffer.constEnd();
         ++it ) {
--- trunk/KDE/kdemultimedia/kioslave/audiocd/plugins/wav/encodercda.cpp \
#1066408:1066409 @@ -62,9 +62,9 @@
     for (int i=0; i < 2 * frames; i++)
        buf[i] = swap16 (buf[i]);
   char * cbuf = reinterpret_cast<char *>(buf);
-  output.setRawData(cbuf, CD_FRAMESIZE_RAW);
+  output = QByteArray::fromRawData(cbuf, CD_FRAMESIZE_RAW);
   ioslave->data(output);
-  output.resetRawData(cbuf, CD_FRAMESIZE_RAW);
+  output.clear();
   return CD_FRAMESIZE_RAW;
 }
 
--- trunk/KDE/kdemultimedia/kioslave/audiocd/plugins/wav/encoderwav.cpp \
#1066408:1066409 @@ -78,9 +78,9 @@
   riffHeader[43]  = (byteCount >> 24) & 0xff;
 
   QByteArray output;
-  output.setRawData((char *) riffHeader, 44);
+  output = QByteArray::fromRawData((char *) riffHeader, 44);
   ioslave->data(output);
-  output.resetRawData((char *) riffHeader, 44);
+  output.clear();
   return 44;
 }
 


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