summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/searchsymbols.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/cpptools/searchsymbols.h')
-rw-r--r--src/plugins/cpptools/searchsymbols.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/plugins/cpptools/searchsymbols.h b/src/plugins/cpptools/searchsymbols.h
index 9a08b4dced..5b61fe783b 100644
--- a/src/plugins/cpptools/searchsymbols.h
+++ b/src/plugins/cpptools/searchsymbols.h
@@ -40,6 +40,7 @@
#include <QMetaType>
#include <QString>
#include <QSet>
+#include <QHash>
#include <functional>
@@ -66,33 +67,33 @@ struct ModelItemInfo
const QIcon &icon)
: symbolName(symbolName),
symbolType(symbolType),
- type(type),
fullyQualifiedName(fullyQualifiedName),
fileName(fileName),
+ icon(icon),
+ type(type),
line(line),
- column(column),
- icon(icon)
+ column(column)
{ }
ModelItemInfo(const ModelItemInfo &otherInfo)
: symbolName(otherInfo.symbolName),
symbolType(otherInfo.symbolType),
- type(otherInfo.type),
fullyQualifiedName(otherInfo.fullyQualifiedName),
fileName(otherInfo.fileName),
+ icon(otherInfo.icon),
+ type(otherInfo.type),
line(otherInfo.line),
- column(otherInfo.column),
- icon(otherInfo.icon)
+ column(otherInfo.column)
{ }
QString symbolName;
QString symbolType;
- ItemType type;
QStringList fullyQualifiedName;
QString fileName;
+ QIcon icon;
+ ItemType type;
int line;
int column;
- QIcon icon;
};
class SearchSymbols: public std::unary_function<CPlusPlus::Document::Ptr, QList<ModelItemInfo> >,
@@ -152,6 +153,7 @@ private:
CPlusPlus::Icons icons;
QList<ModelItemInfo> items;
SymbolTypes symbolsToSearchFor;
+ QHash<const CPlusPlus::StringLiteral *, QString> m_paths;
bool separateScope;
};