Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
e665fc82
Commit
e665fc82
authored
Dec 10, 2008
by
mae
Browse files
Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
parents
fdd87280
037a9bb5
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/cpptools/cpphoverhandler.cpp
View file @
e665fc82
...
...
@@ -175,15 +175,6 @@ void CppHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in
break
;
}
}
if
(
m_toolTip
.
isEmpty
())
{
foreach
(
const
Document
::
MacroUse
use
,
doc
->
macroUses
())
{
if
(
use
.
contains
(
pos
))
{
m_toolTip
=
use
.
macro
().
toString
();
break
;
}
}
}
}
if
(
m_toolTip
.
isEmpty
())
{
...
...
@@ -240,6 +231,16 @@ void CppHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in
}
}
if
(
doc
&&
m_toolTip
.
isEmpty
())
{
foreach
(
const
Document
::
MacroUse
&
use
,
doc
->
macroUses
())
{
if
(
use
.
contains
(
pos
))
{
m_toolTip
=
use
.
macro
().
toString
();
m_helpId
=
use
.
macro
().
name
;
break
;
}
}
}
if
(
m_helpEngineNeedsSetup
&&
m_helpEngine
->
registeredDocumentations
().
count
()
>
0
)
{
m_helpEngine
->
setupData
();
...
...
@@ -248,7 +249,8 @@ void CppHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in
if
(
!
m_helpId
.
isEmpty
()
&&
!
m_helpEngine
->
linksForIdentifier
(
m_helpId
).
isEmpty
())
{
m_toolTip
=
QString
(
QLatin1String
(
"<table><tr><td valign=middle><nobr>%1</td>"
"<td><img src=
\"
:/cpptools/images/f1.svg
\"
></td></tr></table>"
)).
arg
(
Qt
::
escape
(
m_toolTip
));
"<td><img src=
\"
:/cpptools/images/f1.svg
\"
></td></tr></table>"
))
.
arg
(
Qt
::
escape
(
m_toolTip
));
editor
->
setContextHelpId
(
m_helpId
);
}
else
if
(
!
m_toolTip
.
isEmpty
())
{
m_toolTip
=
QString
(
QLatin1String
(
"<nobr>%1"
)).
arg
(
Qt
::
escape
(
m_toolTip
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment