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

List:       kde-commits
Subject:    [kdevplatform] /: Merge branch '5.1'
From:       Friedrich W. H. Kossebau <null () kde ! org>
Date:       2017-06-30 17:32:15
Message-ID: E1dQzmB-000519-Ga () code ! kde ! org
[Download RAW message or body]

Git commit c6dd6e648481e87728fcfd4abb7f2ab01181d9d0 by Friedrich W. H. Kossebau.
Committed on 30/06/2017 at 17:30.
Pushed by kossebau into branch 'master'.

Merge branch '5.1'

# Conflicts:
#	plugins/contextbrowser/contextbrowser.cpp

M  +3    -2    language/duchain/navigation/abstractnavigationcontext.cpp
M  +2    -2    plugins/contextbrowser/contextbrowser.cpp
M  +2    -1    plugins/grepview/grepjob.cpp

https://commits.kde.org/kdevplatform/c6dd6e648481e87728fcfd4abb7f2ab01181d9d0

diff --cc language/duchain/navigation/abstractnavigationcontext.cpp
index cda8427a9,9ae6ba44d..3d2c0d4f0
--- a/language/duchain/navigation/abstractnavigationcontext.cpp
+++ b/language/duchain/navigation/abstractnavigationcontext.cpp
@@@ -39,53 -40,23 +39,56 @@@
  
  namespace KDevelop {
  
 -void AbstractNavigationContext::setTopContext(KDevelop::TopDUContextPointer \
                context) {
 -  m_topContext = context;
 +class AbstractNavigationContextPrivate
 +{
 +public:
 +  QVector<NavigationContextPointer> m_children; //Used to keep alive all children \
until this is deleted  +
 +  int m_selectedLink = 0; //The link currently selected
 +  NavigationAction m_selectedLinkAction; //Target of the currently selected link
 +
 +  bool m_shorten = false;
 +
 +  //A counter used while building the html-code to count the used links.
 +  int m_linkCount = -1;
 +  //Something else than -1 if the current position is represented by a line-number, \
not a link.  +  int m_currentLine = 0;
 +  int m_currentPositionLine = 0;
 +  QMap<QString, NavigationAction> m_links;
 +  QMap<int, int> m_linkLines; //Holds the line for each link
 +  QMap<int, NavigationAction> m_intLinks;
 +  AbstractNavigationContext* m_previousContext;
 +  QString m_prefix, m_suffix;
 +  TopDUContextPointer m_topContext;
 +
 +  QString m_currentText; //Here the text is built
 +};
 +
 +void AbstractNavigationContext::setTopContext(const TopDUContextPointer& context)
 +{
 +  d->m_topContext = context;
  }
  
 -KDevelop::TopDUContextPointer AbstractNavigationContext::topContext() const {
 -  return m_topContext;
 +TopDUContextPointer AbstractNavigationContext::topContext() const
 +{
 +  return d->m_topContext;
  }
  
 -
 -AbstractNavigationContext::AbstractNavigationContext( KDevelop::TopDUContextPointer \
                topContext, AbstractNavigationContext* previousContext)
 -  : m_selectedLink(0), m_shorten(false), m_linkCount(-1), m_currentPositionLine(0),
 -    m_previousContext(previousContext), m_topContext(topContext)
 +AbstractNavigationContext::AbstractNavigationContext(const TopDUContextPointer& \
topContext,  +                                                     \
AbstractNavigationContext* previousContext)  +  : d(new \
AbstractNavigationContextPrivate)  {
 +  d->m_previousContext = previousContext;
 +  d->m_topContext = topContext;
++
+   qRegisterMetaType<KTextEditor::Cursor>("KTextEditor::Cursor");
+   qRegisterMetaType<IDocumentation::Ptr>("IDocumentation::Ptr");
  }
  
 +AbstractNavigationContext::~AbstractNavigationContext()
 +{
 +}
 +
  void AbstractNavigationContext::addExternalHtml( const QString& text )
  {
    int lastPos = 0;
diff --cc plugins/contextbrowser/contextbrowser.cpp
index a53b39296,b3e73f388..e0f7aced8
--- a/plugins/contextbrowser/contextbrowser.cpp
+++ b/plugins/contextbrowser/contextbrowser.cpp
@@@ -343,9 -347,7 +345,7 @@@ KDevelop::ContextMenuExtension ContextB
    if(!codeContext->declaration().data())
      return menuExt;
  
-   qRegisterMetaType<KDevelop::IndexedDeclaration>("KDevelop::IndexedDeclaration");
- 
 -  menuExt.addAction(KDevelop::ContextMenuExtension::ExtensionGroup, m_findUses);
 +  menuExt.addAction(KDevelop::ContextMenuExtension::NavigationGroup, m_findUses);
  
    return menuExt;
  }


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