[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevelop] /: Adapt to changes in kdevplatform
From:       Aleix Pol <null () kde ! org>
Date:       2017-05-31 16:51:23
Message-ID: E1dG6qB-0000tN-E4 () code ! kde ! org
[Download RAW message or body]

Git commit 3a4f572234d7e8b41dc54d27fb9a295a03c1cae7 by Aleix Pol.
Committed on 31/05/2017 at 16:45.
Pushed by apol into branch 'master'.

Adapt to changes in kdevplatform

M  +1    -1    documentation/manpage/manpageplugin.cpp
M  +1    -1    documentation/manpage/manpageplugin.h
M  +1    -1    documentation/qthelp/qthelpproviderabstract.cpp
M  +1    -1    documentation/qthelp/qthelpproviderabstract.h
M  +1    -1    projectmanagers/cmake/cmakedocumentation.cpp
M  +1    -1    projectmanagers/cmake/cmakedocumentation.h
M  +1    -1    projectmanagers/cmake/icmakedocumentation.h

https://commits.kde.org/kdevelop/3a4f572234d7e8b41dc54d27fb9a295a03c1cae7

diff --git a/documentation/manpage/manpageplugin.cpp \
b/documentation/manpage/manpageplugin.cpp index 2d1757efeb..885d9eef28 100644
--- a/documentation/manpage/manpageplugin.cpp
+++ b/documentation/manpage/manpageplugin.cpp
@@ -137,7 +137,7 @@ KDevelop::IDocumentation::Ptr \
                ManPagePlugin::documentationForIdentifier(const QS
     return IDocumentation::Ptr(new ManPageDocumentation(identifier, QUrl("man:/" + \
identifier)));  }
 
-QAbstractListModel* ManPagePlugin::indexModel() const
+QAbstractItemModel* ManPagePlugin::indexModel() const
 {
     return m_model->indexList();
 }
diff --git a/documentation/manpage/manpageplugin.h \
b/documentation/manpage/manpageplugin.h index d32194aada..f5e641664f 100644
--- a/documentation/manpage/manpageplugin.h
+++ b/documentation/manpage/manpageplugin.h
@@ -39,7 +39,7 @@ public:
     explicit ManPagePlugin(QObject *parent, const QVariantList & args= \
QVariantList());  ~ManPagePlugin() override;
     KDevelop::IDocumentation::Ptr documentationForDeclaration \
                (KDevelop::Declaration* dec) const override;
-    QAbstractListModel* indexModel() const override;
+    QAbstractItemModel* indexModel() const override;
     KDevelop::IDocumentation::Ptr documentationForIndex(const QModelIndex& index) \
const override;  QIcon icon() const override;
     QString name() const override;
diff --git a/documentation/qthelp/qthelpproviderabstract.cpp \
b/documentation/qthelp/qthelpproviderabstract.cpp index 1dc3a992f3..f2cc413ef8 100644
--- a/documentation/qthelp/qthelpproviderabstract.cpp
+++ b/documentation/qthelp/qthelpproviderabstract.cpp
@@ -78,7 +78,7 @@ IDocumentation::Ptr \
QtHelpProviderAbstract::documentationForDeclaration(Declarat  return {};
 }
 
-QAbstractListModel* QtHelpProviderAbstract::indexModel() const
+QAbstractItemModel* QtHelpProviderAbstract::indexModel() const
 {
     QtHelpDocumentation::s_provider = const_cast<QtHelpProviderAbstract*>(this);
     return m_engine.indexModel();
diff --git a/documentation/qthelp/qthelpproviderabstract.h \
b/documentation/qthelp/qthelpproviderabstract.h index 0627c9fd41..e580bb59f8 100644
--- a/documentation/qthelp/qthelpproviderabstract.h
+++ b/documentation/qthelp/qthelpproviderabstract.h
@@ -39,7 +39,7 @@ public:
     KDevelop::IDocumentation::Ptr documentationForDeclaration \
(KDevelop::Declaration*) const override;  
     KDevelop::IDocumentation::Ptr documentationForIndex(const QModelIndex& idx) \
                const override;
-    QAbstractListModel* indexModel() const override;
+    QAbstractItemModel* indexModel() const override;
 
     KDevelop::IDocumentation::Ptr homePage() const override;
 
diff --git a/projectmanagers/cmake/cmakedocumentation.cpp \
b/projectmanagers/cmake/cmakedocumentation.cpp index 3f0dd26e33..263c06cf84 100644
--- a/projectmanagers/cmake/cmakedocumentation.cpp
+++ b/projectmanagers/cmake/cmakedocumentation.cpp
@@ -160,7 +160,7 @@ KDevelop::IDocumentation::Ptr \
CMakeDocumentation::documentationForIndex(const QM  return \
description(idx.data().toString(), QUrl());  }
 
-QAbstractListModel* CMakeDocumentation::indexModel() const
+QAbstractItemModel* CMakeDocumentation::indexModel() const
 {
     initializeModel();
     return m_index;
diff --git a/projectmanagers/cmake/cmakedocumentation.h \
b/projectmanagers/cmake/cmakedocumentation.h index 51a334433d..5b1e5332e4 100644
--- a/projectmanagers/cmake/cmakedocumentation.h
+++ b/projectmanagers/cmake/cmakedocumentation.h
@@ -45,7 +45,7 @@ class CMakeDocumentation : public KDevelop::IPlugin, public \
ICMakeDocumentation  
         QStringList names(Type t) const override;
         
-        QAbstractListModel* indexModel() const override;
+        QAbstractItemModel* indexModel() const override;
         KDevelop::IDocumentation::Ptr documentationForIndex(const QModelIndex& idx) \
const override;  
         QIcon icon() const override;
diff --git a/projectmanagers/cmake/icmakedocumentation.h \
b/projectmanagers/cmake/icmakedocumentation.h index 8250bd5f1c..3a69e686a4 100644
--- a/projectmanagers/cmake/icmakedocumentation.h
+++ b/projectmanagers/cmake/icmakedocumentation.h
@@ -30,7 +30,7 @@ public:
     
     virtual ~ICMakeDocumentation() {}
     virtual KDevelop::IDocumentation::Ptr description(const QString& identifier, \
                const QUrl &file) const=0;
-    virtual QStringList names(Type t) const=0;
+    virtual QVector<QString> names(Type t) const=0;
 };
 
 Q_DECLARE_INTERFACE( ICMakeDocumentation, "org.kdevelop.ICMakeDocumentation" )


[prev in list] [next in list] [prev in thread] [next in thread]