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

List:       kde-commits
Subject:    KDE/kdelibs/kdeprint
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2007-06-15 16:02:14
Message-ID: 1181923334.545297.563.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 675967 by apaku:

More suggested fixes from Ossi.

 M  +3 -3      posterpreview.cpp  
 M  +6 -4      tools/escputil/escpwidget.cpp  


--- trunk/KDE/kdelibs/kdeprint/posterpreview.cpp #675966:675967
@@ -105,7 +105,7 @@
 		<< "-c" + QString::number( m_cutmargin ) + '%';
 	m_process->setOutputChannelMode( KProcess::OnlyStderrChannel );
 	m_process->start();
-	if ( !m_process->waitForFinished() )
+	if ( !m_process->waitForStarted() )
 	{
 		m_rows = m_cols = 0;
 		m_dirty = false;
@@ -220,8 +220,8 @@
 
 void PosterPreview::slotProcessStderr()
 {
-	QByteArray buf = m_process->readAllStandardError();
-	m_buffer.append( QString::fromLocal8Bit( buf ) );
+	while( m_process->canReadLine() )
+		m_buffer.append( QString::fromLocal8Bit( m_process->readLine() ) );
 }
 
 void PosterPreview::slotProcessExited()
--- trunk/KDE/kdelibs/kdeprint/tools/escputil/escpwidget.cpp #675966:675967
@@ -247,14 +247,16 @@
 
 void EscpWidget::slotReceivedStdout()
 {
-	QByteArray bufstr = m_proc.readAllStandardOutput();
-	m_outbuffer.append( QString::fromLocal8Bit( bufstr ) );
+	while( m_proc.canReadLine() )
+		m_outbuffer.append( QString::fromLocal8Bit( m_proc.readLine() ) );
 }
 
 void EscpWidget::slotReceivedStderr()
 {
-	QString	bufstr = QString::fromLocal8Bit( m_proc.readAllStandardError() );
-	m_errorbuffer.append(bufstr);
+	m_proc.setReadChannel( QProcess::StandardError );
+	while( m_proc.canReadLine() )
+		m_errorbuffer.append( QString::fromLocal8Bit( m_proc.readLine() ) );
+	m_proc.setReadChannel( QProcess::StandardOutput );
 }
 
 void EscpWidget::slotButtonClicked()
[prev in list] [next in list] [prev in thread] [next in thread]