Attachment #145238 for bug #212230

View | Details | Raw Unified | Return to bug 212230
Collapse All | Expand All




{
    QString sline;
    bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
    
    if( forceCLocale )
        sline = QString::fromAscii( stdoutbuf+line );
    else
        sline = QString::fromLocal8Bit( stdoutbuf+line );
    stdoutbuf.truncate(0);

    if ( !appendToLastLine( sline ) )
        m_directoryStatusFilter.processLine( sline );
    stdoutbuf.truncate(0);
}

void MakeWidget::insertStderrLine( const QCString& line )
{
    QString sline;
    bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
    
    if( forceCLocale ) {
        sline = QString( stderrbuf+line );
    }
    else
        sline = QString::fromLocal8Bit( stderrbuf+line );
    
    if ( !appendToLastLine( sline ) )
        m_errorFilter.processLine( sline );
    stderrbuf.truncate(0);
    if ( !appendToLastLine( line ) )
        m_errorFilter.processLine( line );
}

void MakeWidget::slotProcessExited(KProcess *)


void MakeWidget::storePartialStdoutLine(const QCString & line)
{
    stdoutbuf += line;
}

#include "makewidget.moc"

Return to bug 212230

Lines 532-559 Link Here

(-)branches/KDE/3.5/kdevelop/parts/outputviews/makewidget.cpp (-4 / +7 lines)
532	{	532	{
533	QString sline;	533	QString sline;
534	bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );	534	bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
		535
535	if( forceCLocale )	536	if( forceCLocale )
536	sline = QString::fromAscii( stdoutbuf+line );	537	sline = QString::fromAscii( stdoutbuf+line );
537	else	538	else
538	sline = QString::fromLocal8Bit( stdoutbuf+line );	539	sline = QString::fromLocal8Bit( stdoutbuf+line );
539	stdoutbuf.truncate(0);
540		540
541	if ( !appendToLastLine( sline ) )	541	if ( !appendToLastLine( sline ) )
542	m_directoryStatusFilter.processLine( sline );	542	m_directoryStatusFilter.processLine( sline );
		543	stdoutbuf.truncate(0);
543	}	544	}
544		545
545	void MakeWidget::insertStderrLine( const QCString& line )	546	void MakeWidget::insertStderrLine( const QCString& line )
546	{	547	{
547	QString sline;	548	QString sline;
548	bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );	549	bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
		550
549	if( forceCLocale ) {	551	if( forceCLocale ) {
550	sline = QString( stderrbuf+line );	552	sline = QString( stderrbuf+line );
551	}	553	}
552	else	554	else
553	sline = QString::fromLocal8Bit( stderrbuf+line );	555	sline = QString::fromLocal8Bit( stderrbuf+line );
		556
		557	if ( !appendToLastLine( sline ) )
		558	m_errorFilter.processLine( sline );
554	stderrbuf.truncate(0);	559	stderrbuf.truncate(0);
555	if ( !appendToLastLine( line ) )
556	m_errorFilter.processLine( line );
557	}	560	}
558		561
559	void MakeWidget::slotProcessExited(KProcess *)	562	void MakeWidget::slotProcessExited(KProcess *)
Lines 832-838 Link Here
832		835
833	void MakeWidget::storePartialStdoutLine(const QCString & line)	836	void MakeWidget::storePartialStdoutLine(const QCString & line)
834	{	837	{
835	stderrbuf += line;	838	stdoutbuf += line;
836	}	839	}
837		840
838	#include "makewidget.moc"	841	#include "makewidget.moc"