GIT_SILENT Sync po/docbooks with svn

[dolphin.git] / src / kitemviews / kitemmodelbase.cpp

diff --git a/src/kitemviews/kitemmodelbase.cpp b/src/kitemviews/kitemmodelbase.cpp
index 795a1a2f55e34dd0b51afb4d3cb7ac45c8d074de..9fdecafb864425cc887ca47b1e164b1a04cdb769 100644 (file)
--- a/src/kitemviews/kitemmodelbase.cpp
+++ b/src/kitemviews/kitemmodelbase.cpp
@@ -8,19 +8,19 @@
 
 #include "kitemmodelbase.h"
 
 
 #include "kitemmodelbase.h"
 

-KItemModelBase::KItemModelBase(QObject* parent) :
-    QObject(parent),
-    m_groupedSorting(false),
-    m_sortRole(),
-    m_sortOrder(Qt::AscendingOrder)
+KItemModelBase::KItemModelBase(QObject *parent)
+    : QObject(parent)
+    , m_groupedSorting(false)
+    , m_sortRole()
+    , m_sortOrder(Qt::AscendingOrder)

 {
 }
 
 {
 }
 

-KItemModelBase::KItemModelBase(const QByteArray& sortRole, QObject* parent) :
-    QObject(parent),
-    m_groupedSorting(false),
-    m_sortRole(sortRole),
-    m_sortOrder(Qt::AscendingOrder)
+KItemModelBase::KItemModelBase(const QByteArray &sortRole, QObject *parent)
+    : QObject(parent)
+    , m_groupedSorting(false)
+    , m_sortRole(sortRole)
+    , m_sortOrder(Qt::AscendingOrder)

 {
 }
 
 {
 }
 


@@ -40,7 +40,7 @@ void KItemModelBase::setGroupedSorting(bool grouped)
     if (m_groupedSorting != grouped) {
         m_groupedSorting = grouped;
         onGroupedSortingChanged(grouped);
     if (m_groupedSorting != grouped) {
         m_groupedSorting = grouped;
         onGroupedSortingChanged(grouped);

-        emit groupedSortingChanged(grouped);
+        Q_EMIT groupedSortingChanged(grouped);

     }
 }
 
     }
 }
 


@@ -49,13 +49,13 @@ bool KItemModelBase::groupedSorting() const
     return m_groupedSorting;
 }
 
     return m_groupedSorting;
 }
 

-void KItemModelBase::setSortRole(const QByteArray& role, bool resortItems)
+void KItemModelBase::setSortRole(const QByteArray &role, bool resortItems)

 {
     if (role != m_sortRole) {
         const QByteArray previous = m_sortRole;
         m_sortRole = role;
         onSortRoleChanged(role, previous, resortItems);
 {
     if (role != m_sortRole) {
         const QByteArray previous = m_sortRole;
         m_sortRole = role;
         onSortRoleChanged(role, previous, resortItems);

-        emit sortRoleChanged(role, previous);
+        Q_EMIT sortRoleChanged(role, previous);

     }
 }
 
     }
 }
 


@@ -70,18 +70,18 @@ void KItemModelBase::setSortOrder(Qt::SortOrder order)
         const Qt::SortOrder previous = m_sortOrder;
         m_sortOrder = order;
         onSortOrderChanged(order, previous);
         const Qt::SortOrder previous = m_sortOrder;
         m_sortOrder = order;
         onSortOrderChanged(order, previous);

-        emit sortOrderChanged(order, previous);
+        Q_EMIT sortOrderChanged(order, previous);

     }
 }
 
     }
 }
 

-QString KItemModelBase::roleDescription(const QByteArray& role) const
+QString KItemModelBase::roleDescription(const QByteArray &role) const

 {
 {

-    return role;
+    return QString::fromLatin1(role);

 }
 
 }
 

-QList<QPair<int, QVariant> > KItemModelBase::groups() const
+QList<QPair<int, QVariant>> KItemModelBase::groups() const

 {
 {

-    return QList<QPair<int, QVariant> >();
+    return QList<QPair<int, QVariant>>();

 }
 
 bool KItemModelBase::setExpanded(int index, bool expanded)
 }
 
 bool KItemModelBase::setExpanded(int index, bool expanded)


@@ -109,13 +109,13 @@ int KItemModelBase::expandedParentsCount(int index) const
     return 0;
 }
 
     return 0;
 }
 

-QMimeData* KItemModelBase::createMimeData(const KItemSet& indexes) const
+QMimeData *KItemModelBase::createMimeData(const KItemSet &indexes) const

 {
     Q_UNUSED(indexes)
     return nullptr;
 }
 
 {
     Q_UNUSED(indexes)
     return nullptr;
 }
 

-int KItemModelBase::indexForKeyboardSearch(const QString& text, int startFromIndex) const
+int KItemModelBase::indexForKeyboardSearch(const QString &text, int startFromIndex) const

 {
     Q_UNUSED(text)
     Q_UNUSED(startFromIndex)
 {
     Q_UNUSED(text)
     Q_UNUSED(startFromIndex)


@@ -128,6 +128,12 @@ bool KItemModelBase::supportsDropping(int index) const
     return false;
 }
 
     return false;
 }
 

+bool KItemModelBase::canEnterOnHover(int index) const
+{
+    Q_UNUSED(index)
+    return false;
+}
+

 QString KItemModelBase::blacklistItemDropEventMimeType() const
 {
     return QStringLiteral("application/x-dolphin-blacklist-drop");
 QString KItemModelBase::blacklistItemDropEventMimeType() const
 {
     return QStringLiteral("application/x-dolphin-blacklist-drop");


@@ -138,7 +144,7 @@ void KItemModelBase::onGroupedSortingChanged(bool current)
     Q_UNUSED(current)
 }
 
     Q_UNUSED(current)
 }
 

-void KItemModelBase::onSortRoleChanged(const QByteArray& current, const QByteArray& previous, bool resortItems)
+void KItemModelBase::onSortRoleChanged(const QByteArray &current, const QByteArray &previous, bool resortItems)

 {
     Q_UNUSED(current)
     Q_UNUSED(previous)
 {
     Q_UNUSED(current)
     Q_UNUSED(previous)


@@ -165,3 +171,5 @@ QUrl KItemModelBase::directory() const
 {
     return QUrl();
 }
 {
     return QUrl();
 }

+
+#include "moc_kitemmodelbase.cpp"