diff --git a/projectmanagers/cmake/duchain/declarationbuilder.cpp b/projectmanagers/cmake/duchain/declarationbuilder.cpp index e3d1f6e5f0..384130bc53 100644 --- a/projectmanagers/cmake/duchain/declarationbuilder.cpp +++ b/projectmanagers/cmake/duchain/declarationbuilder.cpp @@ -1,64 +1,64 @@ /* KDevelop CMake Support * * Copyright 2014 Aleix Pol * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. */ #include "declarationbuilder.h" #include #include #include using namespace KDevelop; void DeclarationBuilder::startVisiting(CMakeContentIterator* node) { for(; node->hasNext(); ) { const CMakeFunctionDesc& func = node->next(); if (func.name == QLatin1String("add_executable") || func.name == QLatin1String("add_library")) { if (func.arguments.isEmpty()) { continue; } CMakeFunctionArgument arg = func.arguments.first(); DUChainWriteLocker lock; - Declaration* decl = openDeclaration(QualifiedIdentifier(arg.value), arg.range(), DeclarationIsDefinition); + Declaration* decl = openDeclaration(Identifier(arg.value), arg.range(), DeclarationIsDefinition); decl->setAbstractType(AbstractType::Ptr(new TargetType)); closeDeclaration(); } else if(func.name == QLatin1String("macro") || func.name == QLatin1String("function")) { if (func.arguments.isEmpty()) { continue; } CMakeFunctionArgument arg = func.arguments.first(); FunctionType::Ptr funcType(new FunctionType); QList::const_iterator it=func.arguments.constBegin()+1, itEnd = func.arguments.constEnd(); for (; it!=itEnd; ++it) { DelayedType::Ptr delayed(new DelayedType); delayed->setIdentifier( IndexedTypeIdentifier(it->value) ); funcType->addArgument(delayed); } DUChainWriteLocker lock; - FunctionDeclaration* decl = openDeclaration(QualifiedIdentifier(arg.value), arg.range(), DeclarationIsDefinition); + FunctionDeclaration* decl = openDeclaration(Identifier(arg.value), arg.range(), DeclarationIsDefinition); decl->setAbstractType( funcType ); closeDeclaration(); } } }