palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-06-26 14:18:12 +02:00
Code Issues Projects Releases Wiki Activity

Use Q_DECL_OVERRIDE.

Browse source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-07-03 16:36:54 +03:00
parent f6a551ed4b
commit d4e13bfe34
211 changed files with 1029 additions and 1019 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/core/vapplication.h
View file

@ -56,9 +56,9 @@ class VApplication : public VAbstractApplication
Q_OBJECT
public:
VApplication(int &argc, char ** argv);
virtual ~VApplication();
virtual ~VApplication() Q_DECL_OVERRIDE;
static void NewValentina(const QString &fileName = QString());
virtual bool notify(QObject * receiver, QEvent * event);
virtual bool notify(QObject * receiver, QEvent * event) Q_DECL_OVERRIDE;
void InitOptions();

22
src/app/core/vformulaproperty.h
View file

@ -40,7 +40,7 @@ public:
VFormulaProperty(const QString &name);
//! Get the data how it should be displayed
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const;
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! Returns item flags
Qt::ItemFlags flags(int column = DPC_Name) const;
@ -51,38 +51,38 @@ public:
//! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and
//! slots.
virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options,
const QAbstractItemDelegate* delegate);
const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE;
//! Sets the property's data to the editor (returns false, if the standard delegate should do that)
virtual bool setEditorData(QWidget* editor);
virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE;
//! Gets the data from the widget
virtual QVariant getEditorData(const QWidget* editor) const;
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
//! Returns a string containing the type of the property
virtual QString type() const;
virtual QString type() const Q_DECL_OVERRIDE;
//! Clones this property
//! \param include_children Indicates whether to also clone the children
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
//! to fill all the data into container. This can also be used when subclassing this function.
//! \return Returns the newly created property (or container, if it was not NULL)
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const;
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const Q_DECL_OVERRIDE;
//! Sets the value of the property
virtual void setValue(const QVariant& value);
virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE;
//! Returns the value of the property as a QVariant
virtual QVariant getValue() const;
virtual QVariant getValue() const Q_DECL_OVERRIDE;
//! Returns the formula
virtual VFormula GetFormula() const;
VFormula GetFormula() const;
//! Sets the formula
virtual void SetFormula(const VFormula &formula);
void SetFormula(const VFormula &formula);
public slots:
virtual void ValueChildChanged(const QVariant &value, int typeForParent);
virtual void ValueChildChanged(const QVariant &value, int typeForParent) Q_DECL_OVERRIDE;
};

2
src/app/core/vformulapropertyeditor.h
View file

@ -46,7 +46,7 @@ public:
VFormulaPropertyEditor(QWidget *parent);
//! Destructor
virtual ~VFormulaPropertyEditor();
virtual ~VFormulaPropertyEditor() Q_DECL_OVERRIDE;
//! Returns the formula currently set
VFormula GetFormula() const;

2
src/app/dialogs/configdialog.h
View file

@ -46,7 +46,7 @@ public slots:
signals:
void UpdateProperties();
protected:
virtual void closeEvent(QCloseEvent *event);
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(ConfigDialog)
QListWidget *contentsWidget;

8
src/app/dialogs/dialoghistory.h
View file

@ -49,13 +49,13 @@ class DialogHistory : public DialogTool
Q_OBJECT
public:
DialogHistory(VContainer *data, VPattern *doc, QWidget *parent = nullptr);
virtual ~DialogHistory();
virtual ~DialogHistory() Q_DECL_OVERRIDE;
public slots:
virtual void DialogAccepted();
virtual void DialogAccepted() Q_DECL_OVERRIDE;
/** TODO ISSUE 79 : create real function
* @brief DialogApply apply data and emit signal about applied dialog.
*/
virtual void DialogApply(){}
virtual void DialogApply() Q_DECL_OVERRIDE {}
void cellClicked(int row, int column);
void ChangedCursor(quint32 id);
void UpdateHistory();
@ -67,7 +67,7 @@ signals:
*/
void ShowHistoryTool(quint32 id, bool enable);
protected:
virtual void closeEvent ( QCloseEvent * event );
virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogHistory)

2
src/app/dialogs/dialogincrements.h
View file

@ -73,7 +73,7 @@ signals:
*/
void haveLiteChange();
protected:
virtual void closeEvent ( QCloseEvent * event );
virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogIncrements)

2
src/app/dialogs/dialogpatternproperties.h
View file

@ -46,7 +46,7 @@ class DialogPatternProperties : public QDialog
Q_OBJECT
public:
DialogPatternProperties(VPattern *doc, QWidget *parent = nullptr);
virtual ~DialogPatternProperties();
virtual ~DialogPatternProperties() Q_DECL_OVERRIDE;
signals:
void UpdateGradation();
public slots:

14
src/app/mainwindow.h
View file

@ -52,7 +52,7 @@ class MainWindow : public MainWindowsNoGUI
Q_OBJECT
public:
explicit MainWindow(QWidget *parent = nullptr);
virtual ~MainWindow();
virtual ~MainWindow() Q_DECL_OVERRIDE;
void LoadPattern(const QString &curFile);
void ReopenFilesAfterCrash(QStringList &args);
public slots:
@ -149,13 +149,13 @@ signals:
void RefreshHistory();
void EnableItemMove(bool move);
protected:
virtual void keyPressEvent(QKeyEvent *event);
virtual void showEvent(QShowEvent *event);
virtual void closeEvent(QCloseEvent *event);
virtual void customEvent(QEvent * event);
virtual void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
virtual void customEvent(QEvent * event) Q_DECL_OVERRIDE;
virtual void CleanLayout();
virtual void PrepareSceneList();
virtual void CleanLayout() Q_DECL_OVERRIDE;
virtual void PrepareSceneList() Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(MainWindow)
/** @brief ui keeps information about user interface */

2
src/app/mainwindowsnogui.h
View file

@ -43,7 +43,7 @@ class MainWindowsNoGUI : public QMainWindow
Q_OBJECT
public:
MainWindowsNoGUI(QWidget *parent = nullptr);
virtual ~MainWindowsNoGUI();
virtual ~MainWindowsNoGUI() Q_DECL_OVERRIDE;
public slots:
void ToolLayoutSettings(bool checked);

2
src/app/xml/vabstractmeasurements.h
View file

