diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphinsettings.cpp | 6 | ||||
| -rw-r--r-- | src/protocolcombo.cpp | 3 | ||||
| -rw-r--r-- | src/protocolcombo.h | 2 | ||||
| -rw-r--r-- | src/urlnavigatorbutton.cpp | 33 |
4 files changed, 7 insertions, 37 deletions
diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp index 837a5f4d1..3d187d40d 100644 --- a/src/dolphinsettings.cpp +++ b/src/dolphinsettings.cpp @@ -20,13 +20,9 @@ #include "dolphinsettings.h" -#include <assert.h> -#include <qdir.h> - #include <kbookmark.h> #include <kbookmarkmanager.h> #include <kcomponentdata.h> -#include <kicontheme.h> #include <klocale.h> #include <kstandarddirs.h> @@ -34,8 +30,6 @@ #include "dolphin_iconsmodesettings.h" #include "dolphin_detailsmodesettings.h" -#include <Q3IconView> - DolphinSettings& DolphinSettings::instance() { static DolphinSettings* instance = 0; diff --git a/src/protocolcombo.cpp b/src/protocolcombo.cpp index 3fbf3de55..729102973 100644 --- 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) + + // DF: why not just supportsListing? + if (KProtocolInfo::protocolClass(*it) == ":" || !KProtocolManager::supportsWriting(*it)) { diff --git a/src/protocolcombo.h b/src/protocolcombo.h index 616a286b1..56a001863 100644 --- a/src/protocolcombo.h +++ b/src/protocolcombo.h @@ -19,8 +19,6 @@ #ifndef PROTOCOLCOMBO_H #define PROTOCOLCOMBO_H -//#include <qcombobox.h> -#include "urlbutton.h" #include "urlnavigatorbutton.h" class UrlNavigator; 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); } } |