diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-01-02 22:12:06 +0200 |
---|---|---|
committer | hjk <qthjk@ovi.com> | 2013-01-07 13:43:23 +0100 |
commit | 34db64c752a46942f43daf77263e27e124d932b2 (patch) | |
tree | 25955b8e9edb814fddec1c6e9ca610c95190b5ad | |
parent | e174e24d582985dbdbf3421ab74ab52eb4589fb6 (diff) | |
download | qt-creator-34db64c752a46942f43daf77263e27e124d932b2.tar.gz |
Move SubmitEditorWidget from Utils to VcsBase
It belongs there
Change-Id: I4b4cdacf32b0eab299d4b2d5258cd4d91a759907
Reviewed-by: hjk <qthjk@ovi.com>
27 files changed, 64 insertions, 64 deletions
diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri index 78569bc1de..2c2df3279a 100644 --- a/src/libs/utils/utils-lib.pri +++ b/src/libs/utils/utils-lib.pri @@ -40,12 +40,10 @@ SOURCES += $$PWD/environment.cpp \ $$PWD/fancylineedit.cpp \ $$PWD/qtcolorbutton.cpp \ $$PWD/savedaction.cpp \ - $$PWD/submiteditorwidget.cpp \ $$PWD/synchronousprocess.cpp \ $$PWD/savefile.cpp \ $$PWD/fileutils.cpp \ $$PWD/textfileformat.cpp \ - $$PWD/submitfieldwidget.cpp \ $$PWD/consoleprocess.cpp \ $$PWD/uncommentselection.cpp \ $$PWD/parameteraction.cpp \ @@ -123,14 +121,12 @@ HEADERS += \ $$PWD/fancylineedit.h \ $$PWD/qtcolorbutton.h \ $$PWD/savedaction.h \ - $$PWD/submiteditorwidget.h \ $$PWD/consoleprocess.h \ $$PWD/consoleprocess_p.h \ $$PWD/synchronousprocess.h \ $$PWD/savefile.h \ $$PWD/fileutils.h \ $$PWD/textfileformat.h \ - $$PWD/submitfieldwidget.h \ $$PWD/uncommentselection.h \ $$PWD/parameteraction.h \ $$PWD/treewidgetcolumnstretcher.h \ @@ -174,7 +170,6 @@ HEADERS += \ FORMS += $$PWD/filewizardpage.ui \ $$PWD/projectintropage.ui \ - $$PWD/newclasswidget.ui \ - $$PWD/submiteditorwidget.ui + $$PWD/newclasswidget.ui RESOURCES += $$PWD/utils.qrc diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 34cd5d0a13..916a7df732 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -152,11 +152,6 @@ QtcLibrary { "styledbar.h", "stylehelper.cpp", "stylehelper.h", - "submiteditorwidget.cpp", - "submiteditorwidget.h", - "submiteditorwidget.ui", - "submitfieldwidget.cpp", - "submitfieldwidget.h", "synchronousprocess.cpp", "synchronousprocess.h", "tcpportsgatherer.cpp", @@ -178,7 +173,6 @@ QtcLibrary { "images/crumblepath-segment-selected-end.png", "images/crumblepath-segment-selected.png", "images/crumblepath-segment.png", - "images/removesubmitfield.png", "images/triangle_vert.png", ] diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc index 52ec41382b..2748bccb6c 100644 --- a/src/libs/utils/utils.qrc +++ b/src/libs/utils/utils.qrc @@ -1,6 +1,5 @@ <RCC> <qresource prefix="/utils"> - <file>images/removesubmitfield.png</file> <file>images/arrow.png</file> <file>images/crumblepath-segment.png</file> <file>images/crumblepath-segment-end.png</file> diff --git a/src/plugins/bazaar/bazaarcommitwidget.cpp b/src/plugins/bazaar/bazaarcommitwidget.cpp index 82b169dcea..d55ece70e9 100644 --- a/src/plugins/bazaar/bazaarcommitwidget.cpp +++ b/src/plugins/bazaar/bazaarcommitwidget.cpp @@ -114,7 +114,7 @@ void BazaarSubmitHighlighter::highlightBlock(const QString &text) BazaarCommitWidget::BazaarCommitWidget(QWidget *parent) : - Utils::SubmitEditorWidget(parent), + VcsBase::SubmitEditorWidget(parent), m_bazaarCommitPanel(new QWidget) { m_bazaarCommitPanelUi.setupUi(m_bazaarCommitPanel); diff --git a/src/plugins/bazaar/bazaarcommitwidget.h b/src/plugins/bazaar/bazaarcommitwidget.h index 7fe3ccb1bb..24df89a599 100644 --- a/src/plugins/bazaar/bazaarcommitwidget.h +++ b/src/plugins/bazaar/bazaarcommitwidget.h @@ -31,7 +31,7 @@ #include "ui_bazaarcommitpanel.h" -#include <utils/submiteditorwidget.h> +#include <vcsbase/submiteditorwidget.h> namespace Bazaar { namespace Internal { @@ -42,7 +42,7 @@ class BranchInfo; Some extra fields have been added to the standard SubmitEditorWidget, to help to conform to the commit style that is used by both git and Bazaar*/ -class BazaarCommitWidget : public Utils::SubmitEditorWidget +class BazaarCommitWidget : public VcsBase::SubmitEditorWidget { public: diff --git a/src/plugins/clearcase/clearcasesubmiteditor.cpp b/src/plugins/clearcase/clearcasesubmiteditor.cpp index f8ca7e2c0b..35e9365852 100644 --- a/src/plugins/clearcase/clearcasesubmiteditor.cpp +++ b/src/plugins/clearcase/clearcasesubmiteditor.cpp @@ -31,7 +31,7 @@ #include "clearcasesubmiteditor.h" #include "clearcasesubmiteditorwidget.h" -#include <utils/submiteditorwidget.h> +#include <vcsbase/submiteditorwidget.h> #include <vcsbase/submitfilemodel.h> using namespace ClearCase::Internal; diff --git a/src/plugins/clearcase/clearcasesubmiteditorwidget.cpp b/src/plugins/clearcase/clearcasesubmiteditorwidget.cpp index 0b937a8335..8e7c1d0162 100644 --- a/src/plugins/clearcase/clearcasesubmiteditorwidget.cpp +++ b/src/plugins/clearcase/clearcasesubmiteditorwidget.cpp @@ -40,7 +40,7 @@ using namespace ClearCase::Internal; ClearCaseSubmitEditorWidget::ClearCaseSubmitEditorWidget(QWidget *parent) : - Utils::SubmitEditorWidget(parent), + VcsBase::SubmitEditorWidget(parent), m_actSelector(0) { setDescriptionMandatory(false); diff --git a/src/plugins/clearcase/clearcasesubmiteditorwidget.h b/src/plugins/clearcase/clearcasesubmiteditorwidget.h index ed93004cc6..5534fe8cdc 100644 --- a/src/plugins/clearcase/clearcasesubmiteditorwidget.h +++ b/src/plugins/clearcase/clearcasesubmiteditorwidget.h @@ -31,7 +31,7 @@ #ifndef CLEARCASESUBMITEDITORWIDGET_H #define CLEARCASESUBMITEDITORWIDGET_H -#include <utils/submiteditorwidget.h> +#include <vcsbase/submiteditorwidget.h> QT_BEGIN_NAMESPACE class QCheckBox; @@ -43,7 +43,7 @@ namespace Internal { class ActivitySelector; -class ClearCaseSubmitEditorWidget : public Utils::SubmitEditorWidget +class ClearCaseSubmitEditorWidget : public VcsBase::SubmitEditorWidget { Q_OBJECT diff --git a/src/plugins/cvs/cvssubmiteditor.cpp b/src/plugins/cvs/cvssubmiteditor.cpp index ed08bd963a..8392e84f4e 100644 --- a/src/plugins/cvs/cvssubmiteditor.cpp +++ b/src/plugins/cvs/cvssubmiteditor.cpp @@ -30,7 +30,7 @@ #include "cvssubmiteditor.h" -#include <utils/submiteditorwidget.h> +#include <vcsbase/submiteditorwidget.h> #include <vcsbase/submitfilemodel.h> using namespace Cvs::Internal; @@ -38,7 +38,7 @@ using namespace VcsBase; CvsSubmitEditor::CvsSubmitEditor(const VcsBaseSubmitEditorParameters *parameters, QWidget *parentWidget) : - VcsBaseSubmitEditor(parameters, new Utils::SubmitEditorWidget(parentWidget)), + VcsBaseSubmitEditor(parameters, new VcsBase::SubmitEditorWidget(parentWidget)), m_msgAdded(tr("Added")), m_msgRemoved(tr("Removed")), m_msgModified(tr("Modified")) diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp index 9e234fd5b4..8c79265e3e 100644 --- a/src/plugins/git/gitsubmiteditorwidget.cpp +++ b/src/plugins/git/gitsubmiteditorwidget.cpp @@ -114,7 +114,7 @@ void GitSubmitHighlighter::highlightBlock(const QString &text) // ------------------ GitSubmitEditorWidget::GitSubmitEditorWidget(QWidget *parent) : - Utils::SubmitEditorWidget(parent), + VcsBase::SubmitEditorWidget(parent), m_gitSubmitPanel(new QWidget), m_hasUnmerged(false) { diff --git a/src/plugins/git/gitsubmiteditorwidget.h b/src/plugins/git/gitsubmiteditorwidget.h index 18f93c987e..191578f5f2 100644 --- a/src/plugins/git/gitsubmiteditorwidget.h +++ b/src/plugins/git/gitsubmiteditorwidget.h @@ -32,7 +32,7 @@ #include "ui_gitsubmitpanel.h" -#include <utils/submiteditorwidget.h> +#include <vcsbase/submiteditorwidget.h> QT_BEGIN_NAMESPACE class QValidator; @@ -52,7 +52,7 @@ struct GitSubmitEditorPanelData; * remaining un-added and untracked files will be added 'unchecked' for the * user to click. */ -class GitSubmitEditorWidget : public Utils::SubmitEditorWidget +class GitSubmitEditorWidget : public VcsBase::SubmitEditorWidget { Q_OBJECT diff --git a/src/plugins/mercurial/mercurialcommitwidget.cpp b/src/plugins/mercurial/mercurialcommitwidget.cpp index 6bd215c262..bb14eb6806 100644 --- a/src/plugins/mercurial/mercurialcommitwidget.cpp +++ b/src/plugins/mercurial/mercurialcommitwidget.cpp @@ -114,7 +114,7 @@ void MercurialSubmitHighlighter::highlightBlock(const QString &text) MercurialCommitWidget::MercurialCommitWidget(QWidget *parent) : - Utils::SubmitEditorWidget(parent), + VcsBase::SubmitEditorWidget(parent), mercurialCommitPanel(new QWidget) { mercurialCommitPanelUi.setupUi(mercurialCommitPanel); diff --git a/src/plugins/mercurial/mercurialcommitwidget.h b/src/plugins/mercurial/mercurialcommitwidget.h index 5b3099aedd..f5c276556c 100644 --- a/src/plugins/mercurial/mercurialcommitwidget.h +++ b/src/plugins/mercurial/mercurialcommitwidget.h @@ -32,7 +32,7 @@ #include "ui_mercurialcommitpanel.h" -#include <utils/submiteditorwidget.h> +#include <vcsbase/submiteditorwidget.h> namespace Mercurial { namespace Internal { @@ -41,7 +41,7 @@ namespace Internal { Some extra fields have been added to the standard SubmitEditorWidget, to help to conform to the commit style that is used by both git and Mercurial*/ -class MercurialCommitWidget : public Utils::SubmitEditorWidget +class MercurialCommitWidget : public VcsBase::SubmitEditorWidget { public: diff --git a/src/plugins/perforce/perforcesubmiteditorwidget.cpp b/src/plugins/perforce/perforcesubmiteditorwidget.cpp index 1bbebab3a4..509fee713f 100644 --- a/src/plugins/perforce/perforcesubmiteditorwidget.cpp +++ b/src/plugins/perforce/perforcesubmiteditorwidget.cpp @@ -33,7 +33,7 @@ namespace Perforce { namespace Internal { PerforceSubmitEditorWidget::PerforceSubmitEditorWidget(QWidget *parent) : - Utils::SubmitEditorWidget(parent), + VcsBase::SubmitEditorWidget(parent), m_submitPanel(new QGroupBox) { m_submitPanelUi.setupUi(m_submitPanel); diff --git a/src/plugins/perforce/perforcesubmiteditorwidget.h b/src/plugins/perforce/perforcesubmiteditorwidget.h index 1a0ed8d7e7..7102cf30de 100644 --- a/src/plugins/perforce/perforcesubmiteditorwidget.h +++ b/src/plugins/perforce/perforcesubmiteditorwidget.h @@ -31,14 +31,14 @@ #define PERFORCESUBMITEDITORWIDGET_H #include "ui_submitpanel.h" -#include <utils/submiteditorwidget.h> +#include <vcsbase/submiteditorwidget.h> namespace Perforce { namespace Internal { /* Submit editor widget with additional information pane * at the top. */ -class PerforceSubmitEditorWidget : public Utils::SubmitEditorWidget +class PerforceSubmitEditorWidget : public VcsBase::SubmitEditorWidget { public: diff --git a/src/plugins/subversion/subversionsubmiteditor.cpp b/src/plugins/subversion/subversionsubmiteditor.cpp index c68f8780a3..152d5722d9 100644 --- a/src/plugins/subversion/subversionsubmiteditor.cpp +++ b/src/plugins/subversion/subversionsubmiteditor.cpp @@ -30,14 +30,14 @@ #include "subversionsubmiteditor.h" -#include <utils/submiteditorwidget.h> +#include <vcsbase/submiteditorwidget.h> #include <vcsbase/submitfilemodel.h> using namespace Subversion::Internal; SubversionSubmitEditor::SubversionSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters, QWidget *parentWidget) : - VcsBase::VcsBaseSubmitEditor(parameters, new Utils::SubmitEditorWidget(parentWidget)) + VcsBase::VcsBaseSubmitEditor(parameters, new VcsBase::SubmitEditorWidget(parentWidget)) { setDisplayName(tr("Subversion Submit")); setDescriptionMandatory(false); diff --git a/src/libs/utils/images/removesubmitfield.png b/src/plugins/vcsbase/images/removesubmitfield.png Binary files differindex e4139afc55..e4139afc55 100644 --- a/src/libs/utils/images/removesubmitfield.png +++ b/src/plugins/vcsbase/images/removesubmitfield.png diff --git a/src/libs/utils/submiteditorwidget.cpp b/src/plugins/vcsbase/submiteditorwidget.cpp index 13714e8a5f..9ad7bfaee1 100644 --- a/src/libs/utils/submiteditorwidget.cpp +++ b/src/plugins/vcsbase/submiteditorwidget.cpp @@ -49,7 +49,7 @@ enum { defaultLineWidth = 72 }; enum { checkableColumn = 0 }; /*! - \class Utils::SubmitEditorWidget + \class VcsBase::SubmitEditorWidget \brief Presents a VCS commit message in a text editor and a checkable list of modified files in a list window. @@ -71,7 +71,7 @@ enum { checkableColumn = 0 }; editor closes. */ -namespace Utils { +namespace VcsBase { // QActionPushButton: A push button tied to an action // (similar to a QToolButton) @@ -466,7 +466,7 @@ QStringList SubmitEditorWidget::checkedFiles() const return rc; } -CompletingTextEdit *SubmitEditorWidget::descriptionEdit() const +Utils::CompletingTextEdit *SubmitEditorWidget::descriptionEdit() const { return d->m_ui.description; } @@ -714,6 +714,6 @@ void SubmitEditorWidget::setEmptyFileListEnabled(bool e) } } -} // namespace Utils +} // namespace VcsBase #include "submiteditorwidget.moc" diff --git a/src/libs/utils/submiteditorwidget.h b/src/plugins/vcsbase/submiteditorwidget.h index 9d548e769b..bec7e45a4b 100644 --- a/src/libs/utils/submiteditorwidget.h +++ b/src/plugins/vcsbase/submiteditorwidget.h @@ -30,8 +30,9 @@ #ifndef SUBMITEDITORWIDGET_H #define SUBMITEDITORWIDGET_H -#include "utils_global.h" -#include "completingtextedit.h" +#include "vcsbase_global.h" + +#include <utils/completingtextedit.h> #include <QWidget> #include <QAbstractItemView> @@ -44,12 +45,12 @@ class QModelIndex; class QLineEdit; QT_END_NAMESPACE -namespace Utils { +namespace VcsBase { class SubmitFieldWidget; struct SubmitEditorWidgetPrivate; -class QTCREATOR_UTILS_EXPORT SubmitEditorWidget : public QWidget +class VCSBASE_EXPORT SubmitEditorWidget : public QWidget { Q_OBJECT Q_PROPERTY(QString descriptionText READ descriptionText WRITE setDescriptionText DESIGNABLE true) @@ -103,7 +104,7 @@ public: // Selected files for diff QStringList selectedFiles() const; - CompletingTextEdit *descriptionEdit() const; + Utils::CompletingTextEdit *descriptionEdit() const; void addDescriptionEditContextMenuAction(QAction *a); void insertDescriptionEditContextMenuAction(int pos, QAction *a); @@ -151,6 +152,6 @@ private: SubmitEditorWidgetPrivate *d; }; -} // namespace Utils +} // namespace VcsBase #endif // SUBMITEDITORWIDGET_H diff --git a/src/libs/utils/submiteditorwidget.ui b/src/plugins/vcsbase/submiteditorwidget.ui index 526408e11f..ab37981bb2 100644 --- a/src/libs/utils/submiteditorwidget.ui +++ b/src/plugins/vcsbase/submiteditorwidget.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>Utils::SubmitEditorWidget</class> - <widget class="QWidget" name="Utils::SubmitEditorWidget"> + <class>VcsBase::SubmitEditorWidget</class> + <widget class="QWidget" name="VcsBase::SubmitEditorWidget"> <property name="geometry"> <rect> <x>0</x> @@ -99,7 +99,7 @@ <customwidget> <class>Utils::CompletingTextEdit</class> <extends>QTextEdit</extends> - <header>utils/completingtextedit.h</header> + <header location="global">utils/completingtextedit.h</header> </customwidget> </customwidgets> <resources/> diff --git a/src/libs/utils/submitfieldwidget.cpp b/src/plugins/vcsbase/submitfieldwidget.cpp index 7a9002f8d1..3bd9f004c9 100644 --- a/src/libs/utils/submitfieldwidget.cpp +++ b/src/plugins/vcsbase/submitfieldwidget.cpp @@ -52,7 +52,7 @@ static void inline setComboBlocked(QComboBox *cb, int index) } /*! - \class Utils::SubmitFieldWidget + \class VcsBase::SubmitFieldWidget \brief A widget for editing submit message fields like "reviewed-by:", "signed-off-by:". @@ -63,7 +63,7 @@ static void inline setComboBlocked(QComboBox *cb, int index) completer can be added. */ -namespace Utils { +namespace VcsBase { // Field/Row entry struct FieldEntry { @@ -142,7 +142,7 @@ struct SubmitFieldWidgetPrivate { }; SubmitFieldWidgetPrivate::SubmitFieldWidgetPrivate() : - removeFieldIcon(QLatin1String(":/utils/images/removesubmitfield.png")), + removeFieldIcon(QLatin1String(":/vcsbase/images/removesubmitfield.png")), completer(0), hasBrowseButton(false), allowDuplicateFields(false), diff --git a/src/libs/utils/submitfieldwidget.h b/src/plugins/vcsbase/submitfieldwidget.h index feea4cfd47..3be16bcd7b 100644 --- a/src/libs/utils/submitfieldwidget.h +++ b/src/plugins/vcsbase/submitfieldwidget.h @@ -30,7 +30,7 @@ #ifndef SUBMITFIELDWIDGET_H #define SUBMITFIELDWIDGET_H -#include "utils_global.h" +#include "vcsbase_global.h" #include <QWidget> @@ -38,11 +38,11 @@ QT_BEGIN_NAMESPACE class QCompleter; QT_END_NAMESPACE -namespace Utils { +namespace VcsBase { struct SubmitFieldWidgetPrivate; -class QTCREATOR_UTILS_EXPORT SubmitFieldWidget : public QWidget +class VCSBASE_EXPORT SubmitFieldWidget : public QWidget { Q_OBJECT Q_PROPERTY(QStringList fields READ fields WRITE setFields DESIGNABLE true) @@ -87,6 +87,6 @@ private: SubmitFieldWidgetPrivate *d; }; -} // namespace Utils +} // namespace VcsBase #endif // SUBMITFIELDWIDGET_H diff --git a/src/plugins/vcsbase/vcsbase.pro b/src/plugins/vcsbase/vcsbase.pro index 89a932f02c..ea89fb5999 100644 --- a/src/plugins/vcsbase/vcsbase.pro +++ b/src/plugins/vcsbase/vcsbase.pro @@ -31,7 +31,9 @@ HEADERS += vcsbase_global.h \ command.h \ vcsbaseclient.h \ vcsbaseclientsettings.h \ - vcsbaseeditorparameterwidget.h + vcsbaseeditorparameterwidget.h \ + submitfieldwidget.h \ + submiteditorwidget.h SOURCES += vcsplugin.cpp \ vcsbaseplugin.cpp \ @@ -59,7 +61,9 @@ SOURCES += vcsplugin.cpp \ command.cpp \ vcsbaseclient.cpp \ vcsbaseclientsettings.cpp \ - vcsbaseeditorparameterwidget.cpp + vcsbaseeditorparameterwidget.cpp \ + submitfieldwidget.cpp \ + submiteditorwidget.cpp RESOURCES += vcsbase.qrc @@ -67,5 +71,6 @@ FORMS += commonsettingspage.ui \ nicknamedialog.ui \ checkoutprogresswizardpage.ui \ basecheckoutwizardpage.ui \ - cleandialog.ui + cleandialog.ui \ + submiteditorwidget.ui diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs index aefb0c04f9..b5265d7b8c 100644 --- a/src/plugins/vcsbase/vcsbase.qbs +++ b/src/plugins/vcsbase/vcsbase.qbs @@ -53,6 +53,11 @@ QtcPlugin { "nicknamedialog.ui", "submiteditorfile.cpp", "submiteditorfile.h", + "submiteditorwidget.cpp", + "submiteditorwidget.h", + "submiteditorwidget.ui", + "submitfieldwidget.cpp", + "submitfieldwidget.h", "submitfilemodel.cpp", "submitfilemodel.h", "vcsbase.qrc", @@ -79,6 +84,7 @@ QtcPlugin { "vcsplugin.cpp", "vcsplugin.h", "images/diff.png", + "images/removesubmitfield.png", "images/submit.png", ] } diff --git a/src/plugins/vcsbase/vcsbase.qrc b/src/plugins/vcsbase/vcsbase.qrc index 4da5d9ca9f..2bd826fbae 100644 --- a/src/plugins/vcsbase/vcsbase.qrc +++ b/src/plugins/vcsbase/vcsbase.qrc @@ -2,6 +2,7 @@ <qresource prefix="/vcsbase" > <file>VcsBase.mimetypes.xml</file> <file>images/diff.png</file> + <file>images/removesubmitfield.png</file> <file>images/submit.png</file> </qresource> </RCC> diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index ae6d2bedd2..7eafda69ec 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -30,10 +30,12 @@ #include "vcsbasesubmiteditor.h" #include "commonvcssettings.h" -#include "vcsbaseoutputwindow.h" -#include "vcsplugin.h" #include "nicknamedialog.h" #include "submiteditorfile.h" +#include "submiteditorwidget.h" +#include "submitfieldwidget.h" +#include "vcsbaseoutputwindow.h" +#include "vcsplugin.h" #include <aggregation/aggregate.h> #include <cplusplus/Control.h> @@ -51,10 +53,8 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/editormanager/editormanager.h> #include <utils/completingtextedit.h> -#include <utils/submiteditorwidget.h> #include <utils/checkablemessagebox.h> #include <utils/synchronousprocess.h> -#include <utils/submitfieldwidget.h> #include <utils/fileutils.h> #include <find/basetextfind.h> #include <texteditor/fontsettings.h> @@ -119,7 +119,7 @@ static const char *belongingClassName(const CPlusPlus::Function *function) /*! \class VcsBase::VcsBaseSubmitEditor - \brief Base class for a submit editor based on the Utils::SubmitEditorWidget. + \brief Base class for a submit editor based on the SubmitEditorWidget. Presents the commit message in a text editor and an checkable list of modified files in a list window. The user can delete diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h index 90b9f58f8c..75f8615f86 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.h +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h @@ -42,13 +42,12 @@ class QAbstractItemModel; class QAction; QT_END_NAMESPACE -namespace Utils { class SubmitEditorWidget; } - namespace VcsBase { namespace Internal { class CommonVcsSettings; } struct VcsBaseSubmitEditorPrivate; +class SubmitEditorWidget; class VCSBASE_EXPORT VcsBaseSubmitEditorParameters { @@ -71,7 +70,7 @@ class VCSBASE_EXPORT VcsBaseSubmitEditor : public Core::IEditor protected: explicit VcsBaseSubmitEditor(const VcsBaseSubmitEditorParameters *parameters, - Utils::SubmitEditorWidget *editorWidget); + SubmitEditorWidget *editorWidget); public: // Register the actions with the submit editor widget. |