diff options
| author | John Tapsell <[email protected]> | 2007-12-04 02:41:19 +0000 |
|---|---|---|
| committer | John Tapsell <[email protected]> | 2007-12-04 02:41:19 +0000 |
| commit | 5db74fc80b582c605debf27547b5f56698715607 (patch) | |
| tree | 87654879fc1f3145c30f513db666665a25571106 /src | |
| parent | 7ed28842047c527bba4599c7e5b62d4533ba1d09 (diff) | |
Make checking the name a bit more effecient
svn path=/trunk/KDE/kdebase/apps/; revision=744665
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphinmodel.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp index 8f427adf1..1e14ec677 100644 --- a/src/dolphinmodel.cpp +++ b/src/dolphinmodel.cpp @@ -79,26 +79,26 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const if (!theIndex.isValid()) { return retString; } - QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole); - if (data.toString().size()) { - if (!item.isHidden() && data.toString().at(0).isLetter()) - retString = data.toString().at(0).toUpper(); - else if (item.isHidden() && data.toString().at(0) == '.' && - data.toString().at(1).isLetter()) - retString = data.toString().at(1).toUpper(); - else if (item.isHidden() && data.toString().at(0) == '.' && - !data.toString().at(1).isLetter()) - retString = i18nc("@title:group Name", "Others"); - else if (item.isHidden() && data.toString().at(0) != '.') - retString = data.toString().at(0).toUpper(); - else if (item.isHidden()) - retString = data.toString().at(0).toUpper(); - else + QString name = data.toString(); + if (!name.isEmpty()) { + QChar first + if (!item.isHidden() && name.at(0).isLetter()) + retString = name.at(0).toUpper(); + else if (item.isHidden()) { + if(name.at(0) == '.') { + if(data.size() > 1 && name.at(1).isLetter()) + retString = name.at(1).toUpper(); + else + retString = i18nc("@title:group Name", "Others"); + } else + retString = name.at(0).toUpper(); + } + else { bool validCategory = false; - const QString str(data.toString().toUpper()); + const QString str(name.toUpper()); const QChar* currA = str.unicode(); while (!currA->isNull() && !validCategory) { if (currA->isLetter()) |