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

Plugins: Code cosmetics

Browse Source 
Get closer to a uniform pattern of code layout (public/private,
pimpl naming...)

Change-Id: If2bc6dcee3df9127274f479b4ebc270d283dcb65
Reviewed-by: Xing Xiong
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-02-21 14:59:57 +01:00
parent 095df95bfa
commit b5c3ce57ca
12 changed files with 29 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/bookmarks/bookmarksplugin.cpp
View File

@@ -54,10 +54,10 @@ using namespace Bookmarks::Constants;
namespace Bookmarks {
namespace Internal {
class BookmarksPluginRunData : public QObject
class BookmarksPluginPrivate : public QObject
{
public:
BookmarksPluginRunData();
BookmarksPluginPrivate();
void updateActions(bool enableToggle, int stateMask);
void editorOpened(Core::IEditor *editor);
@@ -84,16 +84,16 @@ public:
BookmarksPlugin::~BookmarksPlugin()
{
delete m_runData;
delete d;
}
bool BookmarksPlugin::initialize(const QStringList &, QString *)
{
m_runData = new BookmarksPluginRunData;
d = new BookmarksPluginPrivate;
return true;
}
BookmarksPluginRunData::BookmarksPluginRunData()
BookmarksPluginPrivate::BookmarksPluginPrivate()
: m_bookmarkFilter(&m_bookmarkManager)
, m_bookmarkViewFactory(&m_bookmarkManager)
{
@@ -162,7 +162,7 @@ BookmarksPluginRunData::BookmarksPluginRunData()
});
connect(&m_bookmarkManager, &BookmarkManager::updateActions,
this, &BookmarksPluginRunData::updateActions);
this, &BookmarksPluginPrivate::updateActions);
updateActions(false, m_bookmarkManager.state());
connect(&m_bookmarkMarginAction, &QAction::triggered, this, [this] {
@@ -171,12 +171,12 @@ BookmarksPluginRunData::BookmarksPluginRunData()
// EditorManager
connect(EditorManager::instance(), &EditorManager::editorAboutToClose,
this, &BookmarksPluginRunData::editorAboutToClose);
this, &BookmarksPluginPrivate::editorAboutToClose);
connect(EditorManager::instance(), &EditorManager::editorOpened,
this, &BookmarksPluginRunData::editorOpened);
this, &BookmarksPluginPrivate::editorOpened);
}
void BookmarksPluginRunData::updateActions(bool enableToggle, int state)
void BookmarksPluginPrivate::updateActions(bool enableToggle, int state)
{
const bool hasbm = state >= BookmarkManager::HasBookMarks;
const bool hasdocbm = state == BookmarkManager::HasBookmarksInDocument;
@@ -188,7 +188,7 @@ void BookmarksPluginRunData::updateActions(bool enableToggle, int state)
m_docNextAction.setEnabled(hasdocbm);
}
void BookmarksPluginRunData::editorOpened(IEditor *editor)
void BookmarksPluginPrivate::editorOpened(IEditor *editor)
{
if (auto widget = qobject_cast<TextEditorWidget *>(editor->widget())) {
connect(widget, &TextEditorWidget::markRequested,
@@ -198,19 +198,19 @@ void BookmarksPluginRunData::editorOpened(IEditor *editor)
});
connect(widget, &TextEditorWidget::markContextMenuRequested,
this, &BookmarksPluginRunData::requestContextMenu);
this, &BookmarksPluginPrivate::requestContextMenu);
}
}
void BookmarksPluginRunData::editorAboutToClose(IEditor *editor)
void BookmarksPluginPrivate::editorAboutToClose(IEditor *editor)
{
if (auto widget = qobject_cast<TextEditorWidget *>(editor->widget())) {
disconnect(widget, &TextEditorWidget::markContextMenuRequested,
this, &BookmarksPluginRunData::requestContextMenu);
this, &BookmarksPluginPrivate::requestContextMenu);
}
}
void BookmarksPluginRunData::requestContextMenu(TextEditorWidget *widget,
void BookmarksPluginPrivate::requestContextMenu(TextEditorWidget *widget,
int lineNumber, QMenu *menu)
{
if (widget->textDocument()->isTemporary())