feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
- Add missing translations
- Remove some unneeded conversions.

Change-Id: Ia30e5c838099e52a9f38ca4854395c10c0391075
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-09 16:30:33 +01:00
parent ed2f41bb58
commit ced6fc4136
40 changed files with 352 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/taskwindow.cpp
View File

@@ -635,7 +635,7 @@ QSize TaskDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelInd
// Layout the description
int leading = fontLeading;
int height = 0;
description.replace('\n', QChar::LineSeparator);
description.replace(QLatin1Char('\n'), QChar::LineSeparator);
QTextLayout tl(description);
tl.beginLayout();
while (true) {
@@ -717,7 +717,7 @@ void TaskDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
// Paint TextArea:
if (!selected) {
// in small mode we lay out differently
QString bottom = index.data(TaskModel::Description).toString().split('\n').first();
QString bottom = index.data(TaskModel::Description).toString().split(QLatin1Char('\n')).first();
painter->setClipRect(positions.textArea());
painter->drawText(positions.textAreaLeft(), positions.top() + fm.ascent(), bottom);
if (fm.width(bottom) > positions.textAreaWidth()) {
@@ -734,7 +734,7 @@ void TaskDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
// Layout the description
int leading = fm.leading();
int height = 0;
description.replace('\n', QChar::LineSeparator);
description.replace(QLatin1Char('\n'), QChar::LineSeparator);
QTextLayout tl(description);
tl.setAdditionalFormats(index.data(TaskModel::Task_t).value<ProjectExplorer::Task>().formats);
tl.beginLayout();