summaryrefslogtreecommitdiff
blob: 9b15fe954825475ba3175e6168b3f9f3ad536ae1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
From: Milian Wolff <mail@milianw.de>
Date: Mon, 22 Aug 2016 10:47:26 +0000
Subject: Fix compile
X-Git-Url: http://quickgit.kde.org/?p=kdevelop.git&a=commitdiff&h=f4b5b7538be64328cf8462ee438caaac6c0907aa
---
Fix compile

BUG: 367659
---


--- a/languages/cpp/cppduchain/cppducontext.cpp
+++ b/languages/cpp/cppduchain/cppducontext.cpp
@@ -39,7 +39,8 @@
 REGISTER_DUCHAIN_ITEM_WITH_DATA(CppNormalDUContext, DUContextData);
 
 template<>
-QWidget* CppDUContext<TopDUContext>::createNavigationWidget( Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix ) const {
+QWidget* CppDUContext<TopDUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix,
+                                                            AbstractNavigationWidget::DisplayHints /*hints*/) const {
   if( decl == 0 ) {
     Path path( url().str() );
     IncludeItem i;
@@ -55,7 +56,8 @@
 }
 
 template<>
-QWidget* CppDUContext<DUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix) const {
+QWidget* CppDUContext<DUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix,
+                                                         AbstractNavigationWidget::DisplayHints /*hints*/) const {
   if( decl == 0 ) {
     if( owner() )
       return new NavigationWidget( DeclarationPointer(owner()), TopDUContextPointer(topContext ? topContext : this->topContext()), htmlPrefix, htmlSuffix );

--- a/languages/cpp/cppduchain/cppducontext.h
+++ b/languages/cpp/cppduchain/cppducontext.h
@@ -652,7 +652,8 @@
       return instantiateDeclarationAndContext( surroundingContext, source, this, info, 0, 0 );
     }
 
-    virtual QWidget* createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix) const override;
+    virtual QWidget* createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix,
+                                            KDevelop::AbstractNavigationWidget::DisplayHints hints = KDevelop::AbstractNavigationWidget::NoHints) const override;
 
     enum {
       Identity = BaseContext::Identity + 50