From 2eadc220235afb539d9a13d7d4344dadd2213fa5 Mon Sep 17 00:00:00 2001 From: hjk Date: Sat, 7 Jan 2012 03:35:54 +0100 Subject: [PATCH] vcsbase: style Change-Id: I139d9d46605383f03215c80bd9e9fd965021b435 Reviewed-by: Friedemann Kleint --- .../vcsbase/baseannotationhighlighter.cpp | 3 +- src/plugins/vcsbase/basecheckoutwizard.cpp | 4 +- .../vcsbase/basevcssubmiteditorfactory.h | 36 ++++------ src/plugins/vcsbase/checkoutjobs.h | 17 ++--- .../vcsbase/checkoutprogresswizardpage.h | 5 +- src/plugins/vcsbase/checkoutwizarddialog.cpp | 5 +- src/plugins/vcsbase/checkoutwizarddialog.h | 5 +- src/plugins/vcsbase/cleandialog.cpp | 8 ++- src/plugins/vcsbase/cleandialog.h | 13 ++-- src/plugins/vcsbase/command.h | 15 ++-- src/plugins/vcsbase/commonsettingspage.cpp | 4 -- src/plugins/vcsbase/commonsettingspage.h | 15 ++-- src/plugins/vcsbase/corelistener.cpp | 4 +- src/plugins/vcsbase/corelistener.h | 4 +- src/plugins/vcsbase/diffhighlighter.cpp | 6 +- src/plugins/vcsbase/diffhighlighter.h | 17 ++--- src/plugins/vcsbase/nicknamedialog.cpp | 7 +- src/plugins/vcsbase/submiteditorfile.cpp | 2 +- src/plugins/vcsbase/submiteditorfile.h | 4 +- src/plugins/vcsbase/submitfilemodel.cpp | 2 +- src/plugins/vcsbase/vcsbaseclient.cpp | 4 -- src/plugins/vcsbase/vcsbaseclient.h | 2 +- src/plugins/vcsbase/vcsbaseclientsettings.cpp | 7 +- src/plugins/vcsbase/vcsbaseclientsettings.h | 6 +- src/plugins/vcsbase/vcsbaseeditor.cpp | 2 +- src/plugins/vcsbase/vcsbaseeditor.h | 13 ++-- .../vcsbase/vcsbaseeditorparameterwidget.cpp | 4 -- .../vcsbase/vcsbaseeditorparameterwidget.h | 8 +-- src/plugins/vcsbase/vcsbaseoptionspage.h | 4 +- src/plugins/vcsbase/vcsbaseoutputwindow.cpp | 9 ++- src/plugins/vcsbase/vcsbaseoutputwindow.h | 31 +++++---- src/plugins/vcsbase/vcsbaseplugin.cpp | 69 ++++++++++--------- src/plugins/vcsbase/vcsbaseplugin.h | 13 ++-- src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 61 ++++++++-------- src/plugins/vcsbase/vcsbasesubmiteditor.h | 34 +++++---- src/plugins/vcsbase/vcsbasetextdocument.h | 1 + src/plugins/vcsbase/vcsconfigurationpage.h | 12 ++-- src/plugins/vcsbase/vcsplugin.cpp | 1 - 38 files changed, 216 insertions(+), 241 deletions(-) diff --git a/src/plugins/vcsbase/baseannotationhighlighter.cpp b/src/plugins/vcsbase/baseannotationhighlighter.cpp index e84f2e6742..5b7764696b 100644 --- a/src/plugins/vcsbase/baseannotationhighlighter.cpp +++ b/src/plugins/vcsbase/baseannotationhighlighter.cpp @@ -58,7 +58,8 @@ typedef QMap ChangeNumberFormatMap; namespace VCSBase { namespace Internal { -class BaseAnnotationHighlighterPrivate { +class BaseAnnotationHighlighterPrivate +{ public: ChangeNumberFormatMap m_changeNumberMap; }; diff --git a/src/plugins/vcsbase/basecheckoutwizard.cpp b/src/plugins/vcsbase/basecheckoutwizard.cpp index 779c25adc0..f99fd2285e 100644 --- a/src/plugins/vcsbase/basecheckoutwizard.cpp +++ b/src/plugins/vcsbase/basecheckoutwizard.cpp @@ -195,9 +195,9 @@ QString BaseCheckoutWizard::openProject(const QString &path, QString *errorMessa return QString(); // Open. Do not use a busy cursor here as additional wizards might pop up const QString projectFile = projectFiles.front().absoluteFilePath(); - if (!pe->openProject(projectFile, errorMessage)) { + if (!pe->openProject(projectFile, errorMessage)) return QString(); - } + return projectFile; } diff --git a/src/plugins/vcsbase/basevcssubmiteditorfactory.h b/src/plugins/vcsbase/basevcssubmiteditorfactory.h index a1f691d471..85ad2486e5 100644 --- a/src/plugins/vcsbase/basevcssubmiteditorfactory.h +++ b/src/plugins/vcsbase/basevcssubmiteditorfactory.h @@ -56,12 +56,12 @@ protected: explicit BaseVCSSubmitEditorFactory(const VCSBaseSubmitEditorParameters *parameters); public: - virtual ~BaseVCSSubmitEditorFactory(); + ~BaseVCSSubmitEditorFactory(); - virtual Core::IEditor *createEditor(QWidget *parent); - virtual Core::Id id() const; - virtual QString displayName() const; - virtual QStringList mimeTypes() const; + Core::IEditor *createEditor(QWidget *parent); + Core::Id id() const; + QString displayName() const; + QStringList mimeTypes() const; Core::IFile *open(const QString &fileName); private: @@ -79,27 +79,19 @@ template class VCSSubmitEditorFactory : public BaseVCSSubmitEditorFactory { public: - explicit VCSSubmitEditorFactory(const VCSBaseSubmitEditorParameters *parameters); + explicit VCSSubmitEditorFactory(const VCSBaseSubmitEditorParameters *parameters) + : BaseVCSSubmitEditorFactory(parameters) + { + } private: - virtual VCSBaseSubmitEditor - *createBaseSubmitEditor(const VCSBaseSubmitEditorParameters *parameters, - QWidget *parent); + VCSBaseSubmitEditor *createBaseSubmitEditor + (const VCSBaseSubmitEditorParameters *parameters, QWidget *parent) + { + return new Editor(parameters, parent); + } }; -template -VCSSubmitEditorFactory::VCSSubmitEditorFactory(const VCSBaseSubmitEditorParameters *parameters) : - BaseVCSSubmitEditorFactory(parameters) -{ -} - -template -VCSBaseSubmitEditor *VCSSubmitEditorFactory::createBaseSubmitEditor(const VCSBaseSubmitEditorParameters *parameters, - QWidget *parent) -{ - return new Editor(parameters, parent); -} - } // namespace VCSBase #endif // VCSBASE_BASEEDITOR_H diff --git a/src/plugins/vcsbase/checkoutjobs.h b/src/plugins/vcsbase/checkoutjobs.h index b7257a6faa..d2d1446a8d 100644 --- a/src/plugins/vcsbase/checkoutjobs.h +++ b/src/plugins/vcsbase/checkoutjobs.h @@ -40,16 +40,9 @@ #include #include -QT_BEGIN_NAMESPACE -class QStringList; -class QByteArray; -QT_END_NAMESPACE - namespace VCSBase { -namespace Internal { -class ProcessCheckoutJobPrivate; -} // namespace Internal +namespace Internal { class ProcessCheckoutJobPrivate; } /* Abstract base class for a job creating an initial project checkout. * It should be something that runs in the background producing log @@ -58,6 +51,7 @@ class ProcessCheckoutJobPrivate; class VCSBASE_EXPORT AbstractCheckoutJob : public QObject { Q_OBJECT + public: virtual void start() = 0; virtual void cancel() = 0; @@ -74,17 +68,18 @@ signals: class VCSBASE_EXPORT ProcessCheckoutJob : public AbstractCheckoutJob { Q_OBJECT + public: explicit ProcessCheckoutJob(QObject *parent = 0); - virtual ~ProcessCheckoutJob(); + ~ProcessCheckoutJob(); void addStep(const QString &binary, const QStringList &args, const QString &workingDirectory = QString(), const QProcessEnvironment &env = QProcessEnvironment::systemEnvironment()); - virtual void start(); - virtual void cancel(); + void start(); + void cancel(); private slots: void slotError(QProcess::ProcessError error); diff --git a/src/plugins/vcsbase/checkoutprogresswizardpage.h b/src/plugins/vcsbase/checkoutprogresswizardpage.h index 7a3484665f..adeb6fab4b 100644 --- a/src/plugins/vcsbase/checkoutprogresswizardpage.h +++ b/src/plugins/vcsbase/checkoutprogresswizardpage.h @@ -41,9 +41,7 @@ class AbstractCheckoutJob; namespace Internal { -namespace Ui { - class CheckoutProgressWizardPage; -} +namespace Ui { class CheckoutProgressWizardPage; } class CheckoutProgressWizardPage : public QWizardPage { @@ -81,4 +79,5 @@ private: } // namespace Internal } // namespace VCSBase + #endif // CHECKOUTPROGRESSWIZARDPAGE_H diff --git a/src/plugins/vcsbase/checkoutwizarddialog.cpp b/src/plugins/vcsbase/checkoutwizarddialog.cpp index c03d5ead24..5d0c00eae9 100644 --- a/src/plugins/vcsbase/checkoutwizarddialog.cpp +++ b/src/plugins/vcsbase/checkoutwizarddialog.cpp @@ -88,11 +88,10 @@ void CheckoutWizardDialog::start(const QSharedPointer &job) void CheckoutWizardDialog::reject() { // First click kills, 2nd closes - if (currentId() == m_progressPageId && m_progressPage->isRunning()) { + if (currentId() == m_progressPageId && m_progressPage->isRunning()) m_progressPage->terminate(); - } else { + else QWizard::reject(); - } } } // namespace Internal diff --git a/src/plugins/vcsbase/checkoutwizarddialog.h b/src/plugins/vcsbase/checkoutwizarddialog.h index a9d15baf0f..6ed9c9c13f 100644 --- a/src/plugins/vcsbase/checkoutwizarddialog.h +++ b/src/plugins/vcsbase/checkoutwizarddialog.h @@ -43,8 +43,10 @@ class AbstractCheckoutJob; namespace Internal { class CheckoutProgressWizardPage; -class CheckoutWizardDialog : public Utils::Wizard { +class CheckoutWizardDialog : public Utils::Wizard +{ Q_OBJECT + public: explicit CheckoutWizardDialog(const QList ¶meterPages, QWidget *parent = 0); @@ -66,4 +68,5 @@ private: } // namespace Internal } // namespace VCSBase + #endif // CHECKOUTWIZARDDIALOG_H diff --git a/src/plugins/vcsbase/cleandialog.cpp b/src/plugins/vcsbase/cleandialog.cpp index c484ab0478..c2a1aaaba4 100644 --- a/src/plugins/vcsbase/cleandialog.cpp +++ b/src/plugins/vcsbase/cleandialog.cpp @@ -85,7 +85,8 @@ static void removeFileRecursion(const QFileInfo &f, QString *errorMessage) // A QFuture task for cleaning files in the background. // Emits error signal if not all files can be deleted. -class CleanFilesTask : public QObject { +class CleanFilesTask : public QObject +{ Q_OBJECT public: @@ -136,7 +137,8 @@ public: QString m_workingDirectory; }; -CleanDialogPrivate::CleanDialogPrivate() : m_filesModel(new QStandardItemModel(0, columnCount)) +CleanDialogPrivate::CleanDialogPrivate() : + m_filesModel(new QStandardItemModel(0, columnCount)) { } @@ -195,7 +197,7 @@ void CleanDialog::setFileList(const QString &workingDirectory, const QStringList const QString qmlProUserSuffix = QLatin1String(".qmlproject.user"); const QChar slash = QLatin1Char('/'); // Do not initially check patches or 'pro.user' files for deletion. - foreach(const QString &fileName, l) { + foreach (const QString &fileName, l) { const QFileInfo fi(workingDirectory + slash + fileName); const bool isDir = fi.isDir(); QStandardItem *nameItem = new QStandardItem(QDir::toNativeSeparators(fileName)); diff --git a/src/plugins/vcsbase/cleandialog.h b/src/plugins/vcsbase/cleandialog.h index 9e52fa2dc1..7336214aa1 100644 --- a/src/plugins/vcsbase/cleandialog.h +++ b/src/plugins/vcsbase/cleandialog.h @@ -43,20 +43,20 @@ QT_END_NAMESPACE namespace VCSBase { -namespace Internal { -class CleanDialogPrivate; -} // namespace Internal +namespace Internal { class CleanDialogPrivate; } -class VCSBASE_EXPORT CleanDialog : public QDialog { +class VCSBASE_EXPORT CleanDialog : public QDialog +{ Q_OBJECT + public: explicit CleanDialog(QWidget *parent = 0); - virtual ~CleanDialog(); + ~CleanDialog(); void setFileList(const QString &workingDirectory, const QStringList &); public slots: - virtual void accept(); + void accept(); protected: void changeEvent(QEvent *e); @@ -72,4 +72,5 @@ private: }; } // namespace VCSBase + #endif // CLEANDIALOG_H diff --git a/src/plugins/vcsbase/command.h b/src/plugins/vcsbase/command.h index 93881aefe0..99293aa1d7 100644 --- a/src/plugins/vcsbase/command.h +++ b/src/plugins/vcsbase/command.h @@ -42,9 +42,7 @@ namespace VCSBase { -namespace Internal { -class CommandPrivate; -} // namespace Internal +namespace Internal { class CommandPrivate; } class VCSBASE_EXPORT Command : public QObject { @@ -52,9 +50,12 @@ class VCSBASE_EXPORT Command : public QObject public: // Where to report command termination with exit code if desired - enum TerminationReportMode { NoReport, - ReportStdout, // This assumes UTF8 - ReportStderr }; + enum TerminationReportMode + { + NoReport, + ReportStdout, // This assumes UTF8 + ReportStderr + }; Command(const QString &binary, const QString &workingDirectory, @@ -104,6 +105,6 @@ private: class Internal::CommandPrivate *const d; }; -} //namespace VCSBase +} // namespace VCSBase #endif // VCSBASE_COMMAND_H diff --git a/src/plugins/vcsbase/commonsettingspage.cpp b/src/plugins/vcsbase/commonsettingspage.cpp index b958ba8371..f006c86b98 100644 --- a/src/plugins/vcsbase/commonsettingspage.cpp +++ b/src/plugins/vcsbase/commonsettingspage.cpp @@ -116,10 +116,6 @@ void CommonOptionsPage::updateNickNames() { } -CommonOptionsPage::~CommonOptionsPage() -{ -} - QString CommonOptionsPage::id() const { return QLatin1String(Constants::VCS_COMMON_SETTINGS_ID); diff --git a/src/plugins/vcsbase/commonsettingspage.h b/src/plugins/vcsbase/commonsettingspage.h index c4b729dc4d..5cd689f3c7 100644 --- a/src/plugins/vcsbase/commonsettingspage.h +++ b/src/plugins/vcsbase/commonsettingspage.h @@ -51,7 +51,7 @@ class CommonSettingsWidget : public QWidget public: explicit CommonSettingsWidget(QWidget *parent = 0); - virtual ~CommonSettingsWidget(); + ~CommonSettingsWidget(); CommonVcsSettings settings() const; void setSettings(const CommonVcsSettings &s); @@ -68,15 +68,14 @@ class CommonOptionsPage : public VCSBaseOptionsPage public: explicit CommonOptionsPage(QObject *parent = 0); - virtual ~CommonOptionsPage(); - virtual QString id() const; - virtual QString displayName() const; + QString id() const; + QString displayName() const; - virtual QWidget *createPage(QWidget *parent); - virtual void apply(); - virtual void finish() { } - virtual bool matches(const QString &key) const; + QWidget *createPage(QWidget *parent); + void apply(); + void finish() { } + bool matches(const QString &key) const; CommonVcsSettings settings() const { return m_settings; } diff --git a/src/plugins/vcsbase/corelistener.cpp b/src/plugins/vcsbase/corelistener.cpp index ae5355aa58..4007108949 100644 --- a/src/plugins/vcsbase/corelistener.cpp +++ b/src/plugins/vcsbase/corelistener.cpp @@ -61,5 +61,5 @@ bool CoreListener::editorAboutToClose(Core::IEditor *editor) return result; } -} -} +} // namespace Internal +} // namespace VCSBase diff --git a/src/plugins/vcsbase/corelistener.h b/src/plugins/vcsbase/corelistener.h index 601fdc5a25..597d77419f 100644 --- a/src/plugins/vcsbase/corelistener.h +++ b/src/plugins/vcsbase/corelistener.h @@ -44,9 +44,10 @@ namespace Internal { class CoreListener : public Core::ICoreListener { Q_OBJECT + public: explicit CoreListener(QObject *parent = 0); - virtual bool editorAboutToClose(Core::IEditor *editor); + bool editorAboutToClose(Core::IEditor *editor); signals: void submitEditorAboutToClose(VCSBaseSubmitEditor *e, bool *result); @@ -54,4 +55,5 @@ signals: } // Internal } // VCSBase + #endif // CORELISTENER_H diff --git a/src/plugins/vcsbase/diffhighlighter.cpp b/src/plugins/vcsbase/diffhighlighter.cpp index c285bd1e51..5c6eefb215 100644 --- a/src/plugins/vcsbase/diffhighlighter.cpp +++ b/src/plugins/vcsbase/diffhighlighter.cpp @@ -88,10 +88,12 @@ enum FoldingState { }; // --- DiffHighlighterPrivate -class DiffHighlighterPrivate { +class DiffHighlighterPrivate +{ public: DiffHighlighterPrivate(const QRegExp &filePattern); - inline DiffFormats analyzeLine(const QString &block) const; + + DiffFormats analyzeLine(const QString &block) const; const QRegExp m_filePattern; const QString m_locationIndicator; diff --git a/src/plugins/vcsbase/diffhighlighter.h b/src/plugins/vcsbase/diffhighlighter.h index bf190922aa..e9311fa8dc 100644 --- a/src/plugins/vcsbase/diffhighlighter.h +++ b/src/plugins/vcsbase/diffhighlighter.h @@ -42,28 +42,23 @@ class QRegExp; class QTextCharFormat; QT_END_NAMESPACE -namespace Core { - class ICore; -} -namespace TextEditor { - class FontSettingsPage; -} +namespace Core { class ICore; } +namespace TextEditor { class FontSettingsPage; } namespace VCSBase { -namespace Internal { -class DiffHighlighterPrivate; -} // namespace Internal +namespace Internal { class DiffHighlighterPrivate; } class VCSBASE_EXPORT DiffHighlighter : public TextEditor::SyntaxHighlighter { Q_OBJECT + public: explicit DiffHighlighter(const QRegExp &filePattern, QTextDocument *document = 0); - virtual ~DiffHighlighter(); + ~DiffHighlighter(); - virtual void highlightBlock(const QString &text); + void highlightBlock(const QString &text); // Set formats from a sequence of type QTextCharFormat void setFormats(const QVector &s); diff --git a/src/plugins/vcsbase/nicknamedialog.cpp b/src/plugins/vcsbase/nicknamedialog.cpp index 29b504f26d..f473fb62f4 100644 --- a/src/plugins/vcsbase/nicknamedialog.cpp +++ b/src/plugins/vcsbase/nicknamedialog.cpp @@ -61,7 +61,8 @@ namespace Internal { // For code clarity, a struct representing the entries of a mail map file // with parse and model functions. -class NickNameEntry { +class NickNameEntry +{ public: void clear(); bool parse(const QString &); @@ -276,5 +277,5 @@ QStringList NickNameDialog::nickNameList(const QStandardItemModel *model) return rc; } -} -} +} // namespace Internal +} // namespace VCSBase diff --git a/src/plugins/vcsbase/submiteditorfile.cpp b/src/plugins/vcsbase/submiteditorfile.cpp index 54e7b32d8f..0101e9e660 100644 --- a/src/plugins/vcsbase/submiteditorfile.cpp +++ b/src/plugins/vcsbase/submiteditorfile.cpp @@ -55,7 +55,7 @@ void SubmitEditorFile::rename(const QString &newName) return; } -void SubmitEditorFile::setFileName(const QString name) +void SubmitEditorFile::setFileName(const QString &name) { m_fileName = name; emit changed(); diff --git a/src/plugins/vcsbase/submiteditorfile.h b/src/plugins/vcsbase/submiteditorfile.h index b69b4a297b..4390ab86f4 100644 --- a/src/plugins/vcsbase/submiteditorfile.h +++ b/src/plugins/vcsbase/submiteditorfile.h @@ -50,7 +50,7 @@ public: QString suggestedFileName() const { return QString(); } bool isModified() const { return m_modified; } - virtual QString mimeType() const; + QString mimeType() const; bool isReadOnly() const { return false; } bool isSaveAsAllowed() const { return false; } bool save(QString *errorString, const QString &fileName, bool autoSave); @@ -58,7 +58,7 @@ public: bool reload(QString *errorString, ReloadFlag flag, ChangeType type); void rename(const QString &newName); - void setFileName(const QString name); + void setFileName(const QString &name); void setModified(bool modified = true); signals: diff --git a/src/plugins/vcsbase/submitfilemodel.cpp b/src/plugins/vcsbase/submitfilemodel.cpp index 113357dc98..b7af1b1daa 100644 --- a/src/plugins/vcsbase/submitfilemodel.cpp +++ b/src/plugins/vcsbase/submitfilemodel.cpp @@ -157,4 +157,4 @@ unsigned SubmitFileModel::filter(const QStringList &filter, int column) return rc; } -} +} // namespace VCSBase diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index fb40dcb7e5..b64a77acd2 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -167,10 +167,6 @@ void VCSBaseClientPrivate::commandFinishedGotoLine(QObject *editorObject) } } -VCSBaseClient::StatusItem::StatusItem() -{ -} - VCSBaseClient::StatusItem::StatusItem(const QString &s, const QString &f) : flags(s), file(f) { diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h index e8b1d1317e..b8bf88da35 100644 --- a/src/plugins/vcsbase/vcsbaseclient.h +++ b/src/plugins/vcsbase/vcsbaseclient.h @@ -66,7 +66,7 @@ public: class VCSBASE_EXPORT StatusItem { public: - StatusItem(); + StatusItem() {} StatusItem(const QString &s, const QString &f); QString flags; QString file; diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.cpp b/src/plugins/vcsbase/vcsbaseclientsettings.cpp index cf302bbcd9..ff1cee73d2 100644 --- a/src/plugins/vcsbase/vcsbaseclientsettings.cpp +++ b/src/plugins/vcsbase/vcsbaseclientsettings.cpp @@ -157,12 +157,11 @@ bool operator==(const SettingValue &lhs, const SettingValue &rhs) namespace VCSBase { namespace Internal { + class VCSBaseClientSettingsPrivate : public QSharedData { public: - VCSBaseClientSettingsPrivate() - { - } + VCSBaseClientSettingsPrivate() {} VCSBaseClientSettingsPrivate(const VCSBaseClientSettingsPrivate &other) : QSharedData(other), @@ -213,7 +212,7 @@ VCSBaseClientSettings::VCSBaseClientSettings(const VCSBaseClientSettings &other) VCSBaseClientSettings &VCSBaseClientSettings::operator=(const VCSBaseClientSettings &other) { if (this != &other) - d = other.d; + d = other.d; return *this; } diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.h b/src/plugins/vcsbase/vcsbaseclientsettings.h index cdc4ad2ab0..4b4950323c 100644 --- a/src/plugins/vcsbase/vcsbaseclientsettings.h +++ b/src/plugins/vcsbase/vcsbaseclientsettings.h @@ -34,7 +34,7 @@ #define VCSBASECLIENTSETTINGS_H #include "vcsbase_global.h" -#include + #include #include #include @@ -45,9 +45,7 @@ QT_END_NAMESPACE namespace VCSBase { -namespace Internal { -class VCSBaseClientSettingsPrivate; -} // namespace Internal +namespace Internal { class VCSBaseClientSettingsPrivate; } class VCSBASE_EXPORT VCSBaseClientSettings { diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index eff7a17952..d3a4e3fcaf 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -136,7 +136,7 @@ public: }; } // namespace Internal -} // VCSBase +} // namespace VCSBase Q_DECLARE_METATYPE(VCSBase::Internal::DiffChunkAction) diff --git a/src/plugins/vcsbase/vcsbaseeditor.h b/src/plugins/vcsbase/vcsbaseeditor.h index 156787143b..d703f8944a 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.h +++ b/src/plugins/vcsbase/vcsbaseeditor.h @@ -45,21 +45,18 @@ class QTextCodec; class QTextCursor; QT_END_NAMESPACE -namespace Core { - class IVersionControl; -} +namespace Core { class IVersionControl; } namespace VCSBase { -namespace Internal { -class VCSBaseEditorWidgetPrivate; -} // namespace Internal +namespace Internal { class VCSBaseEditorWidgetPrivate; } class DiffHighlighter; class BaseAnnotationHighlighter; // Documentation inside -enum EditorContentType { +enum EditorContentType +{ RegularCommandOutput, LogOutput, AnnotateOutput, @@ -106,7 +103,7 @@ protected: public: void init(); - virtual ~VCSBaseEditorWidget(); + ~VCSBaseEditorWidget(); /* Force read-only: Make it a read-only, temporary file. * Should be set to true by version control views. It is not on diff --git a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp index 5b9c93db93..423cdbcd95 100644 --- a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp +++ b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp @@ -107,10 +107,6 @@ public: that should trigger the rerun of the VCS operation. */ -VCSBaseEditorParameterWidget::ComboBoxItem::ComboBoxItem() -{ -} - VCSBaseEditorParameterWidget::ComboBoxItem::ComboBoxItem(const QString &text, const QVariant &val) : displayText(text), diff --git a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h index 9588e86ed6..d1682c0070 100644 --- a/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h +++ b/src/plugins/vcsbase/vcsbaseeditorparameterwidget.h @@ -35,9 +35,9 @@ #include "vcsbase_global.h" -#include #include #include +#include QT_BEGIN_NAMESPACE class QComboBox; @@ -46,9 +46,7 @@ QT_END_NAMESPACE namespace VCSBase { -namespace Internal { -class VCSBaseEditorParameterWidgetPrivate; -} // namespace +namespace Internal { class VCSBaseEditorParameterWidgetPrivate; } // Documentation->inside. class VCSBASE_EXPORT VCSBaseEditorParameterWidget : public QWidget @@ -61,7 +59,7 @@ public: struct VCSBASE_EXPORT ComboBoxItem { - ComboBoxItem(); + ComboBoxItem() {} ComboBoxItem(const QString &text, const QVariant &val); QString displayText; QVariant value; diff --git a/src/plugins/vcsbase/vcsbaseoptionspage.h b/src/plugins/vcsbase/vcsbaseoptionspage.h index 82114f8f46..f1648d005e 100644 --- a/src/plugins/vcsbase/vcsbaseoptionspage.h +++ b/src/plugins/vcsbase/vcsbaseoptionspage.h @@ -33,10 +33,10 @@ #ifndef VCSBASEOPTIONSPAGE_H #define VCSBASEOPTIONSPAGE_H -#include - #include "vcsbase_global.h" +#include + namespace VCSBase { class VCSBASE_EXPORT VCSBaseOptionsPage : public Core::IOptionsPage diff --git a/src/plugins/vcsbase/vcsbaseoutputwindow.cpp b/src/plugins/vcsbase/vcsbaseoutputwindow.cpp index f7a166f350..34a4882380 100644 --- a/src/plugins/vcsbase/vcsbaseoutputwindow.cpp +++ b/src/plugins/vcsbase/vcsbaseoutputwindow.cpp @@ -72,7 +72,8 @@ namespace VCSBase { namespace Internal { // Store repository along with text blocks -class RepositoryUserData : public QTextBlockUserData { +class RepositoryUserData : public QTextBlockUserData +{ public: explicit RepositoryUserData(const QString &repo) : m_repository(repo) {} const QString &repository() const { return m_repository; } @@ -83,7 +84,8 @@ private: // A plain text edit with a special context menu containing "Clear" and // and functions to append specially formatted entries. -class OutputWindowPlainTextEdit : public QPlainTextEdit { +class OutputWindowPlainTextEdit : public QPlainTextEdit +{ public: explicit OutputWindowPlainTextEdit(QWidget *parent = 0); @@ -244,7 +246,8 @@ void OutputWindowPlainTextEdit::appendCommand(const QString &text) } // namespace Internal // ------------------- VCSBaseOutputWindowPrivate -struct VCSBaseOutputWindowPrivate { +struct VCSBaseOutputWindowPrivate +{ static VCSBaseOutputWindow *instance; Internal::OutputWindowPlainTextEdit *plainTextEdit(); diff --git a/src/plugins/vcsbase/vcsbaseoutputwindow.h b/src/plugins/vcsbase/vcsbaseoutputwindow.h index 25a551231b..4d483bc880 100644 --- a/src/plugins/vcsbase/vcsbaseoutputwindow.h +++ b/src/plugins/vcsbase/vcsbaseoutputwindow.h @@ -45,27 +45,28 @@ class VCSBASE_EXPORT VCSBaseOutputWindow : public Core::IOutputPane { Q_OBJECT Q_PROPERTY(QString repository READ repository WRITE setRepository) + public: - virtual ~VCSBaseOutputWindow(); + ~VCSBaseOutputWindow(); - virtual QWidget *outputWidget(QWidget *parent); - virtual QList toolBarWidgets() const; - virtual QString displayName() const; + QWidget *outputWidget(QWidget *parent); + QList toolBarWidgets() const; + QString displayName() const; - virtual int priorityInStatusBar() const; + int priorityInStatusBar() const; - virtual void clearContents(); - virtual void visibilityChanged(bool visible); + void clearContents(); + void visibilityChanged(bool visible); - virtual void setFocus(); - virtual bool hasFocus() const; - virtual bool canFocus() const; + void setFocus(); + bool hasFocus() const; + bool canFocus() const; - virtual bool canNavigate() const; - virtual bool canNext() const; - virtual bool canPrevious() const; - virtual void goToNext(); - virtual void goToPrev(); + bool canNavigate() const; + bool canNext() const; + bool canPrevious() const; + void goToNext(); + void goToPrev(); static VCSBaseOutputWindow *instance(); diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index c4514c29eb..e5bcfcd13e 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -64,6 +64,8 @@ #include #include +using namespace Utils; + enum { debug = 0, debugRepositorySearch = 0, debugExecution = 0 }; /*! @@ -88,7 +90,8 @@ namespace Internal { Aggregated in the QSharedData of VCSBase::VCSBasePluginState. */ -struct State { +struct State +{ void clearFile(); void clearPatchFile(); void clearProject(); @@ -189,8 +192,10 @@ QDebug operator<<(QDebug in, const State &state) Singleton (as not to do checks multiple times). */ -class StateListener : public QObject { +class StateListener : public QObject +{ Q_OBJECT + public: explicit StateListener(QObject *parent); @@ -302,7 +307,8 @@ void StateListener::slotStateChanged() } // namespace Internal -class VCSBasePluginStateData : public QSharedData { +class VCSBasePluginStateData : public QSharedData +{ public: Internal::State m_state; }; @@ -782,8 +788,7 @@ void VCSBasePlugin::setProcessEnvironment(QProcessEnvironment *e, bool forceCLoc // Run a process fully synchronously, returning Utils::SynchronousProcessResponse // response struct and using the VCSBasePlugin flags as applicable -static Utils::SynchronousProcessResponse - runVCS_FullySynchronously(const QString &workingDir, +static SynchronousProcessResponse runVcsFullySynchronously(const QString &workingDir, const QString &binary, const QStringList &arguments, int timeOutMS, @@ -796,8 +801,8 @@ static Utils::SynchronousProcessResponse // Set up process unsigned processFlags = 0; if (VCSBasePlugin::isSshPromptConfigured() && (flags & VCSBasePlugin::SshPasswordPrompt)) - processFlags |= Utils::SynchronousProcess::UnixTerminalDisabled; - QSharedPointer process = Utils::SynchronousProcess::createProcess(processFlags); + processFlags |= SynchronousProcess::UnixTerminalDisabled; + QSharedPointer process = SynchronousProcess::createProcess(processFlags); if (!workingDir.isEmpty()) process->setWorkingDirectory(workingDir); process->setProcessEnvironment(env); @@ -807,9 +812,9 @@ static Utils::SynchronousProcessResponse // Start process->start(binary, arguments, QIODevice::ReadOnly); process->closeWriteChannel(); - Utils::SynchronousProcessResponse response; + SynchronousProcessResponse response; if (!process->waitForStarted()) { - response.result = Utils::SynchronousProcessResponse::StartFailed; + response.result = SynchronousProcessResponse::StartFailed; return response; } @@ -817,7 +822,7 @@ static Utils::SynchronousProcessResponse QByteArray stdOut; QByteArray stdErr; const bool timedOut = - !Utils::SynchronousProcess::readDataFromProcess(*process.data(), timeOutMS, + !SynchronousProcess::readDataFromProcess(*process.data(), timeOutMS, &stdOut, &stdErr, true); if (!stdErr.isEmpty()) { @@ -835,20 +840,19 @@ static Utils::SynchronousProcessResponse // Result if (timedOut) { - response.result = Utils::SynchronousProcessResponse::Hang; + response.result = SynchronousProcessResponse::Hang; } else if (process->exitStatus() != QProcess::NormalExit) { - response.result = Utils::SynchronousProcessResponse::TerminatedAbnormally; + response.result = SynchronousProcessResponse::TerminatedAbnormally; } else { response.result = process->exitCode() == 0 ? - Utils::SynchronousProcessResponse::Finished : - Utils::SynchronousProcessResponse::FinishedError; + SynchronousProcessResponse::Finished : + SynchronousProcessResponse::FinishedError; } return response; } -Utils::SynchronousProcessResponse -VCSBasePlugin::runVCS(const QString &workingDir, +SynchronousProcessResponse VCSBasePlugin::runVCS(const QString &workingDir, const QString &binary, const QStringList &arguments, int timeOutMS, @@ -860,13 +864,13 @@ VCSBasePlugin::runVCS(const QString &workingDir, flags, outputCodec); } -Utils::SynchronousProcessResponse VCSBasePlugin::runVCS(const QString &workingDir, - const QString &binary, - const QStringList &arguments, - int timeOutMS, - QProcessEnvironment env, - unsigned flags, - QTextCodec *outputCodec) +SynchronousProcessResponse VCSBasePlugin::runVCS(const QString &workingDir, + const QString &binary, + const QStringList &arguments, + int timeOutMS, + QProcessEnvironment env, + unsigned flags, + QTextCodec *outputCodec) { VCSBase::VCSBaseOutputWindow *outputWindow = VCSBase::VCSBaseOutputWindow::instance(); @@ -900,14 +904,14 @@ Utils::SynchronousProcessResponse VCSBasePlugin::runVCS(const QString &workingDi VCSBase::VCSBasePlugin::setProcessEnvironment(&env, (flags & ForceCLocale)); - Utils::SynchronousProcessResponse response; + SynchronousProcessResponse response; if (flags & FullySynchronously) { - response = runVCS_FullySynchronously(workingDir, binary, arguments, timeOutMS, + response = runVcsFullySynchronously(workingDir, binary, arguments, timeOutMS, env, flags, outputCodec); } else { // Run, connect stderr to the output window - Utils::SynchronousProcess process; + SynchronousProcess process; if (!workingDir.isEmpty()) process.setWorkingDirectory(workingDir); @@ -918,7 +922,7 @@ Utils::SynchronousProcessResponse VCSBasePlugin::runVCS(const QString &workingDi // Suppress terminal on UNIX for ssh prompts if it is configured. if (sshPromptConfigured && (flags & SshPasswordPrompt)) - process.setFlags(Utils::SynchronousProcess::UnixTerminalDisabled); + process.setFlags(SynchronousProcess::UnixTerminalDisabled); // connect stderr to the output window if desired if (flags & MergeOutputChannels) { @@ -943,7 +947,7 @@ Utils::SynchronousProcessResponse VCSBasePlugin::runVCS(const QString &workingDi } // Success/Fail message in appropriate window? - if (response.result == Utils::SynchronousProcessResponse::Finished) { + if (response.result == SynchronousProcessResponse::Finished) { if (flags & ShowSuccessMessage) outputWindow->append(response.exitMessage(binary, timeOutMS)); } else { @@ -983,10 +987,10 @@ bool VCSBasePlugin::runFullySynchronous(const QString &workingDirectory, return false; } - if (!Utils::SynchronousProcess::readDataFromProcess(process, timeoutMS, + if (!SynchronousProcess::readDataFromProcess(process, timeoutMS, outputText, errorText, true)) { errorText->append(tr("Error: Executable timed out after %1s.").arg(timeoutMS / 1000).toLocal8Bit()); - Utils::SynchronousProcess::stopProcess(process); + SynchronousProcess::stopProcess(process); return false; } @@ -1019,8 +1023,8 @@ bool VCSBasePlugin::runPatch(const QByteArray &input, const QString &workingDire patchProcess.closeWriteChannel(); QByteArray stdOut; QByteArray stdErr; - if (!Utils::SynchronousProcess::readDataFromProcess(patchProcess, 30000, &stdOut, &stdErr, true)) { - Utils::SynchronousProcess::stopProcess(patchProcess); + if (!SynchronousProcess::readDataFromProcess(patchProcess, 30000, &stdOut, &stdErr, true)) { + SynchronousProcess::stopProcess(patchProcess); ow->appendError(tr("A timeout occurred running '%1'").arg(patch)); return false; @@ -1040,6 +1044,7 @@ bool VCSBasePlugin::runPatch(const QByteArray &input, const QString &workingDire } return true; } + } // namespace VCSBase #include "vcsbaseplugin.moc" diff --git a/src/plugins/vcsbase/vcsbaseplugin.h b/src/plugins/vcsbase/vcsbaseplugin.h index f81e41f6d7..5c163ffd8c 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.h +++ b/src/plugins/vcsbase/vcsbaseplugin.h @@ -46,18 +46,13 @@ class QProcessEnvironment; class QTextCodec; QT_END_NAMESPACE -namespace Utils { - struct SynchronousProcessResponse; -} +namespace Utils { struct SynchronousProcessResponse; } -namespace Core { - class IVersionControl; -} +namespace Core { class IVersionControl; } namespace VCSBase { -namespace Internal { - struct State; -} + +namespace Internal { struct State; } class VCSBaseSubmitEditor; struct VCSBasePluginPrivate; diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 3749549d22..07e6645e63 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -150,37 +150,40 @@ static const char *belongingClassName(const CPlusPlus::Function *function) namespace VCSBase { +using namespace Internal; +using namespace Utils; + static inline QString submitMessageCheckScript() { - return Internal::VCSPlugin::instance()->settings().submitMessageCheckScript; + return VCSPlugin::instance()->settings().submitMessageCheckScript; } struct VCSBaseSubmitEditorPrivate { VCSBaseSubmitEditorPrivate(const VCSBaseSubmitEditorParameters *parameters, - Utils::SubmitEditorWidget *editorWidget, + SubmitEditorWidget *editorWidget, QObject *q); - Utils::SubmitEditorWidget *m_widget; + SubmitEditorWidget *m_widget; QToolBar *m_toolWidget; const VCSBaseSubmitEditorParameters *m_parameters; QString m_displayName; QString m_checkScriptWorkingDirectory; - VCSBase::Internal::SubmitEditorFile *m_file; + SubmitEditorFile *m_file; QPointer m_diffAction; QPointer m_submitAction; - Internal::NickNameDialog *m_nickNameDialog; + NickNameDialog *m_nickNameDialog; }; VCSBaseSubmitEditorPrivate::VCSBaseSubmitEditorPrivate(const VCSBaseSubmitEditorParameters *parameters, - Utils::SubmitEditorWidget *editorWidget, + SubmitEditorWidget *editorWidget, QObject *q) : m_widget(editorWidget), m_toolWidget(0), m_parameters(parameters), - m_file(new VCSBase::Internal::SubmitEditorFile(QLatin1String(parameters->mimeType), q)), + m_file(new SubmitEditorFile(QLatin1String(parameters->mimeType), q)), m_nickNameDialog(0) { QCompleter *completer = new QCompleter(q); @@ -191,7 +194,7 @@ VCSBaseSubmitEditorPrivate::VCSBaseSubmitEditorPrivate(const VCSBaseSubmitEditor } VCSBaseSubmitEditor::VCSBaseSubmitEditor(const VCSBaseSubmitEditorParameters *parameters, - Utils::SubmitEditorWidget *editorWidget) : + SubmitEditorWidget *editorWidget) : d(new VCSBaseSubmitEditorPrivate(parameters, editorWidget, this)) { setContext(Core::Context(parameters->context)); @@ -206,13 +209,13 @@ VCSBaseSubmitEditor::VCSBaseSubmitEditor(const VCSBaseSubmitEditorParameters *pa d->m_file->setModified(false); // We are always clean to prevent the editor manager from asking to save. - connect(d->m_file, SIGNAL(saveMe(QString*, QString, bool)), - this, SLOT(save(QString*, QString, bool))); + connect(d->m_file, SIGNAL(saveMe(QString*,QString,bool)), + this, SLOT(save(QString*,QString,bool))); connect(d->m_widget, SIGNAL(diffSelected(QStringList)), this, SLOT(slotDiffSelectedVCSFiles(QStringList))); connect(d->m_widget->descriptionEdit(), SIGNAL(textChanged()), this, SLOT(slotDescriptionChanged())); - const Internal::CommonVcsSettings settings = Internal::VCSPlugin::instance()->settings(); + const CommonVcsSettings settings = VCSPlugin::instance()->settings(); // Add additional context menu settings if (!settings.submitMessageCheckScript.isEmpty() || !settings.nickNameMailMap.isEmpty()) { QAction *sep = new QAction(this); @@ -237,7 +240,7 @@ VCSBaseSubmitEditor::VCSBaseSubmitEditor(const VCSBaseSubmitEditorParameters *pa // wrapping. etc slotUpdateEditorSettings(settings); - connect(Internal::VCSPlugin::instance(), + connect(VCSPlugin::instance(), SIGNAL(settingsChanged(VCSBase::Internal::CommonVcsSettings)), this, SLOT(slotUpdateEditorSettings(VCSBase::Internal::CommonVcsSettings))); @@ -253,7 +256,7 @@ VCSBaseSubmitEditor::~VCSBaseSubmitEditor() delete d; } -void VCSBaseSubmitEditor::slotUpdateEditorSettings(const Internal::CommonVcsSettings &s) +void VCSBaseSubmitEditor::slotUpdateEditorSettings(const CommonVcsSettings &s) { setLineWrapWidth(s.lineWrapWidth); setLineWrap(s.lineWrap); @@ -264,7 +267,7 @@ static inline QStringList fieldTexts(const QString &fileContents) { QStringList rc; const QStringList rawFields = fileContents.trimmed().split(QLatin1Char('\n')); - foreach(const QString &field, rawFields) { + foreach (const QString &field, rawFields) { const QString trimmedField = field.trimmed(); if (!trimmedField.isEmpty()) rc.push_back(trimmedField); @@ -282,10 +285,10 @@ void VCSBaseSubmitEditor::createUserFields(const QString &fieldConfigFile) if (fields.empty()) return; // Create a completer on user names - const QStandardItemModel *nickNameModel = Internal::VCSPlugin::instance()->nickNameModel(); - QCompleter *completer = new QCompleter(Internal::NickNameDialog::nickNameList(nickNameModel), this); + const QStandardItemModel *nickNameModel = VCSPlugin::instance()->nickNameModel(); + QCompleter *completer = new QCompleter(NickNameDialog::nickNameList(nickNameModel), this); - Utils::SubmitFieldWidget *fieldWidget = new Utils::SubmitFieldWidget; + SubmitFieldWidget *fieldWidget = new SubmitFieldWidget; connect(fieldWidget, SIGNAL(browseButtonClicked(int,QString)), this, SLOT(slotSetFieldNickName(int))); fieldWidget->setCompleter(completer); @@ -295,8 +298,8 @@ void VCSBaseSubmitEditor::createUserFields(const QString &fieldConfigFile) d->m_widget->addSubmitFieldWidget(fieldWidget); } -void VCSBaseSubmitEditor::registerActions(QAction *editorUndoAction, QAction *editorRedoAction, - QAction *submitAction, QAction *diffAction)\ +void VCSBaseSubmitEditor::registerActions(QAction *editorUndoAction, QAction *editorRedoAction, + QAction *submitAction, QAction *diffAction) { d->m_widget->registerActions(editorUndoAction, editorRedoAction, submitAction, diffAction); d->m_diffAction = diffAction; @@ -577,8 +580,8 @@ VCSBaseSubmitEditor::PromptSubmitResult bool forcePrompt, bool canCommitOnFailure) const { - Utils::SubmitEditorWidget *submitWidget = - static_cast(const_cast(this)->widget()); + SubmitEditorWidget *submitWidget = + static_cast(const_cast(this)->widget()); raiseSubmitEditor(); @@ -621,9 +624,9 @@ VCSBaseSubmitEditor::PromptSubmitResult if (!canCommit && !canCommitOnFailure) { switch (answer) { case QMessageBox::No: - return SubmitDiscarded; + return SubmitDiscarded; case QMessageBox::Yes: - return SubmitCanceled; + return SubmitCanceled; default: break; } @@ -644,7 +647,7 @@ VCSBaseSubmitEditor::PromptSubmitResult QString VCSBaseSubmitEditor::promptForNickName() { if (!d->m_nickNameDialog) - d->m_nickNameDialog = new Internal::NickNameDialog(Internal::VCSPlugin::instance()->nickNameModel(), d->m_widget); + d->m_nickNameDialog = new NickNameDialog(VCSPlugin::instance()->nickNameModel(), d->m_widget); if (d->m_nickNameDialog->exec() == QDialog::Accepted) return d->m_nickNameDialog->nickName(); return QString(); @@ -659,7 +662,7 @@ void VCSBaseSubmitEditor::slotInsertNickName() void VCSBaseSubmitEditor::slotSetFieldNickName(int i) { - if (Utils::SubmitFieldWidget *sfw =d->m_widget->submitFieldWidgets().front()) { + if (SubmitFieldWidget *sfw = d->m_widget->submitFieldWidgets().front()) { const QString nick = promptForNickName(); if (!nick.isEmpty()) sfw->setFieldValue(i, nick); @@ -704,7 +707,7 @@ bool VCSBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript if (!tempFilePattern.endsWith(QDir::separator())) tempFilePattern += QDir::separator(); tempFilePattern += QLatin1String("msgXXXXXX.txt"); - Utils::TempFileSaver saver(tempFilePattern); + TempFileSaver saver(tempFilePattern); saver.write(fileContents()); if (!saver.finalize(errorMessage)) return false; @@ -722,8 +725,8 @@ bool VCSBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript } QByteArray stdOutData; QByteArray stdErrData; - if (!Utils::SynchronousProcess::readDataFromProcess(checkProcess, 30000, &stdOutData, &stdErrData, false)) { - Utils::SynchronousProcess::stopProcess(checkProcess); + if (!SynchronousProcess::readDataFromProcess(checkProcess, 30000, &stdOutData, &stdErrData, false)) { + SynchronousProcess::stopProcess(checkProcess); *errorMessage = tr("The check script '%1' timed out."). arg(QDir::toNativeSeparators(checkScript)); return false; @@ -789,7 +792,7 @@ void VCSBaseSubmitEditor::filterUntrackedFilesOfProject(const QString &repositor { if (untrackedFiles->empty()) return; - const QStringList nativeProjectFiles = VCSBase::VCSBaseSubmitEditor::currentProjectFiles(true); + const QStringList nativeProjectFiles = VCSBaseSubmitEditor::currentProjectFiles(true); if (nativeProjectFiles.empty()) return; const QDir repoDir(repositoryDirectory); diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h index a384c5231a..404131c2ea 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.h +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h @@ -45,9 +45,7 @@ class QAbstractItemModel; class QAction; QT_END_NAMESPACE -namespace Utils { - class SubmitEditorWidget; -} +namespace Utils { class SubmitEditorWidget; } namespace VCSBase { namespace Internal { @@ -55,7 +53,8 @@ namespace Internal { } struct VCSBaseSubmitEditorPrivate; -class VCSBASE_EXPORT VCSBaseSubmitEditorParameters { +class VCSBASE_EXPORT VCSBaseSubmitEditorParameters +{ public: const char *mimeType; const char *id; @@ -84,7 +83,7 @@ public: void unregisterActions(QAction *editorUndoAction, QAction *editorRedoAction, QAction *submitAction = 0, QAction *diffAction = 0); - virtual ~VCSBaseSubmitEditor(); + ~VCSBaseSubmitEditor(); // A utility routine to be called when closing a submit editor. // Runs checks on the message and prompts according to configuration. @@ -119,19 +118,20 @@ public: void setCheckScriptWorkingDirectory(const QString &); // Core::IEditor - virtual bool createNew(const QString &contents); - virtual bool open(QString *errorString, const QString &fileName, const QString &realFileName); - virtual Core::IFile *file(); - virtual QString displayName() const; - virtual void setDisplayName(const QString &title); - virtual bool duplicateSupported() const; - virtual Core::IEditor *duplicate(QWidget * parent); - virtual Core::Id id() const; + bool createNew(const QString &contents); + bool open(QString *errorString, const QString &fileName, const QString &realFileName); + Core::IFile *file(); + QString displayName() const; + void setDisplayName(const QString &title); + bool duplicateSupported() const; + Core::IEditor *duplicate(QWidget *parent); + Core::Id id() const; + bool isTemporary() const { return true; } - virtual QWidget *toolBar(); + QWidget *toolBar(); - virtual QByteArray saveState() const; - virtual bool restoreState(const QByteArray &state); + QByteArray saveState() const; + bool restoreState(const QByteArray &state); QStringList checkedFiles() const; @@ -150,8 +150,6 @@ public: // that are actually part of the current project(s). static void filterUntrackedFilesOfProject(const QString &repositoryDirectory, QStringList *untrackedFiles); - virtual bool isTemporary() const { return true; } - // Helper to raise an already open submit editor to prevent opening twice. static bool raiseSubmitEditor(); diff --git a/src/plugins/vcsbase/vcsbasetextdocument.h b/src/plugins/vcsbase/vcsbasetextdocument.h index 441acecd58..67ada98b85 100644 --- a/src/plugins/vcsbase/vcsbasetextdocument.h +++ b/src/plugins/vcsbase/vcsbasetextdocument.h @@ -42,6 +42,7 @@ namespace Internal { class VCSBaseTextDocument : public TextEditor::BaseTextDocument { Q_OBJECT + public: VCSBaseTextDocument(); diff --git a/src/plugins/vcsbase/vcsconfigurationpage.h b/src/plugins/vcsbase/vcsconfigurationpage.h index 1b7384bebb..b5de9330cd 100644 --- a/src/plugins/vcsbase/vcsconfigurationpage.h +++ b/src/plugins/vcsbase/vcsconfigurationpage.h @@ -37,17 +37,14 @@ #include -namespace Core { -class IVersionControl; -} // namespace Core +namespace Core { class IVersionControl; } namespace VCSBase { -namespace Internal { -class VcsConfigurationPagePrivate; -} // namespace Internal +namespace Internal { class VcsConfigurationPagePrivate; } -class VCSBASE_EXPORT VcsConfigurationPage : public QWizardPage { +class VCSBASE_EXPORT VcsConfigurationPage : public QWizardPage +{ Q_OBJECT public: @@ -58,6 +55,7 @@ public: private slots: void openConfiguration(); + private: Internal::VcsConfigurationPagePrivate *const d; }; diff --git a/src/plugins/vcsbase/vcsplugin.cpp b/src/plugins/vcsbase/vcsplugin.cpp index b89ce900cc..4fad0d30c2 100644 --- a/src/plugins/vcsbase/vcsplugin.cpp +++ b/src/plugins/vcsbase/vcsplugin.cpp @@ -66,7 +66,6 @@ VCSPlugin::~VCSPlugin() bool VCSPlugin::initialize(const QStringList &arguments, QString *errorMessage) { Q_UNUSED(arguments) - Q_UNUSED(errorMessage) Core::ICore *core = Core::ICore::instance(); if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/vcsbase/VCSBase.mimetypes.xml"), errorMessage)) -- GitLab