@ -36,7 +36,7 @@ class VAbstractMeasurements : public VDomDocument
{
public:
VAbstractMeasurements(VContainer *data);
virtual ~VAbstractMeasurements();
virtual ~VAbstractMeasurements() Q_DECL_OVERRIDE;
virtual void Measurements();
Unit MUnit() const;
static const QString TagUnit;

6
src/app/xml/vindividualmeasurements.h
View file

@ -45,9 +45,9 @@ class VIndividualMeasurements:public VAbstractMeasurements
{
public:
VIndividualMeasurements(VContainer *data);
virtual ~VIndividualMeasurements();
virtual ~VIndividualMeasurements() Q_DECL_OVERRIDE;
void setUnit(const Unit &unit);
virtual void Measurements();
virtual void Measurements() Q_DECL_OVERRIDE;
QString FamilyName() const;
void setFamilyName(const QString &text);
QString GivenName() const;
@ -70,7 +70,7 @@ public:
static QString GenderToStr(const SexType &sex);
static SexType StrToGender(const QString &sex);
protected:
virtual void ReadMeasurement(const QDomElement &domElement, const QString &tag);
virtual void ReadMeasurement(const QDomElement &domElement, const QString &tag) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(VIndividualMeasurements)
};

14
src/app/xml/vpattern.h
View file

@ -46,32 +46,32 @@ public:
VPattern(VContainer *data, Draw *mode, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail,
QObject *parent = nullptr);
virtual void CreateEmptyFile(const QString &tablePath);
virtual void CreateEmptyFile(const QString &tablePath) Q_DECL_OVERRIDE;
void Parse(const Document &parse);
void setCurrentData();
virtual void UpdateToolData(const quint32 &id, VContainer *data);
virtual void UpdateToolData(const quint32 &id, VContainer *data) Q_DECL_OVERRIDE;
virtual void IncrementReferens(quint32 id) const;
virtual void DecrementReferens(quint32 id) const;
virtual void IncrementReferens(quint32 id) const Q_DECL_OVERRIDE;
virtual void DecrementReferens(quint32 id) const Q_DECL_OVERRIDE;
quint32 SPointActiveDraw();
virtual bool SaveDocument(const QString &fileName, QString &error) const;
virtual bool SaveDocument(const QString &fileName, QString &error) const Q_DECL_OVERRIDE;
QRectF ActiveDrawBoundingRect() const;
QString GetAuthor() const;
void SetAuthor(const QString &text);
virtual QString GenerateLabel(const LabelType &type, const QString &reservedName = QString())const;
virtual QString GenerateLabel(const LabelType &type, const QString &reservedName = QString())const Q_DECL_OVERRIDE;
public slots:
void LiteParseTree(const Document &parse);
protected:
virtual void customEvent(QEvent * event);
virtual void customEvent(QEvent * event) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(VPattern)

4
src/app/xml/vstandardmeasurements.h
View file

@ -43,7 +43,7 @@ class VStandardMeasurements:public VAbstractMeasurements
{
public:
VStandardMeasurements(VContainer *data);
virtual ~VStandardMeasurements();
virtual ~VStandardMeasurements() Q_DECL_OVERRIDE;
QString OrigDescription ();
QString TrDescription ();
QString Id();
@ -63,7 +63,7 @@ public:
static const QString AttrHeight_increase;
static const QString AttrBase;
protected:
virtual void ReadMeasurement(const QDomElement &domElement, const QString &tag);
virtual void ReadMeasurement(const QDomElement &domElement, const QString &tag) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(VStandardMeasurements)
qreal TakeParametr(const QString &tag, const QString &attr, qreal defValue) const;

6
src/libs/ifc/exception/vexception.h
View file

@ -46,11 +46,11 @@ public:
VException(const QString &what);
VException(const VException &e);
VException &operator=(const VException &e);
virtual ~VException() V_NOEXCEPT_EXPR (true){}
virtual ~VException() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {}
Q_NORETURN virtual void raise() const;
Q_NORETURN virtual void raise() const Q_DECL_OVERRIDE;
// cppcheck-suppress unusedFunction
virtual VException *clone() const;
virtual VException *clone() const Q_DECL_OVERRIDE;
virtual QString ErrorMessage() const;
virtual QString DetailedInformation() const;
QString What() const;

4
src/libs/ifc/exception/vexceptionbadid.h
View file

@ -41,8 +41,8 @@ public:
VExceptionBadId(const QString &what, const QString &key);
VExceptionBadId(const VExceptionBadId &e);
VExceptionBadId &operator=(const VExceptionBadId &e);
virtual ~VExceptionBadId() V_NOEXCEPT_EXPR (true){}
virtual QString ErrorMessage() const;
virtual ~VExceptionBadId() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {}
virtual QString ErrorMessage() const Q_DECL_OVERRIDE;
quint32 BadId() const;
QString BadKey() const;
protected:

4
src/libs/ifc/exception/vexceptionconversionerror.h
View file

@ -39,8 +39,8 @@ class VExceptionConversionError : public VException
public:
VExceptionConversionError(const QString &what, const QString &str);
VExceptionConversionError(const VExceptionConversionError &e);
virtual ~VExceptionConversionError() V_NOEXCEPT_EXPR (true);
virtual QString ErrorMessage() const;
virtual ~VExceptionConversionError() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE;
virtual QString ErrorMessage() const Q_DECL_OVERRIDE;
QString String() const;
protected:
/** @brief str string, where happend error */

6
src/libs/ifc/exception/vexceptionemptyparameter.h
View file

@ -41,9 +41,9 @@ class VExceptionEmptyParameter : public VException
public:
VExceptionEmptyParameter(const QString &what, const QString &name, const QDomElement &domElement);
VExceptionEmptyParameter(const VExceptionEmptyParameter &e);
virtual ~VExceptionEmptyParameter() V_NOEXCEPT_EXPR (true);
virtual QString ErrorMessage() const;
virtual QString DetailedInformation() const;
virtual ~VExceptionEmptyParameter() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE;
virtual QString ErrorMessage() const Q_DECL_OVERRIDE;
virtual QString DetailedInformation() const Q_DECL_OVERRIDE;
QString Name() const;
QString TagText() const;
QString TagName() const;

6
src/libs/ifc/exception/vexceptionobjecterror.h
View file

@ -41,9 +41,9 @@ class VExceptionObjectError : public VException
public:
VExceptionObjectError(const QString &what, const QDomElement &domElement);
VExceptionObjectError(const VExceptionObjectError &e);
virtual ~VExceptionObjectError() V_NOEXCEPT_EXPR (true) {}
virtual QString ErrorMessage() const;
virtual QString DetailedInformation() const;
virtual ~VExceptionObjectError() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {}
virtual QString ErrorMessage() const Q_DECL_OVERRIDE;
virtual QString DetailedInformation() const Q_DECL_OVERRIDE;
QString TagText() const;
QString TagName() const;
qint32 LineNumber() const;

2
src/libs/ifc/exception/vexceptionundo.h
View file

@ -36,7 +36,7 @@ class VExceptionUndo : public VException
public:
VExceptionUndo(const QString &what);
VExceptionUndo(const VExceptionUndo &e);
virtual ~VExceptionUndo() V_NOEXCEPT_EXPR (true);
virtual ~VExceptionUndo() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE;
};
#endif // VEXCEPTIONUNDO_H

6
src/libs/ifc/exception/vexceptionwrongid.h
View file

@ -41,9 +41,9 @@ class VExceptionWrongId : public VException
public:
VExceptionWrongId(const QString &what, const QDomElement &domElement);
VExceptionWrongId(const VExceptionWrongId &e);
virtual ~VExceptionWrongId() V_NOEXCEPT_EXPR (true){}
virtual QString ErrorMessage() const;
virtual QString DetailedInformation() const;
virtual ~VExceptionWrongId() V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {}
virtual QString ErrorMessage() const Q_DECL_OVERRIDE;
virtual QString DetailedInformation() const Q_DECL_OVERRIDE;
QString TagText() const;
QString TagName() const;
qint32 LineNumber() const;

4
src/libs/ifc/xml/vabstractconverter.h
View file

@ -36,10 +36,10 @@ class VAbstractConverter :public VDomDocument
Q_DECLARE_TR_FUNCTIONS(VAbstractConverter)
public:
VAbstractConverter(const QString &fileName);
virtual ~VAbstractConverter();
virtual ~VAbstractConverter() Q_DECL_OVERRIDE;
void Convert();
virtual bool SaveDocument(const QString &fileName, QString &error) const;
virtual bool SaveDocument(const QString &fileName, QString &error) const Q_DECL_OVERRIDE;
protected:
int ver;

2
src/libs/ifc/xml/vabstractpattern.h
View file

@ -46,7 +46,7 @@ class VAbstractPattern : public QObject, public VDomDocument
Q_OBJECT
public:
VAbstractPattern(QObject *parent = nullptr);
virtual ~VAbstractPattern();
virtual ~VAbstractPattern() Q_DECL_OVERRIDE;
virtual void CreateEmptyFile(const QString &tablePath)=0;

2
src/libs/ifc/xml/vdomdocument.cpp
View file

@ -51,7 +51,7 @@ public:
protected:
// cppcheck-suppress unusedFunction
virtual void handleMessage(QtMsgType type, const QString &description,
const QUrl &identifier, const QSourceLocation &sourceLocation);
const QUrl &identifier, const QSourceLocation &sourceLocation) Q_DECL_OVERRIDE;
private:
QtMsgType m_messageType;
QString m_description;

12
src/libs/ifc/xml/vpatternconverter.h
View file

@ -36,20 +36,20 @@ class VPatternConverter : public VAbstractConverter
Q_DECLARE_TR_FUNCTIONS(VPatternConverter)
public:
VPatternConverter(const QString &fileName);
virtual ~VPatternConverter();
virtual ~VPatternConverter() Q_DECL_OVERRIDE;
static const QString PatternMaxVerStr;
static const QString CurrentSchema;
protected:
virtual int MinVer() const;
virtual int MaxVer() const;
virtual int MinVer() const Q_DECL_OVERRIDE;
virtual int MaxVer() const Q_DECL_OVERRIDE;
virtual QString MinVerStr() const;
virtual QString MaxVerStr() const;
virtual QString MinVerStr() const Q_DECL_OVERRIDE;
virtual QString MaxVerStr() const Q_DECL_OVERRIDE;
QString XSDSchema(int ver) const;
virtual void ApplyPatches();
virtual void ApplyPatches() Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(VPatternConverter)

10
src/libs/qmuparser/qmuparser.h
View file

@ -46,11 +46,11 @@ namespace qmu
{
public:
QmuParser();
virtual void InitCharSets();
virtual void InitFun();
virtual void InitConst();
virtual void InitOprt();
virtual void OnDetectVar(const QString &pExpr, int &nStart, int &nEnd);
virtual void InitCharSets() Q_DECL_OVERRIDE;
virtual void InitFun() Q_DECL_OVERRIDE;
virtual void InitConst() Q_DECL_OVERRIDE;
virtual void InitOprt() Q_DECL_OVERRIDE;
virtual void OnDetectVar(const QString &pExpr, int &nStart, int &nEnd) Q_DECL_OVERRIDE;
qreal Diff(qreal *a_Var, qreal a_fPos, qreal a_fEpsilon = 0) const;
protected:
static int IsVal(const QString &a_szExpr, int *a_iPos, qreal *a_fVal, const std::locale &s_locale);

6
src/libs/qmuparser/qmuparserbase.h
View file

@ -146,17 +146,17 @@ protected:
:std::numpunct<TChar>(), m_nGroup(nGroup), m_cDecPoint(cDecSep), m_cThousandsSep(cThousandsSep)
{}
protected:
virtual char_type do_decimal_point() const
virtual char_type do_decimal_point() const Q_DECL_OVERRIDE
{
return m_cDecPoint;
}
virtual char_type do_thousands_sep() const
virtual char_type do_thousands_sep() const Q_DECL_OVERRIDE
{
return m_cThousandsSep;
}
virtual std::string do_grouping() const
virtual std::string do_grouping() const Q_DECL_OVERRIDE
{
// fix for issue 4: https://code.google.com/p/muparser/issues/detail?id=4
// courtesy of Jens Bartsch

6
src/libs/qmuparser/qmuparsererror.h
View file

@ -140,7 +140,7 @@ public:
QmuParserError ( const QString &a_szMsg, int a_iPos, const QString &sTok = QString() );
QmuParserError ( const QmuParserError &a_Obj );
QmuParserError& operator= ( const QmuParserError &a_Obj );
virtual ~QmuParserError() QMUP_NOEXCEPT_EXPR (true){}
virtual ~QmuParserError() QMUP_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {}
void SetFormula ( const QString &a_strFormula );
const QString& GetExpr() const;
@ -148,8 +148,8 @@ public:
int GetPos() const;
const QString& GetToken() const;
EErrorCodes GetCode() const;
Q_NORETURN virtual void raise() const;
virtual QmuParserError *clone() const;
Q_NORETURN virtual void raise() const Q_DECL_OVERRIDE;
virtual QmuParserError *clone() const Q_DECL_OVERRIDE;
private:
QString m_sMsg; ///< The message string
QString m_sExpr; ///< Formula string

8
src/libs/vgeometry/varc.h
View file

@ -52,15 +52,15 @@ public:
VArc (qreal length, VPointF center, qreal radius, qreal f1);
VArc(const VArc &arc);
VArc& operator= (const VArc &arc);
virtual ~VArc();
virtual ~VArc() Q_DECL_OVERRIDE;
QString GetFormulaF1 () const;
void SetFormulaF1 (const QString &formula, qreal value);
virtual qreal GetStartAngle () const;
virtual qreal GetStartAngle () const Q_DECL_OVERRIDE;
QString GetFormulaF2 () const;
void SetFormulaF2 (const QString &formula, qreal value);
virtual qreal GetEndAngle () const;
virtual qreal GetEndAngle () const Q_DECL_OVERRIDE;
QString GetFormulaRadius () const;
void SetFormulaRadius (const QString &formula, qreal value);
@ -79,7 +79,7 @@ public:
QVector<QPointF> GetPoints () const;
QPointF CutArc (const qreal &length, VArc &arc1, VArc &arc2) const;
QPointF CutArc (const qreal &length) const;
virtual void setId(const quint32 &id);
virtual void setId(const quint32 &id) Q_DECL_OVERRIDE;
private:
QSharedDataPointer<VArcData> d;

2
src/libs/vgeometry/vpointf.h
View file

@ -48,7 +48,7 @@ public:
const Draw &mode = Draw::Calculation);
VPointF (const QPointF &point, const QString &name, qreal mx, qreal my, quint32 idObject = 0,
const Draw &mode = Draw::Calculation);
virtual ~VPointF();
virtual ~VPointF() Q_DECL_OVERRIDE;
VPointF &operator=(const VPointF &point);
qreal mx() const;
qreal my() const;

6
src/libs/vgeometry/vspline.h
View file

@ -51,15 +51,15 @@ public:
quint32 idObject = 0, Draw mode = Draw::Calculation);
VSpline (VPointF p1, QPointF p2, QPointF p3, VPointF p4, qreal kCurve, quint32 idObject = 0,
Draw mode = Draw::Calculation);
virtual ~VSpline();
virtual ~VSpline() Q_DECL_OVERRIDE;
VSpline &operator=(const VSpline &spl);
VPointF GetP1 () const;
QPointF GetP2 () const;
QPointF GetP3 () const;
VPointF GetP4 () const;
virtual qreal GetStartAngle () const;
virtual qreal GetEndAngle() const;
virtual qreal GetStartAngle () const Q_DECL_OVERRIDE;
virtual qreal GetEndAngle() const Q_DECL_OVERRIDE;
qreal GetLength () const;
qreal GetKasm1() const;

