Bookmark: Clean up translations

Some unusual contexts went unnoticed so far.

Change-Id: I6017d8ae92310ee3b56538d1fa5c52f0de0a4c8a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

src/plugins/autotoolsprojectmanager/makefileparserthread.cpp

@@ -5,7 +5,7 @@
 
 #include <QMutexLocker>
 
-using namespace AutotoolsProjectManager::Internal;
+namespace AutotoolsProjectManager::Internal {
 
 MakefileParserThread::MakefileParserThread(ProjectExplorer::BuildSystem *bs)
     : m_parser(bs->projectFilePath().toString()),
@@ -92,3 +92,5 @@ void MakefileParserThread::run()
     m_cflags = m_parser.cflags();
     m_cxxflags = m_parser.cxxflags();
 }
+
+} // AutotoolsProjectManager::Internal

src/plugins/bookmarks/bookmark.cpp

@@ -2,25 +2,26 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "bookmark.h"
+
 #include "bookmarkmanager.h"
 #include "bookmarks_global.h"
+#include "bookmarkstr.h"
 
 #include <utils/utilsicons.h>
 
-#include <QApplication>
-#include <QFileInfo>
 #include <QTextBlock>
 
-using namespace Bookmarks::Internal;
 using namespace Utils;
 
+namespace Bookmarks::Internal {
+
 Bookmark::Bookmark(int lineNumber, BookmarkManager *manager) :
     TextMark(FilePath(), lineNumber, Constants::BOOKMARKS_TEXT_MARK_CATEGORY),
     m_manager(manager)
 {
-    setColor(Utils::Theme::Bookmarks_TextMarkColor);
-    setIcon(Utils::Icons::BOOKMARK_TEXTEDITOR.icon());
-    setDefaultToolTip(QApplication::translate("BookmarkManager", "Bookmark"));
+    setColor(Theme::Bookmarks_TextMarkColor);
+    setIcon(Icons::BOOKMARK_TEXTEDITOR.icon());
+    setDefaultToolTip(Tr::tr("Bookmark"));
     setPriority(TextEditor::TextMark::NormalPriority);
 }
 
@@ -94,3 +95,5 @@ QString Bookmark::note() const
 {
     return toolTip();
 }
+
+} // Bookmarks::Internal

src/plugins/bookmarks/bookmark.h

@@ -5,8 +5,7 @@
 
 #include <texteditor/textmark.h>
 
-namespace Bookmarks {
-namespace Internal {
+namespace Bookmarks::Internal {
 
 class BookmarkManager;
 
@@ -35,5 +34,4 @@ private:
     QString m_lineText;
 };
 
-} // namespace Internal
-} // namespace Bookmarks
+} // Bookmarks::Internal

src/plugins/bookmarks/bookmarkfilter.cpp

@@ -9,10 +9,11 @@
 
 #include <utils/algorithm.h>
 
-using namespace Bookmarks::Internal;
 using namespace Core;
 using namespace Utils;
 
+namespace Bookmarks::Internal {
+
 BookmarkFilter::BookmarkFilter(BookmarkManager *manager)
     : m_manager(manager)
 {
@@ -114,3 +115,5 @@ void BookmarkFilter::accept(const LocatorFilterEntry &selection, QString *newTex
         m_manager->gotoBookmark(bookmark);
     }
 }
+
+} // Bookmarks::Internal

src/plugins/bookmarks/bookmarkfilter.h

@@ -5,14 +5,12 @@
 
 #include <coreplugin/locator/ilocatorfilter.h>
 
-namespace Bookmarks {
-namespace Internal {
+namespace Bookmarks::Internal {
 
 class BookmarkManager;
 
 class BookmarkFilter : public Core::ILocatorFilter
 {
-    Q_OBJECT
 public:
     explicit BookmarkFilter(BookmarkManager *manager);
     void prepareSearch(const QString &entry) override;
@@ -26,5 +24,4 @@ private:
     QList<Core::LocatorFilterEntry> m_results;
 };
 
-} // namespace Internal
-} // namespace Bookmarks
+} // Bookmarks::Internal

src/plugins/bookmarks/bookmarkmanager.cpp

@@ -43,8 +43,7 @@ using namespace ProjectExplorer;
 using namespace Core;
 using namespace Utils;
 
-namespace Bookmarks {
-namespace Internal {
+namespace Bookmarks::Internal {
 
 BookmarkDelegate::BookmarkDelegate(QObject *parent)
     : QStyledItemDelegate(parent)
@@ -794,5 +793,4 @@ NavigationView BookmarkViewFactory::createWidget()
     return {view, view->createToolBarWidgets()};
 }
 
-} // namespace Internal
-} // namespace Bookmarks
+} // Bookmarks::Internal

src/plugins/bookmarks/bookmarkmanager.h

@@ -16,8 +16,7 @@
 
 namespace Core { class IContext; }
 
-namespace Bookmarks {
-namespace Internal {
+namespace Bookmarks::Internal {
 
 class Bookmark;
 class BookmarksPlugin;
@@ -102,17 +101,13 @@ private:
 
 class BookmarkView final : public Utils::ListView
 {
-    Q_OBJECT
-
 public:
     explicit BookmarkView(BookmarkManager *manager);
 
     QList<QToolButton *> createToolBarWidgets();
 
-public slots:
     void gotoBookmark(const QModelIndex &index);
 
-protected slots:
     void removeFromContextMenu();
     void removeAll();
 
@@ -129,8 +124,6 @@ private:
 
 class BookmarkViewFactory : public Core::INavigationWidgetFactory
 {
-    Q_OBJECT
-
 public:
     BookmarkViewFactory(BookmarkManager *bm);
 
@@ -142,8 +135,6 @@ private:
 
 class BookmarkDelegate : public QStyledItemDelegate
 {
-    Q_OBJECT
-
 public:
     BookmarkDelegate(QObject *parent = nullptr);
 
@@ -156,5 +147,4 @@ private:
     mutable QPixmap m_selectedPixmap;
 };
 
-} // namespace Internal
-} // namespace Bookmarks
+} // Bookmarks::Internal

src/plugins/bookmarks/bookmarksplugin.cpp

@@ -31,8 +31,7 @@ using namespace Utils;
 
 using namespace Bookmarks::Constants;
 
-namespace Bookmarks {
-namespace Internal {
+namespace Bookmarks::Internal {
 
 class BookmarksPluginPrivate : public QObject
 {
@@ -225,5 +224,4 @@ void BookmarksPluginPrivate::requestContextMenu(TextEditorWidget *widget,
         menu->addAction(&m_editBookmarkAction);
 }
 
-} // namespace Internal
-} // namespace Bookmarks
+} // Bookmarks::Internal

src/plugins/bookmarks/bookmarksplugin.h

@@ -5,8 +5,7 @@
 
 #include <extensionsystem/iplugin.h>
 
-namespace Bookmarks {
-namespace Internal {
+namespace Bookmarks::Internal {
 
 class BookmarksPlugin final : public ExtensionSystem::IPlugin
 {
@@ -20,5 +19,4 @@ class BookmarksPlugin final : public ExtensionSystem::IPlugin
     class BookmarksPluginPrivate *d = nullptr;
 };
 
-} // namespace Internal
-} // namespace Bookmarks
+} // Bookmarks::Internal