From 51cd6edb17866dbfe96990e3db15273d6d26bf75 Mon Sep 17 00:00:00 2001 From: Marcelo Lira Date: Mon, 28 Jun 2010 19:48:53 -0300 Subject: Fixes usage of std::unique method. std::unique looks for adjacent duplicates in a list, so it needs to be sorted for the algorithm to work in all items. --- abstractmetabuilder.cpp | 1 + parser/codemodel.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/abstractmetabuilder.cpp b/abstractmetabuilder.cpp index fe310cf1e..41a8b9532 100644 --- a/abstractmetabuilder.cpp +++ b/abstractmetabuilder.cpp @@ -337,6 +337,7 @@ bool AbstractMetaBuilder::build(QIODevice* input) // Start the generation... ClassList typeValues = typeMap.values(); + qSort(typeValues); ClassList::iterator it = std::unique(typeValues.begin(), typeValues.end()); typeValues.erase(it, typeValues.end()); diff --git a/parser/codemodel.cpp b/parser/codemodel.cpp index 861a6708c..419471505 100644 --- a/parser/codemodel.cpp +++ b/parser/codemodel.cpp @@ -373,6 +373,7 @@ FunctionModelItem _ScopeModelItem::declaredFunction(FunctionModelItem item) ClassList _ScopeModelItem::classes() const { ClassList result = _M_classes.values(); + qSort(result); ClassList::iterator it = std::unique(result.begin(), result.end()); result.erase(it, result.end()); return result; -- cgit v1.2.3