6
src/libs/vgeometry/vsplinepath.h
View file

@ -57,7 +57,7 @@ public:
* @param splPath spline path.
*/
VSplinePath(const VSplinePath& splPath);
virtual ~VSplinePath();
virtual ~VSplinePath() Q_DECL_OVERRIDE;
/**
* @brief append add point in the end of list points.
* @param point new point.
@ -176,8 +176,8 @@ public:
int Segment(const QPointF &p) const;
virtual qreal GetStartAngle () const;
virtual qreal GetEndAngle () const;
virtual qreal GetStartAngle () const Q_DECL_OVERRIDE;
virtual qreal GetEndAngle () const Q_DECL_OVERRIDE;
private:
QSharedDataPointer<VSplinePathData> d;
};

2
src/libs/vlayout/vcontour.h
View file

@ -47,7 +47,7 @@ public:
VContour(int height, int width);
VContour(const VContour &contour);
VContour &operator=(const VContour &contour);
virtual ~VContour();
~VContour();
void SetContour(const QVector<QPointF> &contour);
QVector<QPointF> GetContour() const;

2
src/libs/vlayout/vlayoutdetail.h
View file

@ -43,7 +43,7 @@ public:
VLayoutDetail();
VLayoutDetail(const VLayoutDetail &detail);
VLayoutDetail &operator=(const VLayoutDetail &detail);
virtual ~VLayoutDetail();
virtual ~VLayoutDetail() Q_DECL_OVERRIDE;
QVector<QPointF> GetContourPoints() const;
void SetCountourPoints(const QVector<QPointF> &points);

2
src/libs/vlayout/vlayoutgenerator.h
View file

@ -44,7 +44,7 @@ class VLayoutGenerator :public QObject
Q_OBJECT
public:
VLayoutGenerator(QObject *parent = 0);
virtual ~VLayoutGenerator();
virtual ~VLayoutGenerator() Q_DECL_OVERRIDE;
void SetDetails(const QVector<VLayoutDetail> &details);
void SetLayoutWidth(qreal width);

2
src/libs/vlayout/vlayoutpaper.h
View file

@ -45,7 +45,7 @@ public:
VLayoutPaper(int height, int width);
VLayoutPaper(const VLayoutPaper &paper);
VLayoutPaper &operator=(const VLayoutPaper &paper);
virtual ~VLayoutPaper();
~VLayoutPaper();
int GetHeight() const;
void SetHeight(int height);

4
src/libs/vlayout/vposition.h
View file

@ -48,7 +48,7 @@ class VPosition : public QRunnable
public:
VPosition(const VContour &gContour, int j, const VLayoutDetail &detail, int i, volatile bool *stop, bool rotate,
int rotationIncrease, bool saveLength);
virtual ~VPosition(){}
virtual ~VPosition() Q_DECL_OVERRIDE{}
quint32 getPaperIndex() const;
void setPaperIndex(const quint32 &value);
@ -101,7 +101,7 @@ private:
EdgeError = 2
};
virtual void run();
virtual void run() Q_DECL_OVERRIDE;
void SaveCandidate(VBestSquare &bestResult, const VLayoutDetail &detail, int globalI, int detJ, BestFrom type);

2
src/libs/vmisc/undoevent.h
View file

@ -38,7 +38,7 @@ class UndoEvent : public QEvent
{
public:
UndoEvent();
virtual ~UndoEvent();
virtual ~UndoEvent() Q_DECL_OVERRIDE;
};
#endif // UNDOEVENT_H

2
src/libs/vmisc/vabstractapplication.h
View file

@ -49,7 +49,7 @@ class VAbstractApplication : public QApplication
{
public:
VAbstractApplication(int &argc, char ** argv);
virtual ~VAbstractApplication();
virtual ~VAbstractApplication() Q_DECL_OVERRIDE;
virtual const VTranslateVars *TrVars()=0;

22
src/libs/vobj/vobjengine.h
View file

@ -40,18 +40,18 @@ class VObjEngine : public QPaintEngine
{
public:
VObjEngine();
virtual ~VObjEngine();
virtual ~VObjEngine() Q_DECL_OVERRIDE;
virtual bool begin(QPaintDevice *pdev);
virtual bool end();
virtual void updateState(const QPaintEngineState &state);
virtual void drawPath(const QPainterPath &path);
virtual Type type() const;
virtual void drawPoints(const QPointF *points, int pointCount);
virtual void drawPoints(const QPoint *points, int pointCount);
virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr);
virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode);
virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode);
virtual bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE;
virtual bool end() Q_DECL_OVERRIDE;
virtual void updateState(const QPaintEngineState &state) Q_DECL_OVERRIDE;
virtual void drawPath(const QPainterPath &path) Q_DECL_OVERRIDE;
virtual Type type() const Q_DECL_OVERRIDE;
virtual void drawPoints(const QPointF *points, int pointCount) Q_DECL_OVERRIDE;
virtual void drawPoints(const QPoint *points, int pointCount) Q_DECL_OVERRIDE;
virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE;
virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE;
virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE;
QSize getSize() const;
void setSize(const QSize &value);

6
src/libs/vobj/vobjpaintdevice.h
View file

@ -39,8 +39,8 @@ class VObjPaintDevice : public QPaintDevice
{
public:
VObjPaintDevice();
virtual ~VObjPaintDevice();
virtual QPaintEngine *paintEngine() const;
virtual ~VObjPaintDevice() Q_DECL_OVERRIDE;
virtual QPaintEngine *paintEngine() const Q_DECL_OVERRIDE;
QString getFileName() const;
void setFileName(const QString &value);
@ -55,7 +55,7 @@ public:
void setResolution(int dpi);
protected:
virtual int metric(PaintDeviceMetric metric) const;
virtual int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(VObjPaintDevice)
VObjEngine *engine;

2
src/libs/vpatterndb/variables/varcangle.h
View file

@ -40,7 +40,7 @@ public:
VArcAngle(const quint32 &id, const quint32 &parentId, const VAbstractCurve *curve, CurveAngle angle);
VArcAngle(const VArcAngle &var);
VArcAngle &operator=(const VArcAngle &var);
virtual ~VArcAngle();
virtual ~VArcAngle() Q_DECL_OVERRIDE;
};
#endif // VARCANGLE_H

2
src/libs/vpatterndb/variables/varclength.h
View file

@ -40,7 +40,7 @@ public:
VArcLength(const quint32 &id, const quint32 &parentId, const VAbstractCurve *arc, Unit patternUnit);
VArcLength(const VArcLength &var);
VArcLength &operator=(const VArcLength &var);
virtual ~VArcLength();
virtual ~VArcLength() Q_DECL_OVERRIDE;
};
#endif // VARCLENGTH_H

2
src/libs/vpatterndb/variables/varcradius.h
View file

@ -41,7 +41,7 @@ public:
VArcRadius(const quint32 &id, const quint32 &parentId, const VArc *arc, Unit patternUnit);
VArcRadius(const VArcRadius &var);
VArcRadius &operator=(const VArcRadius &var);
virtual ~VArcRadius();
virtual ~VArcRadius() Q_DECL_OVERRIDE;
};
#endif // VARCRADIUS_H

2
src/libs/vpatterndb/variables/varcradius_p.h
View file

@ -52,7 +52,7 @@ public:
:QSharedData(var), arcId(var.arcId)
{}
virtual ~VArcRadiusData();
virtual ~VArcRadiusData() Q_DECL_OVERRIDE;
quint32 arcId;
};

2
src/libs/vpatterndb/variables/vcurveangle.h
View file

@ -42,7 +42,7 @@ public:
VCurveAngle(const quint32 &id, const quint32 &parentId, const VAbstractCurve *curve, CurveAngle angle);
VCurveAngle(const VCurveAngle &var);
VCurveAngle &operator=(const VCurveAngle &var);
virtual ~VCurveAngle();
virtual ~VCurveAngle() Q_DECL_OVERRIDE;
};
#endif // VCURVEANGLE_H

2
src/libs/vpatterndb/variables/vcurvelength.h
View file

@ -41,7 +41,7 @@ public:
VCurveLength(const quint32 &id, const quint32 &parentId, const VAbstractCurve *curve, Unit patternUnit);
VCurveLength(const VCurveLength &var);
VCurveLength &operator=(const VCurveLength &var);
virtual ~VCurveLength();
virtual ~VCurveLength() Q_DECL_OVERRIDE;
};
#endif // VCURVELENGTH_H

4
src/libs/vpatterndb/variables/vcurvevariable.h
View file

@ -41,9 +41,9 @@ public:
VCurveVariable(const quint32 &id, const quint32 &parentId);
VCurveVariable(const VCurveVariable &var);
VCurveVariable &operator=(const VCurveVariable &var);
virtual ~VCurveVariable();
virtual ~VCurveVariable() Q_DECL_OVERRIDE;
virtual bool Filter(quint32 id);
virtual bool Filter(quint32 id) Q_DECL_OVERRIDE;
quint32 GetId() const;
void SetId(const quint32 &id);

2
src/libs/vpatterndb/variables/vincrement.h
View file

@ -44,7 +44,7 @@ public:
QString description = QString());
VIncrement(const VIncrement &incr);
VIncrement &operator=(const VIncrement &incr);
virtual ~VIncrement();
virtual ~VIncrement() Q_DECL_OVERRIDE;
quint32 getId() const;
void setId(const quint32 &value);

1
src/libs/vpatterndb/variables/vinternalvariable_p.h
View file

@ -30,6 +30,7 @@
#define VINTERNALVARIABLE_P_H
#include <QSharedData>
#include "../vmisc/def.h"
#ifdef Q_CC_GNU
#pragma GCC diagnostic push

4
src/libs/vpatterndb/variables/vlineangle.h
View file

@ -41,9 +41,9 @@ public:
VLineAngle(const VPointF *p1, const quint32 &p1Id, const VPointF *p2, const quint32 &p2Id);
VLineAngle(const VLineAngle &var);
VLineAngle &operator=(const VLineAngle &var);
virtual ~VLineAngle();
virtual ~VLineAngle() Q_DECL_OVERRIDE;
virtual bool Filter(quint32 id);
virtual bool Filter(quint32 id) Q_DECL_OVERRIDE;
void SetValue(const VPointF *p1, const VPointF *p2);
quint32 GetP1Id() const;
quint32 GetP2Id() const;

4
src/libs/vpatterndb/variables/vlinelength.h
View file

@ -42,9 +42,9 @@ public:
VLengthLine(const VPointF *p1, const quint32 &p1Id, const VPointF *p2, const quint32 &p2Id, Unit patternUnit);
VLengthLine(const VLengthLine &var);
VLengthLine &operator=(const VLengthLine &var);
virtual ~VLengthLine();
virtual ~VLengthLine() Q_DECL_OVERRIDE;
virtual bool Filter(quint32 id);
virtual bool Filter(quint32 id) Q_DECL_OVERRIDE;
void SetValue(const VPointF *p1, const VPointF *p2);
quint32 GetP1Id() const;
quint32 GetP2Id() const;

2
src/libs/vpatterndb/variables/vmeasurement.h
View file

@ -50,7 +50,7 @@ public:
const QString &description = QString(), const QString &TagName = QString());
VMeasurement(const VMeasurement &m);
VMeasurement &operator=(const VMeasurement &m);
virtual ~VMeasurement();
virtual ~VMeasurement() Q_DECL_OVERRIDE;
QString GetGuiText() const;
QString TagName() const;

2
src/libs/vpatterndb/variables/vsplineangle.h
View file

@ -40,7 +40,7 @@ public:
VSplineAngle(const quint32 &id, const quint32 &parentId, const VAbstractCurve *curve, CurveAngle angle);
VSplineAngle(const VSplineAngle &var);
VSplineAngle &operator=(const VSplineAngle &var);
virtual ~VSplineAngle();
virtual ~VSplineAngle() Q_DECL_OVERRIDE;
};
#endif // VSPLINEANGLE_H

2
src/libs/vpatterndb/variables/vsplinelength.h
View file

@ -41,7 +41,7 @@ public:
VSplineLength(const quint32 &id, const quint32 &parentId, const VAbstractCurve *path, Unit patternUnit);
VSplineLength(const VSplineLength &var);
VSplineLength &operator=(const VSplineLength &var);
virtual ~VSplineLength();
virtual ~VSplineLength() Q_DECL_OVERRIDE;
};
#endif // VSPLINELENGTH_H

4
src/libs/vpatterndb/variables/vvariable.h
View file

@ -43,7 +43,7 @@ public:
VVariable(const QString &name, const qreal &base, const QString &description = QString());
VVariable(const VVariable &var);
VVariable &operator=(const VVariable &var);
virtual ~VVariable();
virtual ~VVariable() Q_DECL_OVERRIDE;
qreal GetBase() const;
void SetBase(const qreal &value);
@ -59,7 +59,7 @@ public:
void SetValue(const qreal &size, const qreal &height, Unit patternUnit);
virtual bool IsNotUsed() const;
virtual bool IsNotUsed() const Q_DECL_OVERRIDE;
private:
QSharedDataPointer<VVariableData> d;
};

2
src/libs/vpatterndb/vdetail.h
View file

@ -48,7 +48,7 @@ public:
VDetail(const QString &name, const QVector<VNodeDetail> &nodes);
VDetail(const VDetail &detail);
VDetail &operator=(const VDetail &detail);
virtual ~VDetail();
virtual ~VDetail() Q_DECL_OVERRIDE;
void append(const VNodeDetail &node);
void Clear();

2
src/libs/vpropertyexplorer/checkablemessagebox.h
View file

@ -42,7 +42,7 @@ class Q_DECL_EXPORT CheckableMessageBox : public QDialog
public:
explicit CheckableMessageBox(QWidget *parent);
virtual ~CheckableMessageBox();
virtual ~CheckableMessageBox() Q_DECL_OVERRIDE;
static QDialogButtonBox::StandardButton
question(QWidget *parent,

12
src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h
View file

@ -55,10 +55,10 @@ class VPROPERTYEXPLORERSHARED_EXPORT QVector3DProperty : public VProperty
public:
QVector3DProperty(const QString& name);
virtual ~QVector3DProperty() {}
virtual ~QVector3DProperty() Q_DECL_OVERRIDE {}
//! Get the data how it should be displayed
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const;
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! Returns item flags
Qt::ItemFlags flags(int column = DPC_Name) const;
@ -73,20 +73,20 @@ public:
virtual void setVector(float x, float y, float z);
//! Returns a string containing the type of the property
virtual QString type() const;
virtual QString type() const Q_DECL_OVERRIDE;
//! Clones this property
//! \param include_children Indicates whether to also clone the children
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
//! to fill all the data into container. This can also be used when subclassing this function.
//! \return Returns the newly created property (or container, if it was not NULL)
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const;
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const Q_DECL_OVERRIDE;
//! Sets the value of the property
virtual void setValue(const QVariant& value);
virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE;
//! Returns the value of the property as a QVariant
virtual QVariant getValue() const;
virtual QVariant getValue() const Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(QVector3DProperty)

12
src/libs/vpropertyexplorer/plugins/vboolproperty.h
View file

@ -35,29 +35,29 @@ public:
VBoolProperty(const QString& name);
//! Destructor
~VBoolProperty() {}
virtual ~VBoolProperty() Q_DECL_OVERRIDE {}
//! Get the data how it should be displayed
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const;
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! This is used by the model to set the data
//! \param data The data to set
//! \param role The role. Default is Qt::EditRole
//! \return Returns true, if the data was changed, false if not.
virtual bool setData (const QVariant& data, int role = Qt::EditRole);
virtual bool setData (const QVariant& data, int role = Qt::EditRole) Q_DECL_OVERRIDE;
//! Returns item flags
virtual Qt::ItemFlags flags(int column = DPC_Name) const;
virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE;
//! Returns a string containing the type of the property
virtual QString type() const;
virtual QString type() const Q_DECL_OVERRIDE;
//! Clones this property
//! \param include_children Indicates whether to also clone the children
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
//! to fill all the data into container. This can also be used when subclassing this function.
//! \return Returns the newly created property (or container, if it was not NULL)
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const;
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const Q_DECL_OVERRIDE;
protected:
//! The (translatable) text displayed when the property is set to true (default: "True")

12
src/libs/vpropertyexplorer/plugins/vcolorproperty.h
View file

@ -35,7 +35,7 @@ public:
VColorProperty(const QString &name);
//! Get the data how it should be displayed
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const;
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! Returns an editor widget, or NULL if it doesn't supply one
//! \param parent The widget to which the editor will be added as a child
@ -43,23 +43,23 @@ public:
//! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and
//! slots.
virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options,
const QAbstractItemDelegate* delegate);
const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE;
//! Sets the property's data to the editor (returns false, if the standard delegate should do that)
virtual bool setEditorData(QWidget* editor);
virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE;
//! Gets the data from the widget
virtual QVariant getEditorData(const QWidget* editor) const;
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
//! Returns a string containing the type of the property
virtual QString type() const;
virtual QString type() const Q_DECL_OVERRIDE;
//! Clones this property
//! \param include_children Indicates whether to also clone the children
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
//! to fill all the data into container. This can also be used when subclassing this function.
//! \return Returns the newly created property (or container, if it was not NULL)
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const;
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(VColorProperty)

2
src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h
View file

@ -41,7 +41,7 @@ public:
VColorPropertyEditor(QWidget *parent);
//! Destructor
virtual ~VColorPropertyEditor();
virtual ~VColorPropertyEditor() Q_DECL_OVERRIDE;
//! Returns the color currently set

14
src/libs/vpropertyexplorer/plugins/vemptyproperty.h
View file

@ -34,10 +34,10 @@ public:
explicit VEmptyProperty(const QString& name);
//! Destructor
virtual ~VEmptyProperty();
virtual ~VEmptyProperty() Q_DECL_OVERRIDE;
//! Get the data how it should be displayed
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const;
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! Returns an editor widget, or NULL if it doesn't supply one
//! \param parent The widget to which the editor will be added as a child
@ -45,23 +45,23 @@ public:
//! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and
//! slots.
virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options,
const QAbstractItemDelegate* delegate);
const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE;
//! Gets the data from the widget
virtual QVariant getEditorData(const QWidget* editor) const;
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
//! Returns item flags
virtual Qt::ItemFlags flags(int column = DPC_Name) const;
virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE;
//! Returns a string containing the type of the property
virtual QString type() const;
virtual QString type() const Q_DECL_OVERRIDE;
//! Clones this property
//! \param include_children Indicates whether to also clone the children
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
//! to fill all the data into container. This can also be used when subclassing this function.
//! \return Returns the newly created property (or container, if it was not NULL)
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const;
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const Q_DECL_OVERRIDE;
protected:
//! Protected constructor

20
src/libs/vpropertyexplorer/plugins/venumproperty.h
View file

@ -36,10 +36,10 @@ public:
VEnumProperty(const QString& name);
//! Destructor
~VEnumProperty() {}
virtual ~VEnumProperty() Q_DECL_OVERRIDE {}
//! Get the data how it should be displayed
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const;
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! Returns an editor widget, or NULL if it doesn't supply one
//! \param parent The widget to which the editor will be added as a child
@ -47,10 +47,10 @@ public:
//! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and
//! slots.
virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options,
const QAbstractItemDelegate* delegate);
const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE;
//! Gets the data from the widget
virtual QVariant getEditorData(const QWidget* editor) const;
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
//! Sets the enumeration literals
virtual void setLiterals(const QStringList &literals);
@ -59,28 +59,28 @@ public:
virtual QStringList getLiterals() const;
//! Sets the value of the property
virtual void setValue(const QVariant& value);
virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE;
//! Returns a string containing the type of the property
virtual QString type() const;
virtual QString type() const Q_DECL_OVERRIDE;
//! Clones this property
//! \param include_children Indicates whether to also clone the children
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
//! to fill all the data into container. This can also be used when subclassing this function.
//! \return Returns the newly created property (or container, if it was not NULL)
virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const;
virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const Q_DECL_OVERRIDE;
//! Sets the settings. Available settings:
//!
//! key: "literals" - value: "item1;;item2;;item3"
virtual void setSetting(const QString& key, const QVariant& value);
virtual void setSetting(const QString& key, const QVariant& value) Q_DECL_OVERRIDE;
//! Get the settings. This function has to be implemented in a subclass in order to have an effect
virtual QVariant getSetting(const QString& key) const;
virtual QVariant getSetting(const QString& key) const Q_DECL_OVERRIDE;
//! Returns the list of keys of the property's settings
virtual QStringList getSettingKeys() const;
virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE;
public slots:
void currentIndexChanged(int index);

20
src/libs/vpropertyexplorer/plugins/vfileproperty.h
View file

@ -37,7 +37,7 @@ public:
VFileProperty(const QString &name);
//! The destructor
~VFileProperty();
virtual ~VFileProperty() Q_DECL_OVERRIDE;
//! Sets the file filters. The file filters have to be like the ones passed a QFileOpenDialog.
virtual void setFileFilters(const QString& filefilters);
@ -52,7 +52,7 @@ public:
virtual QString getFile() const;
//! Get the data how it should be displayed
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const;
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! Returns an editor widget, or NULL if it doesn't supply one
//! \param parent The widget to which the editor will be added as a child
@ -60,34 +60,34 @@ public:
//! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and
//! slots.
virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options,
const QAbstractItemDelegate* delegate);
const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE;
//! Sets the property's data to the editor (returns false, if the standard delegate should do that)
virtual bool setEditorData(QWidget* editor);
virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE;
//! Gets the data from the widget
virtual QVariant getEditorData(const QWidget* editor) const;
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
//! Sets the settings. Available settings:
//!
//! key: "FileFilters" - value: File filters in the same format the QFileDialog expects it
virtual void setSetting(const QString& key, const QVariant& value);
virtual void setSetting(const QString& key, const QVariant& value) Q_DECL_OVERRIDE;
//! Get the settings. This function has to be implemented in a subclass in order to have an effect
virtual QVariant getSetting(const QString& key) const;
virtual QVariant getSetting(const QString& key) const Q_DECL_OVERRIDE;
//! Returns the list of keys of the property's settings
virtual QStringList getSettingKeys() const;
virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE;
//! Returns a string containing the type of the property
virtual QString type() const;
virtual QString type() const Q_DECL_OVERRIDE;
//! Clones this property
//! \param include_children Indicates whether to also clone the children
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
//! to fill all the data into container. This can also be used when subclassing this function.
//! \return Returns the newly created property (or container, if it was not NULL)
virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const;
virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const Q_DECL_OVERRIDE;
//! Returns whether this is a file (false) or a directory (true)
virtual bool isDirectory() const;

2
src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h
View file

@ -38,7 +38,7 @@ class VPROPERTYEXPLORERSHARED_EXPORT VFileEditWidget : public QWidget
public:
VFileEditWidget(QWidget* parent, bool is_directory = false);
virtual ~VFileEditWidget();
virtual ~VFileEditWidget() Q_DECL_OVERRIDE;
//! This function returns the file currently set to this editor

14
src/libs/vpropertyexplorer/plugins/vlinecolorproperty.h
View file

@ -45,10 +45,10 @@ public:
VLineColorProperty(const QString& name);
//! Destructor
~VLineColorProperty() {}
virtual ~VLineColorProperty() Q_DECL_OVERRIDE {}
//! Get the data how it should be displayed
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const;
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! Returns an editor widget, or NULL if it doesn't supply one
//! \param parent The widget to which the editor will be added as a child
@ -56,10 +56,10 @@ public:
//! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and
//! slots.
virtual QWidget *createEditor(QWidget* parent, const QStyleOptionViewItem& options,
const QAbstractItemDelegate* delegate);
const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE;
//! Gets the data from the widget
virtual QVariant getEditorData(const QWidget* editor) const;
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
//! Sets the colors
virtual void setColors(const QMap<QString, QString> &colors);
@ -68,17 +68,17 @@ public:
virtual QMap<QString, QString> getColors() const;
//! Sets the value of the property
virtual void setValue(const QVariant& value);
virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE;
//! Returns a string containing the type of the property
virtual QString type() const;
virtual QString type() const Q_DECL_OVERRIDE;
//! Clones this property
//! \param include_children Indicates whether to also clone the children
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
//! to fill all the data into container. This can also be used when subclassing this function.
//! \return Returns the newly created property (or container, if it was not NULL)
virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const;
virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const Q_DECL_OVERRIDE;
static int IndexOfColor(const QMap<QString, QString> &colors, const QString &color);

14
src/libs/vpropertyexplorer/plugins/vlinetypeproperty.h
View file

@ -46,10 +46,10 @@ public:
VLineTypeProperty(const QString& name);
//! Destructor
~VLineTypeProperty() {}
virtual ~VLineTypeProperty() Q_DECL_OVERRIDE {}
//! Get the data how it should be displayed
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const;
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! Returns an editor widget, or NULL if it doesn't supply one
//! \param parent The widget to which the editor will be added as a child
@ -57,10 +57,10 @@ public:
//! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and
//! slots.
virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options,
const QAbstractItemDelegate* delegate);
const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE;
//! Gets the data from the widget
virtual QVariant getEditorData(const QWidget* editor) const;
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
//! Sets the line styles
virtual void setStyles(const QMap<QString, QIcon> &styles);
@ -69,17 +69,17 @@ public:
virtual QMap<QString, QIcon> getStyles() const;
//! Sets the value of the property
virtual void setValue(const QVariant& value);
virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE;
//! Returns a string containing the type of the property
virtual QString type() const;
virtual QString type() const Q_DECL_OVERRIDE;
//! Clones this property
//! \param include_children Indicates whether to also clone the children
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
//! to fill all the data into container. This can also be used when subclassing this function.
//! \return Returns the newly created property (or container, if it was not NULL)
virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const;
virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const Q_DECL_OVERRIDE;
static int IndexOfStyle(const QMap<QString, QIcon> &styles, const QString &style);

14
src/libs/vpropertyexplorer/plugins/vnumberproperty.h
View file

@ -43,32 +43,32 @@ public:
//! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and
//! slots.
virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options,
const QAbstractItemDelegate* delegate);
const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE;
//! Gets the data from the widget
virtual QVariant getEditorData(const QWidget* editor) const;
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
//! Sets the settings. Available settings:
//!
//! key: "Min" - value: Minimum number as integer
//! key: "Max" - value: Maximum number as integer
virtual void setSetting(const QString& key, const QVariant& value);
virtual void setSetting(const QString& key, const QVariant& value) Q_DECL_OVERRIDE;
//! Get the settings. This function has to be implemented in a subclass in order to have an effect
virtual QVariant getSetting(const QString& key) const;
virtual QVariant getSetting(const QString& key) const Q_DECL_OVERRIDE;
//! Returns the list of keys of the property's settings
virtual QStringList getSettingKeys() const;
virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE;
//! Returns a string containing the type of the property
virtual QString type() const;
virtual QString type() const Q_DECL_OVERRIDE;
//! Clones this property
//! \param include_children Indicates whether to also clone the children
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
//! to fill all the data into container. This can also be used when subclassing this function.
//! \return Returns the newly created property (or container, if it was not NULL)
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const;
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const Q_DECL_OVERRIDE;
public slots:
void valueChanged(int i);
protected:

16
src/libs/vpropertyexplorer/plugins/vobjectproperty.h
View file

@ -38,10 +38,10 @@ public:
VObjectProperty(const QString& name);
//! Destructor
~VObjectProperty() {}
virtual ~VObjectProperty() Q_DECL_OVERRIDE {}
//! Get the data how it should be displayed
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const;
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! Returns an editor widget, or NULL if it doesn't supply one
//! \param parent The widget to which the editor will be added as a child
@ -49,13 +49,13 @@ public:
//! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and
//! slots.
virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options,
const QAbstractItemDelegate* delegate);
const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE;
//! Sets the property's data to the editor (returns false, if the standard delegate should do that)
virtual bool setEditorData(QWidget* editor);
virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE;
//! Gets the data from the widget
virtual QVariant getEditorData(const QWidget* editor) const;
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
//! Sets the objects list
void setObjectsList(const QMap<QString, quint32> &objects);
@ -64,17 +64,17 @@ public:
virtual QMap<QString, quint32> getObjects() const;
//! Sets the value of the property
virtual void setValue(const QVariant& value);
virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE;
//! Returns a string containing the type of the property
virtual QString type() const;
virtual QString type() const Q_DECL_OVERRIDE;
//! Clones this property
//! \param include_children Indicates whether to also clone the children
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
//! to fill all the data into container. This can also be used when subclassing this function.
//! \return Returns the newly created property (or container, if it was not NULL)
virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const;
virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const Q_DECL_OVERRIDE;
public slots:
void currentIndexChanged(int index);

14
src/libs/vpropertyexplorer/plugins/vpointfproperty.h
View file

@ -34,13 +34,13 @@ class VPROPERTYEXPLORERSHARED_EXPORT VPointFProperty : public VProperty
public:
VPointFProperty(const QString& name);
virtual ~VPointFProperty() {}
virtual ~VPointFProperty() Q_DECL_OVERRIDE {}
//! Get the data how it should be displayed
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const;
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! Returns item flags
Qt::ItemFlags flags(int column = DPC_Name) const;
Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE;
//! Returns the QPointF
virtual QPointF getPointF() const;
@ -52,20 +52,20 @@ public:
virtual void setPointF(qreal x, qreal y);
//! Returns a string containing the type of the property
virtual QString type() const;
virtual QString type() const Q_DECL_OVERRIDE;
//! Clones this property
//! \param include_children Indicates whether to also clone the children
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
//! to fill all the data into container. This can also be used when subclassing this function.
//! \return Returns the newly created property (or container, if it was not NULL)
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const;
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const Q_DECL_OVERRIDE;
//! Sets the value of the property
virtual void setValue(const QVariant& value);
virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE;
//! Returns the value of the property as a QVariant
virtual QVariant getValue() const;
virtual QVariant getValue() const Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(VPointFProperty)

16
src/libs/vpropertyexplorer/plugins/vshortcutproperty.h
View file

@ -35,10 +35,10 @@ public:
VShortcutProperty(const QString &name);
//! The destructor
~VShortcutProperty();
virtual ~VShortcutProperty() Q_DECL_OVERRIDE;
//! Get the data how it should be displayed
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const;
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! Returns an editor widget, or NULL if it doesn't supply one
//! \param parent The widget to which the editor will be added as a child
@ -46,26 +46,26 @@ public:
//! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and
//! slots.
virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options,
const QAbstractItemDelegate* delegate);
const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE;
//! Sets the property's data to the editor (returns false, if the standard delegate should do that)
virtual bool setEditorData(QWidget* editor);
virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE;
//! Gets the data from the widget
virtual QVariant getEditorData(const QWidget* editor) const;
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
//! Returns a string containing the type of the property
virtual QString type() const;
virtual QString type() const Q_DECL_OVERRIDE;
//! Clones this property
//! \param include_children Indicates whether to also clone the children
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
//! to fill all the data into container. This can also be used when subclassing this function.
//! \return Returns the newly created property (or container, if it was not NULL)
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const;
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const Q_DECL_OVERRIDE;
//! Sets the value of the property
virtual void setValue(const QVariant& value);
virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(VShortcutProperty)

2
src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h
View file

@ -38,7 +38,7 @@ class VPROPERTYEXPLORERSHARED_EXPORT VShortcutEditWidget : public QWidget
public:
VShortcutEditWidget(QWidget* parent);
virtual ~VShortcutEditWidget();
virtual ~VShortcutEditWidget() Q_DECL_OVERRIDE;
//! Needed for proper event handling
bool eventFilter(QObject* obj, QEvent* evenvt);

16
src/libs/vpropertyexplorer/plugins/vstringproperty.h
View file

@ -43,33 +43,33 @@ public:
//! \delegate A pointer to the QAbstractItemDelegate requesting the editor. This can be used to connect signals and
//! slots.
virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& options,
const QAbstractItemDelegate* delegate);
const QAbstractItemDelegate* delegate) Q_DECL_OVERRIDE;
//! Gets the data from the widget
virtual QVariant getEditorData(const QWidget* editor) const;
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
void setReadOnly(bool readOnly);
//! Sets the settings.
virtual void setSetting(const QString& key, const QVariant& value);
virtual void setSetting(const QString& key, const QVariant& value) Q_DECL_OVERRIDE;
//! Get the settings. This function has to be implemented in a subclass in order to have an effect
virtual QVariant getSetting(const QString& key) const;
virtual QVariant getSetting(const QString& key) const Q_DECL_OVERRIDE;
//! Returns the list of keys of the property's settings
virtual QStringList getSettingKeys() const;
virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE;
//! Returns a string containing the type of the property
virtual QString type() const;
virtual QString type() const Q_DECL_OVERRIDE;
//! Clones this property
//! \param include_children Indicates whether to also clone the children
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
//! to fill all the data into container. This can also be used when subclassing this function.
//! \return Returns the newly created property (or container, if it was not NULL)
virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const;
virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const Q_DECL_OVERRIDE;
virtual void UpdateParent(const QVariant &value);
virtual void UpdateParent(const QVariant &value) Q_DECL_OVERRIDE;
int getTypeForParent() const;
void setTypeForParent(int value);

6
src/libs/vpropertyexplorer/plugins/vwidgetproperty.h
View file

@ -42,7 +42,7 @@ public:
VWidgetProperty(const QString &name, QWidget* widget = nullptr);
//! The destructor
~VWidgetProperty();
virtual ~VWidgetProperty() Q_DECL_OVERRIDE;
//! Returns the widget held by this property
QWidget* getWidget() const;
@ -51,14 +51,14 @@ public:
void setWidget(QWidget* widget);
//! Returns a string containing the type of the property
virtual QString type() const;
virtual QString type() const Q_DECL_OVERRIDE;
//! Clones this property
//! \param include_children Indicates whether to also clone the children
//! \param container If a property is being passed here, no new VProperty is being created but instead it is tried
//! to fill all the data into container. This can also be used when subclassing this function.
//! \return Returns the newly created property (or container, if it was not NULL)
virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const;
virtual VProperty* clone(bool include_children = true, VProperty* container = nullptr) const Q_DECL_OVERRIDE;
};
}

3
src/libs/vpropertyexplorer/vabstractpropertyfactory.h
View file

@ -38,8 +38,7 @@ class VPROPERTYEXPLORERSHARED_EXPORT VAbstractPropertyFactory
{
public:
//! Empty virtual destructor
virtual ~VAbstractPropertyFactory()
{}
virtual ~VAbstractPropertyFactory() {}
//! Creates a new property of a certain type and assigns a name and description (otionally)
//! \param type The type of the property as string

2
src/libs/vpropertyexplorer/vfileproperty_p.h
View file

@ -46,7 +46,7 @@ public:
VFilePropertyPrivate()
: VPropertyPrivate(), FileFilters(), Directory(false) {}
virtual ~VFilePropertyPrivate();
virtual ~VFilePropertyPrivate() Q_DECL_OVERRIDE;
};
VFilePropertyPrivate::~VFilePropertyPrivate()

4
src/libs/vpropertyexplorer/vproperty.h
View file

@ -41,7 +41,7 @@ class VPROPERTYEXPLORERSHARED_EXPORT UserChangeEvent : public QEvent
{
public:
UserChangeEvent() : QEvent(static_cast<QEvent::Type>(MyCustomEventType)) {}
virtual ~UserChangeEvent();
virtual ~UserChangeEvent() Q_DECL_OVERRIDE;
};
class VPropertyPrivate;
@ -60,7 +60,7 @@ public:
explicit VProperty(const QString& name, QVariant::Type type = QVariant::String);
//! Destructor
virtual ~VProperty();
virtual ~VProperty() Q_DECL_OVERRIDE;
//! Returns a string containing the type of the property
virtual QString type() const;

15
src/libs/vpropertyexplorer/vpropertydelegate.h
View file

@ -33,25 +33,28 @@ class VPROPERTYEXPLORERSHARED_EXPORT VPropertyDelegate : public QStyledItemDeleg
Q_OBJECT
public:
explicit VPropertyDelegate(QObject *parent = 0);
virtual ~VPropertyDelegate();
virtual ~VPropertyDelegate() Q_DECL_OVERRIDE;
//! Creates the editor widget
virtual QWidget* createEditor (QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const;
virtual QWidget* createEditor (QWidget* parent, const QStyleOptionViewItem& option,
const QModelIndex& index) const Q_DECL_OVERRIDE;
//! Sets the index data to the editor
virtual void setEditorData (QWidget * editor, const QModelIndex & index) const;
virtual void setEditorData (QWidget * editor, const QModelIndex & index) const Q_DECL_OVERRIDE;
//! Updates the index data
virtual void setModelData (QWidget * editor, QAbstractItemModel * model, const QModelIndex & index) const;
virtual void setModelData (QWidget * editor, QAbstractItemModel * model,
const QModelIndex & index) const Q_DECL_OVERRIDE;
//! Returns the size hint
virtual QSize sizeHint (const QStyleOptionViewItem& option, const QModelIndex& index) const;
virtual QSize sizeHint (const QStyleOptionViewItem& option, const QModelIndex& index) const Q_DECL_OVERRIDE;
//! Sets the row height. Set this to 0 and the standard will be taken
void setRowHeight(int height = 0, bool add_to_standard = false);
//! Renders the delegate using the given painter and style option for the item specified by index.
virtual void paint (QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
virtual void paint (QPainter* painter, const QStyleOptionViewItem& option,
const QModelIndex& index ) const Q_DECL_OVERRIDE;
protected:
int RowHeight;

2
src/libs/vpropertyexplorer/vpropertyfactorymanager.h
View file

@ -39,7 +39,7 @@ public:
VPropertyFactoryManager(QObject* parent = nullptr);
//! Destructor
virtual ~VPropertyFactoryManager();
virtual ~VPropertyFactoryManager() Q_DECL_OVERRIDE;
//! Register a factory to the factory manager
//! Note that the manager takes ownership of the factory, so don't delete it.

4
src/libs/vpropertyexplorer/vpropertyformview.h
View file

@ -47,12 +47,12 @@ public:
explicit VPropertyFormView(VPropertySet* property_set, QWidget *parent = 0);
//! Destructor
virtual ~VPropertyFormView();
virtual ~VPropertyFormView() Q_DECL_OVERRIDE;
public slots:
//! Rebuilds the whole form
virtual void build();
virtual void build() Q_DECL_OVERRIDE;
//! Set the source model. Leads to the rebuild of the form
//! \param model The model to use

3
src/libs/vpropertyexplorer/vpropertyformview_p.h
View file

@ -66,8 +66,7 @@ public:
IgnoreDataChangedSignal(false)
{}
virtual ~VPropertyFormViewPrivate()
{}
virtual ~VPropertyFormViewPrivate() Q_DECL_OVERRIDE {}
private:
Q_DISABLE_COPY(VPropertyFormViewPrivate)

3
src/libs/vpropertyexplorer/vpropertyformwidget_p.h
View file

@ -68,8 +68,7 @@ public:
: Properties(properties), EditorWidgets(QList<SEditorWidget>()), UpdateEditors(true)
{}
virtual ~VPropertyFormWidgetPrivate()
{}
virtual ~VPropertyFormWidgetPrivate() {}
};
#ifdef Q_CC_CLANG

17
src/libs/vpropertyexplorer/vpropertymodel.h
View file

@ -59,7 +59,7 @@ class VPROPERTYEXPLORERSHARED_EXPORT VPropertyModel : public QAbstractItemModel
Q_OBJECT
public:
explicit VPropertyModel(QObject * parent = 0);
virtual ~VPropertyModel();
virtual ~VPropertyModel() Q_DECL_OVERRIDE;
//! Adds the property to the model and attaches it to the parentid
//! \param emitsignals If this is set to false, this function will not call beginInsertRows() and endInsertRows(),
@ -78,25 +78,26 @@ public:
virtual Qt::ItemFlags flags (const QModelIndex& index) const;
//! Sets the role data for the item at index to value
virtual bool setData (const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
virtual bool setData (const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
//! Returns the model index at row/column
virtual QModelIndex index (int row, int column, const QModelIndex & parent = QModelIndex() ) const;
virtual QModelIndex index (int row, int column, const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE;
//! Returns the parent of one model index
virtual QModelIndex parent (const QModelIndex& index) const;
virtual QModelIndex parent (const QModelIndex& index) const Q_DECL_OVERRIDE;
//! Returns the data of an model index
virtual QVariant data (const QModelIndex& index, int role = Qt::DisplayRole) const;
virtual QVariant data (const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! Returns the data for the given role and section in the header with the specified orientation.
virtual QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
virtual QVariant headerData (int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
//! Returns the number of rows
virtual int rowCount ( const QModelIndex & parent = QModelIndex() ) const;
virtual int rowCount ( const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE;
//! Returns the number of columns
virtual int columnCount ( const QModelIndex & parent = QModelIndex() ) const;
virtual int columnCount ( const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE;
//! Gets a property by its ModelIndex
//! \param index The modelIndex of the property.

2
src/libs/vpropertyexplorer/vpropertytreeview.h
View file

@ -44,7 +44,7 @@ public:
VPropertyTreeView(VPropertyModel* model, QWidget *parent = 0);
//! Destructor
virtual ~VPropertyTreeView();
virtual ~VPropertyTreeView() Q_DECL_OVERRIDE;
//! Sets the height for each row. Set this to 0 in order to let the standard delegate decide
void setRowHeight(int height = 0, bool add_to_standard = false);

2
src/libs/vpropertyexplorer/vstandardpropertyfactory.h
View file

@ -46,7 +46,7 @@ public:
//! Creates a new property of a certain type and assigns a name and description (otionally)
//! \param type The type of the property as string
//! \return Returns the created property or NULL if it couldn't be be created
virtual VProperty* createProperty(const QString& type, const QString &name);
virtual VProperty* createProperty(const QString& type, const QString &name) Q_DECL_OVERRIDE;
};
}

2
src/libs/vpropertyexplorer/vwidgetproperty_p.h
View file

@ -51,7 +51,7 @@ public:
: VPropertyPrivate(), Widget(nullptr) {}
//! Destructor
virtual ~VWidgetPropertyPrivate()
virtual ~VWidgetPropertyPrivate() Q_DECL_OVERRIDE
{
if (Widget)
{

12
src/libs/vtools/dialogs/support/dialogeditwrongformula.h
View file

@ -49,20 +49,20 @@ class DialogEditWrongFormula : public DialogTool
Q_OBJECT
public:
explicit DialogEditWrongFormula(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr);
virtual ~DialogEditWrongFormula();
virtual ~DialogEditWrongFormula() Q_DECL_OVERRIDE;
QString GetFormula() const;
void SetFormula(const QString &value);
void setCheckZero(bool value);
void setPostfix(const QString &value);
public slots:
virtual void DialogAccepted();
virtual void DialogRejected();
virtual void DialogAccepted() Q_DECL_OVERRIDE;
virtual void DialogRejected() Q_DECL_OVERRIDE;
/**
* @brief DeployFormulaTextEdit grow or shrink formula input
*/
void DeployFormulaTextEdit();
virtual void EvalFormula();
virtual void EvalFormula() Q_DECL_OVERRIDE;
void ValChenged(int row);
void SizeHeight();
void PutHere();
@ -78,8 +78,8 @@ public slots:
void AngleLines();
void Increments();
protected:
virtual void CheckState();
virtual void closeEvent(QCloseEvent *event);
virtual void CheckState() Q_DECL_OVERRIDE;
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogEditWrongFormula)
Ui::DialogEditWrongFormula *ui;

