more fixes

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

diff --git a/src/applyviewpropsjob.cpp b/src/applyviewpropsjob.cpp
index c25c3bd5ae9fd205b3378bd75df7370729d40fde..736e8d24c600b8d57690a2bbccb28034057a97c0 100644 (file)
--- a/src/applyviewpropsjob.cpp
+++ b/src/applyviewpropsjob.cpp
@@ -68,7 +68,7 @@ void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list)
     const KIO::UDSEntryList::ConstIterator end = list.end();
     for (; it != end; ++it) {
         const KIO::UDSEntry& entry = *it;
-        const QString name = entry.stringValue(KIO::UDS_NAME);
+        const QString name = entry.stringValue(KIO::UDSEntry::UDS_NAME);
         if ((name != ".") && (name != "..") && entry.isDir()) {
             ++m_progress;
 

diff --git a/src/dolphinitemcategorizer.cpp b/src/dolphinitemcategorizer.cpp
index d5c6d4e287c0d23510851ff3a85ca6fd73ff56cc..81ca65a610f73f366834ed0f5ac18f9c347bd3d5 100644 (file)
--- a/src/dolphinitemcategorizer.cpp
+++ b/src/dolphinitemcategorizer.cpp
@@ -123,7 +123,7 @@ QString DolphinItemCategorizer::categoryForItem(const QModelIndex& index,
         case DolphinView::SortByDate:
         {
             KDateTime modifiedTime;
-            modifiedTime.setTime_t(item->time(KIO::UDS_MODIFICATION_TIME));
+            modifiedTime.setTime_t(item->time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
             modifiedTime = modifiedTime.toLocalZone();
 
             if (modifiedTime.daysTo(KDateTime::currentLocalDateTime()) == 0)

diff --git a/src/dolphinsortfilterproxymodel.cpp b/src/dolphinsortfilterproxymodel.cpp
index 5ae0f012a14f23b3812ad81cbe81cde4a80cc029..81c261563832b67af9b4a23e11a6591905a43f90 100644 (file)
--- a/src/dolphinsortfilterproxymodel.cpp
+++ b/src/dolphinsortfilterproxymodel.cpp
@@ -137,8 +137,8 @@ bool DolphinSortFilterProxyModel::lessThanGeneralPurpose(const QModelIndex &left
 
     case DolphinView::SortByDate: {
         KDateTime leftTime, rightTime;
-        leftTime.setTime_t(leftFileItem->time(KIO::UDS_MODIFICATION_TIME));
-        rightTime.setTime_t(rightFileItem->time(KIO::UDS_MODIFICATION_TIME));
+        leftTime.setTime_t(leftFileItem->time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
+        rightTime.setTime_t(rightFileItem->time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
         return leftTime > rightTime;
     }
 
@@ -281,8 +281,8 @@ bool DolphinSortFilterProxyModel::lessThan(const QModelIndex& left,
 
     case DolphinView::SortByDate: {
         KDateTime leftTime, rightTime;
-        leftTime.setTime_t(leftFileItem->time(KIO::UDS_MODIFICATION_TIME));
-        rightTime.setTime_t(rightFileItem->time(KIO::UDS_MODIFICATION_TIME));
+        leftTime.setTime_t(leftFileItem->time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
+        rightTime.setTime_t(rightFileItem->time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
 
         if (leftTime == rightTime) {
             return sortCaseSensitivity() ?