diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2015-08-24 13:39:40 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-10-24 16:23:33 +0000 |
| commit | 2c6adc1e747575af5198cc7ea2277b9a70366d3c (patch) | |
| tree | 67cb25bd5fa7ff603fa1daf10bf29a7c4af01b9c /src/plugins/cvs | |
| parent | 6cd68d5401d05187ec3c1eef4e2b9d7846fbfa75 (diff) | |
| download | qt-creator-2c6adc1e747575af5198cc7ea2277b9a70366d3c.tar.gz | |
VCS: Replace QToolButtons in VCS toolbar with QActions
Change VcsBaseEditorParameterWidget to add actions/widgets to an
existing toolbar, instead of being a widget itself.
The class is renamed in a follow-up commit.
Task-number: QTCREATORBUG-14934
Change-Id: I473a439d12a096f4cbb64f06faa0598ee72000de
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/plugins/cvs')
| -rw-r--r-- | src/plugins/cvs/cvsclient.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/cvs/cvsclient.cpp b/src/plugins/cvs/cvsclient.cpp index 5f85889092..072832005c 100644 --- a/src/plugins/cvs/cvsclient.cpp +++ b/src/plugins/cvs/cvsclient.cpp @@ -47,16 +47,15 @@ class CvsDiffParameterWidget : public VcsBaseEditorParameterWidget { Q_OBJECT public: - explicit CvsDiffParameterWidget(VcsBaseClientSettings &settings, QWidget *parent = 0); + CvsDiffParameterWidget(VcsBaseClientSettings &settings, QToolBar *toolBar); QStringList arguments() const; private: VcsBaseClientSettings &m_settings; }; -CvsDiffParameterWidget::CvsDiffParameterWidget(VcsBaseClientSettings &settings, - QWidget *parent) : - VcsBaseEditorParameterWidget(parent), +CvsDiffParameterWidget::CvsDiffParameterWidget(VcsBaseClientSettings &settings, QToolBar *toolBar) : + VcsBaseEditorParameterWidget(toolBar), m_settings(settings) { mapSetting(addToggleButton(QLatin1String("-w"), tr("Ignore Whitespace")), @@ -76,7 +75,9 @@ QStringList CvsDiffParameterWidget::arguments() const CvsClient::CvsClient() : VcsBaseClient(new CvsSettings) { - setDiffParameterWidgetCreator([this] { return new CvsDiffParameterWidget(settings()); }); + setDiffParameterWidgetCreator([this](QToolBar *toolBar) { + return new CvsDiffParameterWidget(settings(), toolBar); + }); } CvsSettings &CvsClient::settings() const |