4
src/libs/vtools/dialogs/support/dialogundo.h
View file

@ -44,13 +44,13 @@ class DialogUndo : public QDialog
public:
explicit DialogUndo(QWidget *parent = 0);
UndoButton Result() const;
~DialogUndo();
virtual ~DialogUndo() Q_DECL_OVERRIDE;
public slots:
void Undo();
void Fix();
void Cancel();
protected:
virtual void closeEvent ( QCloseEvent * event );
virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogUndo)
Ui::DialogUndo *ui;

10
src/libs/vtools/dialogs/tools/dialogalongline.h
View file

@ -44,7 +44,7 @@ class DialogAlongLine : public DialogTool
Q_OBJECT
public:
DialogAlongLine(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr);
virtual ~DialogAlongLine();
virtual ~DialogAlongLine() Q_DECL_OVERRIDE;
void SetPointName(const QString &value);
@ -63,7 +63,7 @@ public:
quint32 GetSecondPointId() const;
void SetSecondPointId(const quint32 &value);
public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type);
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
/**
* @brief DeployFormulaTextEdit grow or shrink formula input
*/
@ -76,12 +76,12 @@ public slots:
void FXLength();
protected:
virtual void ShowVisualization();
virtual void ShowVisualization() Q_DECL_OVERRIDE;
/**
* @brief SaveData Put dialog data in local variables
*/
virtual void SaveData();
virtual void closeEvent(QCloseEvent *event);
virtual void SaveData() Q_DECL_OVERRIDE;
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogAlongLine)

