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

CppEditor: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
- Avoid unnecessary conversions
- Add missing tr().

Change-Id: I3c0dd627a3621929c9c6fc71db6924fa513e34a7
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-11 14:26:09 +01:00
parent 9e8f935a03
commit 9128fc2ab0
9 changed files with 129 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cppeditor/cppelementevaluator.cpp
View File

@@ -157,8 +157,7 @@ bool CppElementEvaluator::matchMacroInUse(const CPlusPlus::Document::Ptr &docume
foreach (const Document::MacroUse &use, document->macroUses()) {
if (use.contains(pos)) {
const unsigned begin = use.begin();
const QString &name = use.macro().name();
if (pos < begin + name.length()) {
if (pos < begin + use.macro().name().length()) {
m_element = QSharedPointer<CppElement>(new CppMacro(use.macro()));
return true;
}
@@ -317,8 +316,9 @@ const QString &CppInclude::fileName() const
CppMacro::CppMacro(const Macro &macro) : CppElement()
{
setHelpCategory(TextEditor::HelpItem::Macro);
setHelpIdCandidates(QStringList(macro.name()));
setHelpMark(macro.name());
const QString macroName = QLatin1String(macro.name());
setHelpIdCandidates(QStringList(macroName));
setHelpMark(macroName);
setLink(CPPEditorWidget::Link(macro.fileName(), macro.line()));
setTooltip(macro.toStringWithLineBreaks());
}