From: Heiko Becker <heirecka@exherbo.org>
Date: Sat, 2 Dec 2017 10:00:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/Applications/17.12'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/2e6450da1cc62c0c8ad6f868becf0fa4a1f32022?hp=-c

Merge remote-tracking branch 'origin/Applications/17.12'
---

2e6450da1cc62c0c8ad6f868becf0fa4a1f32022
diff --combined CMakeLists.txt
index 5a39d6288,b594c1405..558e67613
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,14 -1,14 +1,14 @@@
  cmake_minimum_required(VERSION 3.0)
  
  # KDE Application Version, managed by release script
 -set (KDE_APPLICATIONS_VERSION_MAJOR "17")
 -set (KDE_APPLICATIONS_VERSION_MINOR "11")
 -set (KDE_APPLICATIONS_VERSION_MICRO "90")
 +set (KDE_APPLICATIONS_VERSION_MAJOR "18")
 +set (KDE_APPLICATIONS_VERSION_MINOR "03")
 +set (KDE_APPLICATIONS_VERSION_MICRO "70")
  set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
  project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION})
  
  set(QT_MIN_VERSION "5.5.0")
 -set(KF5_MIN_VERSION "5.37.0")
 +set(KF5_MIN_VERSION "5.40.0")
  set(ECM_MIN_VERSION "1.6.0")
  
  # ECM setup
@@@ -17,7 -17,7 +17,7 @@@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH
  
  include(ECMSetupVersion)
  include(ECMGenerateHeaders)
- include(ECMPackageConfigHelpers)
+ include(CMakePackageConfigHelpers)
  include(GenerateExportHeader)
  include(FeatureSummary)
  include(KDEInstallDirs)
@@@ -108,7 -108,7 +108,7 @@@ add_subdirectory(doc
  # CMake files
  set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/DolphinVcs")
  
- ecm_configure_package_config_file(
+ configure_package_config_file(
      "${CMAKE_CURRENT_SOURCE_DIR}/DolphinVcsConfig.cmake.in"
      "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfig.cmake"
      INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
diff --combined src/kitemviews/kstandarditemlistwidget.h
index b13c303bc,cb7364795..a9b832236
--- a/src/kitemviews/kstandarditemlistwidget.h
+++ b/src/kitemviews/kstandarditemlistwidget.h
@@@ -36,13 -36,13 +36,13 @@@ class DOLPHIN_EXPORT KStandardItemListW
  {
  public:
      KStandardItemListWidgetInformant();
 -    virtual ~KStandardItemListWidgetInformant();
 +    ~KStandardItemListWidgetInformant() override;
  
 -    virtual void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const Q_DECL_OVERRIDE;
 +    void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const override;
  
 -    virtual qreal preferredRoleColumnWidth(const QByteArray& role,
 +    qreal preferredRoleColumnWidth(const QByteArray& role,
                                             int index,
 -                                           const KItemListView* view) const Q_DECL_OVERRIDE;
 +                                           const KItemListView* view) const override;
  protected:
      /**
       * @return The value of the "text" role. The default implementation returns
@@@ -96,7 -96,7 +96,7 @@@ public
      };
  
      KStandardItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent);
 -    virtual ~KStandardItemListWidget();
 +    ~KStandardItemListWidget() override;
  
      void setLayout(Layout layout);
      Layout layout() const;
@@@ -104,15 -104,15 +104,15 @@@
      void setSupportsItemExpanding(bool supportsItemExpanding);
      bool supportsItemExpanding() const;
  
 -    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override;
 +    void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;
  
 -    virtual QRectF iconRect() const Q_DECL_OVERRIDE;
 -    virtual QRectF textRect() const Q_DECL_OVERRIDE;
 -    virtual QRectF textFocusRect() const Q_DECL_OVERRIDE;
 -    virtual QRectF selectionRect() const Q_DECL_OVERRIDE;
 -    virtual QRectF expansionToggleRect() const Q_DECL_OVERRIDE;
 -    virtual QRectF selectionToggleRect() const Q_DECL_OVERRIDE;
 -    virtual QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE;
 +    QRectF iconRect() const override;
 +    QRectF textRect() const override;
 +    QRectF textFocusRect() const override;
 +    QRectF selectionRect() const override;
 +    QRectF expansionToggleRect() const override;
 +    QRectF selectionToggleRect() const override;
 +    QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;
  
      static KItemListWidgetInformant* createInformant();
  
@@@ -172,22 -172,22 +172,25 @@@ protected
       */
      virtual int selectionLength(const QString& text) const;
  
 -    virtual void dataChanged(const QHash<QByteArray, QVariant>& current, const QSet<QByteArray>& roles = QSet<QByteArray>()) Q_DECL_OVERRIDE;
 -    virtual void visibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous) Q_DECL_OVERRIDE;
 -    virtual void columnWidthChanged(const QByteArray& role, qreal current, qreal previous) Q_DECL_OVERRIDE;
 -    virtual void styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) Q_DECL_OVERRIDE;
 -    virtual void hoveredChanged(bool hovered) Q_DECL_OVERRIDE;
 -    virtual void selectedChanged(bool selected) Q_DECL_OVERRIDE;
 -    virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous) Q_DECL_OVERRIDE;
 -    virtual void editedRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE;
 -    virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE;
 -    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
 -    virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE;
 -    bool event(QEvent *event) Q_DECL_OVERRIDE;
 +    void dataChanged(const QHash<QByteArray, QVariant>& current, const QSet<QByteArray>& roles = QSet<QByteArray>()) override;
 +    void visibleRolesChanged(const QList<QByteArray>& current, const QList<QByteArray>& previous) override;
 +    void columnWidthChanged(const QByteArray& role, qreal current, qreal previous) override;
 +    void styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) override;
 +    void hoveredChanged(bool hovered) override;
 +    void selectedChanged(bool selected) override;
 +    void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous) override;
 +    void editedRoleChanged(const QByteArray& current, const QByteArray& previous) override;
 +    void resizeEvent(QGraphicsSceneResizeEvent* event) override;
 +    void showEvent(QShowEvent* event) override;
 +    void hideEvent(QHideEvent* event) override;
 +    bool event(QEvent *event) override;
 +
 +public slots:
 +    void finishRoleEditing();
  
+ public slots:
+     void finishRoleEditing();
+ 
  private slots:
      void slotCutItemsChanged();
      void slotRoleEditingCanceled(const QByteArray& role, const QVariant& value);