[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdevelop/5.3] /: Use more API style foo(), not getFoo(), for getting "foo"
From: Friedrich W. H. Kossebau <null () kde ! org>
Date: 2018-09-12 1:31:33
Message-ID: E1fzu0D-0006tm-SG () code ! kde ! org
[Download RAW message or body]
Git commit f4f15382f4ee33b9b9a58d186e3fc1e3d91fabeb by Friedrich W. H. Kossebau.
Committed on 12/09/2018 at 01:21.
Pushed by kossebau into branch '5.3'.
Use more API style foo(), not getFoo(), for getting "foo"
M +1 -1 kdevplatform/debugger/variable/variablecollection.cpp
M +9 -9 kdevplatform/language/classmodel/classmodel.cpp
M +1 -1 kdevplatform/language/classmodel/classmodel.h
M +16 -16 kdevplatform/language/classmodel/classmodelnode.cpp
M +14 -14 kdevplatform/language/classmodel/classmodelnode.h
M +7 -7 kdevplatform/language/classmodel/documentclassesfolder.cpp
M +2 -2 kdevplatform/language/classmodel/documentclassesfolder.h
M +3 -2 kdevplatform/language/codecompletion/codecompletiontesthelper.h
M +2 -2 kdevplatform/language/codegen/codedescription.cpp
M +1 -1 kdevplatform/language/codegen/templateclassgenerator.cpp
M +9 -9 kdevplatform/language/duchain/appendedlist.h
M +1 -1 kdevplatform/language/duchain/declaration.cpp
M +7 -7 kdevplatform/language/duchain/declarationid.cpp
M +4 -4 kdevplatform/language/duchain/declarationid.h
M +11 -11 kdevplatform/language/duchain/duchainutils.cpp
M +5 -5 kdevplatform/language/duchain/duchainutils.h
M +1 -1 kdevplatform/language/duchain/ducontext.cpp
M +1 -1 kdevplatform/language/duchain/functiondefinition.cpp
M +63 -63 kdevplatform/language/duchain/identifier.cpp
M +9 -9 kdevplatform/language/duchain/identifier.h
M +1 -1 kdevplatform/language/duchain/indexeddeclaration.cpp
M +1 -1 kdevplatform/language/duchain/indexedducontext.cpp
M +1 -1 kdevplatform/language/duchain/localindexeddeclaration.cpp
M +1 -1 kdevplatform/language/duchain/localindexedducontext.cpp
M +4 -4 kdevplatform/language/duchain/navigation/abstractdeclarationnavigationcontext.cpp
M +2 -2 kdevplatform/language/duchain/navigation/usescollector.cpp
M +4 -4 kdevplatform/language/duchain/persistentsymboltable.cpp
M +2 -2 kdevplatform/language/duchain/persistentsymboltable.h
M +1 -1 kdevplatform/language/duchain/problem.cpp
M +3 -3 kdevplatform/language/duchain/tests/test_duchain.cpp
M +6 -6 kdevplatform/language/duchain/topducontext.cpp
M +8 -8 kdevplatform/language/duchain/topducontextdynamicdata.cpp
M +4 -4 kdevplatform/language/duchain/topducontextdynamicdata.h
M +1 -1 kdevplatform/language/duchain/types/identifiedtype.cpp
M +5 -5 kdevplatform/language/util/basicsetrepository.h
M +29 -29 kdevplatform/language/util/setrepository.cpp
M +1 -1 kdevplatform/shell/filteredproblemstore.cpp
M +2 -2 kdevplatform/shell/problemstore.cpp
M +2 -2 kdevplatform/shell/uicontroller.cpp
M +6 -6 kdevplatform/shell/watcheddocumentset.cpp
M +7 -7 kdevplatform/shell/watcheddocumentset.h
M +11 -11 kdevplatform/shell/workingsetcontroller.cpp
M +1 -1 kdevplatform/shell/workingsetcontroller.h
M +4 -4 kdevplatform/shell/workingsets/closedworkingsetswidget.cpp
M +3 -3 kdevplatform/shell/workingsets/workingsettoolbutton.cpp
M +2 -2 kdevplatform/shell/workingsets/workingsettooltipwidget.cpp
M +1 -1 kdevplatform/shell/workingsets/workingsetwidget.cpp
M +1 -1 kdevplatform/template/filters/kdevfilters.cpp
M +1 -1 kdevplatform/util/texteditorhelpers.cpp
M +1 -1 kdevplatform/util/texteditorhelpers.h
M +2 -2 plugins/clang/codecompletion/context.cpp
M +3 -3 plugins/clang/codegen/adaptsignatureaction.cpp
M +2 -2 plugins/clang/codegen/adaptsignatureassistant.cpp
M +5 -5 plugins/clang/tests/test_duchain.cpp
M +1 -1 plugins/classbrowser/classtree.cpp
M +1 -1 plugins/contextbrowser/contextbrowser.cpp
M +1 -1 plugins/contextbrowser/contextbrowserview.cpp
M +1 -1 plugins/outlineview/outlinenode.cpp
M +3 -3 plugins/problemreporter/problemreportermodel.cpp
https://commits.kde.org/kdevelop/f4f15382f4ee33b9b9a58d186e3fc1e3d91fabeb
diff --git a/kdevplatform/debugger/variable/variablecollection.cpp \
b/kdevplatform/debugger/variable/variablecollection.cpp index cac4508c48..70cf1aad81 \
100644
--- a/kdevplatform/debugger/variable/variablecollection.cpp
+++ b/kdevplatform/debugger/variable/variablecollection.cpp
@@ -545,7 +545,7 @@ QString VariableProvider::textHint(KTextEditor::View* view, const \
KTextEditor::C w = view;
m_collection->m_activeTooltip = new VariableToolTip(w, global+QPoint(30,30), \
expression);
- m_collection->m_activeTooltip->setHandleRect(KTextEditorHelpers::getItemBoundingRect(view, \
expressionRange)); + \
m_collection->m_activeTooltip->setHandleRect(KTextEditorHelpers::itemBoundingRect(view, \
expressionRange)); return QString();
}
diff --git a/kdevplatform/language/classmodel/classmodel.cpp \
b/kdevplatform/language/classmodel/classmodel.cpp index 32614afe1f..196b493ae5 100644
--- a/kdevplatform/language/classmodel/classmodel.cpp
+++ b/kdevplatform/language/classmodel/classmodel.cpp
@@ -107,7 +107,7 @@ int ClassModel::rowCount(const QModelIndex& parent) const
if ( parent.isValid() )
node = static_cast<Node*>(parent.internalPointer());
- return node->getChildren().size();
+ return node->children().size();
}
QVariant ClassModel::data(const QModelIndex& index, int role) const
@@ -122,7 +122,7 @@ QVariant ClassModel::data(const QModelIndex& index, int role) \
const
if ( role == Qt::DecorationRole )
{
- QIcon icon = node->getCachedIcon();
+ QIcon icon = node->cachedIcon();
return icon.isNull() ? QVariant() : icon;
}
@@ -161,10 +161,10 @@ QModelIndex ClassModel::index(int row, int column, const \
QModelIndex& parent) co if ( parent.isValid() )
node = static_cast<Node*>(parent.internalPointer());
- if ( row >= node->getChildren().size() )
+ if ( row >= node->children().size() )
return QModelIndex();
- return index(node->getChildren()[row]);
+ return index(node->children()[row]);
}
QModelIndex ClassModel::parent(const QModelIndex& childIndex) const
@@ -174,10 +174,10 @@ QModelIndex ClassModel::parent(const QModelIndex& childIndex) \
const
Node* childNode = static_cast<Node*>(childIndex.internalPointer());
- if ( childNode->getParent() == m_topNode )
+ if ( childNode->parent() == m_topNode )
return QModelIndex();
- return index( childNode->getParent() );
+ return index( childNode->parent() );
}
QModelIndex ClassModel::index(ClassModelNodes::Node* a_node) const
@@ -187,7 +187,7 @@ QModelIndex ClassModel::index(ClassModelNodes::Node* a_node) \
const }
// If no parent exists, we have an invalid index (root node or not part of a \
model).
- if ( a_node->getParent() == nullptr )
+ if ( a_node->parent() == nullptr )
return QModelIndex();
return createIndex(a_node->row(), 0, a_node);
@@ -201,13 +201,13 @@ KDevelop::DUChainBase* ClassModel::duObjectForIndex(const \
QModelIndex& a_index) Node* node = static_cast<Node*>(a_index.internalPointer());
if ( IdentifierNode* identifierNode = dynamic_cast<IdentifierNode*>(node) )
- return identifierNode->getDeclaration();
+ return identifierNode->declaration();
// Non was found.
return nullptr;
}
-QModelIndex ClassModel::getIndexForIdentifier(const \
KDevelop::IndexedQualifiedIdentifier& a_id) +QModelIndex \
ClassModel::indexForIdentifier(const KDevelop::IndexedQualifiedIdentifier& a_id) {
ClassNode* node = m_allClassesNode->findClassNode(a_id);
if ( node == nullptr )
diff --git a/kdevplatform/language/classmodel/classmodel.h \
b/kdevplatform/language/classmodel/classmodel.h index 6c92cf4fad..c8e0dca2dc 100644
--- a/kdevplatform/language/classmodel/classmodel.h
+++ b/kdevplatform/language/classmodel/classmodel.h
@@ -93,7 +93,7 @@ public:
KDevelop::DUChainBase* duObjectForIndex(const QModelIndex& a_index);
/// Call this to retrieve the index for the node associated with the specified id.
- QModelIndex getIndexForIdentifier(const KDevelop::IndexedQualifiedIdentifier& \
a_id); + QModelIndex indexForIdentifier(const KDevelop::IndexedQualifiedIdentifier& \
a_id);
/// Return the model index associated with the given node.
QModelIndex index(ClassModelNodes::Node* a_node) const;
diff --git a/kdevplatform/language/classmodel/classmodelnode.cpp \
b/kdevplatform/language/classmodel/classmodelnode.cpp index 00655fdb66..4a97745bfd \
100644
--- a/kdevplatform/language/classmodel/classmodelnode.cpp
+++ b/kdevplatform/language/classmodel/classmodelnode.cpp
@@ -49,7 +49,7 @@ IdentifierNode::IdentifierNode(KDevelop::Declaration* a_decl,
{
}
-Declaration* IdentifierNode::getDeclaration()
+Declaration* IdentifierNode::declaration()
{
if ( !m_cachedDeclaration )
m_cachedDeclaration = m_indexedDeclaration.declaration();
@@ -61,7 +61,7 @@ bool IdentifierNode::getIcon(QIcon& a_resultIcon)
{
DUChainReadLocker readLock(DUChain::lock());
- Declaration* decl = getDeclaration();
+ Declaration* decl = declaration();
if ( decl )
a_resultIcon = DUChainUtils::iconForDeclaration(decl);
@@ -83,7 +83,7 @@ bool EnumNode::getIcon(QIcon& a_resultIcon)
{
DUChainReadLocker readLock(DUChain::lock());
- ClassMemberDeclaration* decl = \
dynamic_cast<ClassMemberDeclaration*>(getDeclaration()); + ClassMemberDeclaration* \
decl = dynamic_cast<ClassMemberDeclaration*>(declaration()); if ( decl == nullptr )
{
static QIcon Icon = QIcon::fromTheme(QStringLiteral("enum"));
@@ -115,7 +115,7 @@ void EnumNode::populateNode()
{
DUChainReadLocker readLock(DUChain::lock());
- Declaration* decl = getDeclaration();
+ Declaration* decl = declaration();
if ( decl->internalContext() )
foreach( Declaration* enumDecl, decl->internalContext()->localDeclarations() )
@@ -147,7 +147,7 @@ void ClassNode::populateNode()
{
if ( updateClassDeclarations() )
{
- m_cachedUrl = getDeclaration()->url();
+ m_cachedUrl = declaration()->url();
ClassModelNodesController::self().registerForChanges(m_cachedUrl, this);
}
}
@@ -159,7 +159,7 @@ void ClassNode::populateNode()
template <> inline bool qMapLessThanKey(const IndexedIdentifier &key1, const \
IndexedIdentifier &key2) {
- return key1.getIndex() < key2.getIndex();
+ return key1.index() < key2.index();
}
bool ClassNode::updateClassDeclarations()
@@ -167,7 +167,7 @@ bool ClassNode::updateClassDeclarations()
bool hadChanges = false;
SubIdentifiersMap existingIdentifiers = m_subIdentifiers;
- ClassDeclaration* klass = dynamic_cast<ClassDeclaration*>(getDeclaration());
+ ClassDeclaration* klass = dynamic_cast<ClassDeclaration*>(declaration());
if ( klass )
{
@@ -278,7 +278,7 @@ ClassNode* ClassNode::findSubClass(const \
KDevelop::IndexedQualifiedIdentifier& a if ( classNode == nullptr )
continue;
- if ( classNode->getIdentifier() == a_id )
+ if ( classNode->identifier() == a_id )
return classNode;
}
@@ -320,7 +320,7 @@ bool ClassMemberNode::getIcon(QIcon& a_resultIcon)
{
DUChainReadLocker readLock(DUChain::lock());
- ClassMemberDeclaration* decl = \
dynamic_cast<ClassMemberDeclaration*>(getDeclaration()); + ClassMemberDeclaration* \
decl = dynamic_cast<ClassMemberDeclaration*>(declaration()); if ( decl == nullptr )
return false;
@@ -391,7 +391,7 @@ void BaseClassesFolderNode::populateNode()
{
DUChainReadLocker readLock(DUChain::lock());
- ClassDeclaration* klass = dynamic_cast<ClassDeclaration*>( \
static_cast<ClassNode*>(getParent())->getDeclaration() ); + ClassDeclaration* klass \
= dynamic_cast<ClassDeclaration*>( static_cast<ClassNode*>(parent())->declaration() \
); if ( klass )
{
// I use the imports instead of the baseClasses in the ClassDeclaration because \
I need @@ -426,11 +426,11 @@ void DerivedClassesFolderNode::populateNode()
{
DUChainReadLocker readLock(DUChain::lock());
- ClassDeclaration* klass = dynamic_cast<ClassDeclaration*>( \
static_cast<ClassNode*>(getParent())->getDeclaration() ); + ClassDeclaration* klass \
= dynamic_cast<ClassDeclaration*>( static_cast<ClassNode*>(parent())->declaration() \
); if ( klass )
{
uint steps = 10000;
- const QList<Declaration*> inheriters = DUChainUtils::getInheriters(klass, steps, \
true); + const QList<Declaration*> inheriters = DUChainUtils::inheriters(klass, \
steps, true);
for (Declaration* decl : inheriters) {
addNode( new ClassNode(decl, m_model) );
@@ -490,12 +490,12 @@ struct SortNodesFunctor
{
bool operator() (Node* a_lhs, Node* a_rhs)
{
- if ( a_lhs->getScore() == a_rhs->getScore() )
+ if ( a_lhs->score() == a_rhs->score() )
{
- return a_lhs->getSortableString() < a_rhs->getSortableString();
+ return a_lhs->sortableString() < a_rhs->sortableString();
}
else
- return a_lhs->getScore() < a_rhs->getScore();
+ return a_lhs->score() < a_rhs->score();
}
};
@@ -526,7 +526,7 @@ int Node::row()
return m_parentNode->m_children.indexOf(this);
}
-QIcon ClassModelNodes::Node::getCachedIcon()
+QIcon ClassModelNodes::Node::cachedIcon()
{
// Load the cached icon if it's null.
if ( m_cachedIcon.isNull() )
diff --git a/kdevplatform/language/classmodel/classmodelnode.h \
b/kdevplatform/language/classmodel/classmodelnode.h index e4d79d23e5..008ad7f997 \
100644
--- a/kdevplatform/language/classmodel/classmodelnode.h
+++ b/kdevplatform/language/classmodel/classmodelnode.h
@@ -75,7 +75,7 @@ public: // Operations
public: // Info retrieval
/// Return the parent associated with this node.
- Node* getParent() const { return m_parentNode; }
+ Node* parent() const { return m_parentNode; }
/// Get my index in the parent node
int row();
@@ -84,21 +84,21 @@ public: // Info retrieval
QString displayName() const { return m_displayName; }
/// Returns a list of child nodes
- const QList<Node*>& getChildren() const { return m_children; }
+ const QList<Node*>& children() const { return m_children; }
/// Return an icon representation for the node.
/// @note It calls the internal getIcon and caches the result.
- QIcon getCachedIcon();
+ QIcon cachedIcon();
public: // overridables
/// Return a score when sorting the nodes.
- virtual int getScore() const = 0;
+ virtual int score() const = 0;
/// Return true if the node contains sub-nodes.
virtual bool hasChildren() const { return !m_children.empty(); }
/// We use this string when sorting items.
- virtual QString getSortableString() const { return m_displayName; }
+ virtual QString sortableString() const { return m_displayName; }
protected:
/// fill a_resultIcon with a display icon for the node.
@@ -167,7 +167,7 @@ public:
public:
/// Returns the qualified identifier for this node by going through the tree
- const KDevelop::IndexedQualifiedIdentifier& getIdentifier() const { return \
m_identifier; } + const KDevelop::IndexedQualifiedIdentifier& identifier() const { \
return m_identifier; }
public: // Node overrides
bool getIcon(QIcon& a_resultIcon) override;
@@ -175,7 +175,7 @@ public: // Node overrides
public: // Overridables
/// Return the associated declaration
/// @note DU CHAIN MUST BE LOCKED FOR READ
- virtual KDevelop::Declaration* getDeclaration();
+ virtual KDevelop::Declaration* declaration();
private:
KDevelop::IndexedQualifiedIdentifier m_identifier;
@@ -193,7 +193,7 @@ public:
EnumNode(KDevelop::Declaration* a_decl, NodesModelInterface* a_model);
public: // Node overrides
- int getScore() const override { return 102; }
+ int score() const override { return 102; }
bool getIcon(QIcon& a_resultIcon) override;
void populateNode() override;
};
@@ -213,7 +213,7 @@ public:
ClassNode* findSubClass(const KDevelop::IndexedQualifiedIdentifier& a_id);
public: // Node overrides
- int getScore() const override { return 300; }
+ int score() const override { return 300; }
void populateNode() override;
void nodeCleared() override;
bool hasChildren() const override { return true; }
@@ -249,8 +249,8 @@ public:
FunctionNode(KDevelop::Declaration* a_decl, NodesModelInterface* a_model);
public: // Node overrides
- int getScore() const override { return 400; }
- QString getSortableString() const override { return m_sortableString; }
+ int score() const override { return 400; }
+ QString sortableString() const override { return m_sortableString; }
private:
QString m_sortableString;
@@ -266,7 +266,7 @@ public:
ClassMemberNode(KDevelop::ClassMemberDeclaration* a_decl, NodesModelInterface* \
a_model);
public: // Node overrides
- int getScore() const override { return 500; }
+ int score() const override { return 500; }
bool getIcon(QIcon& a_resultIcon) override;
};
@@ -281,7 +281,7 @@ public:
public: // Node overrides
bool getIcon(QIcon& a_resultIcon) override;
- int getScore() const override { return 100; }
+ int score() const override { return 100; }
};
//////////////////////////////////////////////////////////////////////////////
@@ -295,7 +295,7 @@ public:
public: // Node overrides
bool getIcon(QIcon& a_resultIcon) override;
- int getScore() const override { return 100; }
+ int score() const override { return 100; }
};
//////////////////////////////////////////////////////////////////////////////
diff --git a/kdevplatform/language/classmodel/documentclassesfolder.cpp \
b/kdevplatform/language/classmodel/documentclassesfolder.cpp index \
ba5f46166a..f2670a9436 100644
--- a/kdevplatform/language/classmodel/documentclassesfolder.cpp
+++ b/kdevplatform/language/classmodel/documentclassesfolder.cpp
@@ -49,7 +49,7 @@ public:
public: // Node overrides
bool getIcon(QIcon& a_resultIcon) override;
- int getScore() const override { return 101; }
+ int score() const override { return 101; }
private:
/// The namespace identifier.
@@ -128,7 +128,7 @@ void DocumentClassesFolder::populateNode()
m_updateTimer->start();
}
-QSet< KDevelop::IndexedString > DocumentClassesFolder::getAllOpenDocuments()
+QSet<KDevelop::IndexedString> DocumentClassesFolder::allOpenDocuments() const
{
return m_openFiles;
}
@@ -245,7 +245,7 @@ bool DocumentClassesFolder::updateDocument(const \
KDevelop::IndexedString& a_file if ( item.kind & CodeModelItem::Namespace )
{
// This should create the namespace folder and add it to the cache.
- getNamespaceFolder(id);
+ namespaceFolder(id);
// Add to the locally created namespaces.
declaredNamespaces.insert(id);
@@ -306,7 +306,7 @@ bool DocumentClassesFolder::updateDocument(const \
KDevelop::IndexedString& a_file
if ( decls->declaration()->kind() == Declaration::Namespace )
{
// This should create the namespace folder and add it to the cache.
- parentNode = getNamespaceFolder(parentIdentifier);
+ parentNode = namespaceFolder(parentIdentifier);
// Add to the locally created namespaces.
declaredNamespaces.insert(parentIdentifier);
@@ -385,7 +385,7 @@ void \
DocumentClassesFolder::removeClassNode(ClassModelNodes::ClassNode* a_node) {
// Get the parent namespace identifier.
QualifiedIdentifier parentNamespaceIdentifier;
- if ( auto namespaceParent = \
dynamic_cast<StaticNamespaceFolderNode*>(a_node->getParent()) ) + if ( auto \
namespaceParent = dynamic_cast<StaticNamespaceFolderNode*>(a_node->parent()) ) {
parentNamespaceIdentifier = namespaceParent->qualifiedIdentifier();
}
@@ -418,7 +418,7 @@ void DocumentClassesFolder::removeEmptyNamespace(const \
QualifiedIdentifier& a_id }
}
-StaticNamespaceFolderNode* DocumentClassesFolder::getNamespaceFolder(const \
KDevelop::QualifiedIdentifier& a_identifier) +StaticNamespaceFolderNode* \
DocumentClassesFolder::namespaceFolder(const KDevelop::QualifiedIdentifier& \
a_identifier) {
// Stop condition.
if ( a_identifier.count() == 0 )
@@ -429,7 +429,7 @@ StaticNamespaceFolderNode* \
DocumentClassesFolder::getNamespaceFolder(const KDeve if ( iter == \
m_namespaces.end() ) {
// It's not in the cache - create folders up to it.
- Node* parentNode = getNamespaceFolder(a_identifier.left(-1));
+ Node* parentNode = namespaceFolder(a_identifier.left(-1));
if ( parentNode == nullptr )
parentNode = this;
diff --git a/kdevplatform/language/classmodel/documentclassesfolder.h \
b/kdevplatform/language/classmodel/documentclassesfolder.h index \
85902050cb..c591e52edf 100644
--- a/kdevplatform/language/classmodel/documentclassesfolder.h
+++ b/kdevplatform/language/classmodel/documentclassesfolder.h
@@ -54,7 +54,7 @@ protected: // Documents list handling.
void closeDocument(const KDevelop::IndexedString& a_file);
/// Returns a list of documents we have monitored.
- QSet< KDevelop::IndexedString > getAllOpenDocuments();
+ QSet<KDevelop::IndexedString> allOpenDocuments() const;
protected: // Overridables
/// Override this to filter the found classes.
@@ -141,7 +141,7 @@ private:
/// Recursively create a namespace folder for the specified identifier if it \
doesn't /// exist, cache it and return it (or just return it from the cache).
- StaticNamespaceFolderNode* getNamespaceFolder(const KDevelop::QualifiedIdentifier& \
a_identifier); + StaticNamespaceFolderNode* namespaceFolder(const \
KDevelop::QualifiedIdentifier& a_identifier);
/// Removes the given namespace identifier recursively if it's empty.
void removeEmptyNamespace(const KDevelop::QualifiedIdentifier& a_identifier);
diff --git a/kdevplatform/language/codecompletion/codecompletiontesthelper.h \
b/kdevplatform/language/codecompletion/codecompletiontesthelper.h index \
02a191a938..b3a2cdc5d9 100644
--- a/kdevplatform/language/codecompletion/codecompletiontesthelper.h
+++ b/kdevplatform/language/codecompletion/codecompletiontesthelper.h
@@ -201,11 +201,12 @@ struct InsertIntoDUChain
}
///Helper function: get a declaration based on its qualified identifier
- Declaration* getDeclaration(const QString& id) {
+ Declaration* declaration(const QString& id)
+ {
get();
if(!topContext())
return nullptr;
- return DeclarationId(IndexedQualifiedIdentifier(QualifiedIdentifier(id))).getDeclaration(topContext());
+ return DeclarationId(IndexedQualifiedIdentifier(QualifiedIdentifier(id))).declaration(topContext());
}
TopDUContext* topContext() {
diff --git a/kdevplatform/language/codegen/codedescription.cpp \
b/kdevplatform/language/codegen/codedescription.cpp index 3a942b7cb7..9950cfac02 \
100644
--- a/kdevplatform/language/codegen/codedescription.cpp
+++ b/kdevplatform/language/codegen/codedescription.cpp
@@ -117,7 +117,7 @@ FunctionDescription::FunctionDescription(const \
DeclarationPointer& declaration)
DUChainPointer<FunctionDeclaration> function = \
declaration.dynamicCast<FunctionDeclaration>(); if (function)
{
- context = DUChainUtils::getArgumentContext(declaration.data());
+ context = DUChainUtils::argumentContext(declaration.data());
}
DUChainPointer<ClassFunctionDeclaration> method = \
declaration.dynamicCast<ClassFunctionDeclaration>(); @@ -129,7 +129,7 @@ \
FunctionDescription::FunctionDescription(const DeclarationPointer& declaration) \
isVirtual = method->isVirtual(); isAbstract = method->isAbstract();
isFinal = method->isFinal();
- isOverriding = (DUChainUtils::getOverridden(method.data()) != nullptr);
+ isOverriding = (DUChainUtils::overridden(method.data()) != nullptr);
isStatic = method->isStatic();
isSlot = method->isSlot();
isSignal = method->isSignal();
diff --git a/kdevplatform/language/codegen/templateclassgenerator.cpp \
b/kdevplatform/language/codegen/templateclassgenerator.cpp index \
ad1db7a2d5..b392c05c29 100644
--- a/kdevplatform/language/codegen/templateclassgenerator.cpp
+++ b/kdevplatform/language/codegen/templateclassgenerator.cpp
@@ -285,7 +285,7 @@ void TemplateClassGenerator::addBaseClass(const QString& base)
DUChainReadLocker lock;
- PersistentSymbolTable::Declarations decl = \
PersistentSymbolTable::self().getDeclarations(IndexedQualifiedIdentifier(QualifiedIdentifier(desc.baseType)));
+ PersistentSymbolTable::Declarations decl = \
PersistentSymbolTable::self().declarations(IndexedQualifiedIdentifier(QualifiedIdentifier(desc.baseType)));
//Search for all super classes
for(PersistentSymbolTable::Declarations::Iterator it = decl.iterator(); it; \
++it)
diff --git a/kdevplatform/language/duchain/appendedlist.h \
b/kdevplatform/language/duchain/appendedlist.h index 6c3cbf5e31..0f1f3215b3 100644
--- a/kdevplatform/language/duchain/appendedlist.h
+++ b/kdevplatform/language/duchain/appendedlist.h
@@ -88,7 +88,7 @@ class TemporaryDataManager {
delete m_items.at(a);
}
- inline T& getItem(int index) {
+ inline T& item(int index) {
//For performance reasons this function does not lock the mutex, it's called \
too often and must be
//extremely fast. There is special measures in alloc() to make this safe.
Q_ASSERT(index & DynamicAppendedListMask);
@@ -96,7 +96,7 @@ class TemporaryDataManager {
return *m_items.at(index & KDevelop::DynamicAppendedListRevertMask);
}
- ///Allocates an item index, which from now on you can get using getItem, until \
you call free(..) on the index. + ///Allocates an item index, which from now on \
you can get using item(), until you call free(..) on the index.
///The returned item is not initialized and may contain random older content, so \
you should clear it after getting it for the first time int alloc() {
@@ -129,7 +129,7 @@ class TemporaryDataManager {
m_deleteLater.removeFirst();
}
- //The only function that does not lock the mutex is getItem(..), because \
that function must be very efficient. + //The only function that does not \
lock the mutex is item(..), because that function must be very \
efficient.
//Since it's only a few instructions from the moment m_items is read to \
the moment it's used, //deleting the old data after a few seconds should be safe.
m_deleteLater.append(qMakePair(now, oldItems));
@@ -249,14 +249,14 @@ class TemporaryDataManager {
#define APPENDED_LIST_COMMON(container, type, name) \
uint name ## Data; \
- unsigned int name ## Size() const { if((name ## Data & \
KDevelop::DynamicAppendedListRevertMask) == 0) return 0; if(!appendedListsDynamic()) \
return name ## Data; else return temporaryHash ## container ## name().getItem(name ## \
Data).size(); } \
- KDevVarLengthArray<type, 10>& name ## List() { name ## NeedDynamicList(); \
return temporaryHash ## container ## name().getItem(name ## Data); }\ + unsigned \
int name ## Size() const { if((name ## Data & \
KDevelop::DynamicAppendedListRevertMask) == 0) return 0; if(!appendedListsDynamic()) \
return name ## Data; else return temporaryHash ## container ## name().item(name ## \
Data).size(); } \ + KDevVarLengthArray<type, 10>& name ## List() { name ## \
NeedDynamicList(); return temporaryHash ## container ## name().item(name ## Data); }\ \
template<class T> bool name ## Equals(const T& rhs) const { unsigned int size = name \
## Size(); if(size != rhs.name ## Size()) return false; for(uint a = 0; a < size; \
++a) {if(!(name()[a] == rhs.name()[a])) return false;} return true; } \ \
template<class T> void name ## CopyFrom( const T& rhs ) { \
if(rhs.name ## Size() == 0 && (name ## Data & \
KDevelop::DynamicAppendedListRevertMask) == 0) return; \ if(appendedListsDynamic()) \
{ \ name ## NeedDynamicList(); \
- KDevVarLengthArray<type, 10>& item( temporaryHash ## container ## \
name().getItem(name ## Data) ); \ + KDevVarLengthArray<type, 10>& item( \
temporaryHash ## container ## name().item(name ## Data) ); \ item.clear(); \
\ const type* otherCurr = rhs.name(); \
const type* otherEnd = otherCurr + rhs.name ## Size(); \
@@ -275,7 +275,7 @@ class TemporaryDataManager {
Q_ASSERT(appendedListsDynamic()); \
if((name ## Data & KDevelop::DynamicAppendedListRevertMask) == 0) {\
name ## Data = temporaryHash ## container ## name().alloc();\
- Q_ASSERT(temporaryHash ## container ## name().getItem(name ## \
Data).isEmpty()); \ + Q_ASSERT(temporaryHash ## container ## \
name().item(name ## Data).isEmpty()); \ } \
} \
void name ## Initialize(bool dynamic) { name ## Data = (dynamic ? \
KDevelop::DynamicAppendedListMask : 0); } \ @@ -297,7 +297,7 @@ class \
TemporaryDataManager { const type* name() const { \
if((name ## Data & KDevelop::DynamicAppendedListRevertMask) == 0) return \
nullptr; \
if(!appendedListsDynamic()) return reinterpret_cast<const \
type*>(reinterpret_cast<const char*>(this) + classSize() + \
offsetBehindBase()); \
- else return temporaryHash ## container ## name().getItem(name ## Data).data(); \
\ + else return temporaryHash ## container ## name().item(name ## Data).data(); \
\ } \
unsigned int name ## OffsetBehind() const { return name ## Size() * sizeof(type) \
+ offsetBehindBase(); } \
template<class T> bool name ## ListChainEquals( const T& rhs ) const { return \
name ## Equals(rhs); } \ @@ -310,7 +310,7 @@ class TemporaryDataManager {
const type* name() const {\
if((name ## Data & KDevelop::DynamicAppendedListRevertMask) == 0) return \
nullptr; \
if(!appendedListsDynamic()) return reinterpret_cast<const \
type*>(reinterpret_cast<const char*>(this) + classSize() + predecessor ## \
OffsetBehind()); \
- else return temporaryHash ## container ## name().getItem(name ## Data).data(); \
\ + else return temporaryHash ## container ## name().item(name ## Data).data(); \
\ } \
unsigned int name ## OffsetBehind() const { return name ## Size() * sizeof(type) \
+ predecessor ## OffsetBehind(); } \
template<class T> bool name ## ListChainEquals( const T& rhs ) const { return \
name ## Equals(rhs) && predecessor ## ListChainEquals(rhs); } \
diff --git a/kdevplatform/language/duchain/declaration.cpp \
b/kdevplatform/language/duchain/declaration.cpp index ffd2926d4b..c443ff1c13 100644
--- a/kdevplatform/language/duchain/declaration.cpp
+++ b/kdevplatform/language/duchain/declaration.cpp
@@ -350,7 +350,7 @@ void Declaration::allocateOwnIndex() {
m_indexInTopContext = m_topContext->m_dynamicData->allocateDeclarationIndex(this, \
d_func()->m_anonymousInContext || !context() || context()->isAnonymous()); \
Q_ASSERT(m_indexInTopContext);
- if(!m_topContext->m_dynamicData->getDeclarationForIndex(m_indexInTopContext))
+ if(!m_topContext->m_dynamicData->declarationForIndex(m_indexInTopContext))
qFatal("Could not re-retrieve declaration\nindex: %d", m_indexInTopContext);
}
diff --git a/kdevplatform/language/duchain/declarationid.cpp \
b/kdevplatform/language/duchain/declarationid.cpp index a52cc0cced..fbb6cc3b3e 100644
--- a/kdevplatform/language/duchain/declarationid.cpp
+++ b/kdevplatform/language/duchain/declarationid.cpp
@@ -95,7 +95,7 @@ IndexedInstantiationInformation DeclarationId::specialization() \
const return m_specialization;
}
-KDevVarLengthArray<Declaration*> DeclarationId::getDeclarations(const TopDUContext* \
top) const +KDevVarLengthArray<Declaration*> DeclarationId::declarations(const \
TopDUContext* top) const {
KDevVarLengthArray<Declaration*> ret;
@@ -106,7 +106,7 @@ KDevVarLengthArray<Declaration*> \
DeclarationId::getDeclarations(const TopDUConte if(top) {
//Do filtering
PersistentSymbolTable::FilteredDeclarationIterator filter =
- PersistentSymbolTable::self().getFilteredDeclarations(id, \
top->recursiveImportIndices()); + \
PersistentSymbolTable::self().filteredDeclarations(id, \
top->recursiveImportIndices()); for(; filter; ++filter) {
Declaration* decl = filter->data();
if(decl && m_indirectData.additionalIdentity == \
decl->additionalIdentity()) { @@ -116,7 +116,7 @@ KDevVarLengthArray<Declaration*> \
DeclarationId::getDeclarations(const TopDUConte }
}else{
//Just accept anything
- PersistentSymbolTable::Declarations decls = \
PersistentSymbolTable::self().getDeclarations(id); + \
PersistentSymbolTable::Declarations decls = \
PersistentSymbolTable::self().declarations(id);
PersistentSymbolTable::Declarations::Iterator decl = decls.iterator();
for(; decl; ++decl) {
const IndexedDeclaration& iDecl(*decl);
@@ -151,7 +151,7 @@ KDevVarLengthArray<Declaration*> \
DeclarationId::getDeclarations(const TopDUConte return ret;
}
-Declaration* DeclarationId::getDeclaration(const TopDUContext* top, bool \
instantiateIfRequired) const +Declaration* DeclarationId::declaration(const \
TopDUContext* top, bool instantiateIfRequired) const {
Declaration* ret = nullptr;
@@ -162,7 +162,7 @@ Declaration* DeclarationId::getDeclaration(const TopDUContext* \
top, bool instant if(top) {
//Do filtering
PersistentSymbolTable::FilteredDeclarationIterator filter =
- PersistentSymbolTable::self().getFilteredDeclarations(id, \
top->recursiveImportIndices()); + \
PersistentSymbolTable::self().filteredDeclarations(id, \
top->recursiveImportIndices()); for(; filter; ++filter) {
Declaration* decl = filter->data();
if(decl && m_indirectData.additionalIdentity == \
decl->additionalIdentity()) { @@ -174,7 +174,7 @@ Declaration* \
DeclarationId::getDeclaration(const TopDUContext* top, bool instant }
}else{
//Just accept anything
- PersistentSymbolTable::Declarations decls = \
PersistentSymbolTable::self().getDeclarations(id); + \
PersistentSymbolTable::Declarations decls = \
PersistentSymbolTable::self().declarations(id);
PersistentSymbolTable::Declarations::Iterator decl = decls.iterator();
for(; decl; ++decl) {
const IndexedDeclaration& iDecl(*decl);
@@ -226,7 +226,7 @@ QualifiedIdentifier DeclarationId::qualifiedIdentifier() const
return baseIdentifier;
return m_specialization.information().applyToIdentifier(baseIdentifier);
} else {
- Declaration* decl = getDeclaration(nullptr);
+ Declaration* decl = declaration(nullptr);
if(decl)
return decl->qualifiedIdentifier();
diff --git a/kdevplatform/language/duchain/declarationid.h \
b/kdevplatform/language/duchain/declarationid.h index e5c72e2ed7..d086dbe2e9 100644
--- a/kdevplatform/language/duchain/declarationid.h
+++ b/kdevplatform/language/duchain/declarationid.h
@@ -125,7 +125,7 @@ class KDEVPLATFORMLANGUAGE_EXPORT DeclarationId {
if(m_isDirect)
return KDevHash() << m_directData.hash() << m_specialization.index();
else
- return KDevHash() << m_indirectData.identifier.getIndex() << \
m_indirectData.additionalIdentity << m_specialization.index(); + return \
KDevHash() << m_indirectData.identifier.index() << m_indirectData.additionalIdentity \
<< m_specialization.index(); }
/**
@@ -136,13 +136,13 @@ class KDEVPLATFORMLANGUAGE_EXPORT DeclarationId {
* \param instantiateIfRequired Whether the declaration should be instantiated \
if required
* \returns the referenced Declaration, or null if none was found.
* */
- Declaration* getDeclaration(const TopDUContext* context, bool \
instantiateIfRequired = true) const; + Declaration* declaration(const \
TopDUContext* context, bool instantiateIfRequired = true) const;
/**
- * Same as getDeclaration(..), but returns all matching declarations if there \
are multiple. + * Same as declaration(..), but returns all matching declarations \
if there are multiple.
* This also returns found forward-declarations.
*/
- KDevVarLengthArray<Declaration*> getDeclarations(const TopDUContext* context) \
const; + KDevVarLengthArray<Declaration*> declarations(const TopDUContext* \
context) const;
/**
* Set the specialization index (see class documentation).
diff --git a/kdevplatform/language/duchain/duchainutils.cpp \
b/kdevplatform/language/duchain/duchainutils.cpp index ebc0a8c8c6..05dc4ca11f 100644
--- a/kdevplatform/language/duchain/duchainutils.cpp
+++ b/kdevplatform/language/duchain/duchainutils.cpp
@@ -369,7 +369,7 @@ Declaration* DUChainUtils::declarationInLine(const \
KTextEditor::Cursor& _cursor, foreach(Declaration* decl, ctx->localDeclarations()) {
if(decl->range().start.line == cursor.line)
return decl;
- DUContext* funCtx = getFunctionContext(decl);
+ DUContext* funCtx = functionContext(decl);
if(funCtx && funCtx->range().contains(cursor))
return decl;
}
@@ -432,7 +432,7 @@ void DUChainUtils::collectItems( DUContext* context, \
DUChainItemFilter& filter ) }
}
-KDevelop::DUContext* DUChainUtils::getArgumentContext(KDevelop::Declaration* decl) {
+KDevelop::DUContext* DUChainUtils::argumentContext(KDevelop::Declaration* decl) {
DUContext* internal = decl->internalContext();
if( !internal )
return nullptr;
@@ -463,7 +463,7 @@ QList<IndexedDeclaration> \
DUChainUtils::collectAllVersions(Declaration* decl) { return ret;
}
-static QList<Declaration*> getInheritersInternal(const Declaration* decl, uint& \
maxAllowedSteps, bool collectVersions) +static QList<Declaration*> \
inheritersInternal(const Declaration* decl, uint& maxAllowedSteps, bool \
collectVersions) {
QList<Declaration*> ret;
@@ -499,7 +499,7 @@ static QList<Declaration*> getInheritersInternal(const \
Declaration* decl, uint& ++maxAllowedSteps;
if(allDeclarations[a].data() && allDeclarations[a].data() != decl) {
- ret += getInheritersInternal(allDeclarations[a].data(), maxAllowedSteps, \
false); + ret += inheritersInternal(allDeclarations[a].data(), \
maxAllowedSteps, false); }
if(maxAllowedSteps == 0)
@@ -510,9 +510,9 @@ static QList<Declaration*> getInheritersInternal(const \
Declaration* decl, uint& return ret;
}
-QList<Declaration*> DUChainUtils::getInheriters(const Declaration* decl, uint& \
maxAllowedSteps, bool collectVersions) +QList<Declaration*> \
DUChainUtils::inheriters(const Declaration* decl, uint& maxAllowedSteps, bool \
collectVersions) {
- auto inheriters = getInheritersInternal(decl, maxAllowedSteps, collectVersions);
+ auto inheriters = inheritersInternal(decl, maxAllowedSteps, collectVersions);
// remove duplicates
std::sort(inheriters.begin(), inheriters.end());
@@ -521,7 +521,7 @@ QList<Declaration*> DUChainUtils::getInheriters(const \
Declaration* decl, uint& m return inheriters;
}
-QList<Declaration*> DUChainUtils::getOverriders(const Declaration* currentClass, \
const Declaration* overriddenDeclaration, uint& maxAllowedSteps) { \
+QList<Declaration*> DUChainUtils::overriders(const Declaration* currentClass, const \
Declaration* overriddenDeclaration, uint& maxAllowedSteps) { QList<Declaration*> \
ret;
if(maxAllowedSteps == 0)
@@ -530,8 +530,8 @@ QList<Declaration*> DUChainUtils::getOverriders(const \
Declaration* currentClass, if(currentClass != \
overriddenDeclaration->context()->owner() && currentClass->internalContext()) ret += \
currentClass->internalContext()->findLocalDeclarations(overriddenDeclaration->identifier(), \
CursorInRevision::invalid(), currentClass->topContext(), \
overriddenDeclaration->abstractType());
- foreach(Declaration* inheriter, getInheriters(currentClass, maxAllowedSteps))
- ret += getOverriders(inheriter, overriddenDeclaration, maxAllowedSteps);
+ foreach(Declaration* inheriter, inheriters(currentClass, maxAllowedSteps))
+ ret += overriders(inheriter, overriddenDeclaration, maxAllowedSteps);
return ret;
}
@@ -574,7 +574,7 @@ uint DUChainUtils::contextCountUses(DUContext* context, \
Declaration* declaration return countUses(context, \
context->topContext()->indexForUsedDeclaration(declaration, false)); }
-Declaration* DUChainUtils::getOverridden(const Declaration* decl) {
+Declaration* DUChainUtils::overridden(const Declaration* decl) {
const ClassFunctionDeclaration* classFunDecl = dynamic_cast<const \
ClassFunctionDeclaration*>(decl); if(!classFunDecl || !classFunDecl->isVirtual())
return nullptr;
@@ -597,7 +597,7 @@ Declaration* DUChainUtils::getOverridden(const Declaration* decl) \
{ return nullptr;
}
-DUContext* DUChainUtils::getFunctionContext(Declaration* decl) {
+DUContext* DUChainUtils::functionContext(Declaration* decl) {
DUContext* functionContext = decl->internalContext();
if(functionContext && functionContext->type() != DUContext::Function) {
foreach(const DUContext::Import& import, \
functionContext->importedParentContexts()) {
diff --git a/kdevplatform/language/duchain/duchainutils.h \
b/kdevplatform/language/duchain/duchainutils.h index b68d6e3f83..5d6d15471f 100644
--- a/kdevplatform/language/duchain/duchainutils.h
+++ b/kdevplatform/language/duchain/duchainutils.h
@@ -95,7 +95,7 @@ namespace DUChainUtils {
///Re-implement DUChainItemFilter to do something with the items.
KDEVPLATFORMLANGUAGE_EXPORT void collectItems( DUContext* context, \
DUChainItemFilter& filter );
- KDEVPLATFORMLANGUAGE_EXPORT DUContext* getArgumentContext(Declaration* decl);
+ KDEVPLATFORMLANGUAGE_EXPORT DUContext* argumentContext(Declaration* decl);
///Uses the persistent symbol table to find all occurrences of this declaration, \
based on its identifier. ///The result should be filtered to make sure that the \
declaration is actually useful to you. @@ -106,11 +106,11 @@ namespace DUChainUtils {
/// versions of this class, and then get the inheriters from \
them all together. This is needed for C++. ///@param maxAllowedSteps The maximum of \
steps allowed. If this is zero in the end, this means the search has been stopped \
with the max. reached /// If you really \
want _all_ inheriters, you should initialize it with a very large \
value.
- KDEVPLATFORMLANGUAGE_EXPORT QList<Declaration*> getInheriters(const Declaration* \
decl, uint& maxAllowedSteps, bool collectVersions = true); + \
KDEVPLATFORMLANGUAGE_EXPORT QList<Declaration*> inheriters(const Declaration* decl, \
uint& maxAllowedSteps, bool collectVersions = true);
///Gets all functions that override the function @p overriddenDeclaration, \
starting the search at @p currentClass ///@param maxAllowedSteps The maximum of \
steps allowed. If this is zero in the end, this means the search has been stopped \
with the max. reached
- KDEVPLATFORMLANGUAGE_EXPORT QList<Declaration*> getOverriders(const Declaration* \
currentClass, const Declaration* overriddenDeclaration, uint& maxAllowedSteps); + \
KDEVPLATFORMLANGUAGE_EXPORT QList<Declaration*> overriders(const Declaration* \
currentClass, const Declaration* overriddenDeclaration, uint& maxAllowedSteps);
///Returns whether the given context or any of its child-contexts contain a use of \
the given declaration. This is relatively expensive. KDEVPLATFORMLANGUAGE_EXPORT \
bool contextHasUse(DUContext* context, Declaration* declaration); @@ -119,11 +119,11 \
@@ namespace DUChainUtils { KDEVPLATFORMLANGUAGE_EXPORT uint \
contextCountUses(DUContext* context, Declaration* declaration);
///Returns the declaration that is overridden by the given one, or zero.
- KDEVPLATFORMLANGUAGE_EXPORT Declaration* getOverridden(const Declaration* decl);
+ KDEVPLATFORMLANGUAGE_EXPORT Declaration* overridden(const Declaration* decl);
///If the given declaration is a function-declaration, this follows the \
context-structure up to the function-context that contains the arguments, ///and \
returns it.
- KDEVPLATFORMLANGUAGE_EXPORT DUContext* getFunctionContext(Declaration* decl);
+ KDEVPLATFORMLANGUAGE_EXPORT DUContext* functionContext(Declaration* decl);
KDEVPLATFORMLANGUAGE_EXPORT QVector<KDevelop::Problem::Ptr> \
allProblemsForContext(const ReferencedTopDUContext& top); }
diff --git a/kdevplatform/language/duchain/ducontext.cpp \
b/kdevplatform/language/duchain/ducontext.cpp index c2b972f047..784cd7a347 100644
--- a/kdevplatform/language/duchain/ducontext.cpp
+++ b/kdevplatform/language/duchain/ducontext.cpp
@@ -1633,7 +1633,7 @@ DUContext::Import::Import(const DeclarationId& id, const \
CursorInRevision& _posi
DUContext* DUContext::Import::context(const TopDUContext* topContext, bool \
instantiateIfRequired) const { if(m_declaration.isValid()) {
- Declaration* decl = m_declaration.getDeclaration(topContext, \
instantiateIfRequired); + Declaration* decl = \
m_declaration.declaration(topContext, instantiateIfRequired);
//This first case rests on the assumption that no context will ever import a \
function's expression context
//More accurately, that no specialized or cross-topContext imports will, but if \
the former assumption fails the latter will too
if (AbstractFunctionDeclaration *functionDecl = \
dynamic_cast<AbstractFunctionDeclaration*>(decl))
diff --git a/kdevplatform/language/duchain/functiondefinition.cpp \
b/kdevplatform/language/duchain/functiondefinition.cpp index 60ee0e6443..103152520e \
100644
--- a/kdevplatform/language/duchain/functiondefinition.cpp
+++ b/kdevplatform/language/duchain/functiondefinition.cpp
@@ -48,7 +48,7 @@ Declaration* FunctionDefinition::declaration(const TopDUContext* \
topContext) con {
ENSURE_CAN_READ
- const KDevVarLengthArray<Declaration*> declarations = \
d_func()->m_declaration.getDeclarations(topContext ? topContext : \
this->topContext()); + const KDevVarLengthArray<Declaration*> declarations = \
d_func()->m_declaration.declarations(topContext ? topContext : this->topContext());
for (Declaration* decl : declarations) {
if(!dynamic_cast<FunctionDefinition*>(decl))
diff --git a/kdevplatform/language/duchain/identifier.cpp \
b/kdevplatform/language/duchain/identifier.cpp index 16815c05cf..3a80e32725 100644
--- a/kdevplatform/language/duchain/identifier.cpp
+++ b/kdevplatform/language/duchain/identifier.cpp
@@ -179,7 +179,7 @@ static const ConstantIdentifierPrivate* \
emptyConstantIdentifierPrivate()
bool IndexedIdentifier::isEmpty() const
{
- return index == emptyConstantIdentifierPrivateIndex();
+ return m_index == emptyConstantIdentifierPrivateIndex();
}
@@ -257,7 +257,7 @@ public:
| (m_isExpression << 1);
hash << bitfields << identifiersSize();
FOREACH_FUNCTION_STATIC( const IndexedIdentifier& identifier, identifiers ) {
- hash << identifier.getIndex();
+ hash << identifier.index();
}
m_hash = hash;
@@ -1150,7 +1150,7 @@ uint IndexedTypeIdentifier::hash() const
| (m_isVolatile << 3)
| (m_pointerDepth << 4)
| (m_pointerConstMask << 9);
- return KDevHash() << m_identifier.getIndex() << bitfields;
+ return KDevHash() << m_identifier.index() << bitfields;
}
bool IndexedTypeIdentifier::operator==(const IndexedTypeIdentifier& rhs) const
@@ -1280,43 +1280,43 @@ IndexedTypeIdentifier::IndexedTypeIdentifier(const QString& \
identifier, bool isE { }
IndexedIdentifier::IndexedIdentifier()
- : index(emptyConstantIdentifierPrivateIndex())
+ : m_index(emptyConstantIdentifierPrivateIndex())
{
if(shouldDoDUChainReferenceCounting(this)) {
QMutexLocker lock(identifierRepository()->mutex());
- increase(identifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + increase(identifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); }
}
IndexedIdentifier::IndexedIdentifier(const Identifier& id)
- : index(id.index())
+ : m_index(id.index())
{
if(shouldDoDUChainReferenceCounting(this)) {
QMutexLocker lock(identifierRepository()->mutex());
- increase(identifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + increase(identifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); }
}
IndexedIdentifier::IndexedIdentifier(const IndexedIdentifier& rhs)
- : index(rhs.index)
+ : m_index(rhs.m_index)
{
if(shouldDoDUChainReferenceCounting(this)) {
QMutexLocker lock(identifierRepository()->mutex());
- increase(identifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + increase(identifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); }
}
IndexedIdentifier::IndexedIdentifier(IndexedIdentifier&& rhs) Q_DECL_NOEXCEPT
- : index(rhs.index)
+ : m_index(rhs.m_index)
{
- rhs.index = emptyConstantIdentifierPrivateIndex();
+ rhs.m_index = emptyConstantIdentifierPrivateIndex();
}
IndexedIdentifier::~IndexedIdentifier()
{
if(shouldDoDUChainReferenceCounting(this)) {
QMutexLocker lock(identifierRepository()->mutex());
- decrease(identifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + decrease(identifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); }
}
@@ -1324,14 +1324,14 @@ IndexedIdentifier& IndexedIdentifier::operator=(const \
Identifier& id) {
if(shouldDoDUChainReferenceCounting(this)) {
QMutexLocker lock(identifierRepository()->mutex());
- decrease(identifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + decrease(identifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); }
- index = id.index();
+ m_index = id.index();
if(shouldDoDUChainReferenceCounting(this)) {
QMutexLocker lock(identifierRepository()->mutex());
- increase(identifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + increase(identifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); }
return *this;
}
@@ -1342,22 +1342,22 @@ IndexedIdentifier& \
IndexedIdentifier::operator=(IndexedIdentifier&& rhs) Q_DECL_ QMutexLocker \
lock(identifierRepository()->mutex()); ifDebug( qCDebug(LANGUAGE) << "decreasing"; )
- decrease(identifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + decrease(identifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); } else if (shouldDoDUChainReferenceCounting(&rhs)) {
QMutexLocker lock(identifierRepository()->mutex());
ifDebug( qCDebug(LANGUAGE) << "decreasing"; )
- decrease(identifierRepository()->dynamicItemFromIndexSimple(rhs.index)->m_refCount, \
rhs.index); + decrease(identifierRepository()->dynamicItemFromIndexSimple(rhs.m_index)->m_refCount, \
rhs.m_index); }
- index = rhs.index;
- rhs.index = emptyConstantIdentifierPrivateIndex();
+ m_index = rhs.m_index;
+ rhs.m_index = emptyConstantIdentifierPrivateIndex();
if(shouldDoDUChainReferenceCounting(this) && \
!(shouldDoDUChainReferenceCounting(&rhs))) { QMutexLocker \
lock(identifierRepository()->mutex()); ifDebug( qCDebug(LANGUAGE) << "increasing"; )
- increase(identifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + increase(identifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); }
return *this;
@@ -1367,51 +1367,51 @@ IndexedIdentifier& IndexedIdentifier::operator=(const \
IndexedIdentifier& id) {
if(shouldDoDUChainReferenceCounting(this)) {
QMutexLocker lock(identifierRepository()->mutex());
- decrease(identifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + decrease(identifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); }
- index = id.index;
+ m_index = id.m_index;
if(shouldDoDUChainReferenceCounting(this)) {
QMutexLocker lock(identifierRepository()->mutex());
- increase(identifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + increase(identifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); }
return *this;
}
bool IndexedIdentifier::operator==(const IndexedIdentifier& rhs) const
{
- return index == rhs.index;
+ return m_index == rhs.m_index;
}
bool IndexedIdentifier::operator!=(const IndexedIdentifier& rhs) const
{
- return index != rhs.index;
+ return m_index != rhs.m_index;
}
bool IndexedIdentifier::operator==(const Identifier& id) const
{
- return index == id.index();
+ return m_index == id.index();
}
Identifier IndexedIdentifier::identifier() const
{
- return Identifier(index);
+ return Identifier(m_index);
}
IndexedIdentifier::operator Identifier() const
{
- return Identifier(index);
+ return Identifier(m_index);
}
bool IndexedQualifiedIdentifier::isValid() const
{
- return index != emptyConstantQualifiedIdentifierPrivateIndex();
+ return m_index != emptyConstantQualifiedIdentifierPrivateIndex();
}
bool IndexedQualifiedIdentifier::isEmpty() const
{
- return index == emptyConstantQualifiedIdentifierPrivateIndex();
+ return m_index == emptyConstantQualifiedIdentifierPrivateIndex();
}
int cnt = 0;
@@ -1428,66 +1428,66 @@ void IndexedTypeIdentifier::setIdentifier(const \
IndexedQualifiedIdentifier& id) }
IndexedQualifiedIdentifier::IndexedQualifiedIdentifier()
- : index(emptyConstantQualifiedIdentifierPrivateIndex())
+ : m_index(emptyConstantQualifiedIdentifierPrivateIndex())
{
- ifDebug( qCDebug(LANGUAGE) << "(" << ++cnt << ")" << identifier().toString() << \
index; ) + ifDebug( qCDebug(LANGUAGE) << "(" << ++cnt << ")" << \
identifier().toString() << m_index; )
if(shouldDoDUChainReferenceCounting(this)) {
ifDebug( qCDebug(LANGUAGE) << "increasing"; )
//qCDebug(LANGUAGE) << "(" << ++cnt << ")" << this << identifier().toString() << \
"inc" << index; QMutexLocker lock(qualifiedidentifierRepository()->mutex());
- increase(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + increase(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); }
}
IndexedQualifiedIdentifier::IndexedQualifiedIdentifier(const QualifiedIdentifier& \
id)
- : index(id.index())
+ : m_index(id.index())
{
- ifDebug( qCDebug(LANGUAGE) << "(" << ++cnt << ")" << identifier().toString() << \
index; ) + ifDebug( qCDebug(LANGUAGE) << "(" << ++cnt << ")" << \
identifier().toString() << m_index; )
if(shouldDoDUChainReferenceCounting(this)) {
ifDebug( qCDebug(LANGUAGE) << "increasing"; )
QMutexLocker lock(qualifiedidentifierRepository()->mutex());
- increase(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + increase(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); }
}
IndexedQualifiedIdentifier::IndexedQualifiedIdentifier(const \
IndexedQualifiedIdentifier& id)
- : index(id.index)
+ : m_index(id.m_index)
{
- ifDebug( qCDebug(LANGUAGE) << "(" << ++cnt << ")" << identifier().toString() << \
index; ) + ifDebug( qCDebug(LANGUAGE) << "(" << ++cnt << ")" << \
identifier().toString() << m_index; )
if(shouldDoDUChainReferenceCounting(this)) {
ifDebug( qCDebug(LANGUAGE) << "increasing"; )
QMutexLocker lock(qualifiedidentifierRepository()->mutex());
- increase(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + increase(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); }
}
IndexedQualifiedIdentifier::IndexedQualifiedIdentifier(IndexedQualifiedIdentifier&& \
rhs) Q_DECL_NOEXCEPT
- : index(rhs.index)
+ : m_index(rhs.m_index)
{
- rhs.index = emptyConstantQualifiedIdentifierPrivateIndex();
+ rhs.m_index = emptyConstantQualifiedIdentifierPrivateIndex();
}
IndexedQualifiedIdentifier& IndexedQualifiedIdentifier::operator=(const \
QualifiedIdentifier& id) {
- ifDebug( qCDebug(LANGUAGE) << "(" << ++cnt << ")" << identifier().toString() << \
index; ) + ifDebug( qCDebug(LANGUAGE) << "(" << ++cnt << ")" << \
identifier().toString() << m_index; )
if(shouldDoDUChainReferenceCounting(this)) {
QMutexLocker lock(qualifiedidentifierRepository()->mutex());
ifDebug( qCDebug(LANGUAGE) << "decreasing"; )
- decrease(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + decrease(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index);
- index = id.index();
+ m_index = id.index();
- ifDebug( qCDebug(LANGUAGE) << index << "increasing"; )
- increase(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + ifDebug( qCDebug(LANGUAGE) << m_index << "increasing"; )
+ increase(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); } else {
- index = id.index();
+ m_index = id.index();
}
return *this;
@@ -1496,20 +1496,20 @@ IndexedQualifiedIdentifier& \
IndexedQualifiedIdentifier::operator=(const Qualifie IndexedQualifiedIdentifier& \
IndexedQualifiedIdentifier::operator=(const IndexedQualifiedIdentifier& rhs) {
- ifDebug( qCDebug(LANGUAGE) << "(" << ++cnt << ")" << identifier().toString() << \
index; ) + ifDebug( qCDebug(LANGUAGE) << "(" << ++cnt << ")" << \
identifier().toString() << m_index; )
if(shouldDoDUChainReferenceCounting(this)) {
QMutexLocker lock(qualifiedidentifierRepository()->mutex());
ifDebug( qCDebug(LANGUAGE) << "decreasing"; )
- decrease(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + decrease(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index);
- index = rhs.index;
+ m_index = rhs.m_index;
- ifDebug( qCDebug(LANGUAGE) << index << "increasing"; )
- increase(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + ifDebug( qCDebug(LANGUAGE) << m_index << "increasing"; )
+ increase(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); } else {
- index = rhs.index;
+ m_index = rhs.m_index;
}
return *this;
@@ -1521,22 +1521,22 @@ IndexedQualifiedIdentifier& \
IndexedQualifiedIdentifier::operator=(IndexedQualifi QMutexLocker \
lock(qualifiedidentifierRepository()->mutex()); ifDebug( qCDebug(LANGUAGE) << \
"decreasing"; )
- decrease(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + decrease(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); } else if (shouldDoDUChainReferenceCounting(&rhs)) {
QMutexLocker lock(qualifiedidentifierRepository()->mutex());
ifDebug( qCDebug(LANGUAGE) << "decreasing"; )
- decrease(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(rhs.index)->m_refCount, \
rhs.index); + decrease(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(rhs.m_index)->m_refCount, \
rhs.m_index); }
- index = rhs.index;
- rhs.index = emptyConstantQualifiedIdentifierPrivateIndex();
+ m_index = rhs.m_index;
+ rhs.m_index = emptyConstantQualifiedIdentifierPrivateIndex();
if(shouldDoDUChainReferenceCounting(this) && \
!(shouldDoDUChainReferenceCounting(&rhs))) { QMutexLocker \
lock(qualifiedidentifierRepository()->mutex()); ifDebug( qCDebug(LANGUAGE) << \
"increasing"; )
- increase(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + increase(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); }
return *this;
@@ -1548,28 +1548,28 @@ IndexedQualifiedIdentifier::~IndexedQualifiedIdentifier()
if(shouldDoDUChainReferenceCounting(this)) {
ifDebug( qCDebug(LANGUAGE) << index << "decreasing"; )
QMutexLocker lock(qualifiedidentifierRepository()->mutex());
- decrease(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(index)->m_refCount, \
index); + decrease(qualifiedidentifierRepository()->dynamicItemFromIndexSimple(m_index)->m_refCount, \
m_index); }
}
bool IndexedQualifiedIdentifier::operator==(const IndexedQualifiedIdentifier& rhs) \
const {
- return index == rhs.index;
+ return m_index == rhs.m_index;
}
bool IndexedQualifiedIdentifier::operator==(const QualifiedIdentifier& id) const
{
- return index == id.index();
+ return m_index == id.index();
}
QualifiedIdentifier IndexedQualifiedIdentifier::identifier() const
{
- return QualifiedIdentifier(index);
+ return QualifiedIdentifier(m_index);
}
IndexedQualifiedIdentifier::operator QualifiedIdentifier() const
{
- return QualifiedIdentifier(index);
+ return QualifiedIdentifier(m_index);
}
void initIdentifierRepository() {
diff --git a/kdevplatform/language/duchain/identifier.h \
b/kdevplatform/language/duchain/identifier.h index d0653b7329..0441ae22c2 100644
--- a/kdevplatform/language/duchain/identifier.h
+++ b/kdevplatform/language/duchain/identifier.h
@@ -74,13 +74,13 @@ public:
Identifier identifier() const;
operator Identifier() const;
- uint getIndex() const
+ unsigned int index() const
{
- return index;
+ return m_index;
}
private:
- unsigned int index;
+ unsigned int m_index;
};
/**
@@ -109,7 +109,7 @@ public:
bool operator<(const IndexedQualifiedIdentifier& rhs) const
{
- return index < rhs.index;
+ return m_index < rhs.m_index;
}
bool isValid() const;
@@ -118,13 +118,13 @@ public:
QualifiedIdentifier identifier() const;
operator QualifiedIdentifier() const;
- uint getIndex() const
+ unsigned int index() const
{
- return index;
+ return m_index;
}
private:
- uint index;
+ unsigned int m_index;
};
/**
@@ -450,12 +450,12 @@ KDEVPLATFORMLANGUAGE_EXPORT uint qHash(const Identifier& id);
inline uint qHash(const IndexedIdentifier& id)
{
- return id.getIndex();
+ return id.index();
}
inline uint qHash(const IndexedQualifiedIdentifier& id)
{
- return id.getIndex();
+ return id.index();
}
}
diff --git a/kdevplatform/language/duchain/indexeddeclaration.cpp \
b/kdevplatform/language/duchain/indexeddeclaration.cpp index a07f071015..1f989e22b2 \
100644
--- a/kdevplatform/language/duchain/indexeddeclaration.cpp
+++ b/kdevplatform/language/duchain/indexeddeclaration.cpp
@@ -53,5 +53,5 @@ Declaration* IndexedDeclaration::declaration() const
if(!ctx)
return nullptr;
- return ctx->m_dynamicData->getDeclarationForIndex(m_declarationIndex);
+ return ctx->m_dynamicData->declarationForIndex(m_declarationIndex);
}
diff --git a/kdevplatform/language/duchain/indexedducontext.cpp \
b/kdevplatform/language/duchain/indexedducontext.cpp index a1581c35cb..249ce609f5 \
100644
--- a/kdevplatform/language/duchain/indexedducontext.cpp
+++ b/kdevplatform/language/duchain/indexedducontext.cpp
@@ -68,5 +68,5 @@ DUContext* IndexedDUContext::context() const
if(!m_contextIndex)
return ctx;
- return ctx->m_dynamicData->getContextForIndex(m_contextIndex);
+ return ctx->m_dynamicData->contextForIndex(m_contextIndex);
}
diff --git a/kdevplatform/language/duchain/localindexeddeclaration.cpp \
b/kdevplatform/language/duchain/localindexeddeclaration.cpp index \
7cbd30924b..d4b4e38a6b 100644
--- a/kdevplatform/language/duchain/localindexeddeclaration.cpp
+++ b/kdevplatform/language/duchain/localindexeddeclaration.cpp
@@ -39,7 +39,7 @@ Declaration* LocalIndexedDeclaration::data(TopDUContext* top) const
if(!m_declarationIndex)
return nullptr;
Q_ASSERT(top);
- return top->m_dynamicData->getDeclarationForIndex(m_declarationIndex);
+ return top->m_dynamicData->declarationForIndex(m_declarationIndex);
}
bool LocalIndexedDeclaration::isLoaded(TopDUContext* top) const
diff --git a/kdevplatform/language/duchain/localindexedducontext.cpp \
b/kdevplatform/language/duchain/localindexedducontext.cpp index \
75b8e8e22e..9db7d910c8 100644
--- a/kdevplatform/language/duchain/localindexedducontext.cpp
+++ b/kdevplatform/language/duchain/localindexedducontext.cpp
@@ -54,5 +54,5 @@ DUContext* LocalIndexedDUContext::data(TopDUContext* top) const
if(!m_contextIndex)
return nullptr;
else
- return top->m_dynamicData->getContextForIndex(m_contextIndex);
+ return top->m_dynamicData->contextForIndex(m_contextIndex);
}
diff --git a/kdevplatform/language/duchain/navigation/abstractdeclarationnavigationcontext.cpp \
b/kdevplatform/language/duchain/navigation/abstractdeclarationnavigationcontext.cpp \
index b76b616a9e..70d66942b8 100644
--- a/kdevplatform/language/duchain/navigation/abstractdeclarationnavigationcontext.cpp
+++ b/kdevplatform/language/duchain/navigation/abstractdeclarationnavigationcontext.cpp
@@ -385,7 +385,7 @@ void AbstractDeclarationNavigationContext::htmlFunction()
int currentArgNum = 0;
QVector<Declaration*> decls;
- if (DUContext* argumentContext = \
DUChainUtils::getArgumentContext(d->m_declaration.data())) { + if (DUContext* \
argumentContext = DUChainUtils::argumentContext(d->m_declaration.data())) { decls = \
argumentContext->localDeclarations(topContext().data()); }
foreach(const AbstractType::Ptr& argType, type->arguments()) {
@@ -449,7 +449,7 @@ void \
AbstractDeclarationNavigationContext::htmlAdditionalNavigation() const \
ClassFunctionDeclaration* classFunDecl = dynamic_cast<const \
ClassFunctionDeclaration*>(d->m_declaration.data()); if(classFunDecl) {
- Declaration* overridden = DUChainUtils::getOverridden(d->m_declaration.data());
+ Declaration* overridden = DUChainUtils::overridden(d->m_declaration.data());
if(overridden) {
modifyHtml() += i18n("Overrides a ");
@@ -490,7 +490,7 @@ void \
AbstractDeclarationNavigationContext::htmlAdditionalNavigation() Declaration* \
classDecl = d->m_declaration->context()->owner(); if(classDecl) {
uint maxAllowedSteps = d->m_fullBackwardSearch ? (uint)-1 : 10;
- const QList<Declaration*> overriders = \
DUChainUtils::getOverriders(classDecl, classFunDecl, maxAllowedSteps); + const \
QList<Declaration*> overriders = DUChainUtils::overriders(classDecl, classFunDecl, \
maxAllowedSteps);
if(!overriders.isEmpty()) {
modifyHtml() += i18n("Overridden in ");
@@ -514,7 +514,7 @@ void \
AbstractDeclarationNavigationContext::htmlAdditionalNavigation()
///Show all classes that inherit this one
uint maxAllowedSteps = d->m_fullBackwardSearch ? (uint)-1 : 10;
- const QList<Declaration*> inheriters = \
DUChainUtils::getInheriters(d->m_declaration.data(), maxAllowedSteps); + const \
QList<Declaration*> inheriters = DUChainUtils::inheriters(d->m_declaration.data(), \
maxAllowedSteps);
if(!inheriters.isEmpty()) {
modifyHtml() += i18n("Inherited by ");
diff --git a/kdevplatform/language/duchain/navigation/usescollector.cpp \
b/kdevplatform/language/duchain/navigation/usescollector.cpp index \
65c6105417..7261a2ee98 100644
--- a/kdevplatform/language/duchain/navigation/usescollector.cpp
+++ b/kdevplatform/language/duchain/navigation/usescollector.cpp
@@ -143,10 +143,10 @@ void UsesCollector::startCollecting() {
if(m_collectOverloads && decl->context()->owner() && decl->context()->type() \
== DUContext::Class) {
//First find the overridden base, and then all overriders of that base.
- while(Declaration* overridden = DUChainUtils::getOverridden(decl))
+ while(Declaration* overridden = DUChainUtils::overridden(decl))
decl = overridden;
uint maxAllowedSteps = 10000;
- decls += DUChainUtils::getOverriders( decl->context()->owner(), decl, \
maxAllowedSteps ); + decls += DUChainUtils::overriders( \
decl->context()->owner(), decl, maxAllowedSteps ); if(maxAllowedSteps == 10000) {
///@todo Fail!
}
diff --git a/kdevplatform/language/duchain/persistentsymboltable.cpp \
b/kdevplatform/language/duchain/persistentsymboltable.cpp index \
8a82c70c5c..4ae4c595e4 100644
--- a/kdevplatform/language/duchain/persistentsymboltable.cpp
+++ b/kdevplatform/language/duchain/persistentsymboltable.cpp
@@ -64,7 +64,7 @@ class PersistentSymbolTableItem {
inline unsigned int hash() const {
//We only compare the declaration. This allows us implementing a map, although \
the item-repository //originally represents a set.
- return id.getIndex();
+ return id.index();
}
unsigned int itemSize() const {
@@ -270,12 +270,12 @@ struct DeclarationCacheVisitor {
KDevVarLengthArray<IndexedDeclaration>& cache;
};
-PersistentSymbolTable::FilteredDeclarationIterator \
PersistentSymbolTable::getFilteredDeclarations(const IndexedQualifiedIdentifier& id, \
const TopDUContext::IndexedRecursiveImports& visibility) const { \
+PersistentSymbolTable::FilteredDeclarationIterator \
PersistentSymbolTable::filteredDeclarations(const IndexedQualifiedIdentifier& id, \
const TopDUContext::IndexedRecursiveImports& visibility) const {
QMutexLocker lock(d->m_declarations.mutex());
ENSURE_CHAIN_READ_LOCKED
- Declarations decls = getDeclarations(id).iterator();
+ Declarations decls = declarations(id).iterator();
CachedIndexedRecursiveImports cachedImports;
@@ -313,7 +313,7 @@ PersistentSymbolTable::FilteredDeclarationIterator \
PersistentSymbolTable::getFil }
}
-PersistentSymbolTable::Declarations PersistentSymbolTable::getDeclarations(const \
IndexedQualifiedIdentifier& id) const { +PersistentSymbolTable::Declarations \
PersistentSymbolTable::declarations(const IndexedQualifiedIdentifier& id) const { \
QMutexLocker lock(d->m_declarations.mutex()); ENSURE_CHAIN_READ_LOCKED
diff --git a/kdevplatform/language/duchain/persistentsymboltable.h \
b/kdevplatform/language/duchain/persistentsymboltable.h index b60eee731a..7e8a966167 \
100644
--- a/kdevplatform/language/duchain/persistentsymboltable.h
+++ b/kdevplatform/language/duchain/persistentsymboltable.h
@@ -117,7 +117,7 @@ struct KDEVPLATFORMLANGUAGE_EXPORT RecursiveImportCacheRepository \
{ ///them in a structure that is more convenient than declarations().
///@param id The IndexedQualifiedIdentifier for which the declarations should be \
retrieved
///@warning DUChain must be read locked as long as the returned data is used
- Declarations getDeclarations(const IndexedQualifiedIdentifier& id) const;
+ Declarations declarations(const IndexedQualifiedIdentifier& id) const;
typedef Utils::StorableSet<IndexedTopDUContext, \
IndexedTopDUContextIndexConversion, RecursiveImportCacheRepository, true> \
CachedIndexedRecursiveImports;
@@ -125,7 +125,7 @@ struct KDEVPLATFORMLANGUAGE_EXPORT RecursiveImportCacheRepository \
{
///Retrieves an iterator to all declarations of the given id, filtered by the \
visilibity given through @a visibility ///This is very efficient since it uses a \
cache
///The returned iterator is valid as long as the duchain read lock is held
- FilteredDeclarationIterator getFilteredDeclarations(const \
IndexedQualifiedIdentifier& id, const TopDUContext::IndexedRecursiveImports& \
visibility) const; + FilteredDeclarationIterator filteredDeclarations(const \
IndexedQualifiedIdentifier& id, const TopDUContext::IndexedRecursiveImports& \
visibility) const;
static PersistentSymbolTable& self();
diff --git a/kdevplatform/language/duchain/problem.cpp \
b/kdevplatform/language/duchain/problem.cpp index 47e9e7541c..11e385fca4 100644
--- a/kdevplatform/language/duchain/problem.cpp
+++ b/kdevplatform/language/duchain/problem.cpp
@@ -64,7 +64,7 @@ ProblemPointer LocalIndexedProblem::data(const TopDUContext* top) \
const if (!m_index) {
return {};
}
- return top->m_dynamicData->getProblemForIndex(m_index);
+ return top->m_dynamicData->problemForIndex(m_index);
}
Problem::Problem()
diff --git a/kdevplatform/language/duchain/tests/test_duchain.cpp \
b/kdevplatform/language/duchain/tests/test_duchain.cpp index d2b188ade3..1c95b6795f \
100644
--- a/kdevplatform/language/duchain/tests/test_duchain.cpp
+++ b/kdevplatform/language/duchain/tests/test_duchain.cpp
@@ -537,7 +537,7 @@ uint collectNaiveNodeCount(uint currentNode) {
void TestDUChain::testImportStructure()
{
Timer total;
- qDebug() << "before: " << \
KDevelop::RecursiveImportRepository::repository()->getDataRepository().statistics().print();
+ qDebug() << "before: " << \
KDevelop::RecursiveImportRepository::repository()->dataRepository().statistics().print();
///Maintains a naive import-structure along with a real top-context import \
structure, and allows comparing both. int cycles = 5;
@@ -593,12 +593,12 @@ void TestDUChain::testImportStructure()
}
}
- qDebug() << "after: " << \
KDevelop::RecursiveImportRepository::repository()->getDataRepository().statistics().print();
+ qDebug() << "after: " << \
KDevelop::RecursiveImportRepository::repository()->dataRepository().statistics().print();
for(int a = 0; a < contextCount; ++a)
delete allContexts[a];
allContexts.clear();
- qDebug() << "after cleanup: " << \
KDevelop::RecursiveImportRepository::repository()->getDataRepository().statistics().print();
+ qDebug() << "after cleanup: " << \
KDevelop::RecursiveImportRepository::repository()->dataRepository().statistics().print();
}
qDebug() << "total ns needed for import-structure test:" << \
float(total.elapsed()); }
diff --git a/kdevplatform/language/duchain/topducontext.cpp \
b/kdevplatform/language/duchain/topducontext.cpp index 054a6b4a38..a72d6b4ce9 100644
--- a/kdevplatform/language/duchain/topducontext.cpp
+++ b/kdevplatform/language/duchain/topducontext.cpp
@@ -642,10 +642,10 @@ struct TopDUContext::FindDeclarationsAcceptor {
//This is used if filtering is disabled
PersistentSymbolTable::Declarations::Iterator unchecked;
if(check.flags & DUContext::NoImportsCheck) {
- allDecls = PersistentSymbolTable::self().getDeclarations(id);
+ allDecls = PersistentSymbolTable::self().declarations(id);
unchecked = allDecls.iterator();
} else
- filter = PersistentSymbolTable::self().getFilteredDeclarations(id, \
top->recursiveImportIndices()); + filter = \
PersistentSymbolTable::self().filteredDeclarations(id, \
top->recursiveImportIndices());
while(filter || unchecked) {
@@ -764,7 +764,7 @@ bool TopDUContext::applyAliases( const QualifiedIdentifier& \
previous, const Sear
if(aliasId.inRepository()) {
//This iterator efficiently filters the visible declarations out of all \
declarations
- PersistentSymbolTable::FilteredDeclarationIterator filter = \
PersistentSymbolTable::self().getFilteredDeclarations(aliasId, \
recursiveImportIndices()); + PersistentSymbolTable::FilteredDeclarationIterator \
filter = PersistentSymbolTable::self().filteredDeclarations(aliasId, \
recursiveImportIndices());
if(filter) {
DeclarationChecker check(this, position, AbstractType::Ptr(), NoSearchFlags, \
nullptr); @@ -845,7 +845,7 @@ bool TopDUContext::applyAliases( const \
QualifiedIdentifier& previous, const Sear
if(importId.inRepository()) {
//This iterator efficiently filters the visible declarations out of all \
declarations
- PersistentSymbolTable::FilteredDeclarationIterator filter = \
PersistentSymbolTable::self().getFilteredDeclarations(importId, \
recursiveImportIndices()); + PersistentSymbolTable::FilteredDeclarationIterator \
filter = PersistentSymbolTable::self().filteredDeclarations(importId, \
recursiveImportIndices());
if(filter) {
DeclarationChecker check(this, position, AbstractType::Ptr(), NoSearchFlags, \
nullptr); @@ -1080,9 +1080,9 @@ Declaration* \
TopDUContext::usedDeclarationForIndex(unsigned int declarationIndex \
if(declarationIndex & (1<<31)) {
//We use the highest bit to mark direct indices into the local declarations
declarationIndex &= ~(1<<31); //unset the highest bit
- return m_dynamicData->getDeclarationForIndex(declarationIndex);
+ return m_dynamicData->declarationForIndex(declarationIndex);
}else if(declarationIndex < d_func()->m_usedDeclarationIdsSize())
- return d_func()->m_usedDeclarationIds()[declarationIndex].getDeclaration(this);
+ return d_func()->m_usedDeclarationIds()[declarationIndex].declaration(this);
else
return nullptr;
}
diff --git a/kdevplatform/language/duchain/topducontextdynamicdata.cpp \
b/kdevplatform/language/duchain/topducontextdynamicdata.cpp index \
5f0088f01c..c5e580ad0e 100644
--- a/kdevplatform/language/duchain/topducontextdynamicdata.cpp
+++ b/kdevplatform/language/duchain/topducontextdynamicdata.cpp
@@ -364,7 +364,7 @@ bool \
TopDUContextDynamicData::DUChainItemStorage<Item>::isItemForIndexLoaded(uin }
template<class Item>
-Item TopDUContextDynamicData::DUChainItemStorage<Item>::getItemForIndex(uint index) \
const +Item TopDUContextDynamicData::DUChainItemStorage<Item>::itemForIndex(uint \
index) const {
if (index >= (0x0fffffff/2)) {
index = 0x0fffffff - index; //We always keep the highest bit at zero
@@ -410,7 +410,7 @@ Item \
TopDUContextDynamicData::DUChainItemStorage<Item>::getItemForIndex(uint ind \
item->makeDynamic(); }
- auto parent = data->getContextForIndex(offsets[realIndex].parentContext);
+ auto parent = data->contextForIndex(offsets[realIndex].parentContext);
Q_ASSERT_X(parent, Q_FUNC_INFO, "Could not find parent context for loaded \
item.\n"
"Potentially, the context has been deleted \
without deleting its children."); item->rebuildDynamicData(parent, index);
@@ -811,7 +811,7 @@ bool TopDUContextDynamicData::isTemporaryDeclarationIndex(uint \
index) const { return !(index < (0x0fffffff/2));
}
-DUContext* TopDUContextDynamicData::getContextForIndex(uint index) const
+DUContext* TopDUContextDynamicData::contextForIndex(uint index) const
{
if(!m_dataLoaded)
loadData();
@@ -820,23 +820,23 @@ DUContext* TopDUContextDynamicData::getContextForIndex(uint \
index) const return m_topContext;
}
- return m_contexts.getItemForIndex(index);
+ return m_contexts.itemForIndex(index);
}
-Declaration* TopDUContextDynamicData::getDeclarationForIndex(uint index) const
+Declaration* TopDUContextDynamicData::declarationForIndex(uint index) const
{
if(!m_dataLoaded)
loadData();
- return m_declarations.getItemForIndex(index);
+ return m_declarations.itemForIndex(index);
}
-ProblemPointer TopDUContextDynamicData::getProblemForIndex(uint index) const
+ProblemPointer TopDUContextDynamicData::problemForIndex(uint index) const
{
if(!m_dataLoaded)
loadData();
- return m_problems.getItemForIndex(index);
+ return m_problems.itemForIndex(index);
}
void TopDUContextDynamicData::clearDeclarationIndex(Declaration* decl)
diff --git a/kdevplatform/language/duchain/topducontextdynamicdata.h \
b/kdevplatform/language/duchain/topducontextdynamicdata.h index \
c2cc8eb39c..615a0f8a99 100644
--- a/kdevplatform/language/duchain/topducontextdynamicdata.h
+++ b/kdevplatform/language/duchain/topducontextdynamicdata.h
@@ -50,7 +50,7 @@ class TopDUContextDynamicData {
*/
uint allocateDeclarationIndex(Declaration* decl, bool temporary);
- Declaration* getDeclarationForIndex(uint index) const;
+ Declaration* declarationForIndex(uint index) const;
bool isDeclarationForIndexLoaded(uint index) const;
@@ -64,7 +64,7 @@ class TopDUContextDynamicData {
*/
uint allocateContextIndex(DUContext* ctx, bool temporary);
- DUContext* getContextForIndex(uint index) const;
+ DUContext* contextForIndex(uint index) const;
bool isContextForIndexLoaded(uint index) const;
@@ -76,7 +76,7 @@ class TopDUContextDynamicData {
* The returned index is never zero.
*/
uint allocateProblemIndex(const ProblemPointer& problem);
- ProblemPointer getProblemForIndex(uint index) const;
+ ProblemPointer problemForIndex(uint index) const;
void clearProblems();
///Stores this top-context to disk
@@ -144,7 +144,7 @@ class TopDUContextDynamicData {
bool itemsHaveChanged() const;
void storeData(uint& currentDataOffset, const QVector<ArrayWithPosition>& \
oldData);
- Item getItemForIndex(uint index) const;
+ Item itemForIndex(uint index) const;
void clearItemIndex(const Item& item, const uint index);
diff --git a/kdevplatform/language/duchain/types/identifiedtype.cpp \
b/kdevplatform/language/duchain/types/identifiedtype.cpp index cfa368de53..0acd707e77 \
100644
--- a/kdevplatform/language/duchain/types/identifiedtype.cpp
+++ b/kdevplatform/language/duchain/types/identifiedtype.cpp
@@ -69,7 +69,7 @@ void IdentifiedType::setDeclarationId(const DeclarationId& id) {
Declaration* IdentifiedType::declaration(const TopDUContext* top) const
{
- return idData()->m_id.getDeclaration(top);
+ return idData()->m_id.declaration(top);
}
KDevelop::DUContext* IdentifiedType::internalContext(const KDevelop::TopDUContext* \
top) const {
diff --git a/kdevplatform/language/util/basicsetrepository.h \
b/kdevplatform/language/util/basicsetrepository.h index 21c959e55c..57e0146514 100644
--- a/kdevplatform/language/util/basicsetrepository.h
+++ b/kdevplatform/language/util/basicsetrepository.h
@@ -288,7 +288,7 @@ public:
inline const SetNodeData* nodeFromIndex(uint index) const {
if(index)
- return dataRepository.itemFromIndex(index);
+ return m_dataRepository.itemFromIndex(index);
else
return nullptr;
}
@@ -298,8 +298,8 @@ public:
}
///Only public to get statistics and such
- const SetDataRepository& getDataRepository() const {
- return dataRepository;
+ const SetDataRepository& dataRepository() const {
+ return m_dataRepository;
}
///Set whether set-nodes with reference-count zero should be deleted only after a \
delay @@ -317,7 +317,7 @@ public:
private:
friend class Set;
friend class Set::Iterator;
- SetDataRepository dataRepository;
+ SetDataRepository m_dataRepository;
QMutex* m_mutex;
bool m_delayedDeletion;
@@ -340,7 +340,7 @@ public:
private:
friend class Set;
friend class SetIteratorPrivate;
- static inline SetDataRepository &getDataRepository(BasicSetRepository *repo) { \
return repo->dataRepository; } + static inline SetDataRepository \
&getDataRepository(BasicSetRepository *repo) { return repo->m_dataRepository; } \
const QScopedPointer<class SetIteratorPrivate> d; };
diff --git a/kdevplatform/language/util/setrepository.cpp \
b/kdevplatform/language/util/setrepository.cpp index 5c66193889..6190376d70 100644
--- a/kdevplatform/language/util/setrepository.cpp
+++ b/kdevplatform/language/util/setrepository.cpp
@@ -225,8 +225,8 @@ unsigned int Set::count() const {
return 0;
QMutexLocker lock(m_repository->m_mutex);
- SetRepositoryAlgorithms alg(m_repository->dataRepository, m_repository);
- return alg.count(m_repository->dataRepository.itemFromIndex(m_tree));
+ SetRepositoryAlgorithms alg(m_repository->m_dataRepository, m_repository);
+ return alg.count(m_repository->m_dataRepository.itemFromIndex(m_tree));
}
Set::Set(uint treeNode, BasicSetRepository* repository) : m_tree(treeNode), \
m_repository(repository) { @@ -250,7 +250,7 @@ QString Set::dumpDotGraph() const {
QMutexLocker lock(m_repository->m_mutex);
- SetRepositoryAlgorithms alg(m_repository->dataRepository, m_repository);
+ SetRepositoryAlgorithms alg(m_repository->m_dataRepository, m_repository);
return alg.dumpDotGraph(m_tree);
}
@@ -445,9 +445,9 @@ Set::Iterator& Set::Iterator::operator++() {
}else{
//++d->nodeStackSize;
//We were iterating the left slave of the node, now continue with the right.
- ifDebug( const SetNodeData& left = \
*d->repository->dataRepository.itemFromIndex(d->nodeStack[d->nodeStackSize - \
1]->leftNode()); Q_ASSERT(left.end == d->currentIndex); ) + ifDebug( const \
SetNodeData& left = *d->repository->m_dataRepository.itemFromIndex(d->nodeStack[d->nodeStackSize \
- 1]->leftNode()); Q_ASSERT(left.end == d->currentIndex); )
- const SetNodeData& right = \
*d->repository->dataRepository.itemFromIndex(d->nodeStack[d->nodeStackSize - \
1]->rightNode()); + const SetNodeData& right = \
*d->repository->m_dataRepository.itemFromIndex(d->nodeStack[d->nodeStackSize - \
1]->rightNode());
d->startAtNode(&right);
}
@@ -475,7 +475,7 @@ Set::Iterator Set::iterator() const {
ret.d->repository = m_repository;
if(m_tree)
- ret.d->startAtNode(m_repository->dataRepository.itemFromIndex(m_tree));
+ ret.d->startAtNode(m_repository->m_dataRepository.itemFromIndex(m_tree));
return ret;
}
@@ -866,7 +866,7 @@ Set BasicSetRepository::createSetFromIndices(const \
std::vector<Index>& indices) if(indices.empty())
return Set();
- SetRepositoryAlgorithms alg(dataRepository, this);
+ SetRepositoryAlgorithms alg(m_dataRepository, this);
return Set(alg.setForIndices(indices.begin(), indices.end()), this);
}
@@ -875,7 +875,7 @@ Set BasicSetRepository::createSet(Index i) {
QMutexLocker lock(m_mutex);
SetNodeData data(i, i+1);
- return Set(dataRepository.index( SetNodeDataRequest(&data, dataRepository, this) \
), this); + return Set(m_dataRepository.index( SetNodeDataRequest(&data, \
m_dataRepository, this) ), this); }
Set BasicSetRepository::createSet(const std::set<Index>& indices) {
@@ -895,11 +895,11 @@ Set BasicSetRepository::createSet(const std::set<Index>& \
indices) { }
BasicSetRepository::BasicSetRepository(const QString& name, \
KDevelop::ItemRepositoryRegistry* registry, bool delayedDeletion)
- : dataRepository(this, name, registry)
+ : m_dataRepository(this, name, registry)
, m_mutex(nullptr)
, m_delayedDeletion(delayedDeletion)
{
- m_mutex = dataRepository.mutex();
+ m_mutex = m_dataRepository.mutex();
}
struct StatisticsVisitor {
@@ -923,8 +923,8 @@ struct StatisticsVisitor {
void BasicSetRepository::printStatistics() const {
- StatisticsVisitor stats(dataRepository);
- dataRepository.visitAllItems<StatisticsVisitor>(stats);
+ StatisticsVisitor stats(m_dataRepository);
+ m_dataRepository.visitAllItems<StatisticsVisitor>(stats);
qCDebug(LANGUAGE) << "count of nodes:" << stats.nodeCount << "count of nodes with \
bad split:" << stats.badSplitNodeCount << "count of nodes with zero reference-count:" \
<< stats.zeroRefCountNodes; }
@@ -945,8 +945,8 @@ bool Set::contains(Index index) const
QMutexLocker lock(m_repository->m_mutex);
- SetRepositoryAlgorithms alg(m_repository->dataRepository, m_repository);
- return alg.set_contains(m_repository->dataRepository.itemFromIndex(m_tree), \
index); + SetRepositoryAlgorithms alg(m_repository->m_dataRepository, m_repository);
+ return alg.set_contains(m_repository->m_dataRepository.itemFromIndex(m_tree), \
index); }
Set Set::operator +(const Set& first) const
@@ -960,9 +960,9 @@ Set Set::operator +(const Set& first) const
QMutexLocker lock(m_repository->m_mutex);
- SetRepositoryAlgorithms alg(m_repository->dataRepository, m_repository);
+ SetRepositoryAlgorithms alg(m_repository->m_dataRepository, m_repository);
- uint retNode = alg.set_union(m_tree, first.m_tree, \
m_repository->dataRepository.itemFromIndex(m_tree), \
m_repository->dataRepository.itemFromIndex(first.m_tree)); + uint retNode = \
alg.set_union(m_tree, first.m_tree, \
m_repository->m_dataRepository.itemFromIndex(m_tree), \
m_repository->m_dataRepository.itemFromIndex(first.m_tree));
ifDebug(alg.check(retNode));
@@ -980,9 +980,9 @@ Set& Set::operator +=(const Set& first) {
QMutexLocker lock(m_repository->m_mutex);
- SetRepositoryAlgorithms alg(m_repository->dataRepository, m_repository);
+ SetRepositoryAlgorithms alg(m_repository->m_dataRepository, m_repository);
- m_tree = alg.set_union(m_tree, first.m_tree, \
m_repository->dataRepository.itemFromIndex(m_tree), \
m_repository->dataRepository.itemFromIndex(first.m_tree)); + m_tree = \
alg.set_union(m_tree, first.m_tree, \
m_repository->m_dataRepository.itemFromIndex(m_tree), \
m_repository->m_dataRepository.itemFromIndex(first.m_tree));
ifDebug(alg.check(m_tree));
return *this;
@@ -996,9 +996,9 @@ Set Set::operator &(const Set& first) const {
QMutexLocker lock(m_repository->m_mutex);
- SetRepositoryAlgorithms alg(m_repository->dataRepository, m_repository);
+ SetRepositoryAlgorithms alg(m_repository->m_dataRepository, m_repository);
- Set ret( alg.set_intersect(m_tree, first.m_tree, \
m_repository->dataRepository.itemFromIndex(m_tree), \
m_repository->dataRepository.itemFromIndex(first.m_tree)), m_repository ); + Set \
ret( alg.set_intersect(m_tree, first.m_tree, \
m_repository->m_dataRepository.itemFromIndex(m_tree), \
m_repository->m_dataRepository.itemFromIndex(first.m_tree)), m_repository );
ifDebug(alg.check(ret.m_tree));
@@ -1015,9 +1015,9 @@ Set& Set::operator &=(const Set& first) {
QMutexLocker lock(m_repository->m_mutex);
- SetRepositoryAlgorithms alg(m_repository->dataRepository, m_repository);
+ SetRepositoryAlgorithms alg(m_repository->m_dataRepository, m_repository);
- m_tree = alg.set_intersect(m_tree, first.m_tree, \
m_repository->dataRepository.itemFromIndex(m_tree), \
m_repository->dataRepository.itemFromIndex(first.m_tree)); + m_tree = \
alg.set_intersect(m_tree, first.m_tree, \
m_repository->m_dataRepository.itemFromIndex(m_tree), \
m_repository->m_dataRepository.itemFromIndex(first.m_tree)); \
ifDebug(alg.check(m_tree)); return *this;
}
@@ -1030,9 +1030,9 @@ Set Set::operator -(const Set& rhs) const {
QMutexLocker lock(m_repository->m_mutex);
- SetRepositoryAlgorithms alg(m_repository->dataRepository, m_repository);
+ SetRepositoryAlgorithms alg(m_repository->m_dataRepository, m_repository);
- Set ret( alg.set_subtract(m_tree, rhs.m_tree, \
m_repository->dataRepository.itemFromIndex(m_tree), \
m_repository->dataRepository.itemFromIndex(rhs.m_tree)), m_repository ); + Set ret( \
alg.set_subtract(m_tree, rhs.m_tree, \
m_repository->m_dataRepository.itemFromIndex(m_tree), \
m_repository->m_dataRepository.itemFromIndex(rhs.m_tree)), m_repository ); ifDebug( \
alg.check(ret.m_tree) ); return ret;
}
@@ -1045,9 +1045,9 @@ Set& Set::operator -=(const Set& rhs) {
QMutexLocker lock(m_repository->m_mutex);
- SetRepositoryAlgorithms alg(m_repository->dataRepository, m_repository);
+ SetRepositoryAlgorithms alg(m_repository->m_dataRepository, m_repository);
- m_tree = alg.set_subtract(m_tree, rhs.m_tree, \
m_repository->dataRepository.itemFromIndex(m_tree), \
m_repository->dataRepository.itemFromIndex(rhs.m_tree)); + m_tree = \
alg.set_subtract(m_tree, rhs.m_tree, \
m_repository->m_dataRepository.itemFromIndex(m_tree), \
m_repository->m_dataRepository.itemFromIndex(rhs.m_tree));
ifDebug(alg.check(m_tree));
return *this;
@@ -1062,13 +1062,13 @@ void Set::staticRef() {
return;
QMutexLocker lock(m_repository->m_mutex);
- SetNodeData* data = \
m_repository->dataRepository.dynamicItemFromIndexSimple(m_tree); + SetNodeData* data \
= m_repository->m_dataRepository.dynamicItemFromIndexSimple(m_tree); \
++data->m_refCount; }
///Mutex must be locked
void Set::unrefNode(uint current) {
- SetNodeData* data = \
m_repository->dataRepository.dynamicItemFromIndexSimple(current); + SetNodeData* \
data = m_repository->m_dataRepository.dynamicItemFromIndexSimple(current); \
Q_ASSERT(data->m_refCount);
--data->m_refCount;
if(!m_repository->delayedDeletion()) {
@@ -1084,7 +1084,7 @@ void Set::unrefNode(uint current) {
m_repository->itemRemovedFromSets(data->start());
}
- m_repository->dataRepository.deleteItem(current);
+ m_repository->m_dataRepository.deleteItem(current);
}
}
}
diff --git a/kdevplatform/shell/filteredproblemstore.cpp \
b/kdevplatform/shell/filteredproblemstore.cpp index 5081354e62..00c2e3bdbf 100644
--- a/kdevplatform/shell/filteredproblemstore.cpp
+++ b/kdevplatform/shell/filteredproblemstore.cpp
@@ -298,7 +298,7 @@ bool FilteredProblemStorePrivate::match(const IProblem::Ptr \
&problem) const {
if (q->scope() != ProblemScope::BypassScopeFilter &&
!q->documents()->get().contains(problem.data()->finalLocation().document) &&
- !(q->showImports() && \
q->documents()->getImports().contains(problem.data()->finalLocation().document))) + \
!(q->showImports() && \
q->documents()->imports().contains(problem.data()->finalLocation().document))) \
return false;
if(problem->severity()!=IProblem::NoSeverity)
diff --git a/kdevplatform/shell/problemstore.cpp \
b/kdevplatform/shell/problemstore.cpp index 83eb7bd45c..2b1e02e7ce 100644
--- a/kdevplatform/shell/problemstore.cpp
+++ b/kdevplatform/shell/problemstore.cpp
@@ -193,7 +193,7 @@ void ProblemStore::setScope(int scope)
bool showImports = false;
if (d->m_documents) {
- if(cast_scope == d->m_documents->getScope())
+ if(cast_scope == d->m_documents->scope())
return;
showImports = d->m_documents->showImports();
@@ -231,7 +231,7 @@ int ProblemStore::scope() const
{
Q_ASSERT(d->m_documents);
- return d->m_documents->getScope();
+ return d->m_documents->scope();
}
void ProblemStore::setGrouping(int grouping)
diff --git a/kdevplatform/shell/uicontroller.cpp \
b/kdevplatform/shell/uicontroller.cpp index ccaffeaf51..54bce103e2 100644
--- a/kdevplatform/shell/uicontroller.cpp
+++ b/kdevplatform/shell/uicontroller.cpp
@@ -565,7 +565,7 @@ void UiController::saveArea(Sublime::Area * area, KConfigGroup & \
group) {
area->save(group);
if (!area->workingSet().isEmpty()) {
- WorkingSet* set = \
Core::self()->workingSetControllerInternal()->getWorkingSet(area->workingSet()); + \
WorkingSet* set = Core::self()->workingSetControllerInternal()->workingSet(area->workingSet());
set->saveFromArea(area, area->rootIndex());
}
}
@@ -574,7 +574,7 @@ void UiController::loadArea(Sublime::Area * area, const \
KConfigGroup & group) {
area->load(group);
if (!area->workingSet().isEmpty()) {
- WorkingSet* set = \
Core::self()->workingSetControllerInternal()->getWorkingSet(area->workingSet()); + \
WorkingSet* set = Core::self()->workingSetControllerInternal()->workingSet(area->workingSet());
Q_ASSERT(set->isConnected(area));
Q_UNUSED(set);
}
diff --git a/kdevplatform/shell/watcheddocumentset.cpp \
b/kdevplatform/shell/watcheddocumentset.cpp index b5f3a42ae6..0e71c74f3e 100644
--- a/kdevplatform/shell/watcheddocumentset.cpp
+++ b/kdevplatform/shell/watcheddocumentset.cpp
@@ -213,7 +213,7 @@ WatchedDocumentSet::DocumentSet WatchedDocumentSet::get() const
return d->documents();
}
-WatchedDocumentSet::DocumentSet WatchedDocumentSet::getImports() const
+WatchedDocumentSet::DocumentSet WatchedDocumentSet::imports() const
{
return d->imports();
}
@@ -229,7 +229,7 @@ void CurrentDocumentSet::setCurrentDocument(const IndexedString& \
url) d->setDocuments({url}, DoUpdate | DoEmit);
}
-ProblemScope CurrentDocumentSet::getScope() const
+ProblemScope CurrentDocumentSet::scope() const
{
return CurrentDocument;
}
@@ -256,7 +256,7 @@ void OpenDocumentSet::documentCreated(IDocument* doc)
d->addDocument(IndexedString(doc->url()), DoUpdate | DoEmit);
}
-ProblemScope OpenDocumentSet::getScope() const
+ProblemScope OpenDocumentSet::scope() const
{
return OpenDocuments;
}
@@ -322,7 +322,7 @@ void CurrentProjectSet::setCurrentDocumentInternal(const \
IndexedString& url) }
}
-ProblemScope CurrentProjectSet::getScope() const
+ProblemScope CurrentProjectSet::scope() const
{
return CurrentProject;
}
@@ -341,7 +341,7 @@ AllProjectSet::AllProjectSet(QObject* parent)
emit changed();
}
-ProblemScope AllProjectSet::getScope() const
+ProblemScope AllProjectSet::scope() const
{
return AllProjects;
}
@@ -351,7 +351,7 @@ BypassSet::BypassSet(QObject* parent)
{
}
-ProblemScope BypassSet::getScope() const
+ProblemScope BypassSet::scope() const
{
return BypassScopeFilter;
}
diff --git a/kdevplatform/shell/watcheddocumentset.h \
b/kdevplatform/shell/watcheddocumentset.h index 57546e63ff..342a1b8a4f 100644
--- a/kdevplatform/shell/watcheddocumentset.h
+++ b/kdevplatform/shell/watcheddocumentset.h
@@ -52,10 +52,10 @@ public:
void setShowImports(bool showImports);
virtual DocumentSet get() const;
- virtual DocumentSet getImports() const;
+ virtual DocumentSet imports() const;
virtual void setCurrentDocument(const IndexedString& url);
- virtual ProblemScope getScope() const = 0;
+ virtual ProblemScope scope() const = 0;
Q_SIGNALS:
void changed();
@@ -74,7 +74,7 @@ class CurrentDocumentSet : public WatchedDocumentSet
public:
explicit CurrentDocumentSet(const IndexedString& document, QObject* parent);
void setCurrentDocument(const IndexedString& url) override;
- ProblemScope getScope() const override;
+ ProblemScope scope() const override;
};
/**
@@ -85,7 +85,7 @@ class OpenDocumentSet : public WatchedDocumentSet
Q_OBJECT
public:
explicit OpenDocumentSet(QObject* parent);
- ProblemScope getScope() const override;
+ ProblemScope scope() const override;
private Q_SLOTS:
void documentClosed(IDocument* doc);
@@ -120,7 +120,7 @@ class CurrentProjectSet : public ProjectSet
public:
explicit CurrentProjectSet(const IndexedString& document, QObject* parent);
void setCurrentDocument(const IndexedString& url) override;
- ProblemScope getScope() const override;
+ ProblemScope scope() const override;
private:
void setCurrentDocumentInternal(const IndexedString& url); // to avoid virtual \
in constructor @@ -132,7 +132,7 @@ class AllProjectSet : public ProjectSet
Q_OBJECT
public:
explicit AllProjectSet(QObject* parent);
- ProblemScope getScope() const override;
+ ProblemScope scope() const override;
};
class BypassSet : public WatchedDocumentSet
@@ -141,7 +141,7 @@ class BypassSet : public WatchedDocumentSet
public:
explicit BypassSet(QObject* parent);
- ProblemScope getScope() const override;
+ ProblemScope scope() const override;
};
}
diff --git a/kdevplatform/shell/workingsetcontroller.cpp \
b/kdevplatform/shell/workingsetcontroller.cpp index f007c37394..48d3cd2d7b 100644
--- a/kdevplatform/shell/workingsetcontroller.cpp
+++ b/kdevplatform/shell/workingsetcontroller.cpp
@@ -61,7 +61,7 @@ void WorkingSetController::initialize()
if (set.contains(QLatin1Char('|'))) {
continue;
}
- getWorkingSet(set);
+ workingSet(set);
}
m_emptyWorkingSet = new WorkingSet(QStringLiteral("empty"));
@@ -123,10 +123,10 @@ const QString WorkingSetController::makeSetId(const QString& \
prefix) const
WorkingSet* WorkingSetController::newWorkingSet(const QString& prefix)
{
- return getWorkingSet(makeSetId(prefix));
+ return workingSet(makeSetId(prefix));
}
-WorkingSet* WorkingSetController::getWorkingSet(const QString& id)
+WorkingSet* WorkingSetController::workingSet(const QString& id)
{
if(id.isEmpty())
return m_emptyWorkingSet;
@@ -181,7 +181,7 @@ void WorkingSetController::showGlobalToolTip()
{
KDevelop::MainWindow* window = \
static_cast<KDevelop::MainWindow*>(Core::self()->uiControllerInternal()->activeMainWindow());
- showToolTip(getWorkingSet(window->area()->workingSet()),
+ showToolTip(workingSet(window->area()->workingSet()),
window->mapToGlobal(window->geometry().topRight()));
connect(m_hideToolTipTimer, &QTimer::timeout, m_tooltip.data(), \
&ActiveToolTip::deleteLater); @@ -235,7 +235,7 @@ QList< WorkingSet* > \
WorkingSetController::allWorkingSets() const void WorkingSetController::areaCreated( \
Sublime::Area* area ) {
if (!area->workingSet().isEmpty()) {
- WorkingSet* set = getWorkingSet( area->workingSet() );
+ WorkingSet* set = workingSet( area->workingSet() );
set->connectArea( area );
}
@@ -256,7 +256,7 @@ void WorkingSetController::changingWorkingSet(Sublime::Area* \
area, const QString return;
if (!from.isEmpty()) {
- WorkingSet* oldSet = getWorkingSet(from);
+ WorkingSet* oldSet = workingSet(from);
oldSet->disconnectArea(area);
if (!oldSet->id().isEmpty()) {
oldSet->saveFromArea(area, area->rootIndex());
@@ -271,7 +271,7 @@ void WorkingSetController::changedWorkingSet(Sublime::Area* area, \
const QString& return;
if (!to.isEmpty()) {
- WorkingSet* newSet = getWorkingSet(to);
+ WorkingSet* newSet = workingSet(to);
newSet->connectArea(area);
newSet->loadToArea(area, area->rootIndex());
}else{
@@ -301,16 +301,16 @@ void WorkingSetController::viewAdded( Sublime::AreaIndex* , \
Sublime::View* )
void WorkingSetController::clearWorkingSet(Sublime::Area * area)
{
- const QString workingSet = area->workingSet();
- if (workingSet.isEmpty()) {
+ const QString workingSetId = area->workingSet();
+ if (workingSetId.isEmpty()) {
// Nothing to do - area has no working set
return;
}
- WorkingSet* set = getWorkingSet(workingSet);
+ WorkingSet* set = workingSet(workingSetId);
set->deleteSet(true);
- WorkingSet* newSet = getWorkingSet(workingSet);
+ WorkingSet* newSet = workingSet(workingSetId);
newSet->connectArea(area);
newSet->loadToArea(area, area->rootIndex());
Q_ASSERT(newSet->fileList().isEmpty());
diff --git a/kdevplatform/shell/workingsetcontroller.h \
b/kdevplatform/shell/workingsetcontroller.h index 90cf4cb709..2b0b709ce3 100644
--- a/kdevplatform/shell/workingsetcontroller.h
+++ b/kdevplatform/shell/workingsetcontroller.h
@@ -64,7 +64,7 @@ public:
* NOTE: Never pass an empty @p id, this means there is no working set
* for the given area you got that @p id from.
*/
- WorkingSet* getWorkingSet(const QString& id);
+ WorkingSet* workingSet(const QString& id);
QList<WorkingSet*> allWorkingSets() const;
diff --git a/kdevplatform/shell/workingsets/closedworkingsetswidget.cpp \
b/kdevplatform/shell/workingsets/closedworkingsetswidget.cpp index \
5e12234d20..483edf1dcc 100644
--- a/kdevplatform/shell/workingsets/closedworkingsetswidget.cpp
+++ b/kdevplatform/shell/workingsets/closedworkingsetswidget.cpp
@@ -34,9 +34,9 @@
using namespace KDevelop;
-WorkingSet* getWorkingSet(const QString& id)
+WorkingSet* workingSet(const QString& id)
{
- return Core::self()->workingSetControllerInternal()->getWorkingSet(id);
+ return Core::self()->workingSetControllerInternal()->workingSet(id);
}
ClosedWorkingSetsWidget::ClosedWorkingSetsWidget( MainWindow* window )
@@ -86,12 +86,12 @@ void ClosedWorkingSetsWidget::changedWorkingSet( Sublime::Area* \
area, const QStr Q_UNUSED(area);
if (!from.isEmpty()) {
- WorkingSet* oldSet = getWorkingSet(from);
+ WorkingSet* oldSet = workingSet(from);
addWorkingSet(oldSet);
}
if (!to.isEmpty()) {
- WorkingSet* newSet = getWorkingSet(to);
+ WorkingSet* newSet = workingSet(to);
removeWorkingSet(newSet);
}
}
diff --git a/kdevplatform/shell/workingsets/workingsettoolbutton.cpp \
b/kdevplatform/shell/workingsets/workingsettoolbutton.cpp index \
27459d8316..afc4bb975c 100644
--- a/kdevplatform/shell/workingsets/workingsettoolbutton.cpp
+++ b/kdevplatform/shell/workingsets/workingsettoolbutton.cpp
@@ -70,7 +70,7 @@ void WorkingSetToolButton::intersectSet()
m_set->setPersistent(true);
- filterViews(Core::self()->workingSetControllerInternal()->getWorkingSet(mainWindow()->area()->workingSet())->fileList().toSet() \
& m_set->fileList().toSet()); + \
filterViews(Core::self()->workingSetControllerInternal()->workingSet(mainWindow()->area()->workingSet())->fileList().toSet() \
& m_set->fileList().toSet()); }
void WorkingSetToolButton::subtractSet()
@@ -79,14 +79,14 @@ void WorkingSetToolButton::subtractSet()
m_set->setPersistent(true);
- filterViews(Core::self()->workingSetControllerInternal()->getWorkingSet(mainWindow()->area()->workingSet())->fileList().toSet() \
- m_set->fileList().toSet()); + \
filterViews(Core::self()->workingSetControllerInternal()->workingSet(mainWindow()->area()->workingSet())->fileList().toSet() \
- m_set->fileList().toSet()); }
void WorkingSetToolButton::mergeSet()
{
Q_ASSERT(m_set);
- const QSet<QString> loadFiles = m_set->fileList().toSet() - \
Core::self()->workingSetControllerInternal()->getWorkingSet(mainWindow()->area()->workingSet())->fileList().toSet();
+ const QSet<QString> loadFiles = m_set->fileList().toSet() - \
Core::self()->workingSetControllerInternal()->workingSet(mainWindow()->area()->workingSet())->fileList().toSet();
for (const QString& file : loadFiles) {
Core::self()->documentController()->openDocument(QUrl::fromUserInput(file));
}
diff --git a/kdevplatform/shell/workingsets/workingsettooltipwidget.cpp \
b/kdevplatform/shell/workingsets/workingsettooltipwidget.cpp index \
2f7e5f57a6..85541a5a1b 100644
--- a/kdevplatform/shell/workingsets/workingsettooltipwidget.cpp
+++ b/kdevplatform/shell/workingsets/workingsettooltipwidget.cpp
@@ -275,7 +275,7 @@ void WorkingSetToolTipWidget::updateFileButtons()
if(!mainWindow->area()->workingSet().isEmpty())
{
- currentWorkingSet = \
controller->getWorkingSet(mainWindow->area()->workingSet()); + \
currentWorkingSet = controller->workingSet(mainWindow->area()->workingSet()); \
openFiles = currentWorkingSet->fileList().toSet(); }
@@ -348,7 +348,7 @@ void WorkingSetToolTipWidget::buttonClicked(bool)
MainWindow* mainWindow = \
dynamic_cast<MainWindow*>(Core::self()->uiController()->activeMainWindow()); \
Q_ASSERT(mainWindow);
- QSet<QString> openFiles = \
Core::self()->workingSetControllerInternal()->getWorkingSet(mainWindow->area()->workingSet())->fileList().toSet();
+ QSet<QString> openFiles = \
Core::self()->workingSetControllerInternal()->workingSet(mainWindow->area()->workingSet())->fileList().toSet();
if(!openFiles.contains(s->objectName())) {
Core::self()->documentControllerInternal()->openDocument(QUrl::fromUserInput(s->objectName()));
diff --git a/kdevplatform/shell/workingsets/workingsetwidget.cpp \
b/kdevplatform/shell/workingsets/workingsetwidget.cpp index c2ce12f828..1e09621010 \
100644
--- a/kdevplatform/shell/workingsets/workingsetwidget.cpp
+++ b/kdevplatform/shell/workingsets/workingsetwidget.cpp
@@ -36,7 +36,7 @@ WorkingSet* getSet(const QString& id)
return nullptr;
}
- return Core::self()->workingSetControllerInternal()->getWorkingSet(id);
+ return Core::self()->workingSetControllerInternal()->workingSet(id);
}
WorkingSetWidget::WorkingSetWidget(Sublime::Area* area, QWidget* parent)
diff --git a/kdevplatform/template/filters/kdevfilters.cpp \
b/kdevplatform/template/filters/kdevfilters.cpp index 8f6112691c..b1a9a22dc4 100644
--- a/kdevplatform/template/filters/kdevfilters.cpp
+++ b/kdevplatform/template/filters/kdevfilters.cpp
@@ -134,7 +134,7 @@ QVariant ArgumentTypeFilter::doFilter (const QVariant& input, \
const QVariant& /* QString type = safeString(input);
DUChainReadLocker locker(DUChain::lock());
- PersistentSymbolTable::Declarations decl = \
PersistentSymbolTable::self().getDeclarations(IndexedQualifiedIdentifier(QualifiedIdentifier(type)));
+ PersistentSymbolTable::Declarations decl = \
PersistentSymbolTable::self().declarations(IndexedQualifiedIdentifier(QualifiedIdentifier(type)));
for(PersistentSymbolTable::Declarations::Iterator it = decl.iterator(); it; \
++it) {
diff --git a/kdevplatform/util/texteditorhelpers.cpp \
b/kdevplatform/util/texteditorhelpers.cpp index 02c0530dbd..984cea8020 100644
--- a/kdevplatform/util/texteditorhelpers.cpp
+++ b/kdevplatform/util/texteditorhelpers.cpp
@@ -43,7 +43,7 @@ int lineHeight(const KTextEditor::View* view, int curLine)
}
-QRect KTextEditorHelpers::getItemBoundingRect(const KTextEditor::View* view, const \
KTextEditor::Range& itemRange) +QRect KTextEditorHelpers::itemBoundingRect(const \
KTextEditor::View* view, const KTextEditor::Range& itemRange) {
QPoint startPoint = \
view->mapToGlobal(view->cursorToCoordinate(itemRange.start())); QPoint endPoint = \
view->mapToGlobal(view->cursorToCoordinate(itemRange.end()));
diff --git a/kdevplatform/util/texteditorhelpers.h \
b/kdevplatform/util/texteditorhelpers.h index 50ae0a86c7..da66a68ef5 100644
--- a/kdevplatform/util/texteditorhelpers.h
+++ b/kdevplatform/util/texteditorhelpers.h
@@ -34,7 +34,7 @@ namespace KDevelop {
namespace KTextEditorHelpers {
/// @return Item's bounding rect in global screen coordinates
-QRect KDEVPLATFORMUTIL_EXPORT getItemBoundingRect(const KTextEditor::View* view, \
const KTextEditor::Range& itemRange); +QRect KDEVPLATFORMUTIL_EXPORT \
itemBoundingRect(const KTextEditor::View* view, const KTextEditor::Range& itemRange); \
/**
* @brief Try parsing a string such as "path_to_file:line_num:column_num".
diff --git a/plugins/clang/codecompletion/context.cpp \
b/plugins/clang/codecompletion/context.cpp index 9dc622152c..6118f719f9 100644
--- a/plugins/clang/codecompletion/context.cpp
+++ b/plugins/clang/codecompletion/context.cpp
@@ -556,7 +556,7 @@ bool isValidSpecialCompletionIdentifier(const \
QualifiedIdentifier& identifier)
Declaration* findDeclaration(const QualifiedIdentifier& qid, const DUContextPointer& \
ctx, const CursorInRevision& position, QSet<Declaration*>& handled) {
- PersistentSymbolTable::Declarations decl = \
PersistentSymbolTable::self().getDeclarations(qid); + \
PersistentSymbolTable::Declarations decl = \
PersistentSymbolTable::self().declarations(qid);
const auto top = ctx->topContext();
const auto& importedContexts = top->importedParentContexts();
@@ -1135,7 +1135,7 @@ QList<CompletionTreeItemPointer> \
ClangCodeCompletionContext::completionItems(boo
auto declarationClassContext = \
classDeclarationForContext(DUContextPointer(found->context()), m_position);
uint steps = 10;
- auto inheriters = \
DUChainUtils::getInheriters(declarationClassContext, steps); + \
auto inheriters = DUChainUtils::inheriters(declarationClassContext, steps); \
if(!inheriters.contains(currentClassContext)){ continue;
}
diff --git a/plugins/clang/codegen/adaptsignatureaction.cpp \
b/plugins/clang/codegen/adaptsignatureaction.cpp index b0ef54acba..cd9e0a2b7c 100644
--- a/plugins/clang/codegen/adaptsignatureaction.cpp
+++ b/plugins/clang/codegen/adaptsignatureaction.cpp
@@ -63,7 +63,7 @@ QString AdaptSignatureAction::description() const
QString AdaptSignatureAction::toolTip() const
{
DUChainReadLocker lock;
- auto declaration = m_otherSideId.getDeclaration(m_otherSideTopContext.data());
+ auto declaration = m_otherSideId.declaration(m_otherSideTopContext.data());
if (!declaration) {
return {};
}
@@ -89,12 +89,12 @@ void AdaptSignatureAction::execute()
lock.lock();
- Declaration* otherSide = \
m_otherSideId.getDeclaration(m_otherSideTopContext.data()); + Declaration* \
otherSide = m_otherSideId.declaration(m_otherSideTopContext.data()); if (!otherSide) \
{ clangDebug() << "could not find definition";
return;
}
- DUContext* functionContext = DUChainUtils::getFunctionContext(otherSide);
+ DUContext* functionContext = DUChainUtils::functionContext(otherSide);
if (!functionContext) {
clangDebug() << "no function context";
return;
diff --git a/plugins/clang/codegen/adaptsignatureassistant.cpp \
b/plugins/clang/codegen/adaptsignatureassistant.cpp index 3d363a8950..7c39a88a9b \
100644
--- a/plugins/clang/codegen/adaptsignatureassistant.cpp
+++ b/plugins/clang/codegen/adaptsignatureassistant.cpp
@@ -149,7 +149,7 @@ void AdaptSignatureAssistant::textChanged(KTextEditor::Document* \
doc, const KTex clangDebug() << "no other side for signature found";
return;
}
- m_otherSideContext = \
DUContextPointer(DUChainUtils::getFunctionContext(otherSide)); + \
m_otherSideContext = DUContextPointer(DUChainUtils::functionContext(otherSide)); if \
(!m_otherSideContext) { clangDebug() << "no context for other side found";
return;
@@ -270,7 +270,7 @@ void AdaptSignatureAssistant::updateReady(const \
KDevelop::IndexedString& documen
clangDebug() << "No function found at" << m_document->url() << \
m_lastEditPosition; return;
}
- DUContext *functionCtxt = DUChainUtils::getFunctionContext(functionDecl);
+ DUContext *functionCtxt = DUChainUtils::functionContext(functionDecl);
if (!functionCtxt) {
clangDebug() << "No function context found for" << functionDecl->toString();
return;
diff --git a/plugins/clang/tests/test_duchain.cpp \
b/plugins/clang/tests/test_duchain.cpp index 997fac9bee..64089e922f 100644
--- a/plugins/clang/tests/test_duchain.cpp
+++ b/plugins/clang/tests/test_duchain.cpp
@@ -604,7 +604,7 @@ void TestDUChain::testVirtualMemberFunction()
QCOMPARE(top->childContexts()[2]->localDeclarations().count(), 1);
Declaration* decl = top->childContexts()[2]->localDeclarations()[0];
QCOMPARE(decl->identifier(), Identifier("ret"));
- QVERIFY(DUChainUtils::getOverridden(decl));
+ QVERIFY(DUChainUtils::overridden(decl));
}
void TestDUChain::testBaseClasses()
@@ -728,15 +728,15 @@ void TestDUChain::testGetInheriters()
QCOMPARE(inheritedDecl->identifier(), Identifier("Inherited"));
uint maxAllowedSteps = uint(-1);
- auto baseInheriters = DUChainUtils::getInheriters(baseDecl, maxAllowedSteps);
+ auto baseInheriters = DUChainUtils::inheriters(baseDecl, maxAllowedSteps);
QCOMPARE(baseInheriters, QList<Declaration*>() << inheritedDecl);
maxAllowedSteps = uint(-1);
- auto innerInheriters = DUChainUtils::getInheriters(innerDecl, maxAllowedSteps);
+ auto innerInheriters = DUChainUtils::inheriters(innerDecl, maxAllowedSteps);
QCOMPARE(innerInheriters, QList<Declaration*>() << inheritedDecl);
maxAllowedSteps = uint(-1);
- auto inheritedInheriters = DUChainUtils::getInheriters(inheritedDecl, \
maxAllowedSteps); + auto inheritedInheriters = \
DUChainUtils::inheriters(inheritedDecl, maxAllowedSteps); \
QCOMPARE(inheritedInheriters.count(), 0); }
@@ -1817,7 +1817,7 @@ void TestDUChain::testTemplateFunctionParameterName()
QCOMPARE(declarations.size(), 2);
for (auto decl : declarations) {
- auto ctx = DUChainUtils::getArgumentContext(decl);
+ auto ctx = DUChainUtils::argumentContext(decl);
QVERIFY(ctx);
auto args = ctx->localDeclarations();
if (decl == declarations.first())
diff --git a/plugins/classbrowser/classtree.cpp b/plugins/classbrowser/classtree.cpp
index ecb029462a..c5805a0c80 100644
--- a/plugins/classbrowser/classtree.cpp
+++ b/plugins/classbrowser/classtree.cpp
@@ -149,7 +149,7 @@ void ClassTree::itemActivated( const QModelIndex& index )
void ClassTree::highlightIdentifier( const KDevelop::IndexedQualifiedIdentifier& \
a_id ) {
- QModelIndex index = model()->getIndexForIdentifier( a_id );
+ QModelIndex index = model()->indexForIdentifier( a_id );
if ( !index.isValid() )
return;
diff --git a/plugins/contextbrowser/contextbrowser.cpp \
b/plugins/contextbrowser/contextbrowser.cpp index ef1967e45a..eaef28dd3f 100644
--- a/plugins/contextbrowser/contextbrowser.cpp
+++ b/plugins/contextbrowser/contextbrowser.cpp
@@ -623,7 +623,7 @@ void ContextBrowserPlugin::showToolTip(KTextEditor::View* view, \
KTextEditor::Cur auto viewUrl = view->document()->url();
itemRange = DUChainUtils::itemUnderCursor(viewUrl, position).range;
}
- tooltip->setHandleRect(KTextEditorHelpers::getItemBoundingRect(view, \
itemRange)); + tooltip->setHandleRect(KTextEditorHelpers::itemBoundingRect(view, \
itemRange)); tooltip->resize( navigationWidget->sizeHint() + QSize(10, 10) );
QObject::connect( view, &KTextEditor::View::verticalScrollPositionChanged,
this, &ContextBrowserPlugin::hideToolTip );
diff --git a/plugins/contextbrowser/contextbrowserview.cpp \
b/plugins/contextbrowser/contextbrowserview.cpp index 17f9986b0e..800ef7d08b 100644
--- a/plugins/contextbrowser/contextbrowserview.cpp
+++ b/plugins/contextbrowser/contextbrowserview.cpp
@@ -265,7 +265,7 @@ void ContextBrowserView::showEvent(QShowEvent* event)
TopDUContext* top = m_lastUsedTopContext.data();
if(top && m_navigationWidgetDeclaration.isValid()) {
//Update the navigation-widget
- Declaration* decl = m_navigationWidgetDeclaration.getDeclaration(top);
+ Declaration* decl = m_navigationWidgetDeclaration.declaration(top);
if(decl)
setDeclaration(decl, top, true);
}
diff --git a/plugins/outlineview/outlinenode.cpp \
b/plugins/outlineview/outlinenode.cpp index db6b285e70..adcffb5214 100644
--- a/plugins/outlineview/outlinenode.cpp
+++ b/plugins/outlineview/outlinenode.cpp
@@ -99,7 +99,7 @@ OutlineNode::OutlineNode(Declaration* decl, OutlineNode* parent)
case AbstractType::TypeFunction: {
FunctionType::Ptr func = type.cast<FunctionType>();
// func->partToString() does not add the argument names -> do it \
manually
- if (DUContext* fCtx = DUChainUtils::getFunctionContext(decl)) {
+ if (DUContext* fCtx = DUChainUtils::functionContext(decl)) {
m_cachedText += QLatin1Char('(');
bool first = true;
foreach (Declaration* childDecl, \
fCtx->localDeclarations(decl->topContext())) {
diff --git a/plugins/problemreporter/problemreportermodel.cpp \
b/plugins/problemreporter/problemreportermodel.cpp index e97a9bd178..1236924819 \
100644
--- a/plugins/problemreporter/problemreportermodel.cpp
+++ b/plugins/problemreporter/problemreportermodel.cpp
@@ -97,7 +97,7 @@ void ProblemReporterModel::forceFullUpdate()
QSet<IndexedString> documents = store()->documents()->get();
if (showImports())
- documents += store()->documents()->getImports();
+ documents += store()->documents()->imports();
DUChainReadLocker lock(DUChain::lock());
foreach (const IndexedString& document, documents) {
@@ -142,7 +142,7 @@ void ProblemReporterModel::problemsUpdated(const \
KDevelop::IndexedString& url)
// skip update for urls outside current scope
if (!store()->documents()->get().contains(url) &&
- !(showImports() && store()->documents()->getImports().contains(url)))
+ !(showImports() && store()->documents()->imports().contains(url)))
return;
/// m_minTimer will expire in MinTimeout unless some other parsing job finishes \
in this period. @@ -161,7 +161,7 @@ void ProblemReporterModel::rebuildProblemList()
QVector<IProblem::Ptr> allProblems = problems(store()->documents()->get());
if (showImports())
- allProblems += problems(store()->documents()->getImports());
+ allProblems += problems(store()->documents()->imports());
store()->setProblems(allProblems);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic