there's no need having 2-liners inside their own method when this method is only...

[dolphin.git] / src / dolphinmodel.cpp

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index c71062860286d881dbf6bbad8779ac93784d2f28..fc68d39772c10de234bb071b5501105530a8e3c8 100644 (file)
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -1,6 +1,6 @@
 /**
   * This file is part of the KDE project
-  * Copyright (C) 2007 Rafael Fernández López <ereslibre@gmail.com>
+  * Copyright (C) 2007 Rafael Fernández López <ereslibre@kde.org>
   *
   * This library is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Library General Public
@@ -20,10 +20,6 @@
 
 #include "dolphinmodel.h"
 
-extern "C" {
-#include <sys/stat.h>
-}
-
 #include "dolphinsortfilterproxymodel.h"
 
 #include "kcategorizedview.h"
@@ -44,12 +40,12 @@ extern "C" {
 #include <kuser.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
-#include <kpixmapeffect.h>
 
 #include <QList>
 #include <QSortFilterProxyModel>
 #include <QPainter>
 #include <QDir>
+#include <QFileInfo>
 
 DolphinModel::DolphinModel(QObject *parent)
     : KDirModel(parent)
@@ -147,18 +143,7 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                 modifiedTime.setTime_t(item.time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
                 modifiedTime = modifiedTime.toLocalZone();
 
-                if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) == 0)
-                    retString = i18nc("@title:group Date", "Today");
-                else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) == 1)
-                    retString = i18nc("@title:group Date", "Yesterday");
-                else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 7)
-                    retString = i18nc("@title:group Date", "Less than a week");
-                else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 31)
-                    retString = i18nc("@title:group Date", "Less than a month");
-                else if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) < 365)
-                    retString = i18nc("@title:group Date", "Less than a year");
-                else
-                    retString = i18nc("@title:group Date", "More than a year");
+                retString = modifiedTime.toString(i18nc("Prints out the month and year: %B is full month name in current locale, and %Y is full year number", "%B, %Y"));
                 break;
             }
 
@@ -168,15 +153,15 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                 QString group;
                 QString others;
 
-                mode_t permissions = item.permissions();
+                QFileInfo info(item.url().pathOrUrl());
 
-                if (permissions & S_IRUSR)
+                if (info.permission(QFile::ReadUser))
                     user = i18n("Read, ");
 
-                if (permissions & S_IWUSR)
+                if (info.permission(QFile::WriteUser))
                     user += i18n("Write, ");
 
-                if (permissions & S_IXUSR)
+                if (info.permission(QFile::ExeUser))
                     user += i18n("Execute, ");
 
                 if (user.isEmpty())
@@ -184,13 +169,13 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                 else
                     user = user.mid(0, user.count() - 2);
 
-                if (permissions & S_IRGRP)
+                if (info.permission(QFile::ReadGroup))
                     group = i18n("Read, ");
 
-                if (permissions & S_IWGRP)
+                if (info.permission(QFile::WriteGroup))
                     group += i18n("Write, ");
 
-                if (permissions & S_IXGRP)
+                if (info.permission(QFile::ExeGroup))
                     group += i18n("Execute, ");
 
                 if (group.isEmpty())
@@ -198,13 +183,13 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                 else
                     group = group.mid(0, group.count() - 2);
 
-                if (permissions & S_IROTH)
+                if (info.permission(QFile::ReadOther))
                     others = i18n("Read, ");
 
-                if (permissions & S_IWOTH)
+                if (info.permission(QFile::WriteOther))
                     others += i18n("Write, ");
 
-                if (permissions & S_IXOTH)
+                if (info.permission(QFile::ExeOther))
                     others += i18n("Execute, ");
 
                 if (others.isEmpty())