12
src/libs/vtools/dialogs/tools/dialogarc.h
View file

@ -44,7 +44,7 @@ class DialogArc : public DialogTool
Q_OBJECT
public:
DialogArc(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr);
virtual ~DialogArc();
virtual ~DialogArc() Q_DECL_OVERRIDE;
quint32 GetCenter() const;
void SetCenter(const quint32 &value);
@ -61,7 +61,7 @@ public:
QString GetColor() const;
void SetColor(const QString &value);
public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type);
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
/**
* @brief DeployFormulaTextEdit grow or shrink formula input
*/
@ -76,13 +76,13 @@ public slots:
void FXF1();
void FXF2();
protected:
virtual void CheckState();
virtual void ShowVisualization();
virtual void CheckState() Q_DECL_OVERRIDE;
virtual void ShowVisualization() Q_DECL_OVERRIDE;
/**
* @brief SaveData Put dialog data in local variables
*/
virtual void SaveData();
virtual void closeEvent(QCloseEvent *event);
virtual void SaveData() Q_DECL_OVERRIDE;
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogArc)

10
src/libs/vtools/dialogs/tools/dialogarcwithlength.h
View file

@ -60,7 +60,7 @@ public:
void SetColor(const QString &value);
public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type);
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
/**
* @brief DeployFormulaTextEdit grow or shrink formula input
*/
@ -77,13 +77,13 @@ public slots:
void FXLength();
protected:
virtual void CheckState();
virtual void ShowVisualization();
virtual void CheckState() Q_DECL_OVERRIDE;
virtual void ShowVisualization() Q_DECL_OVERRIDE;
/**
* @brief SaveData Put dialog data in local variables
*/
virtual void SaveData();
virtual void closeEvent(QCloseEvent *event);
virtual void SaveData() Q_DECL_OVERRIDE;
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogArcWithLength)

