From 89b6a842077844b0a68c3cc5ac471f57487f9ff2 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Mon, 23 Jul 2012 10:50:15 +0200 Subject: [PATCH] Make class constructors with required args explicit [krazy 45/46] by Mikko Rapeli --- src/abstractmonitor.h | 4 ++-- src/archivewidget.h | 2 +- src/beziercurve/beziersplinewidget.h | 2 +- src/choosecolorwidget.h | 2 +- src/dragvalue.h | 2 +- src/dvdwizardvob.h | 2 +- src/effectstack/effectstackview2.h | 2 +- src/effectstackedit.h | 2 +- src/encodingprofilesdialog.h | 2 +- src/kis_curve_widget.h | 2 +- src/lib/audio/audioEnvelope.h | 2 +- src/monitoreditwidget.h | 2 +- src/monitorscene.h | 2 +- src/onmonitoritems/rotoscoping/bpointitem.h | 2 +- src/onmonitoritems/rotoscoping/splineitem.h | 2 +- src/profilesdialog.h | 2 +- src/scopes/abstractscopewidget.h | 2 +- src/scopes/audioscopes/abstractaudioscopewidget.h | 2 +- src/scopes/colorscopes/abstractgfxscopewidget.h | 2 +- src/slideshowclip.h | 2 +- src/smallruler.h | 2 +- src/stopmotion/capturehandler.h | 2 +- src/timecodedisplay.h | 2 +- src/trackdialog.h | 2 +- src/tracksconfigdialog.h | 2 +- src/transitionsettings.h | 2 +- src/utils/abstractservice.h | 2 +- src/utils/archiveorg.h | 2 +- src/utils/freesound.h | 2 +- src/utils/openclipart.h | 2 +- src/utils/resourcewidget.h | 2 +- src/wizard.h | 2 +- 32 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/abstractmonitor.h b/src/abstractmonitor.h index 58fc1093..5eea2273 100644 --- a/src/abstractmonitor.h +++ b/src/abstractmonitor.h @@ -43,7 +43,7 @@ Q_OBJECT public: * @param name A unique identifier for this renderer * @param winid The parent widget identifier (required for SDL display). Set to 0 for OpenGL rendering * @param profile The MLT profile used for the renderer (default one will be used if empty). */ - AbstractRender(Kdenlive::MONITORID name, QWidget *parent = 0):QObject(parent), sendFrameForAnalysis(false), m_name(name) {}; + explicit AbstractRender(Kdenlive::MONITORID name, QWidget *parent = 0):QObject(parent), sendFrameForAnalysis(false), m_name(name) {}; /** @brief Destroy the MLT Renderer. */ virtual ~AbstractRender() {}; @@ -117,7 +117,7 @@ class VideoContainer : public QFrame { Q_OBJECT public: - VideoContainer(AbstractMonitor *monitor, QWidget *parent = 0); + explicit VideoContainer(AbstractMonitor *monitor, QWidget *parent = 0); void switchFullScreen(); protected: diff --git a/src/archivewidget.h b/src/archivewidget.h index bea13e57..a6f71944 100644 --- a/src/archivewidget.h +++ b/src/archivewidget.h @@ -55,7 +55,7 @@ class ArchiveWidget : public QDialog, public Ui::ArchiveWidget_UI public: ArchiveWidget(QString projectName, QDomDocument doc, QList list, QStringList luma_list, QWidget * parent = 0); // Constructor for extracting widget - ArchiveWidget(const KUrl &url, QWidget * parent = 0); + explicit ArchiveWidget(const KUrl &url, QWidget * parent = 0); ~ArchiveWidget(); QString extractedProjectFile(); diff --git a/src/beziercurve/beziersplinewidget.h b/src/beziercurve/beziersplinewidget.h index a847cfd8..cddefef0 100644 --- a/src/beziercurve/beziersplinewidget.h +++ b/src/beziercurve/beziersplinewidget.h @@ -34,7 +34,7 @@ class BezierSplineWidget : public QWidget public: /** @brief Sets up the UI and sets the spline to @param spline. */ - BezierSplineWidget(const QString &spline, QWidget* parent = 0); + explicit BezierSplineWidget(const QString &spline, QWidget* parent = 0); /** @brief Returns the current spline. */ QString spline(); diff --git a/src/choosecolorwidget.h b/src/choosecolorwidget.h index 3f417948..24ab8cbc 100644 --- a/src/choosecolorwidget.h +++ b/src/choosecolorwidget.h @@ -40,7 +40,7 @@ public: * @param text (optional) What the color will be used for * @param color (optional) initial color * @param alphaEnabled (optional) Should transparent colors be enabled */ - ChooseColorWidget(QString text = QString(), QString color = "0xffffffff", bool alphaEnabled = false, QWidget* parent = 0); + explicit ChooseColorWidget(QString text = QString(), QString color = "0xffffffff", bool alphaEnabled = false, QWidget* parent = 0); /** @brief Gets the choosen color. */ QString getColor(); diff --git a/src/dragvalue.h b/src/dragvalue.h index 49dc0555..1794bc5f 100644 --- a/src/dragvalue.h +++ b/src/dragvalue.h @@ -38,7 +38,7 @@ class CustomLabel : public QProgressBar { Q_OBJECT public: - CustomLabel(const QString &label, bool showSlider = true, int range = 1000, QWidget *parent = 0); + explicit CustomLabel(const QString &label, bool showSlider = true, int range = 1000, QWidget *parent = 0); void setProgressValue(double value); void setStep(double step); diff --git a/src/dvdwizardvob.h b/src/dvdwizardvob.h index aa024dd8..bc395019 100644 --- a/src/dvdwizardvob.h +++ b/src/dvdwizardvob.h @@ -34,7 +34,7 @@ class DvdWizardVob : public QWizardPage Q_OBJECT public: - DvdWizardVob(const QString &profile, QWidget * parent = 0); + explicit DvdWizardVob(const QString &profile, QWidget * parent = 0); virtual ~DvdWizardVob(); virtual bool isComplete() const; QStringList selectedUrls() const; diff --git a/src/effectstack/effectstackview2.h b/src/effectstack/effectstackview2.h index 1db98824..eeb3aebf 100644 --- a/src/effectstack/effectstackview2.h +++ b/src/effectstack/effectstackview2.h @@ -39,7 +39,7 @@ class EffectStackView2 : public QWidget Q_OBJECT public: - EffectStackView2(Monitor *monitor, QWidget *parent = 0); + explicit EffectStackView2(Monitor *monitor, QWidget *parent = 0); virtual ~EffectStackView2(); /** @brief Raises @param dock if a clip is loaded. */ diff --git a/src/effectstackedit.h b/src/effectstackedit.h index 6e73aaf9..ca79ccca 100644 --- a/src/effectstackedit.h +++ b/src/effectstackedit.h @@ -38,7 +38,7 @@ class EffectStackEdit : public QScrollArea { Q_OBJECT public: - EffectStackEdit(Monitor *monitor, QWidget *parent = 0); + explicit EffectStackEdit(Monitor *monitor, QWidget *parent = 0); ~EffectStackEdit(); void updateProjectFormat(MltVideoProfile profile, Timecode t); static QMap iconCache; diff --git a/src/encodingprofilesdialog.h b/src/encodingprofilesdialog.h index 50b9a410..60468f0d 100644 --- a/src/encodingprofilesdialog.h +++ b/src/encodingprofilesdialog.h @@ -30,7 +30,7 @@ class EncodingProfilesDialog : public QDialog, Ui::ManageEncodingProfile_UI Q_OBJECT public: - EncodingProfilesDialog(int profileType, QWidget * parent = 0); + explicit EncodingProfilesDialog(int profileType, QWidget * parent = 0); ~EncodingProfilesDialog(); protected: diff --git a/src/kis_curve_widget.h b/src/kis_curve_widget.h index 421e5230..200db106 100644 --- a/src/kis_curve_widget.h +++ b/src/kis_curve_widget.h @@ -56,7 +56,7 @@ public: * Create a new curve widget with a default curve, that is a straight * line from bottom-left to top-right. */ - KisCurveWidget(QWidget *parent = 0, Qt::WFlags f = 0); + explicit KisCurveWidget(QWidget *parent = 0, Qt::WFlags f = 0); virtual ~KisCurveWidget(); diff --git a/src/lib/audio/audioEnvelope.h b/src/lib/audio/audioEnvelope.h index 058acec2..1add9095 100644 --- a/src/lib/audio/audioEnvelope.h +++ b/src/lib/audio/audioEnvelope.h @@ -26,7 +26,7 @@ class QImage; class AudioEnvelope { public: - AudioEnvelope(Mlt::Producer *producer, int offset = 0, int length = 0); + explicit AudioEnvelope(Mlt::Producer *producer, int offset = 0, int length = 0); ~AudioEnvelope(); /// Returns the envelope, calculates it if necessary. diff --git a/src/monitoreditwidget.h b/src/monitoreditwidget.h index 52bcb8c5..4df207ab 100644 --- a/src/monitoreditwidget.h +++ b/src/monitoreditwidget.h @@ -37,7 +37,7 @@ class MonitorEditWidget : public QWidget Q_OBJECT public: - MonitorEditWidget(Render *renderer, QWidget* parent = 0); + explicit MonitorEditWidget(Render *renderer, QWidget* parent = 0); virtual ~MonitorEditWidget(); /** @brief Updates the necessary settings on a profile change. */ diff --git a/src/monitorscene.h b/src/monitorscene.h index d850e580..a6eb27e9 100644 --- a/src/monitorscene.h +++ b/src/monitorscene.h @@ -31,7 +31,7 @@ class MonitorScene : public QGraphicsScene { Q_OBJECT public: - MonitorScene(Render *renderer, QObject* parent = 0); + explicit MonitorScene(Render *renderer, QObject* parent = 0); /** @brief Sets m_view to this scenes view. */ void setUp(); diff --git a/src/onmonitoritems/rotoscoping/bpointitem.h b/src/onmonitoritems/rotoscoping/bpointitem.h index 536182bf..4e2d0c4c 100644 --- a/src/onmonitoritems/rotoscoping/bpointitem.h +++ b/src/onmonitoritems/rotoscoping/bpointitem.h @@ -29,7 +29,7 @@ class QGraphicsView; class BPointItem : public QAbstractGraphicsShapeItem { public: - BPointItem(BPoint point, QGraphicsItem* parent = 0); + explicit BPointItem(BPoint point, QGraphicsItem* parent = 0); BPoint getPoint(); void setPoint(BPoint point); diff --git a/src/onmonitoritems/rotoscoping/splineitem.h b/src/onmonitoritems/rotoscoping/splineitem.h index fec4dfd1..d6b595c2 100644 --- a/src/onmonitoritems/rotoscoping/splineitem.h +++ b/src/onmonitoritems/rotoscoping/splineitem.h @@ -30,7 +30,7 @@ class SplineItem : public QObject, public QGraphicsPathItem Q_OBJECT public: - SplineItem(const QList &points, QGraphicsItem* parent = 0, QGraphicsScene *scene = 0); + explicit SplineItem(const QList &points, QGraphicsItem* parent = 0, QGraphicsScene *scene = 0); enum { Type = UserType + 10 }; diff --git a/src/profilesdialog.h b/src/profilesdialog.h index d9f1c0d7..18e26fe1 100644 --- a/src/profilesdialog.h +++ b/src/profilesdialog.h @@ -32,7 +32,7 @@ class ProfilesDialog : public QDialog public: ProfilesDialog(QWidget * parent = 0); /** @brief Using this constructor, the dialog only allows editing one profile. */ - ProfilesDialog(QString profilePath, QWidget * parent = 0); + explicit ProfilesDialog(QString profilePath, QWidget * parent = 0); void fillList(const QString selectedProfile = QString()); static QMap< QString, QString > getSettingsForProfile(const QString profileName); diff --git a/src/scopes/abstractscopewidget.h b/src/scopes/abstractscopewidget.h index 4fe726d9..95fbdfc7 100644 --- a/src/scopes/abstractscopewidget.h +++ b/src/scopes/abstractscopewidget.h @@ -67,7 +67,7 @@ public: if mouse tracking is enabled. \see signalMousePositionChanged(): Emitted when mouse tracking is enabled */ - AbstractScopeWidget(bool trackMouse = false, QWidget *parent = 0); + explicit AbstractScopeWidget(bool trackMouse = false, QWidget *parent = 0); virtual ~AbstractScopeWidget(); // Must be virtual because of inheritance, to avoid memory leaks diff --git a/src/scopes/audioscopes/abstractaudioscopewidget.h b/src/scopes/audioscopes/abstractaudioscopewidget.h index a3c352b7..7ea9223d 100644 --- a/src/scopes/audioscopes/abstractaudioscopewidget.h +++ b/src/scopes/audioscopes/abstractaudioscopewidget.h @@ -31,7 +31,7 @@ class AbstractAudioScopeWidget : public AbstractScopeWidget { Q_OBJECT public: - AbstractAudioScopeWidget(bool trackMouse = false, QWidget *parent = 0); + explicit AbstractAudioScopeWidget(bool trackMouse = false, QWidget *parent = 0); virtual ~AbstractAudioScopeWidget(); public slots: diff --git a/src/scopes/colorscopes/abstractgfxscopewidget.h b/src/scopes/colorscopes/abstractgfxscopewidget.h index 54e335ad..cd8d68e4 100644 --- a/src/scopes/colorscopes/abstractgfxscopewidget.h +++ b/src/scopes/colorscopes/abstractgfxscopewidget.h @@ -28,7 +28,7 @@ class AbstractGfxScopeWidget : public AbstractScopeWidget Q_OBJECT public: - AbstractGfxScopeWidget(bool trackMouse = false, QWidget *parent = 0); + explicit AbstractGfxScopeWidget(bool trackMouse = false, QWidget *parent = 0); virtual ~AbstractGfxScopeWidget(); // Must be virtual because of inheritance, to avoid memory leaks protected: diff --git a/src/slideshowclip.h b/src/slideshowclip.h index 69fc496f..b4114f99 100644 --- a/src/slideshowclip.h +++ b/src/slideshowclip.h @@ -34,7 +34,7 @@ class SlideshowClip : public QDialog Q_OBJECT public: - SlideshowClip(Timecode tc, QWidget * parent = 0); + explicit SlideshowClip(Timecode tc, QWidget * parent = 0); virtual ~ SlideshowClip(); /** return selected path for slideshow in MLT format */ QString selectedPath(); diff --git a/src/smallruler.h b/src/smallruler.h index 224ba63a..f3ccc725 100644 --- a/src/smallruler.h +++ b/src/smallruler.h @@ -32,7 +32,7 @@ class SmallRuler : public QWidget Q_OBJECT public: - SmallRuler(MonitorManager *manager, QWidget *parent = 0); + explicit SmallRuler(MonitorManager *manager, QWidget *parent = 0); virtual void mousePressEvent(QMouseEvent * event); virtual void mouseMoveEvent(QMouseEvent * event); virtual void leaveEvent( QEvent * event ); diff --git a/src/stopmotion/capturehandler.h b/src/stopmotion/capturehandler.h index b2ea249d..fe730a46 100644 --- a/src/stopmotion/capturehandler.h +++ b/src/stopmotion/capturehandler.h @@ -28,7 +28,7 @@ class CaptureHandler : public QObject { Q_OBJECT public: - CaptureHandler(QVBoxLayout *lay, QWidget *parent = 0); + explicit CaptureHandler(QVBoxLayout *lay, QWidget *parent = 0); ~CaptureHandler(); virtual void startPreview(int deviceId, int captureMode, bool audio = true) = 0; virtual void stopPreview() = 0; diff --git a/src/timecodedisplay.h b/src/timecodedisplay.h index 484841da..e3ae03f7 100644 --- a/src/timecodedisplay.h +++ b/src/timecodedisplay.h @@ -41,7 +41,7 @@ public: /** @brief Constructor for the widget, sets value to 0. * @param t Timecode object used to setup correct input (frames or HH:MM:SS:FF) * @param parent parent Widget */ - TimecodeDisplay(Timecode t, QWidget *parent = 0); + explicit TimecodeDisplay(Timecode t, QWidget *parent = 0); /** @brief Returns the minimum value, which can be entered. * default is 0 */ diff --git a/src/trackdialog.h b/src/trackdialog.h index 317a651f..8adc9918 100644 --- a/src/trackdialog.h +++ b/src/trackdialog.h @@ -31,7 +31,7 @@ class TrackDialog : public QDialog, public Ui::AddTrack_UI Q_OBJECT public: - TrackDialog(KdenliveDoc *doc, QWidget * parent = 0); + explicit TrackDialog(KdenliveDoc *doc, QWidget * parent = 0); }; diff --git a/src/tracksconfigdialog.h b/src/tracksconfigdialog.h index 3dcefa6d..53029ff2 100644 --- a/src/tracksconfigdialog.h +++ b/src/tracksconfigdialog.h @@ -55,7 +55,7 @@ public: * @param doc the kdenlive document whose tracks to use * @param selected the track which should be selected by default * @param parent the parent widget */ - TracksConfigDialog(KdenliveDoc * doc, int selected = -1, QWidget * parent = 0); + explicit TracksConfigDialog(KdenliveDoc * doc, int selected = -1, QWidget * parent = 0); /** @brief Returns the new list of tracks created from the table. */ const QList tracksList(); diff --git a/src/transitionsettings.h b/src/transitionsettings.h index 118d13b1..0fc869fa 100644 --- a/src/transitionsettings.h +++ b/src/transitionsettings.h @@ -33,7 +33,7 @@ class TransitionSettings : public QWidget, public Ui::TransitionSettings_UI Q_OBJECT public: - TransitionSettings(Monitor *monitor, QWidget* parent = 0); + explicit TransitionSettings(Monitor *monitor, QWidget* parent = 0); void raiseWindow(QWidget*); void updateProjectFormat(MltVideoProfile profile, Timecode t, const QList info); void updateTimecodeFormat(); diff --git a/src/utils/abstractservice.h b/src/utils/abstractservice.h index cf514734..250f3e58 100644 --- a/src/utils/abstractservice.h +++ b/src/utils/abstractservice.h @@ -58,7 +58,7 @@ class AbstractService : public QObject Q_OBJECT public: - AbstractService(QListWidget *listWidget, QObject * parent = 0); + explicit AbstractService(QListWidget *listWidget, QObject * parent = 0); ~AbstractService(); /** @brief Get file extension for currently selected item. */ virtual QString getExtension(QListWidgetItem *item); diff --git a/src/utils/archiveorg.h b/src/utils/archiveorg.h index 51c558f0..e601c814 100644 --- a/src/utils/archiveorg.h +++ b/src/utils/archiveorg.h @@ -34,7 +34,7 @@ class ArchiveOrg : public AbstractService Q_OBJECT public: - ArchiveOrg(QListWidget *listWidget, QObject * parent = 0); + explicit ArchiveOrg(QListWidget *listWidget, QObject * parent = 0); ~ArchiveOrg(); virtual QString getExtension(QListWidgetItem *item); virtual QString getDefaultDownloadName(QListWidgetItem *item); diff --git a/src/utils/freesound.h b/src/utils/freesound.h index 88251a0e..04d33219 100644 --- a/src/utils/freesound.h +++ b/src/utils/freesound.h @@ -34,7 +34,7 @@ class FreeSound : public AbstractService Q_OBJECT public: - FreeSound(QListWidget *listWidget, QObject * parent = 0); + explicit FreeSound(QListWidget *listWidget, QObject * parent = 0); ~FreeSound(); virtual QString getExtension(QListWidgetItem *item); virtual QString getDefaultDownloadName(QListWidgetItem *item); diff --git a/src/utils/openclipart.h b/src/utils/openclipart.h index 66f2556f..1ba638c6 100644 --- a/src/utils/openclipart.h +++ b/src/utils/openclipart.h @@ -34,7 +34,7 @@ class OpenClipArt : public AbstractService Q_OBJECT public: - OpenClipArt(QListWidget *listWidget, QObject * parent = 0); + explicit OpenClipArt(QListWidget *listWidget, QObject * parent = 0); ~OpenClipArt(); virtual QString getExtension(QListWidgetItem *item); virtual QString getDefaultDownloadName(QListWidgetItem *item); diff --git a/src/utils/resourcewidget.h b/src/utils/resourcewidget.h index ed254276..614538da 100644 --- a/src/utils/resourcewidget.h +++ b/src/utils/resourcewidget.h @@ -42,7 +42,7 @@ class ResourceWidget : public QDialog, public Ui::FreeSound_UI Q_OBJECT public: - ResourceWidget(const QString & folder, QWidget * parent = 0); + explicit ResourceWidget(const QString & folder, QWidget * parent = 0); ~ResourceWidget(); diff --git a/src/wizard.h b/src/wizard.h index ec430ec4..134009cb 100644 --- a/src/wizard.h +++ b/src/wizard.h @@ -76,7 +76,7 @@ class Wizard : public QWizard { Q_OBJECT public: - Wizard(bool upgrade, QWidget * parent = 0); + explicit Wizard(bool upgrade, QWidget * parent = 0); void installExtraMimes(QString baseName, QStringList globs); void runUpdateMimeDatabase(); void adjustSettings(); -- 2.39.2