Hello community, here is the log from the commit of package kitemmodels for openSUSE:Factory checked in at 2015-03-16 09:34:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitemmodels (Old) and /work/SRC/openSUSE:Factory/.kitemmodels.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitemmodels" Changes: -------- --- /work/SRC/openSUSE:Factory/kitemmodels/kitemmodels.changes 2015-02-16 17:31:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kitemmodels.new/kitemmodels.changes 2015-03-16 09:34:42.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Mar 7 16:58:59 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.8.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.8.0.php + +------------------------------------------------------------------- Old: ---- kitemmodels-5.7.0.tar.xz New: ---- kitemmodels-5.8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitemmodels.spec ++++++ --- /var/tmp/diff_new_pack.dkEKII/_old 2015-03-16 09:34:43.000000000 +0100 +++ /var/tmp/diff_new_pack.dkEKII/_new 2015-03-16 09:34:43.000000000 +0100 @@ -17,12 +17,12 @@ %define lname libKF5ItemModels5 -%define _tar_path 5.7 +%define _tar_path 5.8 Name: kitemmodels Version: %{_tar_path}.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.7.0 +BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 ++++++ kitemmodels-5.7.0.tar.xz -> kitemmodels-5.8.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.7.0/CMakeLists.txt new/kitemmodels-5.8.0/CMakeLists.txt --- old/kitemmodels-5.7.0/CMakeLists.txt 2015-01-23 21:40:52.000000000 +0100 +++ new/kitemmodels-5.8.0/CMakeLists.txt 2015-02-25 15:20:38.000000000 +0100 @@ -2,7 +2,7 @@ project(KItemModels) -find_package(ECM 1.7.0 REQUIRED NO_MODULE) +find_package(ECM 1.8.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -19,7 +19,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "5.7.0") # handled by release scripts +set(KF5_VERSION "5.8.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KITEMMODELS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kitemmodels_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.7.0/autotests/kdescendantsproxymodeltest.cpp new/kitemmodels-5.8.0/autotests/kdescendantsproxymodeltest.cpp --- old/kitemmodels-5.7.0/autotests/kdescendantsproxymodeltest.cpp 2015-01-23 21:40:52.000000000 +0100 +++ new/kitemmodels-5.8.0/autotests/kdescendantsproxymodeltest.cpp 2015-02-25 15:20:38.000000000 +0100 @@ -36,7 +36,7 @@ } public Q_SLOTS: - void testInsertWhenEmptyData() + void testInsertWhenEmptyData() Q_DECL_OVERRIDE { QTest::addColumn<SignalList>("signalList"); QTest::addColumn<PersistentChangeList>("changeList"); @@ -63,7 +63,7 @@ // QTest::newRow("insert03") << signalList << persistentList; } - void testInsertInRootData() + void testInsertInRootData() Q_DECL_OVERRIDE { QTest::addColumn<SignalList>("signalList"); QTest::addColumn<PersistentChangeList>("changeList"); @@ -90,7 +90,7 @@ skipTestData("insert18"); } - void testInsertInTopLevelData() + void testInsertInTopLevelData() Q_DECL_OVERRIDE { QTest::addColumn<SignalList>("signalList"); QTest::addColumn<PersistentChangeList>("changeList"); @@ -117,7 +117,7 @@ skipTestData("insert18"); } - void testInsertInSecondLevelData() + void testInsertInSecondLevelData() Q_DECL_OVERRIDE { QTest::addColumn<SignalList>("signalList"); QTest::addColumn<PersistentChangeList>("changeList"); @@ -144,7 +144,7 @@ skipTestData("insert18"); } - void testRemoveFromRootData() + void testRemoveFromRootData() Q_DECL_OVERRIDE { QTest::addColumn<SignalList>("signalList"); QTest::addColumn<PersistentChangeList>("changeList"); @@ -156,7 +156,7 @@ newRemoveTest("remove03", indexFinder, 42, 42, 43); } - void testRemoveFromTopLevelData() + void testRemoveFromTopLevelData() Q_DECL_OVERRIDE { QTest::addColumn<SignalList>("signalList"); QTest::addColumn<PersistentChangeList>("changeList"); @@ -168,7 +168,7 @@ newRemoveTest("remove03", indexFinder, 36, 36, 43); } - void testRemoveFromSecondLevelData() + void testRemoveFromSecondLevelData() Q_DECL_OVERRIDE { QTest::addColumn<SignalList>("signalList"); QTest::addColumn<PersistentChangeList>("changeList"); @@ -180,32 +180,32 @@ newRemoveTest("remove03", indexFinder, 31, 31, 43); } - void testMoveFromRootData() + void testMoveFromRootData() Q_DECL_OVERRIDE { dummyTestData(); } - void testMoveFromTopLevelData() + void testMoveFromTopLevelData() Q_DECL_OVERRIDE { dummyTestData(); } - void testMoveFromSecondLevelData() + void testMoveFromSecondLevelData() Q_DECL_OVERRIDE { dummyTestData(); } - void testModifyInRootData() + void testModifyInRootData() Q_DECL_OVERRIDE { dummyTestData(); } - void testModifyInTopLevelData() + void testModifyInTopLevelData() Q_DECL_OVERRIDE { dummyTestData(); } - void testModifyInSecondLevelData() + void testModifyInSecondLevelData() Q_DECL_OVERRIDE { dummyTestData(); } @@ -228,7 +228,7 @@ } protected: - /* reimp */ QAbstractProxyModel *getProxy() + QAbstractProxyModel *getProxy() Q_DECL_OVERRIDE { return new KDescendantsProxyModel(this); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.7.0/autotests/kselectionproxymodeltest.cpp new/kitemmodels-5.8.0/autotests/kselectionproxymodeltest.cpp --- old/kitemmodels-5.7.0/autotests/kselectionproxymodeltest.cpp 2015-01-23 21:40:52.000000000 +0100 +++ new/kitemmodels-5.8.0/autotests/kselectionproxymodeltest.cpp 2015-02-25 15:20:38.000000000 +0100 @@ -57,58 +57,58 @@ return _filterBehaviour; } - void testInsertWhenEmptyData() + void testInsertWhenEmptyData() Q_DECL_OVERRIDE { noop_testInsertWhenEmptyData(); } - void testInsertInRootData() + void testInsertInRootData() Q_DECL_OVERRIDE { noop_testInsertInRootData(); } - void testInsertInTopLevelData() + void testInsertInTopLevelData() Q_DECL_OVERRIDE { noop_testInsertInTopLevelData(); } - void testInsertInSecondLevelData() + void testInsertInSecondLevelData() Q_DECL_OVERRIDE { noop_testInsertInSecondLevelData(); } - void testRemoveFromRootData() + void testRemoveFromRootData() Q_DECL_OVERRIDE { noop_testRemoveFromRootData(); } - void testRemoveFromTopLevelData() + void testRemoveFromTopLevelData() Q_DECL_OVERRIDE { noop_testRemoveFromTopLevelData(); } - void testRemoveFromSecondLevelData() + void testRemoveFromSecondLevelData() Q_DECL_OVERRIDE { noop_testRemoveFromSecondLevelData(); } - void testMoveFromRootData() + void testMoveFromRootData() Q_DECL_OVERRIDE { noselection_testMoveData(); } - void testMoveFromTopLevelData() + void testMoveFromTopLevelData() Q_DECL_OVERRIDE { noselection_testMoveData(); } - void testMoveFromSecondLevelData() + void testMoveFromSecondLevelData() Q_DECL_OVERRIDE { noselection_testMoveData(); } - void testModifyInRootData() + void testModifyInRootData() Q_DECL_OVERRIDE { noop_testModifyInRootData(); } - void testModifyInTopLevelData() + void testModifyInTopLevelData() Q_DECL_OVERRIDE { noop_testModifyInTopLevelData(); } - void testModifyInSecondLevelData() + void testModifyInSecondLevelData() Q_DECL_OVERRIDE { noop_testModifyInSecondLevelData(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.7.0/autotests/proxymodeltestsuite/dynamictreemodel.h new/kitemmodels-5.8.0/autotests/proxymodeltestsuite/dynamictreemodel.h --- old/kitemmodels-5.7.0/autotests/proxymodeltestsuite/dynamictreemodel.h 2015-01-23 21:40:52.000000000 +0100 +++ new/kitemmodels-5.8.0/autotests/proxymodeltestsuite/dynamictreemodel.h 2015-02-25 15:20:38.000000000 +0100 @@ -47,21 +47,21 @@ explicit DynamicTreeModel(QObject *parent = 0); - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; - QModelIndex parent(const QModelIndex &index) const; - int rowCount(const QModelIndex &index = QModelIndex()) const; - int columnCount(const QModelIndex &index = QModelIndex()) const; - - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); - - bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); - Qt::ItemFlags flags(const QModelIndex &index) const; - Qt::DropActions supportedDropActions() const; - QStringList mimeTypes() const; - QMimeData *mimeData(const QModelIndexList &indexes) const; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE; + + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + + bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; + Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; + QStringList mimeTypes() const Q_DECL_OVERRIDE; + QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; QModelIndexList match(const QModelIndex &start, int role, const QVariant &value, int hits = 1, - Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchWrap)) const; + Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchWrap)) const Q_DECL_OVERRIDE; void clear(); QList<int> indexToPath(const QModelIndex &idx) const; @@ -231,7 +231,7 @@ void interpret(const QString &treeString); - virtual void doCommand(); + void doCommand() Q_DECL_OVERRIDE; void doInsertTree(const QModelIndex &parent); protected: @@ -251,7 +251,7 @@ explicit ModelInsertAndRemoveQueuedCommand(DynamicTreeModel *model, QObject *parent = 0); virtual ~ModelInsertAndRemoveQueuedCommand() {} - virtual void doCommand(); + void doCommand() Q_DECL_OVERRIDE; Q_SIGNALS: void beginInsertRows(const QModelIndex &parent, int start, int end); @@ -276,7 +276,7 @@ explicit ModelRemoveCommand(DynamicTreeModel *model, QObject *parent = 0); virtual ~ModelRemoveCommand() {} - virtual void doCommand(); + void doCommand() Q_DECL_OVERRIDE; void purgeItem(qint64 parent); }; @@ -289,7 +289,7 @@ virtual ~ModelDataChangeCommand() {} - virtual void doCommand(); + void doCommand() Q_DECL_OVERRIDE; void setStartColumn(int column) { @@ -310,7 +310,7 @@ virtual bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow); - virtual void doCommand(); + void doCommand() Q_DECL_OVERRIDE; virtual void emitPostSignal(); @@ -340,9 +340,9 @@ explicit ModelMoveLayoutChangeCommand(DynamicTreeModel *model, QObject *parent); virtual ~ModelMoveLayoutChangeCommand(); - virtual bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow); + bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow) Q_DECL_OVERRIDE; - virtual void emitPostSignal(); + void emitPostSignal() Q_DECL_OVERRIDE; void setEndOfMoveSourceAncestors(const QList<int> &rows) { @@ -369,7 +369,7 @@ void setInitialTree(const QString &treeString); - /* reimp */ void doCommand(); + void doCommand() Q_DECL_OVERRIDE; private: QString m_treeString; }; @@ -390,7 +390,7 @@ void setInitialTree(const QString &treeString); - /* reimp */ void doCommand(); + void doCommand() Q_DECL_OVERRIDE; private: QString m_treeString; QList<PersistentChange> m_changes; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.7.0/autotests/proxymodeltestsuite/modeleventlogger.cpp new/kitemmodels-5.8.0/autotests/proxymodeltestsuite/modeleventlogger.cpp --- old/kitemmodels-5.7.0/autotests/proxymodeltestsuite/modeleventlogger.cpp 2015-01-23 21:40:52.000000000 +0100 +++ new/kitemmodels-5.8.0/autotests/proxymodeltestsuite/modeleventlogger.cpp 2015-02-25 15:20:38.000000000 +0100 @@ -79,23 +79,23 @@ return persistentIndexList(); } - virtual QModelIndex index(int /*row*/, int /*column*/, const QModelIndex & /*parent*/ = QModelIndex()) const + QModelIndex index(int /*row*/, int /*column*/, const QModelIndex & /*parent*/ = QModelIndex()) const Q_DECL_OVERRIDE { return QModelIndex(); } - virtual int rowCount(const QModelIndex & /*parent*/ = QModelIndex()) const + int rowCount(const QModelIndex & /*parent*/ = QModelIndex()) const Q_DECL_OVERRIDE { return 0; } - virtual QModelIndex parent(const QModelIndex & /*child*/) const + QModelIndex parent(const QModelIndex & /*child*/) const Q_DECL_OVERRIDE { return QModelIndex(); } - virtual int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const + int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const Q_DECL_OVERRIDE { return 0; } - virtual QVariant data(const QModelIndex & /*index*/, int /*role*/ = Qt::DisplayRole) const + QVariant data(const QModelIndex & /*index*/, int /*role*/ = Qt::DisplayRole) const Q_DECL_OVERRIDE { return QVariant(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.7.0/autotests/proxymodeltestsuite/modelselector.h new/kitemmodels-5.8.0/autotests/proxymodeltestsuite/modelselector.h --- old/kitemmodels-5.7.0/autotests/proxymodeltestsuite/modelselector.h 2015-01-23 21:40:52.000000000 +0100 +++ new/kitemmodels-5.8.0/autotests/proxymodeltestsuite/modelselector.h 2015-02-25 15:20:38.000000000 +0100 @@ -60,67 +60,67 @@ public Q_SLOTS: void rowsInserted(const QModelIndex &parent, int start, int end); - void testInsertWhenEmptyData() + void testInsertWhenEmptyData() Q_DECL_OVERRIDE { dummyTestData(); } - void testInsertInRootData() + void testInsertInRootData() Q_DECL_OVERRIDE { dummyTestData(); } - void testInsertInTopLevelData() + void testInsertInTopLevelData() Q_DECL_OVERRIDE { dummyTestData(); } - void testInsertInSecondLevelData() + void testInsertInSecondLevelData() Q_DECL_OVERRIDE { dummyTestData(); } - void testRemoveFromRootData() + void testRemoveFromRootData() Q_DECL_OVERRIDE { dummyTestData(); } - void testRemoveFromTopLevelData() + void testRemoveFromTopLevelData() Q_DECL_OVERRIDE { dummyTestData(); } - void testRemoveFromSecondLevelData() + void testRemoveFromSecondLevelData() Q_DECL_OVERRIDE { dummyTestData(); } - void testMoveFromRootData() + void testMoveFromRootData() Q_DECL_OVERRIDE { dummyTestData(); } - void testMoveFromTopLevelData() + void testMoveFromTopLevelData() Q_DECL_OVERRIDE { dummyTestData(); } - void testMoveFromSecondLevelData() + void testMoveFromSecondLevelData() Q_DECL_OVERRIDE { dummyTestData(); } - void testModifyInRootData() + void testModifyInRootData() Q_DECL_OVERRIDE { dummyTestData(); } - void testModifyInTopLevelData() + void testModifyInTopLevelData() Q_DECL_OVERRIDE { dummyTestData(); } - void testModifyInSecondLevelData() + void testModifyInSecondLevelData() Q_DECL_OVERRIDE { dummyTestData(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.7.0/autotests/proxymodeltestsuite/proxymodeltest.h new/kitemmodels-5.8.0/autotests/proxymodeltestsuite/proxymodeltest.h --- old/kitemmodels-5.7.0/autotests/proxymodeltestsuite/proxymodeltest.h 2015-01-23 21:40:52.000000000 +0100 +++ new/kitemmodels-5.8.0/autotests/proxymodeltestsuite/proxymodeltest.h 2015-02-25 15:20:38.000000000 +0100 @@ -176,22 +176,22 @@ } Q_SIGNALS: - void testInsertWhenEmptyData(); - void testInsertInRootData(); - void testInsertInTopLevelData(); - void testInsertInSecondLevelData(); - - void testRemoveFromRootData(); - void testRemoveFromTopLevelData(); - void testRemoveFromSecondLevelData(); - - void testMoveFromRootData(); - void testMoveFromTopLevelData(); - void testMoveFromSecondLevelData(); - - void testModifyInRootData(); - void testModifyInTopLevelData(); - void testModifyInSecondLevelData(); + void testInsertWhenEmptyData() Q_DECL_OVERRIDE; + void testInsertInRootData() Q_DECL_OVERRIDE; + void testInsertInTopLevelData() Q_DECL_OVERRIDE; + void testInsertInSecondLevelData() Q_DECL_OVERRIDE; + + void testRemoveFromRootData() Q_DECL_OVERRIDE; + void testRemoveFromTopLevelData() Q_DECL_OVERRIDE; + void testRemoveFromSecondLevelData() Q_DECL_OVERRIDE; + + void testMoveFromRootData() Q_DECL_OVERRIDE; + void testMoveFromTopLevelData() Q_DECL_OVERRIDE; + void testMoveFromSecondLevelData() Q_DECL_OVERRIDE; + + void testModifyInRootData() Q_DECL_OVERRIDE; + void testModifyInTopLevelData() Q_DECL_OVERRIDE; + void testModifyInSecondLevelData() Q_DECL_OVERRIDE; protected Q_SLOTS: void testMappings(); @@ -208,119 +208,119 @@ void testSourceReset(); void testDestroyModel(); - void testInsertWhenEmpty_data() + void testInsertWhenEmpty_data() Q_DECL_OVERRIDE { testInsertWhenEmptyData(); } - void testInsertWhenEmpty() + void testInsertWhenEmpty() Q_DECL_OVERRIDE { doTest(); } - void testInsertInRoot_data() + void testInsertInRoot_data() Q_DECL_OVERRIDE { testInsertInRootData(); } - void testInsertInRoot() + void testInsertInRoot() Q_DECL_OVERRIDE { doTest(); } - void testInsertInTopLevel_data() + void testInsertInTopLevel_data() Q_DECL_OVERRIDE { testInsertInTopLevelData(); } - void testInsertInTopLevel() + void testInsertInTopLevel() Q_DECL_OVERRIDE { doTest(); } - void testInsertInSecondLevel_data() + void testInsertInSecondLevel_data() Q_DECL_OVERRIDE { testInsertInSecondLevelData(); } - void testInsertInSecondLevel() + void testInsertInSecondLevel() Q_DECL_OVERRIDE { doTest(); } - void testRemoveFromRoot_data() + void testRemoveFromRoot_data() Q_DECL_OVERRIDE { testRemoveFromRootData(); } - void testRemoveFromRoot() + void testRemoveFromRoot() Q_DECL_OVERRIDE { doTest(); } - void testRemoveFromTopLevel_data() + void testRemoveFromTopLevel_data() Q_DECL_OVERRIDE { testRemoveFromTopLevelData(); } - void testRemoveFromTopLevel() + void testRemoveFromTopLevel() Q_DECL_OVERRIDE { doTest(); } - void testRemoveFromSecondLevel_data() + void testRemoveFromSecondLevel_data() Q_DECL_OVERRIDE { testRemoveFromSecondLevelData(); } - void testRemoveFromSecondLevel() + void testRemoveFromSecondLevel() Q_DECL_OVERRIDE { doTest(); } - void testMoveFromRoot_data() + void testMoveFromRoot_data() Q_DECL_OVERRIDE { testMoveFromRootData(); } - void testMoveFromRoot() + void testMoveFromRoot() Q_DECL_OVERRIDE { doTest(); } - void testMoveFromTopLevel_data() + void testMoveFromTopLevel_data() Q_DECL_OVERRIDE { testMoveFromTopLevelData(); } - void testMoveFromTopLevel() + void testMoveFromTopLevel() Q_DECL_OVERRIDE { doTest(); } - void testMoveFromSecondLevel_data() + void testMoveFromSecondLevel_data() Q_DECL_OVERRIDE { testMoveFromSecondLevelData(); } - void testMoveFromSecondLevel() + void testMoveFromSecondLevel() Q_DECL_OVERRIDE { doTest(); } - void testModifyInRoot_data() + void testModifyInRoot_data() Q_DECL_OVERRIDE { testModifyInRootData(); } - void testModifyInRoot() + void testModifyInRoot() Q_DECL_OVERRIDE { doTest(); } - void testModifyInTopLevel_data() + void testModifyInTopLevel_data() Q_DECL_OVERRIDE { testModifyInTopLevelData(); } - void testModifyInTopLevel() + void testModifyInTopLevel() Q_DECL_OVERRIDE { doTest(); } - void testModifyInSecondLevel_data() + void testModifyInSecondLevel_data() Q_DECL_OVERRIDE { testModifyInSecondLevelData(); } - void testModifyInSecondLevel() + void testModifyInSecondLevel() Q_DECL_OVERRIDE { doTest(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.7.0/src/kdescendantsproxymodel.h new/kitemmodels-5.8.0/src/kdescendantsproxymodel.h --- old/kitemmodels-5.7.0/src/kdescendantsproxymodel.h 2015-01-23 21:40:52.000000000 +0100 +++ new/kitemmodels-5.8.0/src/kdescendantsproxymodel.h 2015-02-25 15:20:38.000000000 +0100 @@ -87,7 +87,7 @@ /** * Sets the source @p model of the proxy. */ - virtual void setSourceModel(QAbstractItemModel *model); + void setSourceModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; /** * @deprecated @@ -150,29 +150,29 @@ */ QString ancestorSeparator() const; - QModelIndex mapFromSource(const QModelIndex &sourceIndex) const; - QModelIndex mapToSource(const QModelIndex &proxyIndex) const; + QModelIndex mapFromSource(const QModelIndex &sourceIndex) const Q_DECL_OVERRIDE; + QModelIndex mapToSource(const QModelIndex &proxyIndex) const Q_DECL_OVERRIDE; - virtual Qt::ItemFlags flags(const QModelIndex &index) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; - virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const; - - virtual QMimeData *mimeData(const QModelIndexList &indexes) const; - virtual QStringList mimeTypes() const; - - virtual bool hasChildren(const QModelIndex &parent = QModelIndex()) const; - virtual QModelIndex index(int, int, const QModelIndex &parent = QModelIndex()) const; - virtual QModelIndex parent(const QModelIndex &) const; - virtual int columnCount(const QModelIndex &index = QModelIndex()) const; + Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QVariant headerData(int section, Qt::Orientation orientation, int role) const Q_DECL_OVERRIDE; + + QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; + QStringList mimeTypes() const Q_DECL_OVERRIDE; + + bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QModelIndex index(int, int, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QModelIndex parent(const QModelIndex &) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE; - virtual Qt::DropActions supportedDropActions() const; + Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; /** Reimplemented to match all descendants. */ virtual QModelIndexList match(const QModelIndex &start, int role, const QVariant &value, - int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchWrap)) const; + int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchWrap)) const Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(KDescendantsProxyModel) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.7.0/src/klinkitemselectionmodel.h new/kitemmodels-5.8.0/src/klinkitemselectionmodel.h --- old/kitemmodels-5.7.0/src/klinkitemselectionmodel.h 2015-01-23 21:40:52.000000000 +0100 +++ new/kitemmodels-5.8.0/src/klinkitemselectionmodel.h 2015-02-25 15:20:38.000000000 +0100 @@ -101,8 +101,8 @@ */ KLinkItemSelectionModel(QAbstractItemModel *targetModel, QItemSelectionModel *linkedItemSelectionModel, QObject *parent = 0); ~KLinkItemSelectionModel(); - /* reimp */ void select(const QModelIndex &index, QItemSelectionModel::SelectionFlags command); - /* reimp */ void select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command); + void select(const QModelIndex &index, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE; + void select(const QItemSelection &selection, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE; protected: KLinkItemSelectionModelPrivate *const d_ptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kitemmodels-5.7.0/src/kselectionproxymodel.h new/kitemmodels-5.8.0/src/kselectionproxymodel.h --- old/kitemmodels-5.7.0/src/kselectionproxymodel.h 2015-01-23 21:40:52.000000000 +0100 +++ new/kitemmodels-5.8.0/src/kselectionproxymodel.h 2015-02-25 15:20:38.000000000 +0100 @@ -103,7 +103,7 @@ /** reimp. */ - virtual void setSourceModel(QAbstractItemModel *sourceModel); + void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE; QItemSelectionModel *selectionModel() const; @@ -233,29 +233,29 @@ void setFilterBehavior(FilterBehavior behavior); FilterBehavior filterBehavior() const; - QModelIndex mapFromSource(const QModelIndex &sourceIndex) const; - QModelIndex mapToSource(const QModelIndex &proxyIndex) const; + QModelIndex mapFromSource(const QModelIndex &sourceIndex) const Q_DECL_OVERRIDE; + QModelIndex mapToSource(const QModelIndex &proxyIndex) const Q_DECL_OVERRIDE; - QItemSelection mapSelectionFromSource(const QItemSelection &selection) const; - QItemSelection mapSelectionToSource(const QItemSelection &selection) const; + QItemSelection mapSelectionFromSource(const QItemSelection &selection) const Q_DECL_OVERRIDE; + QItemSelection mapSelectionToSource(const QItemSelection &selection) const Q_DECL_OVERRIDE; - virtual Qt::ItemFlags flags(const QModelIndex &index) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; - virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; - - virtual QMimeData *mimeData(const QModelIndexList &indexes) const; - virtual QStringList mimeTypes() const; - virtual Qt::DropActions supportedDropActions() const; - virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); - - virtual bool hasChildren(const QModelIndex &parent = QModelIndex()) const; - virtual QModelIndex index(int, int, const QModelIndex & = QModelIndex()) const; - virtual QModelIndex parent(const QModelIndex &) const; - virtual int columnCount(const QModelIndex & = QModelIndex()) const; + Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + + QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; + QStringList mimeTypes() const Q_DECL_OVERRIDE; + Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; + bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; + + bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QModelIndex index(int, int, const QModelIndex & = QModelIndex()) const Q_DECL_OVERRIDE; + QModelIndex parent(const QModelIndex &) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex & = QModelIndex()) const Q_DECL_OVERRIDE; virtual QModelIndexList match(const QModelIndex &start, int role, const QVariant &value, int hits = 1, - Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchWrap)) const; + Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith | Qt::MatchWrap)) const Q_DECL_OVERRIDE; Q_SIGNALS: #if !defined(Q_MOC_RUN) && !defined(DOXYGEN_SHOULD_SKIP_THIS) && !defined(IN_IDE_PARSER) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