12
src/libs/vtools/dialogs/tools/dialogbisector.h
View file

@ -45,7 +45,7 @@ class DialogBisector : public DialogTool
public:
DialogBisector(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr);
virtual ~DialogBisector();
virtual ~DialogBisector() Q_DECL_OVERRIDE;
void SetPointName(const QString &value);
@ -67,7 +67,7 @@ public:
QString GetLineColor() const;
void SetLineColor(const QString &value);
public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type);
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
/**
* @brief DeployFormulaTextEdit grow or shrink formula input
*/
@ -76,15 +76,15 @@ public slots:
* @brief FormulaTextChanged when formula text changes for validation and calc
*/
void FormulaTextChanged();
virtual void PointNameChanged();
virtual void PointNameChanged() Q_DECL_OVERRIDE;
void FXLength();
protected:
virtual void ShowVisualization();
virtual void ShowVisualization() Q_DECL_OVERRIDE;
/**
* @brief SaveData Put dialog data in local variables
*/
virtual void SaveData();
virtual void closeEvent(QCloseEvent *event);
virtual void SaveData() Q_DECL_OVERRIDE;
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogBisector)

12
src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h
View file

@ -42,7 +42,7 @@ class DialogCurveIntersectAxis : public DialogTool
public:
DialogCurveIntersectAxis(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr);
virtual ~DialogCurveIntersectAxis();
virtual ~DialogCurveIntersectAxis() Q_DECL_OVERRIDE;
void SetPointName(const QString &value);
@ -61,20 +61,20 @@ public:
QString GetLineColor() const;
void SetLineColor(const QString &value);
virtual void ShowDialog(bool click);
virtual void ShowDialog(bool click) Q_DECL_OVERRIDE;
public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type);
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
void EvalAngle();
void AngleTextChanged();
void DeployAngleTextEdit();
void FXAngle();
protected:
virtual void ShowVisualization();
virtual void ShowVisualization() Q_DECL_OVERRIDE;
/**
* @brief SaveData Put dialog data in local variables
*/
virtual void SaveData();
virtual void closeEvent(QCloseEvent *event);
virtual void SaveData() Q_DECL_OVERRIDE;
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogCurveIntersectAxis)
Ui::DialogCurveIntersectAxis *ui;

