Commit 1a1681bb authored by Eike Ziller's avatar Eike Ziller

TextEditor: Work around linguist issues

lupdate has issues with resolving non-trivial uses of "using namespace"
(QTBUG-64007)
Move "using namespace" directive to a place where it is better handled
by lupdate.
Also use TextEditorWidget instead of *Private as the context.

Change-Id: I7d3bb8e1bc493196e47085827be31f97e0dce7b8
Reviewed-by: David Schulz's avatarDavid Schulz <david.schulz@qt.io>
parent ab1107c4
......@@ -150,6 +150,9 @@ using namespace Core;
using namespace Utils;
namespace TextEditor {
using namespace Internal;
namespace Internal {
enum { NExtraSelectionKinds = 12 };
......@@ -683,8 +686,6 @@ TextEditorWidgetPrivate::~TextEditorWidgetPrivate()
} // namespace Internal
using namespace Internal;
/*!
* Test if syntax highlighter is available (or unneeded) for \a widget.
* If not found, show a warning with a link to the relevant settings page.
......@@ -3343,7 +3344,11 @@ bool TextEditorWidgetPrivate::processAnnotaionTooltipRequest(const QTextBlock &b
QFrame* separator = new QFrame();
separator->setFrameShape(QFrame::HLine);
layout->addWidget(separator, layout->rowCount(), 0, 1, -1);
layout->addWidget(new QLabel(tr("Other annotations:")), layout->rowCount(), 0, 1, -1);
layout->addWidget(new QLabel(TextEditorWidget::tr("Other annotations:")),
layout->rowCount(),
0,
1,
-1);
Utils::sort(marks, [](const TextMark* mark1, const TextMark* mark2){
return mark1->priority() > mark2->priority();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment