diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index e3d02bf63eb..edd6997c7ac 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -44,7 +44,7 @@ - BookmarkDialog + Bookmarks Add Bookmark Přidat záložku @@ -81,13 +81,6 @@ Add in folder: Přidat do složky: - - - BookmarkManager - - Bookmarks - Záložky - Remove Odstranit @@ -100,21 +93,6 @@ You are going to delete a Folder which will also<br>remove its content. Are you sure you would like to continue? Chystáte se smazat složku, přičemž se smaže<br>i její obsah. Jste si jistý, že přesto chcete pokračovat? - - New Folder - Nová složka - - - - BookmarkWidget - - Delete Folder - Smazat složku - - - Rename Folder - Přejmenovat složku - Show Bookmark Ukázat záložku @@ -143,17 +121,6 @@ Add Přidat - - Remove - Odstranit - - - - Bookmarks - - Bookmarks - Záložky - Move Up Posunout nahoru diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index bf250badb8e..f36c6a9a5cf 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -3883,7 +3883,7 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15. - BookmarkDialog + Bookmarks Add Bookmark Tilføj bogmærke @@ -3916,13 +3916,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Rename Folder Omdøb mappe - - - BookmarkManager - - Bookmarks - Bogmærker - Remove Fjern @@ -3931,25 +3924,10 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Deleting a folder also removes its content.<br>Do you want to continue? Sletning af en mappe fjerner også alt dens indhold.<br>Vil du fortsætte? - - New Folder - Ny mappe - Bookmark Bogmærke - - - BookmarkWidget - - Delete Folder - Slet mappe - - - Rename Folder - Omdøb mappe - Show Bookmark Vis bogmærke @@ -3966,9 +3944,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Rename Bookmark Omdøb bogmærke - - - Bookmarks Edit Bookmark Rediger bogmærke @@ -3981,10 +3956,6 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.Line number: Linjenummer: - - Bookmarks - Bogmærker - Move Up Flyt op diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 9bcb48a4e14..b336df81650 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -25,7 +25,7 @@ - BookmarkDialog + Bookmarks Add Bookmark Lesezeichen hinzufügen @@ -58,13 +58,6 @@ Add in folder: Im Verzeichnis: - - - BookmarkManager - - Bookmarks - Lesezeichen - Remove Entfernen @@ -73,25 +66,10 @@ Deleting a folder also removes its content.<br>Do you want to continue? Beim Löschen eines Verzeichnisses wird auch dessen Inhalt gelöscht.<br>Möchten Sie trotzdem fortsetzen? - - New Folder - Neues Verzeichnis - Bookmark Lesezeichen - - - BookmarkWidget - - Delete Folder - Verzeichnis löschen - - - Rename Folder - Verzeichnis umbenennen - Show Bookmark Lesezeichen anzeigen @@ -108,13 +86,6 @@ Rename Bookmark Lesezeichen umbenennen - - - Bookmarks - - Bookmarks - Lesezeichen - Move Up Nach oben diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index fd0f5a18bfc..1809eb692cc 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -89,7 +89,7 @@ - BookmarkDialog + Bookmarks Add Bookmark Agregar marcador @@ -126,17 +126,10 @@ Rename Folder Renombrar directorio - - - BookmarkManager Bookmark Marcador - - Bookmarks - Marcadores - Remove Suprimir @@ -149,17 +142,6 @@ New Folder Nuevo directorio - - - BookmarkWidget - - Delete Folder - Suprimir directorio - - - Rename Folder - Renombrar directorio - Show Bookmark Mostrar marcador @@ -184,17 +166,6 @@ Add Agregar - - Remove - Suprimir - - - - Bookmarks - - Bookmarks - Marcadores - &Remove Bookmark Sup&rimir marcador diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 50d18ff4106..892561e7269 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -48,7 +48,7 @@ - BookmarkDialog + Bookmarks Add Bookmark Ajouter un signet @@ -85,17 +85,10 @@ Add in folder: Ajouter dans le dossier : - - - BookmarkManager Bookmark Signet - - Bookmarks - Signets - Remove Supprimer @@ -108,21 +101,6 @@ You are going to delete a Folder which will also<br>remove its content. Are you sure you would like to continue? Vous allez supprimer un dossier et tout ce qu'il contient.<br>Êtes vous sûr de vouloir continuer ? - - New Folder - Nouveau dossier - - - - BookmarkWidget - - Delete Folder - Supprimer le dossier - - - Rename Folder - Renommer le dossier - Show Bookmark Afficher le signet @@ -151,17 +129,6 @@ Add Ajouter - - Remove - Supprimer - - - - Bookmarks - - Bookmarks - Signets - Move Up Déplacer vers le haut diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index d733979252a..24388562824 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -9383,7 +9383,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - BookmarkDialog + Bookmarks Add Bookmark Dodaj knjižnu oznaku @@ -16741,15 +16741,11 @@ Check the test environment. - BookmarkManager + Bookmarks Bookmark Knjižna oznaka - - Bookmarks - Knjižne oznake - Remove Ukloni @@ -16758,17 +16754,6 @@ Check the test environment. Deleting a folder also removes its content.<br>Do you want to continue? Brisanjem mape se uklanja i njen sadržaj.<br>Želiš li nastaviti? - - New Folder - Nova mapa - - - - Bookmarks - - Bookmarks - Knjižne oznake - Move Up Premjesti prema gore @@ -40861,15 +40846,7 @@ What do you want to do? - BookmarkWidget - - Delete Folder - Ukloni mapu - - - Rename Folder - Preimenuj mapu - + Bookmarks Show Bookmark Prikaži knjižnu oznaku diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts index 5f485187fec..25dca57a887 100644 --- a/share/qtcreator/translations/qtcreator_hu.ts +++ b/share/qtcreator/translations/qtcreator_hu.ts @@ -77,7 +77,7 @@ - BookmarkDialog + Bookmarks Add Bookmark Künyvjelző hozzáadása @@ -110,13 +110,6 @@ Rename Folder Dosszié átnevezése - - - BookmarkManager - - Bookmarks - Könyvjelzők - Remove Eltávolítás @@ -125,13 +118,6 @@ You are going to delete a Folder which will also<br>remove its content. Are you sure you would like to continue? Egy olyan irattárat fog törölni, mely <br>törölni fogja annak tartalmát is. Biztos benne, hogy folytatni szeretné? - - New Folder - Új dosszié - - - - BookmarkWidget Delete Folder Irattár törlése @@ -164,21 +150,10 @@ Add Hozzáadás - - Remove - Eltávolítás - - - - Bookmarks &Remove Bookmark Könyvjelző &eltávolítása - - Bookmarks - Könyvjelzők - Remove all Bookmarks Az összes könyvjelző eltávolítása diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts index f675922862e..9dc5befdad6 100644 --- a/share/qtcreator/translations/qtcreator_it.ts +++ b/share/qtcreator/translations/qtcreator_it.ts @@ -98,7 +98,7 @@ - BookmarkDialog + Bookmarks Add Bookmark Aggiungi un Segnalibro @@ -135,17 +135,10 @@ Rename Folder Rinomina la Cartella - - - BookmarkManager Bookmark Segnalibro - - Bookmarks - Segnalibri - Remove Rimuovi @@ -158,17 +151,6 @@ New Folder Nuova Cartella - - - BookmarkWidget - - Delete Folder - Cancella la Cartella - - - Rename Folder - Rinomina la Cartella - Show Bookmark Mostra il Segnalibro @@ -193,17 +175,6 @@ Add Aggiungi - - Remove - Rimuovi - - - - Bookmarks - - Bookmarks - Segnalibri - &Remove Bookmark &Rimuovi Segnalibro diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 8c9cadfe3b9..5824aad2e46 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -7513,7 +7513,7 @@ SSH 認証が必要とされるリポジトリで使用されます(SSH の SSH_ - BookmarkDialog + Bookmarks Add Bookmark ブックマークの追加 @@ -12877,10 +12877,6 @@ in the system's browser for manual download. Bookmarks - - Bookmarks - ブックマーク - Move Up 上に移動 @@ -33401,15 +33397,7 @@ When a problem is detected, the application is interrupted and can be debugged.< - BookmarkWidget - - Delete Folder - フォルダを削除する - - - Rename Folder - フォルダ名の変更 - + Bookmarks Show Bookmark ブックマークを開く @@ -33426,13 +33414,6 @@ When a problem is detected, the application is interrupted and can be debugged.< Rename Bookmark ブックマークの名前変更 - - - BookmarkManager - - Bookmarks - ブックマーク - Remove 削除 @@ -33441,10 +33422,6 @@ When a problem is detected, the application is interrupted and can be debugged.< Deleting a folder also removes its content.<br>Do you want to continue? フォルダを削除すると中身も削除されます。<br>続行しますか？ - - New Folder - 新しいフォルダ - Bookmark ブックマーク diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 5bddaf96398..dfb4ed087f4 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -1378,7 +1378,7 @@ - BookmarkDialog + Bookmarks Add Bookmark Dodaj zakładkę @@ -1986,10 +1986,6 @@ Przyczyna: %3 Bookmarks - - Bookmarks - Zakładki - Move Up Przenieś do góry @@ -9958,15 +9954,7 @@ Nie zostanie zastosowane do białych znaków w komentarzach i ciągach znakowych - BookmarkWidget - - Delete Folder - Usuń katalog - - - Rename Folder - Zmień nazwę katalogu - + Bookmarks Show Bookmark Pokaż zakładkę @@ -9983,13 +9971,6 @@ Nie zostanie zastosowane do białych znaków w komentarzach i ciągach znakowych Rename Bookmark Zmień nazwę zakładki - - - BookmarkManager - - Bookmarks - Zakładki - Remove Usuń @@ -9998,10 +9979,6 @@ Nie zostanie zastosowane do białych znaków w komentarzach i ciągach znakowych Deleting a folder also removes its content.<br>Do you want to continue? Usunięcie katalogu usuwa również jego zawartość.<br>Czy kontynuować? - - New Folder - Nowy katalog - Bookmark Zakładka diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 43e121c3515..c150c2f49d4 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -5577,7 +5577,7 @@ For example, "Revision: 15" will leave the branch at revision 15. - BookmarkDialog + Bookmarks Add Bookmark Добавить закладку @@ -5610,13 +5610,6 @@ For example, "Revision: 15" will leave the branch at revision 15.Add in folder: Добавить в папку: - - - BookmarkManager - - Bookmarks - Закладки - Remove Удалить @@ -5625,25 +5618,10 @@ For example, "Revision: 15" will leave the branch at revision 15.Deleting a folder also removes its content.<br>Do you want to continue? Удаление папки приведёт к удалению её содержимого.<br>Желаете продолжить? - - New Folder - Новая папка - Bookmark Закладка - - - BookmarkWidget - - Delete Folder - Удалить папку - - - Rename Folder - Переименовать папку - Show Bookmark Показать закладку @@ -5660,13 +5638,6 @@ For example, "Revision: 15" will leave the branch at revision 15.Rename Bookmark Переименовать закладку - - - Bookmarks - - Bookmarks - Закладки - Edit Bookmark Изменение закладки diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index e36ea3677b6..c78944f2445 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -109,7 +109,7 @@ - BookmarkDialog + Bookmarks Add Bookmark Dodaj zaznamek @@ -149,13 +149,6 @@ Add in Folder: Dodaj v mapo: - - - BookmarkManager - - Bookmarks - Zaznamki - Remove Odstrani @@ -164,25 +157,10 @@ Deleting a folder also removes its content.<br>Do you want to continue? Izbris mape odstrani tudi njeno vsebino.<br>Ali želite nadaljevati? - - New Folder - Nova mapa - You are going to delete a Folder which will also<br>remove its content. Are you sure you would like to continue? Nameravate izbrisati mapo, pri čemer bo zbrisana<br>tudi njena vsebina. Ali res želite nadaljevati? - - - BookmarkWidget - - Delete Folder - Izbriši mapo - - - Rename Folder - Preimenuj mapo - Show Bookmark Prikaži zaznamek @@ -203,17 +181,6 @@ Add Dodaj - - Remove - Odstrani - - - - Bookmarks - - Bookmarks - Zaznamki - Move Up Premakni gor diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 08267cdecaa..ce6aef153e3 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -806,7 +806,7 @@ Local pulls are not applied to the master branch. - BookmarkDialog + Bookmarks Add Bookmark Додати закладку @@ -839,13 +839,6 @@ Local pulls are not applied to the master branch. Add in folder: Додати в теку: - - - BookmarkManager - - Bookmarks - Закладки - Remove Видалити @@ -854,21 +847,6 @@ Local pulls are not applied to the master branch. Deleting a folder also removes its content.<br>Do you want to continue? Видалення теки призводить до видалення її вмісту.<br>Бажаєте продовжити? - - New Folder - Нова тека - - - - BookmarkWidget - - Delete Folder - Видалити теку - - - Rename Folder - Перейменувати теку - Show Bookmark Показати закладку @@ -889,17 +867,6 @@ Local pulls are not applied to the master branch. Add Додати - - Remove - Видалити - - - - Bookmarks - - Bookmarks - Закладки - Move Up Пересунути вгору diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 28f18753195..f5fd36f27c2 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -114,7 +114,7 @@ - BookmarkDialog + Bookmarks Add Bookmark 添加书签 @@ -151,13 +151,6 @@ Add in folder: 添加到文件夹: - - - BookmarkManager - - Bookmarks - 书签 - Remove 删除 @@ -166,21 +159,6 @@ Deleting a folder also removes its content.<br>Do you want to continue? 删除文件夹会同时删除文件夹下的文件。<br>您确定继续吗？ - - New Folder - 新文件夹 - - - - BookmarkWidget - - Delete Folder - 删除文件夹 - - - Rename Folder - 重命名文件夹 - Show Bookmark 显示书签 @@ -205,17 +183,6 @@ Add 添加 - - Remove - 删除 - - - - Bookmarks - - Bookmarks - 书签 - Move Up 向上移动 diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 240f7042cf7..e807194fa89 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -32,7 +32,7 @@ - BookmarkDialog + Bookmarks Add Bookmark 新增書籤 @@ -65,13 +65,6 @@ Add in folder: 新增到資料夾: - - - BookmarkManager - - Bookmarks - 書籤 - Remove 移除 @@ -80,21 +73,6 @@ Deleting a folder also removes its content.<br>Do you want to continue? 刪除資料夾會同時移除它的內容。<br>您確定要繼續嗎? - - New Folder - 新資料夾 - - - - BookmarkWidget - - Delete Folder - 刪除資料夾 - - - Rename Folder - 重新命名資料夾 - Show Bookmark 顯示書籤 @@ -115,17 +93,6 @@ Add 新增 - - Remove - 移除 - - - - Bookmarks - - Bookmarks - 書籤 - Move Up 向上移動 diff --git a/src/plugins/autotoolsprojectmanager/makefileparserthread.cpp b/src/plugins/autotoolsprojectmanager/makefileparserthread.cpp index 685b73a70ed..6321db32d33 100644 --- a/src/plugins/autotoolsprojectmanager/makefileparserthread.cpp +++ b/src/plugins/autotoolsprojectmanager/makefileparserthread.cpp @@ -5,7 +5,7 @@ #include -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 diff --git a/src/plugins/bookmarks/bookmark.cpp b/src/plugins/bookmarks/bookmark.cpp index fead3df3ed9..e99a2214357 100644 --- a/src/plugins/bookmarks/bookmark.cpp +++ b/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 -#include -#include #include -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 diff --git a/src/plugins/bookmarks/bookmark.h b/src/plugins/bookmarks/bookmark.h index 38a177e484a..93f5b8a88ae 100644 --- a/src/plugins/bookmarks/bookmark.h +++ b/src/plugins/bookmarks/bookmark.h @@ -5,8 +5,7 @@ #include -namespace Bookmarks { -namespace Internal { +namespace Bookmarks::Internal { class BookmarkManager; @@ -35,5 +34,4 @@ private: QString m_lineText; }; -} // namespace Internal -} // namespace Bookmarks +} // Bookmarks::Internal diff --git a/src/plugins/bookmarks/bookmarkfilter.cpp b/src/plugins/bookmarks/bookmarkfilter.cpp index c17c134b379..493c5916d32 100644 --- a/src/plugins/bookmarks/bookmarkfilter.cpp +++ b/src/plugins/bookmarks/bookmarkfilter.cpp @@ -9,10 +9,11 @@ #include -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 diff --git a/src/plugins/bookmarks/bookmarkfilter.h b/src/plugins/bookmarks/bookmarkfilter.h index fc7262bdfd4..bc068ac176b 100644 --- a/src/plugins/bookmarks/bookmarkfilter.h +++ b/src/plugins/bookmarks/bookmarkfilter.h @@ -5,14 +5,12 @@ #include -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 m_results; }; -} // namespace Internal -} // namespace Bookmarks +} // Bookmarks::Internal diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index f3693ed51c3..41a46590b66 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/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 diff --git a/src/plugins/bookmarks/bookmarkmanager.h b/src/plugins/bookmarks/bookmarkmanager.h index da34b54dd31..0667c9633a3 100644 --- a/src/plugins/bookmarks/bookmarkmanager.h +++ b/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 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 diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp index 33da6d8e798..f1b6a78ddf3 100644 --- a/src/plugins/bookmarks/bookmarksplugin.cpp +++ b/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 diff --git a/src/plugins/bookmarks/bookmarksplugin.h b/src/plugins/bookmarks/bookmarksplugin.h index 5a3172819b4..30e81a96857 100644 --- a/src/plugins/bookmarks/bookmarksplugin.h +++ b/src/plugins/bookmarks/bookmarksplugin.h @@ -5,8 +5,7 @@ #include -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