Fix selection rect after porting from QFontMetrics::width()

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

diff --git a/src/kitemviews/kitemmodelbase.h b/src/kitemviews/kitemmodelbase.h
index 0aa6d187f4e28191b512483d10ae6bc01aba69bd..a6ba3f7c4ec888adb461bd5b893afc1862dda13d 100644 (file)
--- a/src/kitemviews/kitemmodelbase.h
+++ b/src/kitemviews/kitemmodelbase.h
@@ -1,8 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
  *                                                                         *
 /***************************************************************************
  *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
  *                                                                         *

- *   Based on the Itemviews NG project from Trolltech Labs:                *
- *   http://qt.gitorious.org/qt-labs/itemviews-ng                          *
+ *   Based on the Itemviews NG project from Trolltech Labs                 *

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -24,13 +23,12 @@
 #define KITEMMODELBASE_H
 
 #include "dolphin_export.h"
 #define KITEMMODELBASE_H
 
 #include "dolphin_export.h"

+#include "kitemviews/kitemrange.h"
+#include "kitemviews/kitemset.h"

 
 

-#include <kitemviews/kitemrange.h>
-#include <kitemviews/kitemset.h>
-
-#include <QUrl>

 #include <QHash>
 #include <QObject>
 #include <QHash>
 #include <QObject>

+#include <QUrl>

 #include <QVariant>
 
 class QMimeData;
 #include <QVariant>
 
 class QMimeData;


@@ -55,7 +53,7 @@ class DOLPHIN_EXPORT KItemModelBase : public QObject
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

-    KItemModelBase(QObject* parent = nullptr);
+    explicit KItemModelBase(QObject* parent = nullptr);

     explicit KItemModelBase(const QByteArray& sortRole, QObject* parent = nullptr);
     ~KItemModelBase() override;
 
     explicit KItemModelBase(const QByteArray& sortRole, QObject* parent = nullptr);
     ~KItemModelBase() override;
 


@@ -86,8 +84,9 @@ public:
      * Sets the sort-role to \a role. The method KItemModelBase::onSortRoleChanged() will be
      * called so that model-implementations can react on the sort-role change. Afterwards the
      * signal sortRoleChanged() will be emitted.
      * Sets the sort-role to \a role. The method KItemModelBase::onSortRoleChanged() will be
      * called so that model-implementations can react on the sort-role change. Afterwards the
      * signal sortRoleChanged() will be emitted.

+     * The implementation should resort only if \a resortItems is true.

      */
      */

-    void setSortRole(const QByteArray& role);
+    void setSortRole(const QByteArray& role, bool resortItems = true);

     QByteArray sortRole() const;
 
     /**
     QByteArray sortRole() const;
 
     /**


@@ -267,8 +266,9 @@ protected:
      * Usually the most efficient way is to emit a
      * itemsRemoved() signal for all items, reorder the items internally and to emit a
      * itemsInserted() signal afterwards.
      * Usually the most efficient way is to emit a
      * itemsRemoved() signal for all items, reorder the items internally and to emit a
      * itemsInserted() signal afterwards.

+     * The implementation should resort only if \a resortItems is true.

      */
      */

-    virtual void onSortRoleChanged(const QByteArray& current, const QByteArray& previous);
+    virtual void onSortRoleChanged(const QByteArray& current, const QByteArray& previous, bool resortItems = true);

 
     /**
      * Is invoked if the sort order has been changed by KItemModelBase::setSortOrder(). Allows
 
     /**
      * Is invoked if the sort order has been changed by KItemModelBase::setSortOrder(). Allows