feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Nicer implementation of CPlusPlus::Macro.

Browse Source
This commit is contained in:
Roberto Raggi
2008-12-22 13:55:42 +01:00
parent 1e0f06e4e8
commit e325aa38d9
9 changed files with 153 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -543,8 +543,8 @@ void CPPEditor::jumpToDefinition()
foreach (const Document::MacroUse use, doc->macroUses()) {
if (use.contains(endOfName - 1)) {
const Macro &macro = use.macro();
const QString fileName = QString::fromUtf8(macro.fileName);
if (openCppEditorAt(fileName, macro.line, 0))
const QString fileName = QString::fromUtf8(macro.fileName());
if (openCppEditorAt(fileName, macro.line(), 0))
return; // done
}
}

5
src/plugins/cppeditor/cpphoverhandler.cpp
View File

@@ -271,8 +271,9 @@ void CppHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in
if (m_toolTip.isEmpty()) {
foreach (const Document::MacroUse &use, doc->macroUses()) {
if (use.contains(pos)) {
m_toolTip = use.macro().toString();
m_helpId = use.macro().name;
const Macro m = use.macro();
m_toolTip = m.toString();
m_helpId = m.name();
break;
}
}

4
src/plugins/cpptools/cppcodecompletion.cpp
View File

@@ -741,7 +741,7 @@ void CppCodeCompletion::addMacros(const LookupContext &context)
processed.insert(fn);
if (Document::Ptr doc = context.document(fn)) {
foreach (const Macro &macro, doc->definedMacros()) {
macroNames.insert(macro.name);
macroNames.insert(macro.name());
}
todo += doc->includedFiles();
}
@@ -749,7 +749,7 @@ void CppCodeCompletion::addMacros(const LookupContext &context)
foreach (const QByteArray &macroName, macroNames) {
TextEditor::CompletionItem item(this);
item.m_text = QString::fromLatin1(macroName.constData(), macroName.length());
item.m_text = QString::fromUtf8(macroName.constData(), macroName.length());
item.m_icon = m_icons.macroIcon();
m_completions.append(item);
}