Author: coolo Date: Mon Jan 7 15:03:30 2008 New Revision: 43307 URL: http://svn.opensuse.org/viewcvs/yast?rev=43307&view=rev Log: hopefully fixing the utf-8 mess I created everywhere Modified: trunk/qt/src/YQBarGraph.cc trunk/qt/src/YQRichText.cc trunk/qt/src/YQTable.cc trunk/qt/src/YQTimezoneSelector.cc Modified: trunk/qt/src/YQBarGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQBarGraph.cc?rev=43307&r1=43306&r2=43307&view=diff ============================================================================== --- trunk/qt/src/YQBarGraph.cc (original) +++ trunk/qt/src/YQBarGraph.cc Mon Jan 7 15:03:30 2008 @@ -124,7 +124,7 @@ textColor.green(), textColor.blue() ) ); - QString txt = QString::fromStdString( seg.label() ); + QString txt = fromUTF8( seg.label() ); if ( txt.contains( "%1" ) ) txt = txt.arg( seg.value() ); // substitute variable @@ -199,7 +199,7 @@ for ( int i=0; i < segments(); i++ ) { - QString txt = QString::fromStdString( segment(i).label() ); + QString txt = fromUTF8( segment(i).label() ); if ( txt.contains( "%1" ) ) txt = txt.arg( segment(i).value() ); @@ -225,7 +225,7 @@ for ( int i=0; i < segments(); i++ ) { - QString txt = QString::fromStdString( segment(i).label() ); + QString txt = fromUTF8( segment(i).label() ); if ( txt.contains( "%1" ) ) txt = txt.arg( segment(i).value() ); Modified: trunk/qt/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQRichText.cc?rev=43307&r1=43306&r2=43307&view=diff ============================================================================== --- trunk/qt/src/YQRichText.cc (original) +++ trunk/qt/src/YQRichText.cc Mon Jan 7 15:03:30 2008 @@ -53,12 +53,12 @@ if ( plainTextMode ) { - _textBrowser->setPlainText(QString::fromUtf8(text.c_str())); + _textBrowser->setPlainText( fromUTF8( text ) ); _textBrowser->setWordWrapMode( QTextOption::NoWrap ); } else { - _textBrowser->setHtml(QString::fromUtf8(text.c_str())); + _textBrowser->setHtml( fromUTF8( text ) ); } setValue( text ); Modified: trunk/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTable.cc?rev=43307&r1=43306&r2=43307&view=diff ============================================================================== --- trunk/qt/src/YQTable.cc (original) +++ trunk/qt/src/YQTable.cc Mon Jan 7 15:03:30 2008 @@ -57,7 +57,7 @@ _qt_listView->setColumnCount(columns()); for ( int i=0; i < columns(); i++ ) { - headers << QString::fromUtf8(header(i).c_str()); + headers << fromUTF8(header(i)); int qt_alignment = Qt::AlignLeft; Modified: trunk/qt/src/YQTimezoneSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTimezoneSelector.cc?rev=43307&r1=43306&r2=43307&view=diff ============================================================================== --- trunk/qt/src/YQTimezoneSelector.cc (original) +++ trunk/qt/src/YQTimezoneSelector.cc Mon Jan 7 15:03:30 2008 @@ -111,7 +111,7 @@ setWidgetRep( this ); setMouseTracking(true); - d->_pix.load( QString::fromStdString( pixmap ) ); + d->_pix.load( fromUTF8( pixmap ) ); setStretchable( YD_HORIZ, true ); setStretchable( YD_VERT, true ); @@ -136,7 +136,7 @@ if (tooltip == timezones.end() ) continue; - loc.tip = QString::fromStdString( tooltip->second ); + loc.tip = fromUTF8( tooltip->second ); if ( arr.size() > 3 ) loc.comment = arr[3]; loc.latitude = convert_pos ( arr[1].left( split_index ), 2); @@ -342,7 +342,7 @@ void YQTimezoneSelector::setCurrentZone( const std::string &_zone, bool zoom ) { - QString zone = QString::fromStdString( _zone ); + QString zone = fromUTF8( _zone ); if ( d->_best.zone == zone ) return; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org