Cppcheck warning 'missingOverride'.
--HG-- branch : develop
This commit is contained in:
Roman Telezhynskyi
parent
6c3ef7580a
commit
63b1eb8068
|
|
@ -46,7 +46,7 @@ public:
|
|||
|
||||
void Apply();
|
||||
protected:
|
||||
virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent(QEvent* event) override;
|
||||
private:
|
||||
Q_DISABLE_COPY(TapePreferencesConfigurationPage)
|
||||
Ui::TapePreferencesConfigurationPage *ui;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ public:
|
|||
|
||||
void Apply();
|
||||
protected:
|
||||
virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent(QEvent* event) override;
|
||||
private slots:
|
||||
void DefaultPath();
|
||||
void EditPath();
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ public:
|
|||
virtual ~DialogAboutTape();
|
||||
|
||||
protected:
|
||||
virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent(QEvent* event) override;
|
||||
virtual void showEvent(QShowEvent *event) override;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(DialogAboutTape)
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ class DialogMDataBase : public QDialog
|
|||
public:
|
||||
explicit DialogMDataBase(const QStringList &list, QWidget *parent = nullptr);
|
||||
explicit DialogMDataBase(QWidget *parent = nullptr);
|
||||
virtual ~DialogMDataBase() Q_DECL_OVERRIDE;
|
||||
virtual ~DialogMDataBase() override;
|
||||
|
||||
QStringList GetNewNames() const;
|
||||
|
||||
|
|
@ -54,8 +54,8 @@ public:
|
|||
static QString ImgTag(const QString &number);
|
||||
|
||||
protected:
|
||||
virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual bool eventFilter(QObject *target, QEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent(QEvent* event) override;
|
||||
virtual bool eventFilter(QObject *target, QEvent *event) override;
|
||||
|
||||
private slots:
|
||||
void UpdateChecks(QTreeWidgetItem *item, int column);
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@ public:
|
|||
int BaseHeight() const;
|
||||
|
||||
protected:
|
||||
virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent(QEvent* event) override;
|
||||
virtual void showEvent(QShowEvent *event) override;
|
||||
|
||||
private slots:
|
||||
void CurrentTypeChanged(int index);
|
||||
|
|
|
|||
|
|
@ -50,9 +50,9 @@ public:
|
|||
signals:
|
||||
void UpdateProperties();
|
||||
protected:
|
||||
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void showEvent(QShowEvent *event) override;
|
||||
virtual void resizeEvent(QResizeEvent *event) override;
|
||||
virtual void changeEvent(QEvent* event) override;
|
||||
private slots:
|
||||
void Apply();
|
||||
void Ok();
|
||||
|
|
|
|||
|
|
@ -52,21 +52,21 @@ class MApplication : public VAbstractApplication
|
|||
|
||||
public:
|
||||
MApplication(int &argc, char **argv);
|
||||
virtual ~MApplication() Q_DECL_OVERRIDE;
|
||||
virtual ~MApplication() override;
|
||||
|
||||
virtual bool notify(QObject * receiver, QEvent * event) Q_DECL_OVERRIDE;
|
||||
virtual bool notify(QObject * receiver, QEvent * event) override;
|
||||
|
||||
bool IsTestMode() const;
|
||||
virtual bool IsAppInGUIMode() const Q_DECL_OVERRIDE;
|
||||
virtual bool IsAppInGUIMode() const override;
|
||||
TMainWindow *MainWindow();
|
||||
QList<TMainWindow*> MainWindows();
|
||||
TMainWindow *NewMainWindow();
|
||||
|
||||
void InitOptions();
|
||||
|
||||
virtual const VTranslateVars *TrVars() Q_DECL_OVERRIDE;
|
||||
virtual const VTranslateVars *TrVars() override;
|
||||
|
||||
virtual void OpenSettings() Q_DECL_OVERRIDE;
|
||||
virtual void OpenSettings() override;
|
||||
VTapeSettings *TapeSettings();
|
||||
|
||||
QString diagramsPath() const;
|
||||
|
|
@ -81,8 +81,8 @@ public slots:
|
|||
void ProcessCMD();
|
||||
|
||||
protected:
|
||||
virtual void InitTrVars() Q_DECL_OVERRIDE;
|
||||
virtual bool event(QEvent *e) Q_DECL_OVERRIDE;
|
||||
virtual void InitTrVars() override;
|
||||
virtual bool event(QEvent *e) override;
|
||||
|
||||
private slots:
|
||||
void NewLocalSocketConnection();
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ class TMainWindow : public VAbstractMainWindow
|
|||
|
||||
public:
|
||||
explicit TMainWindow(QWidget *parent = nullptr);
|
||||
virtual ~TMainWindow() Q_DECL_OVERRIDE;
|
||||
virtual ~TMainWindow() override;
|
||||
|
||||
QString CurrentFile() const;
|
||||
|
||||
|
|
@ -64,15 +64,15 @@ public:
|
|||
bool LoadFile(const QString &path);
|
||||
|
||||
public slots:
|
||||
virtual void ShowToolTip(const QString &toolTip) Q_DECL_OVERRIDE;
|
||||
virtual void ShowToolTip(const QString &toolTip) override;
|
||||
|
||||
protected:
|
||||
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void closeEvent(QCloseEvent *event) override;
|
||||
virtual void changeEvent(QEvent* event) override;
|
||||
virtual void showEvent(QShowEvent *event) override;
|
||||
virtual bool eventFilter(QObject *object, QEvent *event) override;
|
||||
virtual void ExportToCSVData(const QString &fileName, bool withHeader, int mib,
|
||||
const QChar &separator) Q_DECL_FINAL;
|
||||
const QChar &separator) final;
|
||||
|
||||
private slots:
|
||||
void FileNew();
|
||||
|
|
|
|||
|
|
@ -37,18 +37,18 @@ class VLitePattern : public VAbstractPattern
|
|||
public:
|
||||
explicit VLitePattern(QObject *parent = nullptr);
|
||||
|
||||
virtual void CreateEmptyFile() Q_DECL_OVERRIDE;
|
||||
virtual void CreateEmptyFile() override;
|
||||
|
||||
virtual void IncrementReferens(quint32 id) const Q_DECL_OVERRIDE;
|
||||
virtual void DecrementReferens(quint32 id) const Q_DECL_OVERRIDE;
|
||||
virtual void IncrementReferens(quint32 id) const override;
|
||||
virtual void DecrementReferens(quint32 id) const override;
|
||||
|
||||
virtual QString GenerateLabel(const LabelType &type, const QString &reservedName = QString())const Q_DECL_OVERRIDE;
|
||||
virtual QString GenerateSuffix() const Q_DECL_OVERRIDE;
|
||||
virtual QString GenerateLabel(const LabelType &type, const QString &reservedName = QString())const override;
|
||||
virtual QString GenerateSuffix() const override;
|
||||
|
||||
virtual void UpdateToolData(const quint32 &id, VContainer *data) Q_DECL_OVERRIDE;
|
||||
virtual void UpdateToolData(const quint32 &id, VContainer *data) override;
|
||||
|
||||
public slots:
|
||||
virtual void LiteParseTree(const Document &parse) Q_DECL_OVERRIDE;
|
||||
virtual void LiteParseTree(const Document &parse) override;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(VLitePattern)
|
||||
|
|
|
|||
|
|
@ -52,9 +52,9 @@ class VApplication : public VAbstractApplication
|
|||
public:
|
||||
|
||||
VApplication(int &argc, char ** argv);
|
||||
virtual ~VApplication() Q_DECL_OVERRIDE;
|
||||
virtual ~VApplication() override;
|
||||
static void NewValentina(const QString &fileName = QString());
|
||||
virtual bool notify(QObject * receiver, QEvent * event) Q_DECL_OVERRIDE;
|
||||
virtual bool notify(QObject * receiver, QEvent * event) override;
|
||||
|
||||
void InitOptions();
|
||||
|
||||
|
|
@ -68,17 +68,17 @@ public:
|
|||
void StartLogging();
|
||||
QTextStream *LogFile();
|
||||
|
||||
virtual const VTranslateVars *TrVars() Q_DECL_OVERRIDE;
|
||||
virtual const VTranslateVars *TrVars() override;
|
||||
|
||||
bool static IsGUIMode();
|
||||
virtual bool IsAppInGUIMode() const Q_DECL_OVERRIDE;
|
||||
virtual bool IsAppInGUIMode() const override;
|
||||
|
||||
virtual void OpenSettings() Q_DECL_OVERRIDE;
|
||||
virtual void OpenSettings() override;
|
||||
VSettings *ValentinaSettings();
|
||||
|
||||
protected:
|
||||
virtual void InitTrVars() Q_DECL_OVERRIDE;
|
||||
virtual bool event(QEvent *e) Q_DECL_OVERRIDE;
|
||||
virtual void InitTrVars() override;
|
||||
virtual bool event(QEvent *e) override;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(VApplication)
|
||||
|
|
|
|||
|
|
@ -40,10 +40,10 @@ public:
|
|||
explicit VFormulaProperty(const QString &name);
|
||||
|
||||
//! Get the data how it should be displayed
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const override;
|
||||
|
||||
//! Returns item flags
|
||||
virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE;
|
||||
virtual Qt::ItemFlags flags(int column = DPC_Name) const 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
|
||||
|
|
@ -51,16 +51,16 @@ 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) Q_DECL_OVERRIDE;
|
||||
const QAbstractItemDelegate* delegate) override;
|
||||
|
||||
//! Sets the property's data to the editor (returns false, if the standard delegate should do that)
|
||||
virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE;
|
||||
virtual bool setEditorData(QWidget* editor) override;
|
||||
|
||||
//! Gets the data from the widget
|
||||
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant getEditorData(const QWidget* editor) const override;
|
||||
|
||||
//! Returns a string containing the type of the property
|
||||
virtual QString type() const Q_DECL_OVERRIDE;
|
||||
virtual QString type() const override;
|
||||
|
||||
//! Clones this property
|
||||
//! \param include_children Indicates whether to also clone the children
|
||||
|
|
@ -68,13 +68,13 @@ public:
|
|||
//! 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)
|
||||
Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true,
|
||||
VProperty* container = nullptr) const Q_DECL_OVERRIDE;
|
||||
VProperty* container = nullptr) const override;
|
||||
|
||||
//! Sets the value of the property
|
||||
virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE;
|
||||
virtual void setValue(const QVariant& value) override;
|
||||
|
||||
//! Returns the value of the property as a QVariant
|
||||
virtual QVariant getValue() const Q_DECL_OVERRIDE;
|
||||
virtual QVariant getValue() const override;
|
||||
|
||||
//! Returns the formula
|
||||
VFormula GetFormula() const;
|
||||
|
|
@ -83,7 +83,7 @@ public:
|
|||
void SetFormula(const VFormula &formula);
|
||||
|
||||
public slots:
|
||||
virtual void ValueChildChanged(const QVariant &value, int typeForParent) Q_DECL_OVERRIDE;
|
||||
virtual void ValueChildChanged(const QVariant &value, int typeForParent) override;
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ public:
|
|||
VFormula GetFormula() const;
|
||||
|
||||
//! Needed for proper event handling
|
||||
virtual bool eventFilter(QObject *obj, QEvent *ev) Q_DECL_OVERRIDE;
|
||||
virtual bool eventFilter(QObject *obj, QEvent *ev) override;
|
||||
|
||||
signals:
|
||||
//! This is emitted, when the user changes the color
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ public:
|
|||
|
||||
QStringList Apply();
|
||||
protected:
|
||||
virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent(QEvent* event) override;
|
||||
private:
|
||||
Q_DISABLE_COPY(PreferencesConfigurationPage)
|
||||
Ui::PreferencesConfigurationPage *ui;
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ public:
|
|||
QStringList Apply();
|
||||
|
||||
protected:
|
||||
virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent(QEvent* event) override;
|
||||
|
||||
private slots:
|
||||
void DefaultPath();
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ public:
|
|||
void InitDefaultSeamAllowance();
|
||||
|
||||
protected:
|
||||
virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent(QEvent* event) override;
|
||||
|
||||
private slots:
|
||||
void EditDateTimeFormats();
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ public:
|
|||
virtual ~DialogAboutApp();
|
||||
|
||||
protected:
|
||||
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void showEvent(QShowEvent *event) override;
|
||||
|
||||
private:
|
||||
Ui::DialogAboutApp *ui;
|
||||
|
|
|
|||
|
|
@ -51,11 +51,11 @@ public:
|
|||
QVector<VFinalMeasurement> FinalMeasurements() const;
|
||||
|
||||
protected:
|
||||
virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent ( QEvent * event) Q_DECL_OVERRIDE;
|
||||
virtual bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE;
|
||||
virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void closeEvent ( QCloseEvent * event ) override;
|
||||
virtual void changeEvent ( QEvent * event) override;
|
||||
virtual bool eventFilter(QObject *object, QEvent *event) override;
|
||||
virtual void showEvent( QShowEvent *event ) override;
|
||||
virtual void resizeEvent(QResizeEvent *event) override;
|
||||
private slots:
|
||||
void ShowFinalMeasurementDetails();
|
||||
void Add();
|
||||
|
|
|
|||
|
|
@ -48,13 +48,13 @@ class DialogHistory : public DialogTool
|
|||
Q_OBJECT
|
||||
public:
|
||||
DialogHistory(VContainer *data, VPattern *doc, QWidget *parent = nullptr);
|
||||
virtual ~DialogHistory() Q_DECL_OVERRIDE;
|
||||
virtual ~DialogHistory() override;
|
||||
public slots:
|
||||
virtual void DialogAccepted() Q_DECL_OVERRIDE;
|
||||
virtual void DialogAccepted() override;
|
||||
/** TODO ISSUE 79 : create real function
|
||||
* @brief DialogApply apply data and emit signal about applied dialog.
|
||||
*/
|
||||
virtual void DialogApply() Q_DECL_OVERRIDE {}
|
||||
virtual void DialogApply() override {}
|
||||
void cellClicked(int row, int column);
|
||||
void ChangedCursor(quint32 id);
|
||||
void UpdateHistory();
|
||||
|
|
@ -66,8 +66,8 @@ signals:
|
|||
*/
|
||||
void ShowHistoryTool(quint32 id, bool enable);
|
||||
protected:
|
||||
virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void closeEvent ( QCloseEvent * event ) override;
|
||||
virtual void changeEvent(QEvent* event) override;
|
||||
private:
|
||||
Q_DISABLE_COPY(DialogHistory)
|
||||
|
||||
|
|
|
|||
|
|
@ -50,17 +50,17 @@ class DialogIncrements : public DialogTool
|
|||
Q_OBJECT
|
||||
public:
|
||||
DialogIncrements(VContainer *data, VPattern *doc, QWidget *parent = nullptr);
|
||||
virtual ~DialogIncrements() Q_DECL_OVERRIDE;
|
||||
virtual ~DialogIncrements() override;
|
||||
|
||||
signals:
|
||||
void UpdateProperties();
|
||||
|
||||
protected:
|
||||
virtual void closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent ( QEvent * event) Q_DECL_OVERRIDE;
|
||||
virtual bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE;
|
||||
virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void closeEvent ( QCloseEvent * event ) override;
|
||||
virtual void changeEvent ( QEvent * event) override;
|
||||
virtual bool eventFilter(QObject *object, QEvent *event) override;
|
||||
virtual void showEvent( QShowEvent *event ) override;
|
||||
virtual void resizeEvent(QResizeEvent *event) override;
|
||||
private slots:
|
||||
void ShowIncrementDetails();
|
||||
void AddIncrement();
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ public slots:
|
|||
void Finished();
|
||||
|
||||
protected:
|
||||
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void showEvent(QShowEvent *event) override;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(DialogLayoutProgress)
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ public:
|
|||
qreal PageToPixels(qreal value) const;
|
||||
static QString MakeGroupsHelp();
|
||||
protected:
|
||||
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void showEvent(QShowEvent *event) override;
|
||||
QSizeF GetTemplateSize(const PaperSizeTemplate &tmpl, const Unit &unit) const;
|
||||
|
||||
public slots:
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ public:
|
|||
QString name() const;
|
||||
Unit PatternUnit() const;
|
||||
protected:
|
||||
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void showEvent(QShowEvent *event) override;
|
||||
private slots:
|
||||
void CheckState();
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ public:
|
|||
}
|
||||
|
||||
virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
|
||||
const QModelIndex &index) const Q_DECL_OVERRIDE
|
||||
const QModelIndex &index) const override
|
||||
{
|
||||
Q_UNUSED(option)
|
||||
Q_UNUSED(index)
|
||||
|
|
@ -78,7 +78,7 @@ public:
|
|||
return editor;
|
||||
}
|
||||
|
||||
virtual void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE
|
||||
virtual void setEditorData(QWidget *editor, const QModelIndex &index) const override
|
||||
{
|
||||
const QString value = index.model()->data(index, Qt::EditRole).toString();
|
||||
|
||||
|
|
@ -92,7 +92,7 @@ public:
|
|||
}
|
||||
|
||||
virtual void setModelData(QWidget *editor, QAbstractItemModel *model,
|
||||
const QModelIndex &index) const Q_DECL_OVERRIDE
|
||||
const QModelIndex &index) const override
|
||||
{
|
||||
QComboBox *comboBox = static_cast<QComboBox*>(editor);
|
||||
QString value;
|
||||
|
|
@ -107,7 +107,7 @@ public:
|
|||
}
|
||||
|
||||
virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option,
|
||||
const QModelIndex &index) const Q_DECL_OVERRIDE
|
||||
const QModelIndex &index) const override
|
||||
{
|
||||
Q_UNUSED(index)
|
||||
editor->setGeometry(option.rect);
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ class DialogPatternProperties : public QDialog
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit DialogPatternProperties(VPattern *doc, VContainer *pattern, QWidget *parent = nullptr);
|
||||
virtual ~DialogPatternProperties() Q_DECL_OVERRIDE;
|
||||
virtual ~DialogPatternProperties() override;
|
||||
signals:
|
||||
void UpdateGradation();
|
||||
private slots:
|
||||
|
|
|
|||
|
|
@ -52,9 +52,9 @@ public:
|
|||
signals:
|
||||
void UpdateProperties();
|
||||
protected:
|
||||
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void showEvent(QShowEvent *event) override;
|
||||
virtual void resizeEvent(QResizeEvent *event) override;
|
||||
virtual void changeEvent(QEvent* event) override;
|
||||
private slots:
|
||||
void PageChanged(QListWidgetItem *current, QListWidgetItem *previous);
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ public:
|
|||
PageOrientation GetTiledPageOrientation() const;
|
||||
|
||||
protected:
|
||||
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void showEvent(QShowEvent *event) override;
|
||||
void InitTemplates(QComboBox *comboBoxTemplates);
|
||||
|
||||
private slots:
|
||||
|
|
|
|||
|
|
@ -62,16 +62,16 @@ class MainWindow : public MainWindowsNoGUI
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit MainWindow(QWidget *parent = nullptr);
|
||||
virtual ~MainWindow() Q_DECL_OVERRIDE;
|
||||
virtual ~MainWindow() override;
|
||||
|
||||
bool LoadPattern(QString fileName, const QString &customMeasureFile = QString());
|
||||
|
||||
public slots:
|
||||
void ProcessCMD();
|
||||
virtual void ShowToolTip(const QString &toolTip) Q_DECL_OVERRIDE;
|
||||
virtual void UpdateVisibilityGroups() Q_DECL_OVERRIDE;
|
||||
virtual void UpdateDetailsList() Q_DECL_OVERRIDE;
|
||||
virtual void ZoomFitBestCurrent() Q_DECL_OVERRIDE;
|
||||
virtual void ShowToolTip(const QString &toolTip) override;
|
||||
virtual void UpdateVisibilityGroups() override;
|
||||
virtual void UpdateDetailsList() override;
|
||||
virtual void ZoomFitBestCurrent() override;
|
||||
|
||||
signals:
|
||||
void RefreshHistory();
|
||||
|
|
@ -100,15 +100,15 @@ signals:
|
|||
void EnableNodePointHover(bool enable);
|
||||
void EnableDetailHover(bool enable);
|
||||
protected:
|
||||
virtual void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void customEvent(QEvent * event) Q_DECL_OVERRIDE;
|
||||
virtual void CleanLayout() Q_DECL_OVERRIDE;
|
||||
virtual void PrepareSceneList() Q_DECL_OVERRIDE;
|
||||
virtual void keyPressEvent(QKeyEvent *event) override;
|
||||
virtual void showEvent(QShowEvent *event) override;
|
||||
virtual void changeEvent(QEvent* event) override;
|
||||
virtual void closeEvent(QCloseEvent *event) override;
|
||||
virtual void customEvent(QEvent * event) override;
|
||||
virtual void CleanLayout() override;
|
||||
virtual void PrepareSceneList() override;
|
||||
virtual void ExportToCSVData(const QString &fileName, bool withHeader, int mib,
|
||||
const QChar &separator) Q_DECL_FINAL;
|
||||
const QChar &separator) final;
|
||||
private slots:
|
||||
void ScaleChanged(qreal scale);
|
||||
void MouseMove(const QPointF &scenePos);
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ class MainWindowsNoGUI : public VAbstractMainWindow
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit MainWindowsNoGUI(QWidget *parent = nullptr);
|
||||
virtual ~MainWindowsNoGUI() Q_DECL_OVERRIDE;
|
||||
virtual ~MainWindowsNoGUI() override;
|
||||
|
||||
public slots:
|
||||
void ToolLayoutSettings(bool checked);
|
||||
|
|
|
|||
|
|
@ -49,25 +49,25 @@ public:
|
|||
VPattern(VContainer *data, Draw *mode, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail,
|
||||
QObject *parent = nullptr);
|
||||
|
||||
virtual void CreateEmptyFile() Q_DECL_OVERRIDE;
|
||||
virtual void CreateEmptyFile() override;
|
||||
|
||||
void Parse(const Document &parse);
|
||||
|
||||
void GarbageCollector(bool commit = false);
|
||||
|
||||
void setCurrentData();
|
||||
virtual void UpdateToolData(const quint32 &id, VContainer *data) Q_DECL_OVERRIDE;
|
||||
virtual void UpdateToolData(const quint32 &id, VContainer *data) override;
|
||||
VContainer GetCompleteData() const;
|
||||
|
||||
virtual void IncrementReferens(quint32 id) const Q_DECL_OVERRIDE;
|
||||
virtual void DecrementReferens(quint32 id) const Q_DECL_OVERRIDE;
|
||||
virtual void IncrementReferens(quint32 id) const override;
|
||||
virtual void DecrementReferens(quint32 id) const override;
|
||||
|
||||
quint32 SPointActiveDraw();
|
||||
|
||||
QVector<quint32> GetActivePPPieces() const;
|
||||
|
||||
virtual void setXMLContent(const QString &fileName) Q_DECL_OVERRIDE;
|
||||
virtual bool SaveDocument(const QString &fileName, QString &error) Q_DECL_OVERRIDE;
|
||||
virtual void setXMLContent(const QString &fileName) override;
|
||||
virtual bool SaveDocument(const QString &fileName, QString &error) override;
|
||||
|
||||
QRectF ActiveDrawBoundingRect() const;
|
||||
|
||||
|
|
@ -92,8 +92,8 @@ public:
|
|||
|
||||
void ReplaceNameInFormula(QVector<VFormulaField> &expressions, const QString &name, const QString &newName);
|
||||
|
||||
virtual QString GenerateLabel(const LabelType &type, const QString &reservedName = QString())const Q_DECL_OVERRIDE;
|
||||
virtual QString GenerateSuffix() const Q_DECL_OVERRIDE;
|
||||
virtual QString GenerateLabel(const LabelType &type, const QString &reservedName = QString())const override;
|
||||
virtual QString GenerateSuffix() const override;
|
||||
|
||||
bool IsDefCustom() const;
|
||||
void SetDefCustom(bool value);
|
||||
|
|
@ -114,10 +114,10 @@ public:
|
|||
int ElementsToParse() const;
|
||||
|
||||
public slots:
|
||||
virtual void LiteParseTree(const Document &parse) Q_DECL_OVERRIDE;
|
||||
virtual void LiteParseTree(const Document &parse) override;
|
||||
|
||||
protected:
|
||||
virtual void customEvent(QEvent * event) Q_DECL_OVERRIDE;
|
||||
virtual void customEvent(QEvent * event) override;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(VPattern)
|
||||
|
|
|
|||
|
|
@ -48,10 +48,10 @@ public:
|
|||
VException &operator=(const VException &e);
|
||||
virtual ~VException() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
|
||||
Q_NORETURN virtual void raise() const Q_DECL_OVERRIDE;
|
||||
Q_NORETURN virtual void raise() const override;
|
||||
|
||||
// cppcheck-suppress unusedFunction
|
||||
Q_REQUIRED_RESULT virtual VException *clone() const Q_DECL_OVERRIDE;
|
||||
Q_REQUIRED_RESULT virtual VException *clone() const override;
|
||||
|
||||
virtual QString ErrorMessage() const;
|
||||
virtual QString DetailedInformation() const;
|
||||
|
|
@ -99,9 +99,9 @@ public:
|
|||
VExceptionToolWasDeleted &operator=(const VExceptionToolWasDeleted &e);
|
||||
virtual ~VExceptionToolWasDeleted() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
|
||||
Q_NORETURN virtual void raise() const Q_DECL_OVERRIDE;
|
||||
Q_NORETURN virtual void raise() const override;
|
||||
// cppcheck-suppress unusedFunction
|
||||
virtual VExceptionToolWasDeleted *clone() const Q_DECL_OVERRIDE;
|
||||
virtual VExceptionToolWasDeleted *clone() const override;
|
||||
};
|
||||
|
||||
#endif // VEXCEPTION_H
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ public:
|
|||
VExceptionBadId(const VExceptionBadId &e);
|
||||
VExceptionBadId &operator=(const VExceptionBadId &e);
|
||||
virtual ~VExceptionBadId() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
virtual QString ErrorMessage() const Q_DECL_OVERRIDE;
|
||||
virtual QString ErrorMessage() const override;
|
||||
quint32 BadId() const;
|
||||
QString BadKey() const;
|
||||
protected:
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ public:
|
|||
VExceptionConversionError(const VExceptionConversionError &e);
|
||||
VExceptionConversionError &operator=(const VExceptionConversionError &e);
|
||||
virtual ~VExceptionConversionError() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
virtual QString ErrorMessage() const Q_DECL_OVERRIDE;
|
||||
virtual QString ErrorMessage() const override;
|
||||
QString String() const;
|
||||
protected:
|
||||
/** @brief str string, where happend error */
|
||||
|
|
|
|||
|
|
@ -48,8 +48,8 @@ public:
|
|||
VExceptionEmptyParameter(const VExceptionEmptyParameter &e);
|
||||
VExceptionEmptyParameter &operator=(const VExceptionEmptyParameter &e);
|
||||
virtual ~VExceptionEmptyParameter() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
virtual QString ErrorMessage() const Q_DECL_OVERRIDE;
|
||||
virtual QString DetailedInformation() const Q_DECL_OVERRIDE;
|
||||
virtual QString ErrorMessage() const override;
|
||||
virtual QString DetailedInformation() const override;
|
||||
QString Name() const;
|
||||
QString TagText() const;
|
||||
QString TagName() const;
|
||||
|
|
|
|||
|
|
@ -48,8 +48,8 @@ public:
|
|||
VExceptionObjectError(const VExceptionObjectError &e);
|
||||
VExceptionObjectError &operator=(const VExceptionObjectError &e);
|
||||
virtual ~VExceptionObjectError() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
virtual QString ErrorMessage() const Q_DECL_OVERRIDE;
|
||||
virtual QString DetailedInformation() const Q_DECL_OVERRIDE;
|
||||
virtual QString ErrorMessage() const override;
|
||||
virtual QString DetailedInformation() const override;
|
||||
QString TagText() const;
|
||||
QString TagName() const;
|
||||
qint32 LineNumber() const;
|
||||
|
|
|
|||
|
|
@ -48,8 +48,8 @@ public:
|
|||
VExceptionWrongId(const VExceptionWrongId &e);
|
||||
VExceptionWrongId &operator=(const VExceptionWrongId &e);
|
||||
virtual ~VExceptionWrongId() V_NOEXCEPT_EXPR (true) Q_DECL_EQ_DEFAULT;
|
||||
virtual QString ErrorMessage() const Q_DECL_OVERRIDE;
|
||||
virtual QString DetailedInformation() const Q_DECL_OVERRIDE;
|
||||
virtual QString ErrorMessage() const override;
|
||||
virtual QString DetailedInformation() const override;
|
||||
QString TagText() const;
|
||||
QString TagName() const;
|
||||
qint32 LineNumber() const;
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ public:
|
|||
protected:
|
||||
// cppcheck-suppress unusedFunction
|
||||
virtual void handleMessage(QtMsgType type, const QString &description,
|
||||
const QUrl &identifier, const QSourceLocation &sourceLocation) Q_DECL_OVERRIDE;
|
||||
const QUrl &identifier, const QSourceLocation &sourceLocation) override;
|
||||
private:
|
||||
QtMsgType m_messageType;
|
||||
QString m_description;
|
||||
|
|
|
|||
|
|
@ -43,17 +43,17 @@ public:
|
|||
static Q_DECL_CONSTEXPR const int LabelTemplateMaxVer = CONVERTER_VERSION_CHECK(1, 0, 0);
|
||||
|
||||
protected:
|
||||
virtual int MinVer() const Q_DECL_OVERRIDE;
|
||||
virtual int MaxVer() const Q_DECL_OVERRIDE;
|
||||
virtual int MinVer() const override;
|
||||
virtual int MaxVer() const override;
|
||||
|
||||
virtual QString MinVerStr() const Q_DECL_OVERRIDE;
|
||||
virtual QString MaxVerStr() const Q_DECL_OVERRIDE;
|
||||
virtual QString MinVerStr() const override;
|
||||
virtual QString MaxVerStr() const override;
|
||||
|
||||
virtual QString XSDSchema(int ver) const Q_DECL_OVERRIDE;
|
||||
virtual void ApplyPatches() Q_DECL_OVERRIDE;
|
||||
virtual void DowngradeToCurrentMaxVersion() Q_DECL_OVERRIDE;
|
||||
virtual QString XSDSchema(int ver) const override;
|
||||
virtual void ApplyPatches() override;
|
||||
virtual void DowngradeToCurrentMaxVersion() override;
|
||||
|
||||
virtual bool IsReadOnly() const Q_DECL_OVERRIDE {return false;}
|
||||
virtual bool IsReadOnly() const override {return false;}
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(VLabelTemplateConverter)
|
||||
|
|
|
|||
|
|
@ -56,17 +56,17 @@ public:
|
|||
static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 7, 8);
|
||||
|
||||
protected:
|
||||
virtual int MinVer() const Q_DECL_OVERRIDE;
|
||||
virtual int MaxVer() const Q_DECL_OVERRIDE;
|
||||
virtual int MinVer() const override;
|
||||
virtual int MaxVer() const override;
|
||||
|
||||
virtual QString MinVerStr() const Q_DECL_OVERRIDE;
|
||||
virtual QString MaxVerStr() const Q_DECL_OVERRIDE;
|
||||
virtual QString MinVerStr() const override;
|
||||
virtual QString MaxVerStr() const override;
|
||||
|
||||
virtual QString XSDSchema(int ver) const Q_DECL_OVERRIDE;
|
||||
virtual void ApplyPatches() Q_DECL_OVERRIDE;
|
||||
virtual void DowngradeToCurrentMaxVersion() Q_DECL_OVERRIDE;
|
||||
virtual QString XSDSchema(int ver) const override;
|
||||
virtual void ApplyPatches() override;
|
||||
virtual void DowngradeToCurrentMaxVersion() override;
|
||||
|
||||
virtual bool IsReadOnly() const Q_DECL_OVERRIDE;
|
||||
virtual bool IsReadOnly() const override;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(VPatternConverter)
|
||||
|
|
|
|||
|
|
@ -52,16 +52,16 @@ public:
|
|||
static Q_DECL_CONSTEXPR const int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 4, 0);
|
||||
|
||||
protected:
|
||||
virtual int MinVer() const Q_DECL_OVERRIDE;
|
||||
virtual int MaxVer() const Q_DECL_OVERRIDE;
|
||||
virtual int MinVer() const override;
|
||||
virtual int MaxVer() const override;
|
||||
|
||||
virtual QString MinVerStr() const Q_DECL_OVERRIDE;
|
||||
virtual QString MaxVerStr() const Q_DECL_OVERRIDE;
|
||||
virtual QString MinVerStr() const override;
|
||||
virtual QString MaxVerStr() const override;
|
||||
|
||||
virtual QString XSDSchema(int ver) const Q_DECL_OVERRIDE;
|
||||
virtual void ApplyPatches() Q_DECL_OVERRIDE;
|
||||
virtual void DowngradeToCurrentMaxVersion() Q_DECL_OVERRIDE;
|
||||
virtual bool IsReadOnly() const Q_DECL_OVERRIDE;
|
||||
virtual QString XSDSchema(int ver) const override;
|
||||
virtual void ApplyPatches() override;
|
||||
virtual void DowngradeToCurrentMaxVersion() override;
|
||||
virtual bool IsReadOnly() const override;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(VVITConverter)
|
||||
|
|
|
|||
|
|
@ -58,16 +58,16 @@ public:
|
|||
#endif
|
||||
|
||||
protected:
|
||||
virtual int MinVer() const Q_DECL_OVERRIDE;
|
||||
virtual int MaxVer() const Q_DECL_OVERRIDE;
|
||||
virtual int MinVer() const override;
|
||||
virtual int MaxVer() const override;
|
||||
|
||||
virtual QString MinVerStr() const Q_DECL_OVERRIDE;
|
||||
virtual QString MaxVerStr() const Q_DECL_OVERRIDE;
|
||||
virtual QString MinVerStr() const override;
|
||||
virtual QString MaxVerStr() const override;
|
||||
|
||||
virtual QString XSDSchema(int ver) const Q_DECL_OVERRIDE;
|
||||
virtual void ApplyPatches() Q_DECL_OVERRIDE;
|
||||
virtual void DowngradeToCurrentMaxVersion() Q_DECL_OVERRIDE;
|
||||
virtual bool IsReadOnly() const Q_DECL_OVERRIDE;
|
||||
virtual QString XSDSchema(int ver) const override;
|
||||
virtual void ApplyPatches() override;
|
||||
virtual void DowngradeToCurrentMaxVersion() override;
|
||||
virtual bool IsReadOnly() const override;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(VVSTConverter)
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ class QMUPARSERSHARED_EXPORT QmuFormulaBase : public QmuParser
|
|||
{
|
||||
public:
|
||||
QmuFormulaBase();
|
||||
virtual ~QmuFormulaBase() Q_DECL_OVERRIDE;
|
||||
virtual ~QmuFormulaBase() override;
|
||||
|
||||
virtual void InitCharSets() Q_DECL_OVERRIDE;
|
||||
virtual void InitCharSets() override;
|
||||
|
||||
static void RemoveAll(QMap<int, QString> &map, const QString &val);
|
||||
|
||||
|
|
|
|||
|
|
@ -51,11 +51,11 @@ namespace qmu
|
|||
{
|
||||
public:
|
||||
QmuParser();
|
||||
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;
|
||||
virtual void InitCharSets() override;
|
||||
virtual void InitFun() override;
|
||||
virtual void InitConst() override;
|
||||
virtual void InitOprt() override;
|
||||
virtual void OnDetectVar(const QString &pExpr, int &nStart, int &nEnd) 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 QLocale &locale,
|
||||
|
|
|
|||
|
|
@ -166,17 +166,17 @@ protected:
|
|||
:std::numpunct<TChar>(), m_nGroup(nGroup), m_cDecPoint(cDecSep), m_cThousandsSep(cThousandsSep)
|
||||
{}
|
||||
protected:
|
||||
virtual char_type do_decimal_point() const Q_DECL_OVERRIDE
|
||||
virtual char_type do_decimal_point() const override
|
||||
{
|
||||
return m_cDecPoint;
|
||||
}
|
||||
|
||||
virtual char_type do_thousands_sep() const Q_DECL_OVERRIDE
|
||||
virtual char_type do_thousands_sep() const override
|
||||
{
|
||||
return m_cThousandsSep;
|
||||
}
|
||||
|
||||
virtual std::string do_grouping() const Q_DECL_OVERRIDE
|
||||
virtual std::string do_grouping() const override
|
||||
{
|
||||
// fix for issue 4: https://code.google.com/p/muparser/issues/detail?id=4
|
||||
// courtesy of Jens Bartsch
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ public:
|
|||
QmuParserError ( const QString &szMsg, int iPos, const QString &sTok = QString() );
|
||||
QmuParserError ( const QmuParserError &a_Obj );
|
||||
QmuParserError& operator= ( const QmuParserError &a_Obj );
|
||||
virtual ~QmuParserError() QMUP_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE {}
|
||||
virtual ~QmuParserError() QMUP_NOEXCEPT_EXPR (true) override {}
|
||||
|
||||
void SetFormula ( const QString &a_strFormula );
|
||||
const QString& GetExpr() const;
|
||||
|
|
@ -154,8 +154,8 @@ public:
|
|||
int GetPos() const;
|
||||
const QString& GetToken() const;
|
||||
EErrorCodes GetCode() const;
|
||||
Q_NORETURN virtual void raise() const Q_DECL_OVERRIDE;
|
||||
Q_REQUIRED_RESULT virtual QmuParserError *clone() const Q_DECL_OVERRIDE;
|
||||
Q_NORETURN virtual void raise() const override;
|
||||
Q_REQUIRED_RESULT virtual QmuParserError *clone() const override;
|
||||
private:
|
||||
QString m_sMsg; ///< The message string
|
||||
QString m_sExpr; ///< Formula string
|
||||
|
|
|
|||
|
|
@ -103,18 +103,18 @@ public:
|
|||
|
||||
//reimplement virtual DRW_Interface functions
|
||||
//writer part, send all in class dx_data to writer
|
||||
virtual void writeHeader(DRW_Header& data);
|
||||
virtual void writeBlocks();
|
||||
virtual void writeHeader(DRW_Header& data) override;
|
||||
virtual void writeBlocks() override;
|
||||
//only send the name, needed by the reader to prepare handles of blocks & blockRecords
|
||||
virtual void writeBlockRecords();
|
||||
virtual void writeBlockRecords() override;
|
||||
//write entities of model space and first paper_space
|
||||
virtual void writeEntities();
|
||||
virtual void writeLTypes();
|
||||
virtual void writeLayers();
|
||||
virtual void writeTextstyles();
|
||||
virtual void writeVports();
|
||||
virtual void writeDimstyles();
|
||||
virtual void writeAppId();
|
||||
virtual void writeEntities() override;
|
||||
virtual void writeLTypes() override;
|
||||
virtual void writeLayers() override;
|
||||
virtual void writeTextstyles() override;
|
||||
virtual void writeVports() override;
|
||||
virtual void writeDimstyles() override;
|
||||
virtual void writeAppId() override;
|
||||
|
||||
void AddEntity(DRW_Entity* e);
|
||||
UTF8STRING AddFont(const QFont &f);
|
||||
|
|
|
|||
|
|
@ -238,7 +238,7 @@ public:
|
|||
eType = DRW::POINT;
|
||||
}
|
||||
|
||||
virtual void applyExtrusion(){}
|
||||
virtual void applyExtrusion() override{}
|
||||
|
||||
protected:
|
||||
void parseCode(int code, dxfReader *reader);
|
||||
|
|
@ -265,7 +265,7 @@ public:
|
|||
eType = DRW::LINE;
|
||||
}
|
||||
|
||||
virtual void applyExtrusion(){}
|
||||
virtual void applyExtrusion() override{}
|
||||
|
||||
protected:
|
||||
void parseCode(int code, dxfReader *reader);
|
||||
|
|
@ -313,7 +313,7 @@ public:
|
|||
eType = DRW::CIRCLE;
|
||||
}
|
||||
|
||||
virtual void applyExtrusion();
|
||||
virtual void applyExtrusion() override;
|
||||
|
||||
protected:
|
||||
void parseCode(int code, dxfReader *reader);
|
||||
|
|
@ -338,7 +338,7 @@ public:
|
|||
eType = DRW::ARC;
|
||||
}
|
||||
|
||||
virtual void applyExtrusion();
|
||||
virtual void applyExtrusion() override;
|
||||
|
||||
//! center point in OCS
|
||||
const DRW_Coord & center() const { return basePoint; }
|
||||
|
|
@ -383,7 +383,7 @@ public:
|
|||
}
|
||||
|
||||
void toPolyline(DRW_Polyline *pol, int parts = 128);
|
||||
virtual void applyExtrusion();
|
||||
virtual void applyExtrusion() override;
|
||||
|
||||
protected:
|
||||
//! interpret code in dxf reading process or dispatch to inherited class
|
||||
|
|
@ -414,7 +414,7 @@ public:
|
|||
eType = DRW::TRACE;
|
||||
}
|
||||
|
||||
virtual void applyExtrusion();
|
||||
virtual void applyExtrusion() override;
|
||||
|
||||
protected:
|
||||
void parseCode(int code, dxfReader *reader);
|
||||
|
|
@ -481,7 +481,7 @@ public:
|
|||
eType = DRW::E3DFACE;
|
||||
}
|
||||
|
||||
virtual void applyExtrusion() {}
|
||||
virtual void applyExtrusion() override {}
|
||||
|
||||
//! first corner in WCS
|
||||
const DRW_Coord & firstCorner() const { return basePoint; }
|
||||
|
|
@ -519,7 +519,7 @@ public:
|
|||
layer = '0';
|
||||
}
|
||||
|
||||
virtual void applyExtrusion(){}
|
||||
virtual void applyExtrusion() override {}
|
||||
|
||||
protected:
|
||||
void parseCode(int code, dxfReader *reader);
|
||||
|
|
@ -607,7 +607,7 @@ public:
|
|||
~DRW_LWPolyline() {
|
||||
for(DRW_Vertex2D *item : vertlist) delete item;
|
||||
}
|
||||
virtual void applyExtrusion();
|
||||
virtual void applyExtrusion() override;
|
||||
void addVertex (DRW_Vertex2D v) {
|
||||
DRW_Vertex2D *vert = new DRW_Vertex2D();
|
||||
vert->x = v.x;
|
||||
|
|
@ -682,7 +682,7 @@ public:
|
|||
eType = DRW::TEXT;
|
||||
}
|
||||
|
||||
virtual void applyExtrusion(){} //RLZ TODO
|
||||
virtual void applyExtrusion() override {} //RLZ TODO
|
||||
|
||||
protected:
|
||||
void parseCode(int code, dxfReader *reader);
|
||||
|
|
@ -943,7 +943,7 @@ public:
|
|||
for(DRW_Coord *item : controllist) delete item;
|
||||
for(DRW_Coord *item : fitlist) delete item;
|
||||
}
|
||||
virtual void applyExtrusion(){}
|
||||
virtual void applyExtrusion() override {}
|
||||
|
||||
protected:
|
||||
void parseCode(int code, dxfReader *reader);
|
||||
|
|
@ -1057,7 +1057,7 @@ public:
|
|||
looplist.push_back(v);
|
||||
}
|
||||
|
||||
virtual void applyExtrusion(){}
|
||||
virtual void applyExtrusion() override {}
|
||||
|
||||
protected:
|
||||
void parseCode(int code, dxfReader *reader);
|
||||
|
|
@ -1238,7 +1238,7 @@ public:
|
|||
}
|
||||
virtual ~DRW_Dimension() = default;
|
||||
|
||||
virtual void applyExtrusion(){}
|
||||
virtual void applyExtrusion() override {}
|
||||
|
||||
protected:
|
||||
void parseCode(int code, dxfReader *reader);
|
||||
|
|
@ -1544,7 +1544,7 @@ public:
|
|||
for(DRW_Coord *item : vertexlist) delete item;
|
||||
}
|
||||
|
||||
virtual void applyExtrusion(){}
|
||||
virtual void applyExtrusion() override {}
|
||||
|
||||
protected:
|
||||
void parseCode(int code, dxfReader *reader);
|
||||
|
|
@ -1606,7 +1606,7 @@ public:
|
|||
eType = DRW::VIEWPORT;
|
||||
}
|
||||
|
||||
virtual void applyExtrusion(){}
|
||||
virtual void applyExtrusion() override {}
|
||||
|
||||
protected:
|
||||
void parseCode(int code, dxfReader *reader);
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ DRW_dbg *DRW_dbg::instance= NULL;
|
|||
/*********private clases*************/
|
||||
class print_none {
|
||||
public:
|
||||
virtual void printS(std::string s){(void)s;}
|
||||
virtual void printS(const std::string &s){(void)s;}
|
||||
virtual void printI(long long int i){(void)i;}
|
||||
virtual void printUI(long long unsigned int i){(void)i;}
|
||||
virtual void printD(double d){(void)d;}
|
||||
|
|
@ -33,14 +33,14 @@ public:
|
|||
|
||||
class print_debug : public print_none {
|
||||
public:
|
||||
virtual void printS(std::string s);
|
||||
virtual void printI(long long int i);
|
||||
virtual void printUI(long long unsigned int i);
|
||||
virtual void printD(double d);
|
||||
virtual void printH(long long int i);
|
||||
virtual void printB(int i);
|
||||
virtual void printHL(int c, int s, int h);
|
||||
virtual void printPT(double x, double y, double z);
|
||||
virtual void printS(const std::string &s) override;
|
||||
virtual void printI(long long int i) override;
|
||||
virtual void printUI(long long unsigned int i) override;
|
||||
virtual void printD(double d) override;
|
||||
virtual void printH(long long int i) override;
|
||||
virtual void printB(int i) override;
|
||||
virtual void printHL(int c, int s, int h) override;
|
||||
virtual void printPT(double x, double y, double z) override;
|
||||
print_debug();
|
||||
virtual ~print_debug() = default;
|
||||
private:
|
||||
|
|
@ -82,7 +82,7 @@ DRW_dbg::LEVEL DRW_dbg::getLevel() const{
|
|||
return level;
|
||||
}
|
||||
|
||||
void DRW_dbg::print(std::string s){
|
||||
void DRW_dbg::print(const std::string &s){
|
||||
prClass->printS(s);
|
||||
}
|
||||
|
||||
|
|
@ -129,7 +129,7 @@ print_debug::print_debug()
|
|||
: flags(std::cerr.flags())
|
||||
{}
|
||||
|
||||
void print_debug::printS(std::string s){
|
||||
void print_debug::printS(const std::string &s){
|
||||
std::cerr << s;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ public:
|
|||
void setLevel(LEVEL lvl);
|
||||
LEVEL getLevel() const;
|
||||
static DRW_dbg *getInstance();
|
||||
void print(std::string s);
|
||||
void print(const std::string &s);
|
||||
void print(int i);
|
||||
void print(unsigned int i);
|
||||
void print(long long int i);
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ public:
|
|||
|
||||
std::string getString() const {return strData;}
|
||||
int getHandleString();//Convert hex string to int
|
||||
std::string toUtf8String(std::string t) {return decoder.toUtf8(t);}
|
||||
std::string toUtf8String(const std::string &t) {return decoder.toUtf8(t);}
|
||||
std::string getUtf8String() {return decoder.toUtf8(strData);}
|
||||
double getDouble() const {return doubleData;}
|
||||
int getInt32() const {return intData;}
|
||||
|
|
@ -83,14 +83,14 @@ public:
|
|||
{skip = false; }
|
||||
|
||||
virtual ~dxfReaderBinary() = default;
|
||||
virtual bool readCode(int *code);
|
||||
virtual bool readString(std::string *text);
|
||||
virtual bool readString();
|
||||
virtual bool readInt16();
|
||||
virtual bool readInt32();
|
||||
virtual bool readInt64();
|
||||
virtual bool readDouble();
|
||||
virtual bool readBool();
|
||||
virtual bool readCode(int *code) override;
|
||||
virtual bool readString(std::string *text) override;
|
||||
virtual bool readString() override;
|
||||
virtual bool readInt16() override;
|
||||
virtual bool readInt32() override;
|
||||
virtual bool readInt64() override;
|
||||
virtual bool readDouble() override;
|
||||
virtual bool readBool() override;
|
||||
};
|
||||
|
||||
class dxfReaderAscii : public dxfReader {
|
||||
|
|
@ -100,14 +100,14 @@ public:
|
|||
{skip = true; }
|
||||
|
||||
virtual ~dxfReaderAscii() = default;
|
||||
virtual bool readCode(int *code);
|
||||
virtual bool readString(std::string *text);
|
||||
virtual bool readString();
|
||||
virtual bool readInt16();
|
||||
virtual bool readDouble();
|
||||
virtual bool readInt32();
|
||||
virtual bool readInt64();
|
||||
virtual bool readBool();
|
||||
virtual bool readCode(int *code) override;
|
||||
virtual bool readString(std::string *text) override;
|
||||
virtual bool readString() override;
|
||||
virtual bool readInt16() override;
|
||||
virtual bool readDouble() override;
|
||||
virtual bool readInt32() override;
|
||||
virtual bool readInt64() override;
|
||||
virtual bool readBool() override;
|
||||
};
|
||||
|
||||
#endif // DXFREADER_H
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ public:
|
|||
virtual bool writeString(int code, std::string text) = 0;
|
||||
bool writeUtf8String(int code, const std::string &text);
|
||||
bool writeUtf8Caps(int code, const std::string &text);
|
||||
std::string fromUtf8String(std::string t) {return encoder.fromUtf8(t);}
|
||||
std::string fromUtf8String(const std::string &t) {return encoder.fromUtf8(t);}
|
||||
virtual bool writeInt16(int code, int data) = 0;
|
||||
virtual bool writeInt32(int code, int data) = 0;
|
||||
virtual bool writeInt64(int code, unsigned long long int data) = 0;
|
||||
|
|
@ -48,24 +48,24 @@ public:
|
|||
: dxfWriter(stream)
|
||||
{}
|
||||
virtual ~dxfWriterBinary() = default;
|
||||
virtual bool writeString(int code, std::string text);
|
||||
virtual bool writeInt16(int code, int data);
|
||||
virtual bool writeInt32(int code, int data);
|
||||
virtual bool writeInt64(int code, unsigned long long int data);
|
||||
virtual bool writeDouble(int code, double data);
|
||||
virtual bool writeBool(int code, bool data);
|
||||
virtual bool writeString(int code, std::string text) override;
|
||||
virtual bool writeInt16(int code, int data) override;
|
||||
virtual bool writeInt32(int code, int data) override;
|
||||
virtual bool writeInt64(int code, unsigned long long int data) override;
|
||||
virtual bool writeDouble(int code, double data) override;
|
||||
virtual bool writeBool(int code, bool data) override;
|
||||
};
|
||||
|
||||
class dxfWriterAscii : public dxfWriter {
|
||||
public:
|
||||
explicit dxfWriterAscii(std::ofstream *stream);
|
||||
virtual ~dxfWriterAscii() = default;
|
||||
virtual bool writeString(int code, std::string text);
|
||||
virtual bool writeInt16(int code, int data);
|
||||
virtual bool writeInt32(int code, int data);
|
||||
virtual bool writeInt64(int code, unsigned long long int data);
|
||||
virtual bool writeDouble(int code, double data);
|
||||
virtual bool writeBool(int code, bool data);
|
||||
virtual bool writeString(int code, std::string text) override;
|
||||
virtual bool writeInt16(int code, int data) override;
|
||||
virtual bool writeInt32(int code, int data) override;
|
||||
virtual bool writeInt64(int code, unsigned long long int data) override;
|
||||
virtual bool writeDouble(int code, double data) override;
|
||||
virtual bool writeBool(int code, bool data) override;
|
||||
};
|
||||
|
||||
#endif // DXFWRITER_H
|
||||
|
|
|
|||
|
|
@ -57,19 +57,19 @@ public:
|
|||
VDxfEngine();
|
||||
virtual ~VDxfEngine();
|
||||
|
||||
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 void drawLines(const QLineF * lines, int lineCount) Q_DECL_OVERRIDE;
|
||||
virtual void drawLines(const QLine * lines, int lineCount) 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;
|
||||
virtual void drawEllipse(const QRectF & rect) Q_DECL_OVERRIDE;
|
||||
virtual void drawEllipse(const QRect & rect) Q_DECL_OVERRIDE;
|
||||
virtual void drawTextItem(const QPointF & p, const QTextItem & textItem) Q_DECL_OVERRIDE;
|
||||
virtual Type type() const Q_DECL_OVERRIDE;
|
||||
virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE;
|
||||
virtual bool begin(QPaintDevice *pdev) override;
|
||||
virtual bool end() override;
|
||||
virtual void updateState(const QPaintEngineState &state) override;
|
||||
virtual void drawPath(const QPainterPath &path) override;
|
||||
virtual void drawLines(const QLineF * lines, int lineCount) override;
|
||||
virtual void drawLines(const QLine * lines, int lineCount) override;
|
||||
virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override;
|
||||
virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) override;
|
||||
virtual void drawEllipse(const QRectF & rect) override;
|
||||
virtual void drawEllipse(const QRect & rect) override;
|
||||
virtual void drawTextItem(const QPointF & p, const QTextItem & textItem) override;
|
||||
virtual Type type() const override;
|
||||
virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override;
|
||||
|
||||
QSize getSize() const;
|
||||
void setSize(const QSize &value);
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ class VDxfPaintDevice : public QPaintDevice
|
|||
{
|
||||
public:
|
||||
VDxfPaintDevice();
|
||||
virtual ~VDxfPaintDevice() Q_DECL_OVERRIDE;
|
||||
virtual QPaintEngine *paintEngine() const Q_DECL_OVERRIDE;
|
||||
virtual ~VDxfPaintDevice() override;
|
||||
virtual QPaintEngine *paintEngine() const override;
|
||||
|
||||
QString getFileName() const;
|
||||
void setFileName(const QString &value);
|
||||
|
|
@ -69,7 +69,7 @@ public:
|
|||
bool ExportToAAMA(const QVector<VLayoutPiece> &details) const;
|
||||
|
||||
protected:
|
||||
virtual int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE;
|
||||
virtual int metric(PaintDeviceMetric metric) const override;
|
||||
private:
|
||||
Q_DISABLE_COPY(VDxfPaintDevice)
|
||||
VDxfEngine *engine;
|
||||
|
|
|
|||
|
|
@ -51,8 +51,8 @@ public:
|
|||
VMeasurements(Unit unit, int baseSize, int baseHeight, VContainer *data);
|
||||
virtual ~VMeasurements() Q_DECL_EQ_DEFAULT;
|
||||
|
||||
virtual void setXMLContent(const QString &fileName) Q_DECL_OVERRIDE;
|
||||
virtual bool SaveDocument(const QString &fileName, QString &error) Q_DECL_OVERRIDE;
|
||||
virtual void setXMLContent(const QString &fileName) override;
|
||||
virtual bool SaveDocument(const QString &fileName, QString &error) override;
|
||||
|
||||
void AddEmpty(const QString &name, const QString &formula = QString());
|
||||
void AddEmptyAfter(const QString &after, const QString &name, const QString &formula = QString());
|
||||
|
|
|
|||
|
|
@ -66,11 +66,11 @@ public:
|
|||
|
||||
QString GetFormulaF1 () const;
|
||||
void SetFormulaF1 (const QString &formula, qreal value);
|
||||
virtual qreal GetStartAngle () const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetStartAngle () const override;
|
||||
|
||||
QString GetFormulaF2 () const;
|
||||
void SetFormulaF2 (const QString &formula, qreal value);
|
||||
virtual qreal GetEndAngle () const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetEndAngle () const override;
|
||||
|
||||
virtual VPointF GetCenter () const;
|
||||
void SetCenter (const VPointF &point);
|
||||
|
|
@ -78,8 +78,8 @@ public:
|
|||
QString GetFormulaLength () const;
|
||||
void SetFormulaLength (const QString &formula, qreal value);
|
||||
|
||||
virtual void setId(const quint32 &id) Q_DECL_OVERRIDE;
|
||||
virtual QString NameForHistory(const QString &toolName) const Q_DECL_OVERRIDE;
|
||||
virtual void setId(const quint32 &id) override;
|
||||
virtual QString NameForHistory(const QString &toolName) const override;
|
||||
|
||||
bool IsFlipped() const;
|
||||
qreal AngleArc() const;
|
||||
|
|
|
|||
|
|
@ -56,13 +56,13 @@ public:
|
|||
|
||||
QPointF CutSpline ( qreal length, QPointF &spl1p2, QPointF &spl1p3, QPointF &spl2p2, QPointF &spl2p3) const;
|
||||
|
||||
virtual QString NameForHistory(const QString &toolName) const Q_DECL_OVERRIDE;
|
||||
virtual QString NameForHistory(const QString &toolName) const override;
|
||||
|
||||
qreal GetParmT(qreal length) const;
|
||||
qreal LengthT(qreal t) const;
|
||||
|
||||
protected:
|
||||
virtual void CreateName() Q_DECL_OVERRIDE;
|
||||
virtual void CreateName() override;
|
||||
|
||||
static qreal CalcSqDistance(qreal x1, qreal y1, qreal x2, qreal y2);
|
||||
static void PointBezier_r(qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4,
|
||||
|
|
|
|||
|
|
@ -59,21 +59,21 @@ public:
|
|||
virtual VSpline GetSpline(qint32 index) const =0;
|
||||
virtual QVector<VSplinePoint> GetSplinePath() const =0;
|
||||
|
||||
virtual QPainterPath GetPath() const Q_DECL_OVERRIDE;
|
||||
virtual QVector<QPointF> GetPoints() const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetLength() const Q_DECL_OVERRIDE;
|
||||
virtual QPainterPath GetPath() const override;
|
||||
virtual QVector<QPointF> GetPoints() const override;
|
||||
virtual qreal GetLength() const override;
|
||||
|
||||
virtual QVector<DirectionArrow> DirectionArrows() const Q_DECL_OVERRIDE;
|
||||
virtual QVector<DirectionArrow> DirectionArrows() const override;
|
||||
|
||||
int Segment(const QPointF &p) const;
|
||||
|
||||
QPointF CutSplinePath(qreal length, qint32 &p1, qint32 &p2, QPointF &spl1p2, QPointF &spl1p3, QPointF &spl2p2,
|
||||
QPointF &spl2p3) const;
|
||||
|
||||
virtual QString NameForHistory(const QString &toolName) const Q_DECL_OVERRIDE;
|
||||
virtual QString NameForHistory(const QString &toolName) const override;
|
||||
|
||||
protected:
|
||||
virtual void CreateName() Q_DECL_OVERRIDE;
|
||||
virtual void CreateName() override;
|
||||
|
||||
virtual VPointF FirstPoint() const =0;
|
||||
virtual VPointF LastPoint() const =0;
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public:
|
|||
explicit VAbstractCurve(const GOType &type, const quint32 &idObject = NULL_ID,
|
||||
const Draw &mode = Draw::Calculation);
|
||||
explicit VAbstractCurve(const VAbstractCurve &curve);
|
||||
virtual ~VAbstractCurve() Q_DECL_OVERRIDE;
|
||||
virtual ~VAbstractCurve() override;
|
||||
|
||||
VAbstractCurve& operator= (const VAbstractCurve &curve);
|
||||
#ifdef Q_COMPILER_RVALUE_REFS
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ public:
|
|||
VArc Rotate(const QPointF &originPoint, qreal degrees, const QString &prefix = QString()) const;
|
||||
VArc Flip(const QLineF &axis, const QString &prefix = QString()) const;
|
||||
VArc Move(qreal length, qreal angle, const QString &prefix = QString()) const;
|
||||
virtual ~VArc() Q_DECL_OVERRIDE;
|
||||
virtual ~VArc() override;
|
||||
|
||||
VArc& operator= (const VArc &arc);
|
||||
#ifdef Q_COMPILER_RVALUE_REFS
|
||||
|
|
@ -76,18 +76,18 @@ public:
|
|||
void SetFormulaRadius (const QString &formula, qreal value);
|
||||
qreal GetRadius () const;
|
||||
|
||||
virtual qreal GetLength () const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetLength () const override;
|
||||
|
||||
QPointF GetP1() const;
|
||||
QPointF GetP2 () const;
|
||||
|
||||
virtual QVector<QPointF> GetPoints () const Q_DECL_OVERRIDE;
|
||||
virtual QVector<QPointF> GetPoints () const override;
|
||||
|
||||
QPointF CutArc (const qreal &length, VArc &arc1, VArc &arc2) const;
|
||||
QPointF CutArc (const qreal &length) const;
|
||||
protected:
|
||||
virtual void CreateName() Q_DECL_OVERRIDE;
|
||||
virtual void FindF2(qreal length) Q_DECL_OVERRIDE;
|
||||
virtual void CreateName() override;
|
||||
virtual void FindF2(qreal length) override;
|
||||
private:
|
||||
QSharedDataPointer<VArcData> d;
|
||||
|
||||
|
|
|
|||
|
|
@ -63,29 +63,29 @@ public:
|
|||
inline void Swap(VCubicBezier &curve) Q_DECL_NOTHROW
|
||||
{ VAbstractCubicBezier::Swap(curve); std::swap(d, curve.d); }
|
||||
|
||||
virtual VPointF GetP1() const Q_DECL_OVERRIDE;
|
||||
virtual VPointF GetP1() const override;
|
||||
void SetP1(const VPointF &p);
|
||||
|
||||
virtual VPointF GetP2() const Q_DECL_OVERRIDE;
|
||||
virtual VPointF GetP2() const override;
|
||||
void SetP2(const VPointF &p);
|
||||
|
||||
virtual VPointF GetP3() const Q_DECL_OVERRIDE;
|
||||
virtual VPointF GetP3() const override;
|
||||
void SetP3(const VPointF &p);
|
||||
|
||||
virtual VPointF GetP4() const Q_DECL_OVERRIDE;
|
||||
virtual VPointF GetP4() const override;
|
||||
void SetP4(const VPointF &p);
|
||||
|
||||
virtual qreal GetStartAngle() const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetEndAngle() const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetLength() const Q_DECL_OVERRIDE;
|
||||
virtual QVector<QPointF> GetPoints() const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetStartAngle() const override;
|
||||
virtual qreal GetEndAngle() const override;
|
||||
virtual qreal GetLength() const override;
|
||||
virtual QVector<QPointF> GetPoints() const override;
|
||||
|
||||
virtual qreal GetC1Length() const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetC2Length() const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetC1Length() const override;
|
||||
virtual qreal GetC2Length() const override;
|
||||
|
||||
protected:
|
||||
virtual QPointF GetControlPoint1() const Q_DECL_OVERRIDE;
|
||||
virtual QPointF GetControlPoint2() const Q_DECL_OVERRIDE;
|
||||
virtual QPointF GetControlPoint1() const override;
|
||||
virtual QPointF GetControlPoint2() const override;
|
||||
|
||||
private:
|
||||
QSharedDataPointer<VCubicBezierData> d;
|
||||
|
|
|
|||
|
|
@ -70,25 +70,25 @@ public:
|
|||
|
||||
void append(const VPointF &point);
|
||||
|
||||
virtual qint32 CountSubSpl() const Q_DECL_OVERRIDE;
|
||||
virtual qint32 CountPoints() const Q_DECL_OVERRIDE;
|
||||
virtual void Clear() Q_DECL_OVERRIDE;
|
||||
virtual VSpline GetSpline(qint32 index) const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetStartAngle () const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetEndAngle () const Q_DECL_OVERRIDE;
|
||||
virtual qint32 CountSubSpl() const override;
|
||||
virtual qint32 CountPoints() const override;
|
||||
virtual void Clear() override;
|
||||
virtual VSpline GetSpline(qint32 index) const override;
|
||||
virtual qreal GetStartAngle () const override;
|
||||
virtual qreal GetEndAngle () const override;
|
||||
|
||||
virtual qreal GetC1Length() const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetC2Length() const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetC1Length() const override;
|
||||
virtual qreal GetC2Length() const override;
|
||||
|
||||
virtual QVector<VSplinePoint> GetSplinePath() const Q_DECL_OVERRIDE;
|
||||
virtual QVector<VSplinePoint> GetSplinePath() const override;
|
||||
QVector<VPointF> GetCubicPath() const;
|
||||
|
||||
static qint32 CountSubSpl(qint32 size);
|
||||
static qint32 SubSplOffset(qint32 subSplIndex);
|
||||
static qint32 SubSplPointsCount(qint32 countSubSpl);
|
||||
protected:
|
||||
virtual VPointF FirstPoint() const Q_DECL_OVERRIDE;
|
||||
virtual VPointF LastPoint() const Q_DECL_OVERRIDE;
|
||||
virtual VPointF FirstPoint() const override;
|
||||
virtual VPointF LastPoint() const override;
|
||||
private:
|
||||
QSharedDataPointer<VCubicBezierPathData> d;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ public:
|
|||
VEllipticalArc Flip(const QLineF &axis, const QString &prefix = QString()) const;
|
||||
VEllipticalArc Move(qreal length, qreal angle, const QString &prefix = QString()) const;
|
||||
|
||||
virtual ~VEllipticalArc() Q_DECL_OVERRIDE;
|
||||
virtual ~VEllipticalArc() override;
|
||||
|
||||
VEllipticalArc& operator= (const VEllipticalArc &arc);
|
||||
#ifdef Q_COMPILER_RVALUE_REFS
|
||||
|
|
@ -87,7 +87,7 @@ public:
|
|||
void SetFormulaRadius2 (const QString &formula, qreal value);
|
||||
qreal GetRadius2 () const;
|
||||
|
||||
virtual qreal GetLength () const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetLength () const override;
|
||||
|
||||
QPointF GetP1() const;
|
||||
QPointF GetP2() const;
|
||||
|
|
@ -95,18 +95,18 @@ public:
|
|||
QTransform GetTransform() const;
|
||||
void SetTransform(const QTransform &matrix, bool combine = false);
|
||||
|
||||
virtual VPointF GetCenter () const Q_DECL_OVERRIDE;
|
||||
virtual QVector<QPointF> GetPoints () const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetStartAngle () const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetEndAngle () const Q_DECL_OVERRIDE;
|
||||
virtual VPointF GetCenter () const override;
|
||||
virtual QVector<QPointF> GetPoints () const override;
|
||||
virtual qreal GetStartAngle () const override;
|
||||
virtual qreal GetEndAngle () const override;
|
||||
|
||||
QPointF CutArc (const qreal &length, VEllipticalArc &arc1, VEllipticalArc &arc2) const;
|
||||
QPointF CutArc (const qreal &length) const;
|
||||
|
||||
static qreal OptimizeAngle(qreal angle);
|
||||
protected:
|
||||
virtual void CreateName() Q_DECL_OVERRIDE;
|
||||
virtual void FindF2(qreal length) Q_DECL_OVERRIDE;
|
||||
virtual void CreateName() override;
|
||||
virtual void FindF2(qreal length) override;
|
||||
private:
|
||||
QSharedDataPointer<VEllipticalArcData> d;
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ class VPlaceLabelItem : public VPointF
|
|||
public:
|
||||
VPlaceLabelItem();
|
||||
VPlaceLabelItem(const VPlaceLabelItem &item);
|
||||
virtual ~VPlaceLabelItem() Q_DECL_OVERRIDE;
|
||||
virtual ~VPlaceLabelItem() override;
|
||||
|
||||
VPlaceLabelItem &operator=(const VPlaceLabelItem &item);
|
||||
#ifdef Q_COMPILER_RVALUE_REFS
|
||||
|
|
|
|||
|
|
@ -58,7 +58,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() Q_DECL_OVERRIDE;
|
||||
virtual ~VPointF() override;
|
||||
|
||||
VPointF &operator=(const VPointF &point);
|
||||
#ifdef Q_COMPILER_RVALUE_REFS
|
||||
|
|
|
|||
|
|
@ -73,17 +73,17 @@ public:
|
|||
inline void Swap(VSpline &spline) Q_DECL_NOTHROW
|
||||
{ VAbstractCubicBezier::Swap(spline); std::swap(d, spline.d); }
|
||||
|
||||
virtual VPointF GetP1 () const Q_DECL_OVERRIDE;
|
||||
virtual VPointF GetP1 () const override;
|
||||
void SetP1 (const VPointF &p);
|
||||
|
||||
virtual VPointF GetP2 () const Q_DECL_OVERRIDE;
|
||||
virtual VPointF GetP3 () const Q_DECL_OVERRIDE;
|
||||
virtual VPointF GetP2 () const override;
|
||||
virtual VPointF GetP3 () const override;
|
||||
|
||||
virtual VPointF GetP4 () const Q_DECL_OVERRIDE;
|
||||
virtual VPointF GetP4 () const override;
|
||||
void SetP4 (const VPointF &p);
|
||||
|
||||
virtual qreal GetStartAngle () const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetEndAngle() const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetStartAngle () const override;
|
||||
virtual qreal GetEndAngle() const override;
|
||||
|
||||
QString GetStartAngleFormula () const;
|
||||
QString GetEndAngleFormula() const;
|
||||
|
|
@ -91,8 +91,8 @@ public:
|
|||
void SetStartAngle(qreal angle, const QString &formula);
|
||||
void SetEndAngle(qreal angle, const QString &formula);
|
||||
|
||||
virtual qreal GetC1Length() const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetC2Length() const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetC1Length() const override;
|
||||
virtual qreal GetC2Length() const override;
|
||||
|
||||
QString GetC1LengthFormula() const;
|
||||
QString GetC2LengthFormula() const;
|
||||
|
|
@ -100,7 +100,7 @@ public:
|
|||
void SetC1Length(qreal length, const QString &formula);
|
||||
void SetC2Length(qreal length, const QString &formula);
|
||||
|
||||
virtual qreal GetLength () const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetLength () const override;
|
||||
qreal GetKasm1() const;
|
||||
qreal GetKasm2() const;
|
||||
qreal GetKcurve() const;
|
||||
|
|
@ -108,15 +108,15 @@ public:
|
|||
using VAbstractCubicBezier::CutSpline;
|
||||
QPointF CutSpline ( qreal length, VSpline &spl1, VSpline &spl2) const;
|
||||
|
||||
virtual QVector<QPointF> GetPoints () const Q_DECL_OVERRIDE;
|
||||
virtual QVector<QPointF> GetPoints () const override;
|
||||
// cppcheck-suppress unusedFunction
|
||||
static QVector<QPointF> SplinePoints(const QPointF &p1, const QPointF &p4, qreal angle1, qreal angle2, qreal kAsm1,
|
||||
qreal kAsm2, qreal kCurve, qreal approximationScale);
|
||||
qreal ParamT(const QPointF &pBt) const;
|
||||
|
||||
protected:
|
||||
virtual QPointF GetControlPoint1() const Q_DECL_OVERRIDE;
|
||||
virtual QPointF GetControlPoint2() const Q_DECL_OVERRIDE;
|
||||
virtual QPointF GetControlPoint1() const override;
|
||||
virtual QPointF GetControlPoint2() const override;
|
||||
private:
|
||||
QSharedDataPointer<VSplineData> d;
|
||||
QVector<qreal> CalcT(qreal curveCoord1, qreal curveCoord2, qreal curveCoord3, qreal curveCoord4,
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ public:
|
|||
VSplinePath Rotate(const QPointF &originPoint, qreal degrees, const QString &prefix = QString()) const;
|
||||
VSplinePath Flip(const QLineF &axis, const QString &prefix = QString()) const;
|
||||
VSplinePath Move(qreal length, qreal angle, const QString &prefix = QString()) const;
|
||||
virtual ~VSplinePath() Q_DECL_OVERRIDE;
|
||||
virtual ~VSplinePath() override;
|
||||
|
||||
VSplinePoint &operator[](int indx);
|
||||
VSplinePath &operator=(const VSplinePath &path);
|
||||
|
|
@ -75,27 +75,27 @@ public:
|
|||
|
||||
void append(const VSplinePoint &point);
|
||||
|
||||
virtual qint32 CountSubSpl() const Q_DECL_OVERRIDE;
|
||||
virtual qint32 CountPoints() const Q_DECL_OVERRIDE;
|
||||
virtual void Clear() Q_DECL_OVERRIDE;
|
||||
virtual VSpline GetSpline(qint32 index) const Q_DECL_OVERRIDE;
|
||||
virtual qint32 CountSubSpl() const override;
|
||||
virtual qint32 CountPoints() const override;
|
||||
virtual void Clear() override;
|
||||
virtual VSpline GetSpline(qint32 index) const override;
|
||||
|
||||
virtual QVector<VSplinePoint> GetSplinePath() const Q_DECL_OVERRIDE;
|
||||
virtual QVector<VSplinePoint> GetSplinePath() const override;
|
||||
QVector<VFSplinePoint> GetFSplinePath() const;
|
||||
|
||||
virtual qreal GetStartAngle () const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetEndAngle () const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetStartAngle () const override;
|
||||
virtual qreal GetEndAngle () const override;
|
||||
|
||||
virtual qreal GetC1Length() const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetC2Length() const Q_DECL_OVERRIDE;
|
||||
virtual qreal GetC1Length() const override;
|
||||
virtual qreal GetC2Length() const override;
|
||||
|
||||
void UpdatePoint(qint32 indexSpline, const SplinePointPosition &pos, const VSplinePoint &point);
|
||||
VSplinePoint GetSplinePoint(qint32 indexSpline, SplinePointPosition pos) const;
|
||||
|
||||
const VSplinePoint &at(int indx) const;
|
||||
protected:
|
||||
virtual VPointF FirstPoint() const Q_DECL_OVERRIDE;
|
||||
virtual VPointF LastPoint() const Q_DECL_OVERRIDE;
|
||||
virtual VPointF FirstPoint() const override;
|
||||
virtual VPointF LastPoint() const override;
|
||||
private:
|
||||
QSharedDataPointer<VSplinePathData> d;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ class VLayoutGenerator :public QObject
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit VLayoutGenerator(QObject *parent = nullptr);
|
||||
virtual ~VLayoutGenerator() Q_DECL_OVERRIDE;
|
||||
virtual ~VLayoutGenerator() override;
|
||||
|
||||
void SetDetails(const QVector<VLayoutPiece> &details);
|
||||
void SetLayoutWidth(qreal width);
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ public:
|
|||
VLayoutPiece();
|
||||
VLayoutPiece(const VLayoutPiece &detail);
|
||||
|
||||
virtual ~VLayoutPiece() Q_DECL_OVERRIDE;
|
||||
virtual ~VLayoutPiece() override;
|
||||
|
||||
VLayoutPiece &operator=(const VLayoutPiece &detail);
|
||||
#ifdef Q_COMPILER_RVALUE_REFS
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ class VPosition : public QRunnable
|
|||
public:
|
||||
VPosition(const VContour &gContour, int j, const VLayoutPiece &detail, int i, std::atomic_bool *stop, bool rotate,
|
||||
int rotationIncrease, bool saveLength);
|
||||
virtual ~VPosition() Q_DECL_OVERRIDE{}
|
||||
virtual ~VPosition() override{}
|
||||
|
||||
quint32 getPaperIndex() const;
|
||||
void setPaperIndex(const quint32 &value);
|
||||
|
|
@ -98,7 +98,7 @@ private:
|
|||
EdgeError = 2
|
||||
};
|
||||
|
||||
virtual void run() Q_DECL_OVERRIDE;
|
||||
virtual void run() override;
|
||||
|
||||
void SaveCandidate(VBestSquare &bestResult, const VLayoutPiece &detail, int globalI, int detJ, BestFrom type);
|
||||
|
||||
|
|
|
|||
|
|
@ -59,8 +59,8 @@ public:
|
|||
static QString MakeHelpSeparatorList();
|
||||
|
||||
protected:
|
||||
virtual void changeEvent(QEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
|
||||
virtual void changeEvent(QEvent* event) override;
|
||||
virtual void showEvent(QShowEvent *event) override;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(DialogExportToCSV)
|
||||
|
|
|
|||
|
|
@ -61,14 +61,14 @@ public:
|
|||
QChar separator = ',', QTextCodec *codec = nullptr);
|
||||
virtual ~QxtCsvModel() Q_DECL_EQ_DEFAULT;
|
||||
|
||||
virtual int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
|
||||
virtual int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
|
||||
virtual bool setData(const QModelIndex& index, const QVariant& data, int role = Qt::EditRole) Q_DECL_OVERRIDE;
|
||||
virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override;
|
||||
virtual int columnCount(const QModelIndex& parent = QModelIndex()) const override;
|
||||
virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
|
||||
virtual bool setData(const QModelIndex& index, const QVariant& data, int role = Qt::EditRole) override;
|
||||
virtual QVariant headerData(int section, Qt::Orientation orientation,
|
||||
int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
|
||||
int role = Qt::DisplayRole) const override;
|
||||
virtual bool setHeaderData(int section, Qt::Orientation orientation, const QVariant& value,
|
||||
int role = Qt::DisplayRole) Q_DECL_OVERRIDE;
|
||||
int role = Qt::DisplayRole) override;
|
||||
void setHeaderData(const QStringList& data);
|
||||
|
||||
QString text(int row, int column) const;
|
||||
|
|
@ -79,16 +79,16 @@ public:
|
|||
|
||||
|
||||
bool insertRow(int row, const QModelIndex& parent = QModelIndex());
|
||||
virtual bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
|
||||
virtual bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
|
||||
|
||||
bool removeRow(int row, const QModelIndex& parent = QModelIndex());
|
||||
virtual bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
|
||||
virtual bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
|
||||
|
||||
bool insertColumn(int col, const QModelIndex& parent = QModelIndex());
|
||||
virtual bool insertColumns(int col, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
|
||||
virtual bool insertColumns(int col, int count, const QModelIndex& parent = QModelIndex()) override;
|
||||
|
||||
bool removeColumn(int col, const QModelIndex& parent = QModelIndex());
|
||||
virtual bool removeColumns(int col, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
|
||||
virtual bool removeColumns(int col, int count, const QModelIndex& parent = QModelIndex()) override;
|
||||
|
||||
void setSource(QIODevice *file, bool withHeader = false, QChar separator = ',', QTextCodec* codec = nullptr);
|
||||
void setSource(const QString &filename, bool withHeader = false, QChar separator = ',',
|
||||
|
|
@ -113,7 +113,7 @@ public:
|
|||
QuoteMode quoteMode() const;
|
||||
void setQuoteMode(QuoteMode mode);
|
||||
|
||||
virtual Qt::ItemFlags flags(const QModelIndex& index) const Q_DECL_OVERRIDE;
|
||||
virtual Qt::ItemFlags flags(const QModelIndex& index) const override;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(QxtCsvModel)
|
||||
|
|
|
|||
|
|
@ -54,23 +54,23 @@ public:
|
|||
|
||||
virtual ~TestVApplication() Q_DECL_EQ_DEFAULT;
|
||||
|
||||
virtual const VTranslateVars *TrVars() Q_DECL_OVERRIDE
|
||||
virtual const VTranslateVars *TrVars() override
|
||||
{
|
||||
return m_trVars;
|
||||
}
|
||||
|
||||
virtual void OpenSettings() Q_DECL_OVERRIDE
|
||||
virtual void OpenSettings() override
|
||||
{
|
||||
settings = new VSettings(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(),
|
||||
QCoreApplication::applicationName(), this);
|
||||
}
|
||||
|
||||
virtual bool IsAppInGUIMode() const Q_DECL_OVERRIDE
|
||||
virtual bool IsAppInGUIMode() const override
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
virtual void InitTrVars() Q_DECL_OVERRIDE
|
||||
virtual void InitTrVars() override
|
||||
{}
|
||||
|
||||
void SetTrVars(VTranslateVars *trVars)
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ class VAbstractApplication : public QApplication
|
|||
Q_OBJECT
|
||||
public:
|
||||
VAbstractApplication(int &argc, char ** argv);
|
||||
virtual ~VAbstractApplication() Q_DECL_OVERRIDE;
|
||||
virtual ~VAbstractApplication() override;
|
||||
|
||||
virtual const VTranslateVars *TrVars()=0;
|
||||
|
||||
|
|
|
|||
|
|
@ -48,18 +48,18 @@ class VObjEngine : public QPaintEngine
|
|||
{
|
||||
public:
|
||||
VObjEngine();
|
||||
virtual ~VObjEngine() Q_DECL_OVERRIDE;
|
||||
virtual ~VObjEngine() override;
|
||||
|
||||
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;
|
||||
virtual bool begin(QPaintDevice *pdev) override;
|
||||
virtual bool end() override;
|
||||
virtual void updateState(const QPaintEngineState &state) override;
|
||||
virtual void drawPath(const QPainterPath &path) override;
|
||||
virtual Type type() const override;
|
||||
virtual void drawPoints(const QPointF *points, int pointCount) override;
|
||||
virtual void drawPoints(const QPoint *points, int pointCount) override;
|
||||
virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override;
|
||||
virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override;
|
||||
virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) override;
|
||||
|
||||
QSize getSize() const;
|
||||
void setSize(const QSize &value);
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ class VObjPaintDevice : public QPaintDevice
|
|||
{
|
||||
public:
|
||||
VObjPaintDevice();
|
||||
virtual ~VObjPaintDevice() Q_DECL_OVERRIDE;
|
||||
virtual QPaintEngine *paintEngine() const Q_DECL_OVERRIDE;
|
||||
virtual ~VObjPaintDevice() override;
|
||||
virtual QPaintEngine *paintEngine() const override;
|
||||
|
||||
QString getFileName() const;
|
||||
void setFileName(const QString &value);
|
||||
|
|
@ -59,7 +59,7 @@ public:
|
|||
void setResolution(int dpi);
|
||||
|
||||
protected:
|
||||
virtual int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE;
|
||||
virtual int metric(PaintDeviceMetric metric) const override;
|
||||
private:
|
||||
Q_DISABLE_COPY(VObjPaintDevice)
|
||||
QSharedPointer<VObjEngine> engine;
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public:
|
|||
Unit patternUnit);
|
||||
VArcRadius(const VArcRadius &var);
|
||||
VArcRadius &operator=(const VArcRadius &var);
|
||||
virtual ~VArcRadius() Q_DECL_OVERRIDE;
|
||||
virtual ~VArcRadius() override;
|
||||
};
|
||||
|
||||
#endif // VARCRADIUS_H
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public:
|
|||
:QSharedData(var), arcId(var.arcId)
|
||||
{}
|
||||
|
||||
virtual ~VArcRadiusData() Q_DECL_OVERRIDE;
|
||||
virtual ~VArcRadiusData() override;
|
||||
|
||||
quint32 arcId;
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ public:
|
|||
CurveCLength cType, Unit patternUnit, qint32 segment);
|
||||
VCurveCLength(const VCurveCLength &var);
|
||||
VCurveCLength &operator=(const VCurveCLength &var);
|
||||
virtual ~VCurveCLength() Q_DECL_OVERRIDE;
|
||||
virtual ~VCurveCLength() override;
|
||||
};
|
||||
|
||||
#endif // VCURVECLENGTH_H
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ public:
|
|||
Unit patternUnit, qint32 segment);
|
||||
VCurveLength(const VCurveLength &var);
|
||||
VCurveLength &operator=(const VCurveLength &var);
|
||||
virtual ~VCurveLength() Q_DECL_OVERRIDE;
|
||||
virtual ~VCurveLength() override;
|
||||
};
|
||||
|
||||
#endif // VCURVELENGTH_H
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ public:
|
|||
VCurveVariable(const quint32 &id, const quint32 &parentId);
|
||||
VCurveVariable(const VCurveVariable &var);
|
||||
|
||||
virtual ~VCurveVariable() Q_DECL_OVERRIDE;
|
||||
virtual ~VCurveVariable() override;
|
||||
|
||||
VCurveVariable &operator=(const VCurveVariable &var);
|
||||
#ifdef Q_COMPILER_RVALUE_REFS
|
||||
|
|
@ -55,7 +55,7 @@ public:
|
|||
inline void Swap(VCurveVariable &var) Q_DECL_NOTHROW
|
||||
{ VInternalVariable::Swap(var); std::swap(d, var.d); }
|
||||
|
||||
virtual bool Filter(quint32 id) Q_DECL_OVERRIDE;
|
||||
virtual bool Filter(quint32 id) override;
|
||||
|
||||
quint32 GetId() const;
|
||||
void SetId(const quint32 &id);
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ public:
|
|||
const QString &description = QString());
|
||||
VIncrement(const VIncrement &incr);
|
||||
|
||||
virtual ~VIncrement() Q_DECL_OVERRIDE;
|
||||
virtual ~VIncrement() override;
|
||||
|
||||
VIncrement &operator=(const VIncrement &incr);
|
||||
#ifdef Q_COMPILER_RVALUE_REFS
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ public:
|
|||
VLineAngle(const VPointF *p1, const quint32 &p1Id, const VPointF *p2, const quint32 &p2Id);
|
||||
VLineAngle(const VLineAngle &var);
|
||||
|
||||
virtual ~VLineAngle() Q_DECL_OVERRIDE;
|
||||
virtual ~VLineAngle() override;
|
||||
|
||||
VLineAngle &operator=(const VLineAngle &var);
|
||||
#ifdef Q_COMPILER_RVALUE_REFS
|
||||
|
|
@ -56,7 +56,7 @@ public:
|
|||
inline void Swap(VLineAngle &var) Q_DECL_NOTHROW
|
||||
{ VInternalVariable::Swap(var); std::swap(d, var.d); }
|
||||
|
||||
virtual bool Filter(quint32 id) Q_DECL_OVERRIDE;
|
||||
virtual bool Filter(quint32 id) override;
|
||||
void SetValue(const VPointF *p1, const VPointF *p2);
|
||||
quint32 GetP1Id() const;
|
||||
quint32 GetP2Id() const;
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public:
|
|||
VLengthLine(const VPointF *p1, const quint32 &p1Id, const VPointF *p2, const quint32 &p2Id, Unit patternUnit);
|
||||
VLengthLine(const VLengthLine &var);
|
||||
|
||||
virtual ~VLengthLine() Q_DECL_OVERRIDE;
|
||||
virtual ~VLengthLine() override;
|
||||
|
||||
VLengthLine &operator=(const VLengthLine &var);
|
||||
#ifdef Q_COMPILER_RVALUE_REFS
|
||||
|
|
@ -58,7 +58,7 @@ public:
|
|||
inline void Swap(VLengthLine &var) Q_DECL_NOTHROW
|
||||
{ VInternalVariable::Swap(var); std::swap(d, var.d); }
|
||||
|
||||
virtual bool Filter(quint32 id) Q_DECL_OVERRIDE;
|
||||
virtual bool Filter(quint32 id) override;
|
||||
void SetValue(const VPointF *p1, const VPointF *p2);
|
||||
quint32 GetP1Id() const;
|
||||
quint32 GetP2Id() const;
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ public:
|
|||
const QString &tagName = QString());
|
||||
VMeasurement(const VMeasurement &m);
|
||||
|
||||
virtual ~VMeasurement() Q_DECL_OVERRIDE;
|
||||
virtual ~VMeasurement() override;
|
||||
|
||||
VMeasurement &operator=(const VMeasurement &m);
|
||||
#ifdef Q_COMPILER_RVALUE_REFS
|
||||
|
|
@ -80,10 +80,10 @@ public:
|
|||
int Index() const;
|
||||
bool IsFormulaOk() const;
|
||||
|
||||
virtual bool IsNotUsed() const Q_DECL_OVERRIDE;
|
||||
virtual bool IsNotUsed() const override;
|
||||
|
||||
virtual qreal GetValue() const Q_DECL_OVERRIDE;
|
||||
virtual qreal* GetValue() Q_DECL_OVERRIDE;
|
||||
virtual qreal GetValue() const override;
|
||||
virtual qreal* GetValue() override;
|
||||
|
||||
VContainer *GetData();
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public:
|
|||
VVariable(const QString &name, const QString &description = QString());
|
||||
VVariable(const VVariable &var);
|
||||
|
||||
virtual ~VVariable() Q_DECL_OVERRIDE;
|
||||
virtual ~VVariable() override;
|
||||
|
||||
VVariable &operator=(const VVariable &var);
|
||||
#ifdef Q_COMPILER_RVALUE_REFS
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ public:
|
|||
QString FormulaToUser(const QString &formula, bool osSeparator) const;
|
||||
static QString TryFormulaToUser(const QString &formula, bool osSeparator);
|
||||
|
||||
virtual void Retranslate() Q_DECL_OVERRIDE;
|
||||
virtual void Retranslate() override;
|
||||
|
||||
QMap<QString, QString> GetTranslatedFunctions() const;
|
||||
QMap<QString, qmu::QmuTranslation> GetFunctions() const;
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ class VPROPERTYEXPLORERSHARED_EXPORT CheckableMessageBox : public QDialog
|
|||
|
||||
public:
|
||||
explicit CheckableMessageBox(QWidget *parent);
|
||||
virtual ~CheckableMessageBox() Q_DECL_OVERRIDE;
|
||||
virtual ~CheckableMessageBox() override;
|
||||
|
||||
static QDialogButtonBox::StandardButton
|
||||
question(QWidget *parent,
|
||||
|
|
|
|||
|
|
@ -76,13 +76,13 @@ class VPROPERTYEXPLORERSHARED_EXPORT QVector3DProperty : public VProperty
|
|||
public:
|
||||
explicit QVector3DProperty(const QString& name);
|
||||
|
||||
virtual ~QVector3DProperty() Q_DECL_OVERRIDE {}
|
||||
virtual ~QVector3DProperty() override {}
|
||||
|
||||
//! Get the data how it should be displayed
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const override;
|
||||
|
||||
//! Returns item flags
|
||||
virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE;
|
||||
virtual Qt::ItemFlags flags(int column = DPC_Name) const override;
|
||||
|
||||
//! Returns the Vector3d
|
||||
virtual Vector3D getVector() const;
|
||||
|
|
@ -94,20 +94,20 @@ public:
|
|||
virtual void setVector(double x, double y, double z);
|
||||
|
||||
//! Returns a string containing the type of the property
|
||||
virtual QString type() const Q_DECL_OVERRIDE;
|
||||
virtual QString type() const 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 Q_DECL_OVERRIDE;
|
||||
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const override;
|
||||
|
||||
//! Sets the value of the property
|
||||
virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE;
|
||||
virtual void setValue(const QVariant& value) override;
|
||||
|
||||
//! Returns the value of the property as a QVariant
|
||||
virtual QVariant getValue() const Q_DECL_OVERRIDE;
|
||||
virtual QVariant getValue() const override;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(QVector3DProperty)
|
||||
|
|
|
|||
|
|
@ -45,29 +45,29 @@ public:
|
|||
explicit VBoolProperty(const QString& name);
|
||||
|
||||
//! Destructor
|
||||
virtual ~VBoolProperty() Q_DECL_OVERRIDE {}
|
||||
virtual ~VBoolProperty() override {}
|
||||
|
||||
//! Get the data how it should be displayed
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const 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) Q_DECL_OVERRIDE;
|
||||
virtual bool setData (const QVariant& data, int role = Qt::EditRole) override;
|
||||
|
||||
//! Returns item flags
|
||||
virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE;
|
||||
virtual Qt::ItemFlags flags(int column = DPC_Name) const override;
|
||||
|
||||
//! Returns a string containing the type of the property
|
||||
virtual QString type() const Q_DECL_OVERRIDE;
|
||||
virtual QString type() const 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 Q_DECL_OVERRIDE;
|
||||
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const override;
|
||||
|
||||
protected:
|
||||
//! The (translatable) text displayed when the property is set to true (default: "True")
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ public:
|
|||
explicit VColorProperty(const QString &name);
|
||||
|
||||
//! Get the data how it should be displayed
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const 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
|
||||
|
|
@ -52,23 +52,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) Q_DECL_OVERRIDE;
|
||||
const QAbstractItemDelegate* delegate) override;
|
||||
|
||||
//! Sets the property's data to the editor (returns false, if the standard delegate should do that)
|
||||
virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE;
|
||||
virtual bool setEditorData(QWidget* editor) override;
|
||||
|
||||
//! Gets the data from the widget
|
||||
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant getEditorData(const QWidget* editor) const override;
|
||||
|
||||
//! Returns a string containing the type of the property
|
||||
virtual QString type() const Q_DECL_OVERRIDE;
|
||||
virtual QString type() const 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 Q_DECL_OVERRIDE;
|
||||
virtual VProperty* clone(bool include_children = true, VProperty* container = NULL) const override;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(VColorProperty)
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public:
|
|||
explicit VColorPropertyEditor(QWidget *parent);
|
||||
|
||||
//! Destructor
|
||||
virtual ~VColorPropertyEditor() Q_DECL_OVERRIDE;
|
||||
virtual ~VColorPropertyEditor() override;
|
||||
|
||||
|
||||
//! Returns the color currently set
|
||||
|
|
@ -66,7 +66,7 @@ public:
|
|||
static QString GetColorString(const QColor& color);
|
||||
|
||||
//! Needed for proper event handling
|
||||
virtual bool eventFilter(QObject *obj, QEvent *ev) Q_DECL_OVERRIDE;
|
||||
virtual bool eventFilter(QObject *obj, QEvent *ev) override;
|
||||
|
||||
signals:
|
||||
//! This is emitted, when the user changes the color
|
||||
|
|
|
|||
|
|
@ -49,10 +49,10 @@ public:
|
|||
explicit VEmptyProperty(const QString& name);
|
||||
|
||||
//! Destructor
|
||||
virtual ~VEmptyProperty() Q_DECL_OVERRIDE;
|
||||
virtual ~VEmptyProperty() override;
|
||||
|
||||
//! Get the data how it should be displayed
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const 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,16 +60,16 @@ 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) Q_DECL_OVERRIDE;
|
||||
const QAbstractItemDelegate* delegate) override;
|
||||
|
||||
//! Gets the data from the widget
|
||||
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant getEditorData(const QWidget* editor) const override;
|
||||
|
||||
//! Returns item flags
|
||||
virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE;
|
||||
virtual Qt::ItemFlags flags(int column = DPC_Name) const override;
|
||||
|
||||
//! Returns a string containing the type of the property
|
||||
virtual QString type() const Q_DECL_OVERRIDE;
|
||||
virtual QString type() const override;
|
||||
|
||||
//! Clones this property
|
||||
//! \param include_children Indicates whether to also clone the children
|
||||
|
|
@ -77,7 +77,7 @@ public:
|
|||
//! 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)
|
||||
Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true,
|
||||
VProperty* container = nullptr) const Q_DECL_OVERRIDE;
|
||||
VProperty* container = nullptr) const override;
|
||||
|
||||
protected:
|
||||
//! Protected constructor
|
||||
|
|
|
|||
|
|
@ -45,10 +45,10 @@ public:
|
|||
explicit VEnumProperty(const QString& name);
|
||||
|
||||
//! Destructor
|
||||
virtual ~VEnumProperty() Q_DECL_OVERRIDE {}
|
||||
virtual ~VEnumProperty() override {}
|
||||
|
||||
//! Get the data how it should be displayed
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const 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) Q_DECL_OVERRIDE;
|
||||
const QAbstractItemDelegate* delegate) override;
|
||||
|
||||
//! Gets the data from the widget
|
||||
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant getEditorData(const QWidget* editor) const override;
|
||||
|
||||
//! Sets the enumeration literals
|
||||
virtual void setLiterals(const QStringList &literals);
|
||||
|
|
@ -68,10 +68,10 @@ public:
|
|||
virtual QStringList getLiterals() const;
|
||||
|
||||
//! Sets the value of the property
|
||||
virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE;
|
||||
virtual void setValue(const QVariant& value) override;
|
||||
|
||||
//! Returns a string containing the type of the property
|
||||
virtual QString type() const Q_DECL_OVERRIDE;
|
||||
virtual QString type() const override;
|
||||
|
||||
//! Clones this property
|
||||
//! \param include_children Indicates whether to also clone the children
|
||||
|
|
@ -79,18 +79,18 @@ public:
|
|||
//! 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)
|
||||
Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true,
|
||||
VProperty* container = nullptr) const Q_DECL_OVERRIDE;
|
||||
VProperty* container = nullptr) const override;
|
||||
|
||||
//! Sets the settings. Available settings:
|
||||
//!
|
||||
//! key: "literals" - value: "item1;;item2;;item3"
|
||||
virtual void setSetting(const QString& key, const QVariant& value) Q_DECL_OVERRIDE;
|
||||
virtual void setSetting(const QString& key, const QVariant& value) 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 Q_DECL_OVERRIDE;
|
||||
virtual QVariant getSetting(const QString& key) const override;
|
||||
|
||||
//! Returns the list of keys of the property's settings
|
||||
virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE;
|
||||
virtual QStringList getSettingKeys() const override;
|
||||
|
||||
public slots:
|
||||
void currentIndexChanged(int index);
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ public:
|
|||
explicit VFileProperty(const QString &name);
|
||||
|
||||
//! The destructor
|
||||
virtual ~VFileProperty() Q_DECL_OVERRIDE;
|
||||
virtual ~VFileProperty() override;
|
||||
|
||||
//! Sets the file filters. The file filters have to be like the ones passed a QFileOpenDialog.
|
||||
virtual void setFileFilters(const QString& filefilters);
|
||||
|
|
@ -60,7 +60,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 Q_DECL_OVERRIDE;
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const 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
|
||||
|
|
@ -68,27 +68,27 @@ 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) Q_DECL_OVERRIDE;
|
||||
const QAbstractItemDelegate* delegate) override;
|
||||
|
||||
//! Sets the property's data to the editor (returns false, if the standard delegate should do that)
|
||||
virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE;
|
||||
virtual bool setEditorData(QWidget* editor) override;
|
||||
|
||||
//! Gets the data from the widget
|
||||
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant getEditorData(const QWidget* editor) const 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) Q_DECL_OVERRIDE;
|
||||
virtual void setSetting(const QString& key, const QVariant& value) 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 Q_DECL_OVERRIDE;
|
||||
virtual QVariant getSetting(const QString& key) const override;
|
||||
|
||||
//! Returns the list of keys of the property's settings
|
||||
virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE;
|
||||
virtual QStringList getSettingKeys() const override;
|
||||
|
||||
//! Returns a string containing the type of the property
|
||||
virtual QString type() const Q_DECL_OVERRIDE;
|
||||
virtual QString type() const override;
|
||||
|
||||
//! Clones this property
|
||||
//! \param include_children Indicates whether to also clone the children
|
||||
|
|
@ -96,7 +96,7 @@ public:
|
|||
//! 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)
|
||||
Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true,
|
||||
VProperty* container = nullptr) const Q_DECL_OVERRIDE;
|
||||
VProperty* container = nullptr) const override;
|
||||
|
||||
//! Returns whether this is a file (false) or a directory (true)
|
||||
virtual bool isDirectory() const;
|
||||
|
|
|
|||
|
|
@ -44,14 +44,14 @@ class VPROPERTYEXPLORERSHARED_EXPORT VFileEditWidget : public QWidget
|
|||
|
||||
public:
|
||||
explicit VFileEditWidget(QWidget* parent, bool is_directory = false);
|
||||
virtual ~VFileEditWidget() Q_DECL_OVERRIDE;
|
||||
virtual ~VFileEditWidget() override;
|
||||
|
||||
|
||||
//! This function returns the file currently set to this editor
|
||||
QString getFile() const;
|
||||
|
||||
//! Needed for proper event handling
|
||||
virtual bool eventFilter(QObject* obj, QEvent* ev) Q_DECL_OVERRIDE;
|
||||
virtual bool eventFilter(QObject* obj, QEvent* ev) override;
|
||||
|
||||
//! Returns the directory/file setting
|
||||
//! \return True, if a directory dialog is being shown, false if a file dialog
|
||||
|
|
@ -88,10 +88,10 @@ private slots:
|
|||
void onToolButtonClicked();
|
||||
|
||||
protected:
|
||||
virtual void dragEnterEvent(QDragEnterEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void dragMoveEvent(QDragMoveEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void dragLeaveEvent(QDragLeaveEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void dropEvent(QDropEvent* event) Q_DECL_OVERRIDE;
|
||||
virtual void dragEnterEvent(QDragEnterEvent* event) override;
|
||||
virtual void dragMoveEvent(QDragMoveEvent* event) override;
|
||||
virtual void dragLeaveEvent(QDragLeaveEvent* event) override;
|
||||
virtual void dropEvent(QDropEvent* event) override;
|
||||
|
||||
//! This function checks the mime data, if it is compatible with the filters
|
||||
virtual bool checkMimeData(const QMimeData* data, QString& file) const;
|
||||
|
|
|
|||
|
|
@ -61,22 +61,22 @@ 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) Q_DECL_OVERRIDE;
|
||||
const QAbstractItemDelegate* delegate) override;
|
||||
|
||||
//! Gets the data from the widget
|
||||
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant getEditorData(const QWidget* editor) const override;
|
||||
|
||||
//! Sets the settings.
|
||||
virtual void setSetting(const QString& key, const QVariant& value) Q_DECL_OVERRIDE;
|
||||
virtual void setSetting(const QString& key, const QVariant& value) 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 Q_DECL_OVERRIDE;
|
||||
virtual QVariant getSetting(const QString& key) const override;
|
||||
|
||||
//! Returns the list of keys of the property's settings
|
||||
virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE;
|
||||
virtual QStringList getSettingKeys() const override;
|
||||
|
||||
//! Returns a string containing the type of the property
|
||||
virtual QString type() const Q_DECL_OVERRIDE;
|
||||
virtual QString type() const override;
|
||||
|
||||
//! Clones this property
|
||||
//! \param include_children Indicates whether to also clone the children
|
||||
|
|
@ -84,9 +84,9 @@ public:
|
|||
//! 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)
|
||||
Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true,
|
||||
VProperty* container = nullptr) const Q_DECL_OVERRIDE;
|
||||
VProperty* container = nullptr) const override;
|
||||
|
||||
virtual void UpdateParent(const QVariant &value) Q_DECL_OVERRIDE;
|
||||
virtual void UpdateParent(const QVariant &value) override;
|
||||
|
||||
int getTypeForParent() const;
|
||||
void setTypeForParent(int value);
|
||||
|
|
|
|||
|
|
@ -54,10 +54,10 @@ public:
|
|||
explicit VLineColorProperty(const QString& name);
|
||||
|
||||
//! Destructor
|
||||
virtual ~VLineColorProperty() Q_DECL_OVERRIDE {}
|
||||
virtual ~VLineColorProperty() override {}
|
||||
|
||||
//! Get the data how it should be displayed
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const 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
|
||||
|
|
@ -65,10 +65,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) Q_DECL_OVERRIDE;
|
||||
const QAbstractItemDelegate* delegate) override;
|
||||
|
||||
//! Gets the data from the widget
|
||||
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant getEditorData(const QWidget* editor) const override;
|
||||
|
||||
//! Sets the colors
|
||||
virtual void setColors(const QMap<QString, QString> &colors);
|
||||
|
|
@ -77,10 +77,10 @@ public:
|
|||
virtual QMap<QString, QString> getColors() const;
|
||||
|
||||
//! Sets the value of the property
|
||||
virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE;
|
||||
virtual void setValue(const QVariant& value) override;
|
||||
|
||||
//! Returns a string containing the type of the property
|
||||
virtual QString type() const Q_DECL_OVERRIDE;
|
||||
virtual QString type() const override;
|
||||
|
||||
//! Clones this property
|
||||
//! \param include_children Indicates whether to also clone the children
|
||||
|
|
@ -88,7 +88,7 @@ public:
|
|||
//! 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)
|
||||
Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true,
|
||||
VProperty* container = nullptr) const Q_DECL_OVERRIDE;
|
||||
VProperty* container = nullptr) const override;
|
||||
|
||||
static int IndexOfColor(const QMap<QString, QString> &colors, const QString &color);
|
||||
|
||||
|
|
|
|||
|
|
@ -55,10 +55,10 @@ public:
|
|||
explicit VLineTypeProperty(const QString& name);
|
||||
|
||||
//! Destructor
|
||||
virtual ~VLineTypeProperty() Q_DECL_OVERRIDE {}
|
||||
virtual ~VLineTypeProperty() override {}
|
||||
|
||||
//! Get the data how it should be displayed
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const 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
|
||||
|
|
@ -66,10 +66,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) Q_DECL_OVERRIDE;
|
||||
const QAbstractItemDelegate* delegate) override;
|
||||
|
||||
//! Gets the data from the widget
|
||||
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant getEditorData(const QWidget* editor) const override;
|
||||
|
||||
//! Sets the line styles
|
||||
virtual void setStyles(const QMap<QString, QIcon> &styles);
|
||||
|
|
@ -78,10 +78,10 @@ public:
|
|||
virtual QMap<QString, QIcon> getStyles() const;
|
||||
|
||||
//! Sets the value of the property
|
||||
virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE;
|
||||
virtual void setValue(const QVariant& value) override;
|
||||
|
||||
//! Returns a string containing the type of the property
|
||||
virtual QString type() const Q_DECL_OVERRIDE;
|
||||
virtual QString type() const override;
|
||||
|
||||
//! Clones this property
|
||||
//! \param include_children Indicates whether to also clone the children
|
||||
|
|
@ -89,7 +89,7 @@ public:
|
|||
//! 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)
|
||||
Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true,
|
||||
VProperty* container = nullptr) const Q_DECL_OVERRIDE;
|
||||
VProperty* container = nullptr) const override;
|
||||
|
||||
static int IndexOfStyle(const QMap<QString, QIcon> &styles, const QString &style);
|
||||
|
||||
|
|
|
|||
|
|
@ -54,25 +54,25 @@ 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) Q_DECL_OVERRIDE;
|
||||
const QAbstractItemDelegate* delegate) override;
|
||||
|
||||
//! Gets the data from the widget
|
||||
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant getEditorData(const QWidget* editor) const 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) Q_DECL_OVERRIDE;
|
||||
virtual void setSetting(const QString& key, const QVariant& value) 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 Q_DECL_OVERRIDE;
|
||||
virtual QVariant getSetting(const QString& key) const override;
|
||||
|
||||
//! Returns the list of keys of the property's settings
|
||||
virtual QStringList getSettingKeys() const Q_DECL_OVERRIDE;
|
||||
virtual QStringList getSettingKeys() const override;
|
||||
|
||||
//! Returns a string containing the type of the property
|
||||
virtual QString type() const Q_DECL_OVERRIDE;
|
||||
virtual QString type() const override;
|
||||
|
||||
//! Clones this property
|
||||
//! \param include_children Indicates whether to also clone the children
|
||||
|
|
@ -80,7 +80,7 @@ public:
|
|||
//! 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)
|
||||
Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true,
|
||||
VProperty* container = nullptr) const Q_DECL_OVERRIDE;
|
||||
VProperty* container = nullptr) const override;
|
||||
public slots:
|
||||
void valueChanged(int i);
|
||||
protected:
|
||||
|
|
@ -109,32 +109,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) override;
|
||||
|
||||
//! Gets the data from the widget
|
||||
virtual QVariant getEditorData(const QWidget* editor) const;
|
||||
virtual QVariant getEditorData(const QWidget* editor) const 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) 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 override;
|
||||
|
||||
//! Returns the list of keys of the property's settings
|
||||
virtual QStringList getSettingKeys() const;
|
||||
virtual QStringList getSettingKeys() const override;
|
||||
|
||||
//! Returns a string containing the type of the property
|
||||
virtual QString type() const;
|
||||
virtual QString type() const 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 override;
|
||||
|
||||
protected:
|
||||
//! Number of decimals after the decimal point
|
||||
|
|
|
|||
|
|
@ -48,10 +48,10 @@ public:
|
|||
explicit VObjectProperty(const QString& name);
|
||||
|
||||
//! Destructor
|
||||
virtual ~VObjectProperty() Q_DECL_OVERRIDE {}
|
||||
virtual ~VObjectProperty() override {}
|
||||
|
||||
//! Get the data how it should be displayed
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const 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
|
||||
|
|
@ -59,13 +59,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) Q_DECL_OVERRIDE;
|
||||
const QAbstractItemDelegate* delegate) override;
|
||||
|
||||
//! Sets the property's data to the editor (returns false, if the standard delegate should do that)
|
||||
virtual bool setEditorData(QWidget* editor) Q_DECL_OVERRIDE;
|
||||
virtual bool setEditorData(QWidget* editor) override;
|
||||
|
||||
//! Gets the data from the widget
|
||||
virtual QVariant getEditorData(const QWidget* editor) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant getEditorData(const QWidget* editor) const override;
|
||||
|
||||
//! Sets the objects list
|
||||
void setObjectsList(const QMap<QString, quint32> &objects);
|
||||
|
|
@ -74,10 +74,10 @@ public:
|
|||
virtual QMap<QString, quint32> getObjects() const;
|
||||
|
||||
//! Sets the value of the property
|
||||
virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE;
|
||||
virtual void setValue(const QVariant& value) override;
|
||||
|
||||
//! Returns a string containing the type of the property
|
||||
virtual QString type() const Q_DECL_OVERRIDE;
|
||||
virtual QString type() const override;
|
||||
|
||||
//! Clones this property
|
||||
//! \param include_children Indicates whether to also clone the children
|
||||
|
|
@ -85,7 +85,7 @@ public:
|
|||
//! 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)
|
||||
Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true,
|
||||
VProperty* container = nullptr) const Q_DECL_OVERRIDE;
|
||||
VProperty* container = nullptr) const override;
|
||||
|
||||
public slots:
|
||||
void currentIndexChanged(int index);
|
||||
|
|
|
|||
|
|
@ -42,13 +42,13 @@ class VPROPERTYEXPLORERSHARED_EXPORT VPointFProperty : public VProperty
|
|||
public:
|
||||
explicit VPointFProperty(const QString& name);
|
||||
|
||||
virtual ~VPointFProperty() Q_DECL_OVERRIDE {}
|
||||
virtual ~VPointFProperty() override {}
|
||||
|
||||
//! Get the data how it should be displayed
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
|
||||
virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const override;
|
||||
|
||||
//! Returns item flags
|
||||
Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE;
|
||||
Qt::ItemFlags flags(int column = DPC_Name) const override;
|
||||
|
||||
//! Returns the QPointF
|
||||
virtual QPointF getPointF() const;
|
||||
|
|
@ -60,7 +60,7 @@ public:
|
|||
virtual void setPointF(qreal x, qreal y);
|
||||
|
||||
//! Returns a string containing the type of the property
|
||||
virtual QString type() const Q_DECL_OVERRIDE;
|
||||
virtual QString type() const override;
|
||||
|
||||
//! Clones this property
|
||||
//! \param include_children Indicates whether to also clone the children
|
||||
|
|
@ -68,13 +68,13 @@ public:
|
|||
//! 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)
|
||||
Q_REQUIRED_RESULT virtual VProperty* clone(bool include_children = true,
|
||||
VProperty* container = nullptr) const Q_DECL_OVERRIDE;
|
||||
VProperty* container = nullptr) const override;
|
||||
|
||||
//! Sets the value of the property
|
||||
virtual void setValue(const QVariant& value) Q_DECL_OVERRIDE;
|
||||
virtual void setValue(const QVariant& value) override;
|
||||
|
||||
//! Returns the value of the property as a QVariant
|
||||
virtual QVariant getValue() const Q_DECL_OVERRIDE;
|
||||
virtual QVariant getValue() const override;
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(VPointFProperty)
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user