Use isEmpty()

[dolphin.git] / src / views / dolphinmodel.cpp

diff --git a/src/views/dolphinmodel.cpp b/src/views/dolphinmodel.cpp
index 137274e0dffa7e12572568578ce3ed5e15807c72..eb63c25dbc29378665e6b0a0af5925f7028697ba 100644 (file)
--- a/src/views/dolphinmodel.cpp
+++ b/src/views/dolphinmodel.cpp
@@ -22,17 +22,16 @@
 
 #include "dolphinsortfilterproxymodel.h"
 
-#include "kcategorizedview.h"
-
-#include <kdatetime.h>
-#include <kdirmodel.h>
-#include <kfileitem.h>
-#include <kiconloader.h>
-#include <klocale.h>
-#include <kurl.h>
-#include <kuser.h>
-#include <kmimetype.h>
-#include <kstandarddirs.h>
+#include <KCategorizedView>
+#include <KDateTime>
+#include <KDirModel>
+#include <KFileItem>
+#include <KIconLoader>
+#include <KLocale>
+#include <KUrl>
+#include <KUser>
+#include <KMimeType>
+#include <KStandardDirs>
 
 #include <QList>
 #include <QSortFilterProxyModel>
@@ -104,8 +103,12 @@ QVariant DolphinModel::data(const QModelIndex& index, int role) const
         case DolphinModel::LocalPathOrUrl:
             const KDirModel *dirModel = qobject_cast<const KDirModel*>(index.model());
             const KFileItem item = dirModel->itemForIndex(index);
-            return item.localPath();
-            break;
+            const KUrl url = item.mostLocalUrl();
+            if (url.protocol() == QLatin1String("trash")) {
+                const KIO::UDSEntry udsEntry = item.entry();
+                return udsEntry.stringValue(KIO::UDSEntry::UDS_EXTRA);
+            }
+            return url.directory();
         }
         break;
 
@@ -183,7 +186,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
                 retString = name.at(0).toUpper();
             else if (item.isHidden()) {
                 if (name.at(0) == '.') {
-                    if (name.size() > 1 && name.at(1).isLetter()) {
+                    if (!name.isEmpty()  && name.at(1).isLetter()) {
                         retString = name.at(1).toUpper();
                     } else {
                         retString = i18nc("@title:group Name", m_others);