minor coding style fixes:

* let the global variable 'others' be a static member 'm_others'
* constify

svn path=/trunk/KDE/kdebase/apps/; revision=900070

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index 9b77781b8b18dc472a67e95161e23539a4cce850..14d9af12b5ecddacb5b53850f9fb95fc485d2554 100644 (file)
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -48,7 +48,7 @@
 #include <QDir>
 #include <QFileInfo>
 
 #include <QDir>
 #include <QFileInfo>
 

-static const char* others = I18N_NOOP2("@title:group Name", "Others");
+const char* DolphinModel::m_others = I18N_NOOP2("@title:group Name", "Others");

 
 DolphinModel::DolphinModel(QObject* parent)
     : KDirModel(parent)
 
 DolphinModel::DolphinModel(QObject* parent)
     : KDirModel(parent)


@@ -142,15 +142,12 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
     case KDirModel::Name: {
         // KDirModel checks columns to know to which role are
         // we talking about
     case KDirModel::Name: {
         // KDirModel checks columns to know to which role are
         // we talking about

-        QModelIndex theIndex = index.model()->index(index.row(),
-            KDirModel::Name,
-            index.parent());
-
-        if (!theIndex.isValid()) {
+        const QModelIndex nameIndex = index.model()->index(index.row(), KDirModel::Name, index.parent());
+        if (!nameIndex.isValid()) {

             return retString;
         }
             return retString;
         }

-        QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole);
-        QString name = data.toString();
+        const QVariant data = nameIndex.model()->data(nameIndex, Qt::DisplayRole);
+        const QString name = data.toString();

         if (!name.isEmpty()) {
             if (!item.isHidden() && name.at(0).isLetter())
                 retString = name.at(0).toUpper();
         if (!name.isEmpty()) {
             if (!item.isHidden() && name.at(0).isLetter())
                 retString = name.at(0).toUpper();


@@ -159,7 +156,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
                     if (name.size() > 1 && name.at(1).isLetter()) {
                         retString = name.at(1).toUpper();
                     } else {
                     if (name.size() > 1 && name.at(1).isLetter()) {
                         retString = name.at(1).toUpper();
                     } else {

-                        retString = i18nc("@title:group Name", others);
+                        retString = i18nc("@title:group Name", m_others);

                     }
                 } else {
                     retString = name.at(0).toUpper();
                     }
                 } else {
                     retString = name.at(0).toUpper();


@@ -173,14 +170,14 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
                     if (currA->isLetter()) {
                         validCategory = true;
                     } else if (currA->isDigit()) {
                     if (currA->isLetter()) {
                         validCategory = true;
                     } else if (currA->isDigit()) {

-                        return i18nc("@title:group Name", others);
+                        return i18nc("@title:group Name", m_others);

                     } else {
                         ++currA;
                     }
                 }
 
                 if (!validCategory) {
                     } else {
                         ++currA;
                     }
                 }
 
                 if (!validCategory) {

-                    retString = validCategory ? *currA : i18nc("@title:group Name", others);
+                    retString = validCategory ? *currA : i18nc("@title:group Name", m_others);

                 } else {
                     retString = *currA;
                 }
                 } else {
                     retString = *currA;
                 }

diff --git a/src/dolphinmodel.h b/src/dolphinmodel.h
index abd53a7c3b4f5afe4805e7ccc2f27a613852f275..2aa6455f30201026a8290e66ab0f4b32af2c4ad8 100644 (file)
--- a/src/dolphinmodel.h
+++ b/src/dolphinmodel.h
@@ -57,6 +57,9 @@ public:
 private:
     QVariant displayRoleData(const QModelIndex& index) const;
     QVariant sortRoleData(const QModelIndex& index) const;
 private:
     QVariant displayRoleData(const QModelIndex& index) const;
     QVariant sortRoleData(const QModelIndex& index) const;

+
+private:
+    static const char* m_others;

 };
 
 #endif // DOLPHINMODEL_H
 };
 
 #endif // DOLPHINMODEL_H