cleanups

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

diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp
index 837a5f4d1c76e48753cb354db812ebb957ad3891..3d187d40d3d64c0da0837cd830fbbc5539bee8f0 100644 (file)
--- a/src/dolphinsettings.cpp
+++ b/src/dolphinsettings.cpp
@@ -20,13 +20,9 @@
 
 #include "dolphinsettings.h"
 
 
 #include "dolphinsettings.h"
 

-#include <assert.h>
-#include <qdir.h>
-

 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
 #include <kcomponentdata.h>
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
 #include <kcomponentdata.h>

-#include <kicontheme.h>

 #include <klocale.h>
 #include <kstandarddirs.h>
 
 #include <klocale.h>
 #include <kstandarddirs.h>
 


@@ -34,8 +30,6 @@
 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_detailsmodesettings.h"
 
 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_detailsmodesettings.h"
 

-#include <Q3IconView>
-

 DolphinSettings& DolphinSettings::instance()
 {
     static DolphinSettings* instance = 0;
 DolphinSettings& DolphinSettings::instance()
 {
     static DolphinSettings* instance = 0;

diff --git a/src/protocolcombo.cpp b/src/protocolcombo.cpp
index 3fbf3de55df7e3b1d772d09fdf87aad95165ffd1..729102973e1bfb96030c67e6093bff8de32cf1a6 100644 (file)
--- a/src/protocolcombo.cpp
+++ b/src/protocolcombo.cpp
@@ -42,6 +42,9 @@ ProtocolCombo::ProtocolCombo(const QString& protocol, UrlNavigator* parent)
         //TODO: wow this is ugly. or .. is it? ;) we need a way to determine
         //      if a protocol is appropriate for use in a file manager. hum!
         //if (KProtocolInfo::capabilities(*it).findIndex("filemanager") == -1)
         //TODO: wow this is ugly. or .. is it? ;) we need a way to determine
         //      if a protocol is appropriate for use in a file manager. hum!
         //if (KProtocolInfo::capabilities(*it).findIndex("filemanager") == -1)

+
+        // DF: why not just supportsListing?
+

         if (KProtocolInfo::protocolClass(*it) == ":" ||
             !KProtocolManager::supportsWriting(*it))
         {
         if (KProtocolInfo::protocolClass(*it) == ":" ||
             !KProtocolManager::supportsWriting(*it))
         {

diff --git a/src/protocolcombo.h b/src/protocolcombo.h
index 616a286b1eb5ed298693706f8db0a4eaca64a5aa..56a0018633e7bdd1cdd0e594c6c356efd65fac07 100644 (file)
--- a/src/protocolcombo.h
+++ b/src/protocolcombo.h
@@ -19,8 +19,6 @@
 #ifndef PROTOCOLCOMBO_H
 #define PROTOCOLCOMBO_H
 
 #ifndef PROTOCOLCOMBO_H
 #define PROTOCOLCOMBO_H
 

-//#include <qcombobox.h>
-#include "urlbutton.h"

 #include "urlnavigatorbutton.h"
 
 class UrlNavigator;
 #include "urlnavigatorbutton.h"
 
 class UrlNavigator;

diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp
index 6c89e5098f1bf996d59375fef6a46245889af3b6..2925ed35032a530b4b047afa2e433be9950593a0 100644 (file)
--- 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) {
 
     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()) {
         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);

             }
         }
 
             }
         }