10
src/libs/vtools/dialogs/tools/dialogcutarc.h
View file

@ -45,7 +45,7 @@ class DialogCutArc : public DialogTool
public:
DialogCutArc(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr);
virtual ~DialogCutArc();
virtual ~DialogCutArc() Q_DECL_OVERRIDE;
void SetPointName(const QString &value);
@ -60,7 +60,7 @@ public:
void SetChildrenId(const quint32 &ch1, const quint32 &ch2);
public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type);
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
/**
* @brief DeployFormulaTextEdit grow or shrink formula input
*/
@ -71,12 +71,12 @@ public slots:
void FormulaTextChanged();
void FXLength();
protected:
virtual void ShowVisualization();
virtual void ShowVisualization() Q_DECL_OVERRIDE;
/**
* @brief SaveData Put dialog data in local variables
*/
virtual void SaveData();
virtual void closeEvent(QCloseEvent *event);
virtual void SaveData() Q_DECL_OVERRIDE;
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogCutArc)
/** @brief ui keeps information about user interface */

10
src/libs/vtools/dialogs/tools/dialogcutspline.h
View file

@ -44,7 +44,7 @@ class DialogCutSpline : public DialogTool
Q_OBJECT
public:
DialogCutSpline(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr);
virtual ~DialogCutSpline();
virtual ~DialogCutSpline() Q_DECL_OVERRIDE;
void SetPointName(const QString &value);
@ -59,19 +59,19 @@ public:
void SetChildrenId(const quint32 &ch1, const quint32 &ch2);
public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type);
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
/**
* @brief DeployFormulaTextEdit grow or shrink formula input
*/
void DeployFormulaTextEdit();
void FXLength();
protected:
virtual void ShowVisualization();
virtual void ShowVisualization() Q_DECL_OVERRIDE;
/**
* @brief SaveData Put dialog data in local variables
*/
virtual void SaveData();
virtual void closeEvent(QCloseEvent *event);
virtual void SaveData() Q_DECL_OVERRIDE;
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogCutSpline)

