Reapply unconnected changes from reverted commit

Only revert stuff that is linked to fast string concat.
This commit is contained in:
Kai Koehne
2010-02-08 11:07:18 +01:00
parent 999c73ad9d
commit 6c4b9ba227
9 changed files with 16 additions and 14 deletions

View File

@@ -804,7 +804,7 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
switch (idx.column()) {
case 0:
if (data.name == QLatin1String("*") && item->parent)
return QLatin1Char('*') + item->parent->name;
return QVariant(QLatin1Char('*') + item->parent->name);
return data.name;
case 1: {
int format = m_handler->m_individualFormats.value(data.iname, -1);