cleanups

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

1 files changed, 4 insertions, 29 deletions

diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp
index 6c89e5098..2925ed350 100644
--- a/src/urlnavigatorbutton.cpp
+++ b/src/urlnavigatorbutton.cpp
@@ -281,37 +281,12 @@ void UrlNavigatorButton::entriesList(KIO::Job* job, const KIO::UDSEntryList& ent
 
     bool showHidden = urlNavigator()->showHiddenFiles();
     while (it != itEnd) {
-        QString name;
-        //bool isDir = false;
-        KIO::UDSEntry entry = *it;
-
-        /* KDE3 reference:
-            KIO::UDSEntry::const_iterator atomIt = entry.constBegin();
-            KIO::UDSEntry::const_iterator atomEndIt = entry.constEnd();
-
-            while (atomIt != atomEndIt) {
-            switch ((*atomIt).m_uds) {
-                case KIO::UDS_NAME:
-                    name = (*atomIt).m_str;
-                    break;
-                case KIO::UDS_FILE_TYPE:
-                    isDir = S_ISDIR((*atomIt).m_long);
-                    break;
-                default:
-                    break;
-            }
-            ++atomIt;
-         }
-         if (isDir) {
-             m_subdirs.append(name);
-         }
-        */
-
+        const KIO::UDSEntry entry = *it;
         if (entry.isDir()) {
-            QString dir = entry.stringValue(KIO::UDS_NAME);
+            QString name = entry.stringValue(KIO::UDS_NAME);
 
-            if (!showHidden || (dir != "." && dir != "..")) {
-                m_subdirs.append(entry.stringValue(KIO::UDS_NAME));
+            if (!showHidden || (name != "." && name != "..")) {
+                m_subdirs.append(name);
             }
         }