10
src/libs/vtools/dialogs/tools/dialogcutsplinepath.h
View file

@ -44,7 +44,7 @@ class DialogCutSplinePath : public DialogTool
Q_OBJECT
public:
DialogCutSplinePath(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr);
virtual ~DialogCutSplinePath();
virtual ~DialogCutSplinePath() Q_DECL_OVERRIDE;
void SetPointName(const QString &value);
@ -59,19 +59,19 @@ public:
void SetChildrenId(const quint32 &ch1, const quint32 &ch2);
public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type);
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
/**
* @brief DeployFormulaTextEdit grow or shrink formula input
*/
void DeployFormulaTextEdit();
void FXLength();
protected:
virtual void ShowVisualization();
virtual void ShowVisualization() Q_DECL_OVERRIDE;
/**
* @brief SaveData Put dialog data in local variables
*/
virtual void SaveData();
virtual void closeEvent(QCloseEvent *event);
virtual void SaveData() Q_DECL_OVERRIDE;
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogCutSplinePath)

6
src/libs/vtools/dialogs/tools/dialogdetail.h
View file

@ -45,7 +45,7 @@ public:
VDetail getDetail() const;
void setDetail(const VDetail &value);
public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type);
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
void BiasXChanged(qreal d);
void BiasYChanged(qreal d);
void AlowenceChanged(qreal d);
@ -58,8 +58,8 @@ protected:
/**
* @brief SaveData Put dialog data in local variables
*/
virtual void SaveData();
virtual void CheckState();
virtual void SaveData() Q_DECL_OVERRIDE;
virtual void CheckState() Q_DECL_OVERRIDE;
private:
/** @brief ui keeps information about user interface */

12
src/libs/vtools/dialogs/tools/dialogendline.h
View file

@ -44,7 +44,7 @@ class DialogEndLine : public DialogTool
Q_OBJECT
public:
DialogEndLine(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr);
virtual ~DialogEndLine();
virtual ~DialogEndLine() Q_DECL_OVERRIDE;
void SetPointName(const QString &value);
@ -63,9 +63,9 @@ public:
QString GetLineColor() const;
void SetLineColor(const QString &value);
virtual void ShowDialog(bool click);
virtual void ShowDialog(bool click) Q_DECL_OVERRIDE;
public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type);
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
/**
* @brief DeployFormulaTextEdit grow or shrink formula input
*/
@ -82,12 +82,12 @@ public slots:
void FXAngle();
void FXLength();
protected:
virtual void ShowVisualization();
virtual void ShowVisualization() Q_DECL_OVERRIDE;
/**
* @brief SaveData Put dialog data in local variables
*/
virtual void SaveData();
virtual void closeEvent(QCloseEvent *event);
virtual void SaveData() Q_DECL_OVERRIDE;
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogEndLine)

10
src/libs/vtools/dialogs/tools/dialogheight.h
View file

@ -44,7 +44,7 @@ class DialogHeight : public DialogTool
Q_OBJECT
public:
DialogHeight(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr);
virtual ~DialogHeight();
virtual ~DialogHeight() Q_DECL_OVERRIDE;
void SetPointName(const QString &value);
@ -63,14 +63,14 @@ public:
QString GetLineColor() const;
void SetLineColor(const QString &value);
public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type);
virtual void PointNameChanged();
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
virtual void PointNameChanged() Q_DECL_OVERRIDE;
protected:
virtual void ShowVisualization();
virtual void ShowVisualization() Q_DECL_OVERRIDE;
/**
* @brief SaveData Put dialog data in local variables
*/
virtual void SaveData();
virtual void SaveData() Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogHeight)

10
src/libs/vtools/dialogs/tools/dialogline.h
View file

@ -44,7 +44,7 @@ class DialogLine : public DialogTool
Q_OBJECT
public:
DialogLine(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr);
virtual ~DialogLine();
virtual ~DialogLine() Q_DECL_OVERRIDE;
quint32 GetFirstPoint() const;
void SetFirstPoint(const quint32 &value);
@ -58,14 +58,14 @@ public:
QString GetLineColor() const;
void SetLineColor(const QString &value);
public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type);
virtual void PointNameChanged();
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
virtual void PointNameChanged() Q_DECL_OVERRIDE;
protected:
virtual void ShowVisualization();
virtual void ShowVisualization() Q_DECL_OVERRIDE;
/**
* @brief SaveData Put dialog data in local variables
*/
virtual void SaveData();
virtual void SaveData() Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(DialogLine)

Some files were not shown because too many files have changed in this diff Show more