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

List:       kde-commits
Subject:    KDE/kdemultimedia/kioslave/audiocd
From:       Jeff Mitchell <kde-dev () emailgoeshere ! com>
Date:       2007-12-10 19:49:39
Message-ID: 1197316179.342612.22979.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 746993 by mitchell:

Some porting to Qt4, warnings--


 M  +1 -1      audiocd.cpp  
 M  +2 -4      plugins/lame/collectingprocess.cpp  
 M  +6 -6      plugins/lame/encoderlame.cpp  


--- trunk/KDE/kdemultimedia/kioslave/audiocd/audiocd.cpp #746992:746993
@@ -914,7 +914,7 @@
 {
 	d->clearURLargs();
 
-	QString query(KUrl::decode_string(url.query()));
+	QString query(QUrl::fromPercentEncoding(url.query().toAscii()));
 
 	if (query.isEmpty() || query[0] != '?')
 		return;
--- trunk/KDE/kdemultimedia/kioslave/audiocd/plugins/lame/collectingprocess.cpp #746992:746993
@@ -77,16 +77,14 @@
 
 void CollectingProcess::slotReceivedStdout( K3Process *, char *buf, int len )
 {
-  QByteArray b;
-  b.duplicate( buf, len );
+  QByteArray b( buf, len);
   d->stdoutBuffer.append( b );
   d->stdoutSize += len;
 }
 
 void CollectingProcess::slotReceivedStderr( K3Process *, char *buf, int len )
 {
-  QByteArray b;
-  b.duplicate( buf, len );
+  QByteArray b( buf, len );
   d->stderrBuffer.append( b );
   d->stderrSize += len;
 }
--- trunk/KDE/kdemultimedia/kioslave/audiocd/plugins/lame/encoderlame.cpp #746992:746993
@@ -99,7 +99,7 @@
 		return false;
 
 	QString str = QString::fromLocal8Bit( proc.collectedStdout() );
-	d->genreList = QStringList::split( '\n', str );
+    d->genreList = str.split( '\n', QString::SkipEmptyParts );
 	// Remove the numbers in front of every genre
 	for( QStringList::Iterator it = d->genreList.begin(); it != d->genreList.end(); ++it ) {
 		QString& genre = *it;
@@ -235,7 +235,7 @@
 		*d->currentEncodeProcess << trackInfo;
 
 	// Read in stdin, output to the temp file
-	*d->currentEncodeProcess << "-" << d->tempFile->fileName().latin1();
+	*d->currentEncodeProcess << "-" << d->tempFile->fileName().toLatin1();
 	
 	//kDebug(7117) << d->currentEncodeProcess->args();
 	
@@ -316,10 +316,10 @@
 		QByteArray output;
 		char data[1024];
 		while ( !file.atEnd() ) {
-			uint read = file.readBlock(data, 1024);
-			output.setRawData(data, read);
+			uint read = file.read(data, 1024);
+			output.fromRawData(data, read);
 			ioslave->data(output);
-			output.resetRawData(data, read);
+			output.clear();
 		}
 		file.close();
 	}
@@ -353,7 +353,7 @@
 	trackInfo.append(QString("%1").arg(track));
 
 	const QString genre = info.get(Genre).toString();
-	if ( d->genreList.find( genre ) != d->genreList.end() )
+	if ( d->genreList.indexOf( genre ) != -1 )
 	{
 	trackInfo.append("--tg");
 		trackInfo.append(genre);
[prev in list] [next in list] [prev in thread] [next in thread]