mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
Cleanup: remove all override modifiers
Commit df156a56c0
replaced "virtual"
by "override" where appropriate. Unfortunately, this had the
unintended consequence of producing numerous clang warnings. If
clang finds a override-modified function in a class definition,
it warns for *all* overriden virtual functions without the override
modifier.
To solve this, go the easy route and remove all overrides. At least
it is consistent.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
42aae8196f
commit
1c4a859c8d
49 changed files with 199 additions and 199 deletions
|
@ -10,7 +10,7 @@ Q_OBJECT
|
|||
public:
|
||||
static ReverseGeoLookupThread *instance();
|
||||
void lookup(struct dive_site *ds);
|
||||
void run() override;
|
||||
void run();
|
||||
|
||||
private:
|
||||
ReverseGeoLookupThread(QObject *parent = 0);
|
||||
|
|
|
@ -63,7 +63,7 @@ class DownloadThread : public QThread {
|
|||
|
||||
public:
|
||||
DownloadThread();
|
||||
void run() override;
|
||||
void run();
|
||||
|
||||
DCDeviceData *data();
|
||||
QString error;
|
||||
|
|
|
@ -39,7 +39,7 @@ public:
|
|||
bool isActive() const;
|
||||
QString errorToString() const;
|
||||
QBluetoothDeviceDiscoveryAgent::Error error() const;
|
||||
void run() override;
|
||||
void run();
|
||||
void stop();
|
||||
|
||||
private:
|
||||
|
|
|
@ -26,9 +26,9 @@ public:
|
|||
GasSpinBoxItemDelegate(QObject *parent = 0, column_type type = PERCENT);
|
||||
~GasSpinBoxItemDelegate();
|
||||
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
|
||||
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
|
||||
void setEditorData(QWidget *editor, const QModelIndex &index) const;
|
||||
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
|
||||
|
||||
private:
|
||||
column_type type;
|
||||
|
@ -46,9 +46,9 @@ public:
|
|||
GasTypeComboBoxItemDelegate(QObject *parent = 0, computer_type type = OSTC3);
|
||||
~GasTypeComboBoxItemDelegate();
|
||||
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
|
||||
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
|
||||
void setEditorData(QWidget *editor, const QModelIndex &index) const;
|
||||
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
|
||||
|
||||
private:
|
||||
computer_type type;
|
||||
|
|
|
@ -45,8 +45,8 @@ slots:
|
|||
void removeFromTrip();
|
||||
void deleteDive();
|
||||
void markDiveInvalid();
|
||||
void rowsInserted(const QModelIndex &parent, int start, int end) override;
|
||||
void reset() override;
|
||||
void rowsInserted(const QModelIndex &parent, int start, int end);
|
||||
void reset();
|
||||
void mergeTripAbove();
|
||||
void mergeTripBelow();
|
||||
void newTripAbove();
|
||||
|
|
|
@ -12,9 +12,9 @@ class DivePictureWidget : public QListView {
|
|||
public:
|
||||
DivePictureWidget(QWidget *parent);
|
||||
protected:
|
||||
void mouseDoubleClickEvent(QMouseEvent *event) override;
|
||||
void mousePressEvent(QMouseEvent *event) override;
|
||||
void wheelEvent(QWheelEvent *event) override;
|
||||
void mouseDoubleClickEvent(QMouseEvent *event);
|
||||
void mousePressEvent(QMouseEvent *event);
|
||||
void wheelEvent(QWheelEvent *event);
|
||||
|
||||
signals:
|
||||
void photoDoubleClicked(const QString filePath);
|
||||
|
|
|
@ -55,15 +55,15 @@ public:
|
|||
|
||||
void addColor(QColor color);
|
||||
|
||||
QSize sizeHint() const override;
|
||||
QSize minimumSizeHint() const override;
|
||||
QSize sizeHint() const;
|
||||
QSize minimumSizeHint() const;
|
||||
|
||||
signals:
|
||||
void editingFinished();
|
||||
|
||||
protected:
|
||||
void paintEvent(QPaintEvent *e) override;
|
||||
void keyPressEvent(QKeyEvent *e) override;
|
||||
void paintEvent(QPaintEvent *e);
|
||||
void keyPressEvent(QKeyEvent *e);
|
||||
|
||||
private:
|
||||
struct Private;
|
||||
|
|
|
@ -186,18 +186,18 @@ public:
|
|||
/**
|
||||
* Returns the preferred size of the message widget.
|
||||
*/
|
||||
QSize sizeHint() const override;
|
||||
QSize sizeHint() const;
|
||||
|
||||
/**
|
||||
* Returns the minimum size of the message widget.
|
||||
*/
|
||||
QSize minimumSizeHint() const override;
|
||||
QSize minimumSizeHint() const;
|
||||
|
||||
/**
|
||||
* Returns the required height for @p width.
|
||||
* @param width the width in pixels
|
||||
*/
|
||||
int heightForWidth(int width) const override;
|
||||
int heightForWidth(int width) const;
|
||||
|
||||
/**
|
||||
* The icon shown on the left of the text. By default, no icon is shown.
|
||||
|
@ -326,11 +326,11 @@ Q_SIGNALS:
|
|||
void showAnimationFinished();
|
||||
|
||||
protected:
|
||||
void paintEvent(QPaintEvent *event) override;
|
||||
void paintEvent(QPaintEvent *event);
|
||||
|
||||
bool event(QEvent *event) override;
|
||||
bool event(QEvent *event);
|
||||
|
||||
void resizeEvent(QResizeEvent *event) override;
|
||||
void resizeEvent(QResizeEvent *event);
|
||||
|
||||
private:
|
||||
KMessageWidgetPrivate *const d;
|
||||
|
|
|
@ -11,7 +11,7 @@ class LocationInformationWidget : public QGroupBox {
|
|||
Q_OBJECT
|
||||
public:
|
||||
LocationInformationWidget(QWidget *parent = 0);
|
||||
bool eventFilter(QObject*, QEvent*) override;
|
||||
bool eventFilter(QObject*, QEvent*);
|
||||
|
||||
protected:
|
||||
void showEvent(QShowEvent *);
|
||||
|
@ -56,8 +56,8 @@ class DiveLocationFilterProxyModel : public QSortFilterProxyModel {
|
|||
Q_OBJECT
|
||||
public:
|
||||
DiveLocationFilterProxyModel(QObject *parent = 0);
|
||||
bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
|
||||
bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const override;
|
||||
bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
|
||||
bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const;
|
||||
};
|
||||
|
||||
class DiveLocationModel : public QAbstractTableModel {
|
||||
|
@ -79,7 +79,7 @@ class DiveLocationListView : public QListView {
|
|||
public:
|
||||
DiveLocationListView(QWidget *parent = 0);
|
||||
protected:
|
||||
void currentChanged(const QModelIndex& current, const QModelIndex& previous) override;
|
||||
void currentChanged(const QModelIndex& current, const QModelIndex& previous);
|
||||
signals:
|
||||
void currentIndexChanged(const QModelIndex& current);
|
||||
};
|
||||
|
|
|
@ -19,8 +19,8 @@ class StarWidgetsDelegate : public QStyledItemDelegate {
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit StarWidgetsDelegate(QWidget *parent = 0);
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
|
||||
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
|
||||
const QSize& starSize() const;
|
||||
|
||||
private:
|
||||
|
@ -32,10 +32,10 @@ class ComboBoxDelegate : public QStyledItemDelegate {
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit ComboBoxDelegate(QAbstractItemModel *model, QObject *parent = 0, bool allowEdit = true);
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
|
||||
void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
bool eventFilter(QObject *object, QEvent *event) override;
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
|
||||
void setEditorData(QWidget *editor, const QModelIndex &index) const;
|
||||
void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const;
|
||||
bool eventFilter(QObject *object, QEvent *event);
|
||||
public
|
||||
slots:
|
||||
void testActivation(const QString &currString = QString());
|
||||
|
@ -54,8 +54,8 @@ class TankInfoDelegate : public ComboBoxDelegate {
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit TankInfoDelegate(QObject *parent = 0);
|
||||
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
|
||||
public
|
||||
slots:
|
||||
void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint);
|
||||
|
@ -66,17 +66,17 @@ class TankUseDelegate : public QStyledItemDelegate {
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit TankUseDelegate(QObject *parent = 0);
|
||||
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
void setEditorData(QWidget * editor, const QModelIndex & index) const override;
|
||||
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
|
||||
void setEditorData(QWidget * editor, const QModelIndex & index) const;
|
||||
};
|
||||
|
||||
class WSInfoDelegate : public ComboBoxDelegate {
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit WSInfoDelegate(QObject *parent = 0);
|
||||
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
|
||||
public
|
||||
slots:
|
||||
void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint);
|
||||
|
@ -86,7 +86,7 @@ class AirTypesDelegate : public ComboBoxDelegate {
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit AirTypesDelegate(QObject *parent = 0);
|
||||
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
|
||||
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
|
||||
public
|
||||
slots:
|
||||
void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint);
|
||||
|
@ -96,7 +96,7 @@ class DiveTypesDelegate : public ComboBoxDelegate {
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit DiveTypesDelegate(QObject *parent = 0);
|
||||
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
|
||||
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
|
||||
public
|
||||
slots:
|
||||
void revertModelData(QWidget *widget, QAbstractItemDelegate::EndEditHint hint);
|
||||
|
@ -106,7 +106,7 @@ class SpinBoxDelegate : public QStyledItemDelegate {
|
|||
Q_OBJECT
|
||||
public:
|
||||
SpinBoxDelegate(int min, int max, int step, QObject *parent = 0);
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
|
||||
private:
|
||||
int min;
|
||||
int max;
|
||||
|
@ -117,7 +117,7 @@ class DoubleSpinBoxDelegate : public QStyledItemDelegate {
|
|||
Q_OBJECT
|
||||
public:
|
||||
DoubleSpinBoxDelegate(double min, double max, double step, QObject *parent = 0);
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
|
||||
private:
|
||||
double min;
|
||||
double max;
|
||||
|
@ -128,8 +128,8 @@ class LocationFilterDelegate : public QStyledItemDelegate {
|
|||
Q_OBJECT
|
||||
public:
|
||||
LocationFilterDelegate(QObject *parent = 0);
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
|
||||
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
|
||||
};
|
||||
|
||||
#endif // MODELDELEGATES_H
|
||||
|
|
|
@ -13,12 +13,12 @@ class FacebookPlugin : public ISocialNetworkIntegration {
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit FacebookPlugin(QObject* parent = 0);
|
||||
bool isConnected() override;
|
||||
void requestLogin() override;
|
||||
void requestLogoff() override;
|
||||
QString socialNetworkIcon() const override;
|
||||
QString socialNetworkName() const override;
|
||||
void requestUpload() override;
|
||||
bool isConnected();
|
||||
void requestLogin();
|
||||
void requestLogoff();
|
||||
QString socialNetworkIcon() const;
|
||||
QString socialNetworkName() const;
|
||||
void requestUpload();
|
||||
private:
|
||||
FacebookConnectWidget *fbConnectWidget;
|
||||
};
|
||||
|
|
|
@ -14,8 +14,8 @@ class PreferencesDefaults : public AbstractPreferencesWidget {
|
|||
public:
|
||||
PreferencesDefaults();
|
||||
~PreferencesDefaults();
|
||||
void refreshSettings() override;
|
||||
void syncSettings() override;
|
||||
void refreshSettings();
|
||||
void syncSettings();
|
||||
public slots:
|
||||
void on_chooseFile_clicked();
|
||||
void on_btnUseDefaultFile_toggled(bool toggled);
|
||||
|
|
|
@ -13,8 +13,8 @@ class PreferencesGeoreference : public AbstractPreferencesWidget {
|
|||
public:
|
||||
PreferencesGeoreference();
|
||||
~PreferencesGeoreference();
|
||||
void refreshSettings() override;
|
||||
void syncSettings() override;
|
||||
void refreshSettings();
|
||||
void syncSettings();
|
||||
private:
|
||||
Ui::PreferencesGeoreference *ui;
|
||||
};
|
||||
|
|
|
@ -13,8 +13,8 @@ class PreferencesGraph : public AbstractPreferencesWidget {
|
|||
public:
|
||||
PreferencesGraph();
|
||||
~PreferencesGraph();
|
||||
void refreshSettings() override;
|
||||
void syncSettings() override;
|
||||
void refreshSettings();
|
||||
void syncSettings();
|
||||
|
||||
private slots:
|
||||
void on_gflow_valueChanged(int gf);
|
||||
|
|
|
@ -14,8 +14,8 @@ class PreferencesLanguage : public AbstractPreferencesWidget {
|
|||
public:
|
||||
PreferencesLanguage();
|
||||
~PreferencesLanguage();
|
||||
void refreshSettings() override;
|
||||
void syncSettings() override;
|
||||
void refreshSettings();
|
||||
void syncSettings();
|
||||
private:
|
||||
Ui::PreferencesLanguage *ui;
|
||||
QMap<QString, QString> dateFormatShortMap;
|
||||
|
|
|
@ -14,8 +14,8 @@ class PreferencesNetwork : public AbstractPreferencesWidget {
|
|||
public:
|
||||
PreferencesNetwork();
|
||||
~PreferencesNetwork();
|
||||
void refreshSettings() override;
|
||||
void syncSettings() override;
|
||||
void refreshSettings();
|
||||
void syncSettings();
|
||||
|
||||
public slots:
|
||||
void proxyType_changed(int i);
|
||||
|
|
|
@ -13,8 +13,8 @@ class PreferencesUnits : public AbstractPreferencesWidget {
|
|||
public:
|
||||
PreferencesUnits();
|
||||
~PreferencesUnits();
|
||||
void refreshSettings() override;
|
||||
void syncSettings() override;
|
||||
void refreshSettings();
|
||||
void syncSettings();
|
||||
private:
|
||||
Ui::PreferencesUnits *ui;
|
||||
};
|
||||
|
|
|
@ -172,8 +172,8 @@ protected:
|
|||
FilterBase(FilterModelBase *model, QWidget *parent = 0);
|
||||
FilterModelBase *model;
|
||||
Ui::FilterWidget ui;
|
||||
void showEvent(QShowEvent *) override;
|
||||
void hideEvent(QHideEvent *) override;
|
||||
void showEvent(QShowEvent *);
|
||||
void hideEvent(QHideEvent *);
|
||||
friend class MultiFilter;
|
||||
};
|
||||
|
||||
|
@ -201,7 +201,7 @@ class TextHyperlinkEventFilter : public QObject {
|
|||
public:
|
||||
explicit TextHyperlinkEventFilter(QTextEdit *txtEdit);
|
||||
|
||||
bool eventFilter(QObject *target, QEvent *evt) override;
|
||||
bool eventFilter(QObject *target, QEvent *evt);
|
||||
|
||||
private:
|
||||
void handleUrlClick(const QString &urlStr);
|
||||
|
|
|
@ -14,7 +14,7 @@ public:
|
|||
explicit StarWidget(QWidget *parent = 0, Qt::WindowFlags f = 0);
|
||||
int currentStars() const;
|
||||
|
||||
QSize sizeHint() const override;
|
||||
QSize sizeHint() const;
|
||||
|
||||
static const QImage& starActive();
|
||||
static const QImage& starInactive();
|
||||
|
@ -28,11 +28,11 @@ slots:
|
|||
void setReadOnly(bool readOnly);
|
||||
|
||||
protected:
|
||||
void mouseReleaseEvent(QMouseEvent *) override;
|
||||
void paintEvent(QPaintEvent *) override;
|
||||
void focusInEvent(QFocusEvent *) override;
|
||||
void focusOutEvent(QFocusEvent *) override;
|
||||
void keyPressEvent(QKeyEvent *) override;
|
||||
void mouseReleaseEvent(QMouseEvent *);
|
||||
void paintEvent(QPaintEvent *);
|
||||
void focusInEvent(QFocusEvent *);
|
||||
void focusOutEvent(QFocusEvent *);
|
||||
void keyPressEvent(QKeyEvent *);
|
||||
|
||||
private:
|
||||
int current;
|
||||
|
|
|
@ -13,7 +13,7 @@ public:
|
|||
YearlyStatisticsWidget(QWidget *parent = 0);
|
||||
void setModel(YearlyStatisticsModel *m);
|
||||
protected:
|
||||
void resizeEvent(QResizeEvent *event) override;
|
||||
void resizeEvent(QResizeEvent *event);
|
||||
public slots:
|
||||
void modelRowsInserted(const QModelIndex& index, int first, int last);
|
||||
void modelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
|
||||
|
|
|
@ -105,9 +105,9 @@ public:
|
|||
private
|
||||
slots:
|
||||
// need to declare them as no ops or Qt4 is unhappy
|
||||
void startDownload() override { }
|
||||
void startUpload() override { }
|
||||
void buttonClicked(QAbstractButton *button) override { Q_UNUSED(button) }
|
||||
void startDownload() { }
|
||||
void startUpload() { }
|
||||
void buttonClicked(QAbstractButton *button) { Q_UNUSED(button) }
|
||||
};
|
||||
|
||||
#endif // SUBSURFACEWEBSERVICES_H
|
||||
|
|
|
@ -15,8 +15,8 @@ class TabDiveExtraInfo : public TabBase {
|
|||
public:
|
||||
TabDiveExtraInfo(QWidget *parent = 0);
|
||||
~TabDiveExtraInfo();
|
||||
void updateData() override;
|
||||
void clear() override;
|
||||
void updateData();
|
||||
void clear();
|
||||
private:
|
||||
Ui::TabDiveExtraInfo *ui;
|
||||
ExtraDataModel *extraDataModel;
|
||||
|
|
|
@ -13,8 +13,8 @@ class TabDiveInformation : public TabBase {
|
|||
public:
|
||||
TabDiveInformation(QWidget *parent = 0);
|
||||
~TabDiveInformation();
|
||||
void updateData() override;
|
||||
void clear() override;
|
||||
void updateData();
|
||||
void clear();
|
||||
|
||||
private:
|
||||
Ui::TabDiveInformation *ui;
|
||||
|
|
|
@ -15,11 +15,11 @@ class TabDivePhotos : public TabBase {
|
|||
public:
|
||||
TabDivePhotos(QWidget *parent = 0);
|
||||
~TabDivePhotos();
|
||||
void updateData() override;
|
||||
void clear() override;
|
||||
void updateData();
|
||||
void clear();
|
||||
|
||||
protected:
|
||||
void contextMenuEvent(QContextMenuEvent *ev) override;
|
||||
void contextMenuEvent(QContextMenuEvent *ev);
|
||||
|
||||
private slots:
|
||||
void addPhotosFromFile();
|
||||
|
|
|
@ -13,8 +13,8 @@ class TabDiveStatistics : public TabBase {
|
|||
public:
|
||||
TabDiveStatistics(QWidget *parent = 0);
|
||||
~TabDiveStatistics();
|
||||
void updateData() override;
|
||||
void clear() override;
|
||||
void updateData();
|
||||
void clear();
|
||||
|
||||
private:
|
||||
Ui::TabDiveStatistics *ui;
|
||||
|
|
|
@ -40,8 +40,8 @@ public:
|
|||
QTableView *view();
|
||||
|
||||
protected:
|
||||
void showEvent(QShowEvent *) override;
|
||||
void resizeEvent(QResizeEvent *) override;
|
||||
void showEvent(QShowEvent *);
|
||||
void resizeEvent(QResizeEvent *);
|
||||
|
||||
signals:
|
||||
void addButtonClicked();
|
||||
|
|
|
@ -8,8 +8,8 @@
|
|||
class UndoDeleteDive : public QUndoCommand {
|
||||
public:
|
||||
UndoDeleteDive(QList<struct dive*> deletedDives);
|
||||
void undo() override;
|
||||
void redo() override;
|
||||
void undo();
|
||||
void redo();
|
||||
|
||||
private:
|
||||
QList<struct dive*> diveList;
|
||||
|
@ -19,8 +19,8 @@ private:
|
|||
class UndoShiftTime : public QUndoCommand {
|
||||
public:
|
||||
UndoShiftTime(QList<int> changedDives, int amount);
|
||||
void undo() override;
|
||||
void redo() override;
|
||||
void undo();
|
||||
void redo();
|
||||
|
||||
private:
|
||||
QList<int> diveList;
|
||||
|
@ -30,8 +30,8 @@ private:
|
|||
class UndoRenumberDives : public QUndoCommand {
|
||||
public:
|
||||
UndoRenumberDives(QMap<int, QPair<int, int> > originalNumbers);
|
||||
void undo() override;
|
||||
void redo() override;
|
||||
void undo();
|
||||
void redo();
|
||||
|
||||
private:
|
||||
QMap<int,QPair<int, int> > oldNumbers;
|
||||
|
@ -40,8 +40,8 @@ private:
|
|||
class UndoRemoveDivesFromTrip : public QUndoCommand {
|
||||
public:
|
||||
UndoRemoveDivesFromTrip(QMap<struct dive*, dive_trip*> removedDives);
|
||||
void undo() override;
|
||||
void redo() override;
|
||||
void undo();
|
||||
void redo();
|
||||
|
||||
private:
|
||||
QMap<struct dive*, dive_trip*> divesToUndo;
|
||||
|
|
|
@ -20,7 +20,7 @@ class CloseButtonItem : public DivePixmapItem {
|
|||
public:
|
||||
CloseButtonItem(QGraphicsItem *parent = 0);
|
||||
protected:
|
||||
void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
|
||||
void mousePressEvent(QGraphicsSceneMouseEvent *event);
|
||||
public slots:
|
||||
void hide();
|
||||
void show();
|
||||
|
|
|
@ -72,10 +72,10 @@ class DiveProfileItem : public AbstractProfilePolygonItem {
|
|||
|
||||
public:
|
||||
DiveProfileItem();
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
|
||||
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
|
||||
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex());
|
||||
void settingsToggled(bool toggled);
|
||||
void settingsChanged() override;
|
||||
void settingsChanged();
|
||||
void plot_depth_sample(struct plot_data *entry, QFlags<Qt::AlignmentFlag> flags, const QColor &color);
|
||||
int maxCeiling(int row);
|
||||
|
||||
|
@ -89,8 +89,8 @@ class DiveMeanDepthItem : public AbstractProfilePolygonItem {
|
|||
Q_OBJECT
|
||||
public:
|
||||
DiveMeanDepthItem();
|
||||
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
|
||||
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex());
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
|
||||
|
||||
private:
|
||||
void createTextItem();
|
||||
|
@ -102,8 +102,8 @@ class DiveTemperatureItem : public AbstractProfilePolygonItem {
|
|||
Q_OBJECT
|
||||
public:
|
||||
DiveTemperatureItem();
|
||||
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
|
||||
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex());
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
|
||||
|
||||
private:
|
||||
void createTextItem(int seconds, int mkelvin);
|
||||
|
@ -113,8 +113,8 @@ class DiveHeartrateItem : public AbstractProfilePolygonItem {
|
|||
Q_OBJECT
|
||||
public:
|
||||
DiveHeartrateItem();
|
||||
void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
|
||||
void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
|
||||
|
||||
private:
|
||||
void createTextItem(int seconds, int hr);
|
||||
|
@ -125,8 +125,8 @@ class DivePercentageItem : public AbstractProfilePolygonItem {
|
|||
Q_OBJECT
|
||||
public:
|
||||
DivePercentageItem(int i);
|
||||
void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
|
||||
void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
|
||||
|
||||
private:
|
||||
QString visibilityKey;
|
||||
|
@ -139,8 +139,8 @@ class DiveAmbPressureItem : public AbstractProfilePolygonItem {
|
|||
Q_OBJECT
|
||||
public:
|
||||
DiveAmbPressureItem();
|
||||
void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
|
||||
void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
|
||||
|
||||
private:
|
||||
QString visibilityKey;
|
||||
|
@ -150,8 +150,8 @@ class DiveGFLineItem : public AbstractProfilePolygonItem {
|
|||
Q_OBJECT
|
||||
public:
|
||||
DiveGFLineItem();
|
||||
void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
|
||||
void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
|
||||
|
||||
private:
|
||||
QString visibilityKey;
|
||||
|
@ -161,8 +161,8 @@ class DiveGasPressureItem : public AbstractProfilePolygonItem {
|
|||
Q_OBJECT
|
||||
|
||||
public:
|
||||
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
|
||||
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex());
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
|
||||
|
||||
private:
|
||||
void plotPressureValue(int mbar, int sec, QFlags<Qt::AlignmentFlag> align, double offset);
|
||||
|
@ -175,9 +175,9 @@ class DiveCalculatedCeiling : public AbstractProfilePolygonItem {
|
|||
|
||||
public:
|
||||
DiveCalculatedCeiling(ProfileWidget2 *profileWidget);
|
||||
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
|
||||
void settingsChanged() override;
|
||||
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex());
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
|
||||
void settingsChanged();
|
||||
|
||||
public
|
||||
slots:
|
||||
|
@ -195,8 +195,8 @@ class DiveReportedCeiling : public AbstractProfilePolygonItem {
|
|||
|
||||
public:
|
||||
DiveReportedCeiling();
|
||||
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
|
||||
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex());
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
|
||||
};
|
||||
|
||||
class DiveCalculatedTissue : public DiveCalculatedCeiling {
|
||||
|
@ -204,15 +204,15 @@ class DiveCalculatedTissue : public DiveCalculatedCeiling {
|
|||
public:
|
||||
DiveCalculatedTissue(ProfileWidget2 *profileWidget);
|
||||
void setVisible(bool visible);
|
||||
void settingsChanged() override;
|
||||
void settingsChanged();
|
||||
};
|
||||
|
||||
class PartialPressureGasItem : public AbstractProfilePolygonItem {
|
||||
Q_OBJECT
|
||||
public:
|
||||
PartialPressureGasItem();
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) override;
|
||||
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex()) override;
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
|
||||
void modelDataChanged(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex());
|
||||
void setThresholdSettingsKey(double *prefPointerMin, double *prefPointerMax);
|
||||
void setVisibilitySettingsKey(const QString &setVisibilitySettingsKey);
|
||||
void setColors(const QColor &normalColor, const QColor &alertColor);
|
||||
|
|
|
@ -84,7 +84,7 @@ public:
|
|||
double getFontPrintScale();
|
||||
void setFontPrintScale(double scale);
|
||||
#ifndef SUBSURFACE_MOBILE
|
||||
bool eventFilter(QObject *, QEvent *) override;
|
||||
bool eventFilter(QObject *, QEvent *);
|
||||
void clearHandlers();
|
||||
#endif
|
||||
void recalcCeiling();
|
||||
|
@ -146,18 +146,18 @@ slots: // Necessary to call from QAction's signals.
|
|||
#endif
|
||||
|
||||
protected:
|
||||
void resizeEvent(QResizeEvent *event) override;
|
||||
void resizeEvent(QResizeEvent *event);
|
||||
#ifndef SUBSURFACE_MOBILE
|
||||
void wheelEvent(QWheelEvent *event) override;
|
||||
void mouseMoveEvent(QMouseEvent *event) override;
|
||||
void contextMenuEvent(QContextMenuEvent *event) override;
|
||||
void mouseDoubleClickEvent(QMouseEvent *event) override;
|
||||
void mousePressEvent(QMouseEvent *event) override;
|
||||
void mouseReleaseEvent(QMouseEvent *event) override;
|
||||
void wheelEvent(QWheelEvent *event);
|
||||
void mouseMoveEvent(QMouseEvent *event);
|
||||
void contextMenuEvent(QContextMenuEvent *event);
|
||||
void mouseDoubleClickEvent(QMouseEvent *event);
|
||||
void mousePressEvent(QMouseEvent *event);
|
||||
void mouseReleaseEvent(QMouseEvent *event);
|
||||
#endif
|
||||
void dropEvent(QDropEvent *event) override;
|
||||
void dragEnterEvent(QDragEnterEvent *event) override;
|
||||
void dragMoveEvent(QDragMoveEvent *event) override;
|
||||
void dropEvent(QDropEvent *event);
|
||||
void dragEnterEvent(QDragEnterEvent *event);
|
||||
void dragMoveEvent(QDragMoveEvent *event);
|
||||
|
||||
|
||||
private: /*methods*/
|
||||
|
|
|
@ -22,7 +22,7 @@ public:
|
|||
void recalculate();
|
||||
|
||||
protected:
|
||||
void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
|
||||
void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
|
||||
private:
|
||||
struct plot_info pInfo;
|
||||
struct plot_data *entry;
|
||||
|
|
|
@ -20,8 +20,8 @@ class CleanerTableModel : public QAbstractTableModel {
|
|||
Q_OBJECT
|
||||
public:
|
||||
explicit CleanerTableModel(QObject *parent = 0);
|
||||
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
|
||||
int columnCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
|
||||
|
||||
protected:
|
||||
void setHeaderDataStrings(const QStringList &headers);
|
||||
|
|
|
@ -28,10 +28,10 @@ public:
|
|||
|
||||
explicit CylindersModel(QObject *parent = 0);
|
||||
static CylindersModel *instance();
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
Qt::ItemFlags flags(const QModelIndex &index) const override;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
Qt::ItemFlags flags(const QModelIndex &index) const;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
|
||||
|
||||
void passInData(const QModelIndex &index, const QVariant &value);
|
||||
void add();
|
||||
|
@ -43,7 +43,7 @@ public:
|
|||
void moveAtFirst(int cylid);
|
||||
cylinder_t *cylinderAt(const QModelIndex &index);
|
||||
bool changed;
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role) const;
|
||||
|
||||
public
|
||||
slots:
|
||||
|
|
|
@ -13,8 +13,8 @@ public:
|
|||
VALUE
|
||||
};
|
||||
explicit ExtraDataModel(QObject *parent = 0);
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
|
||||
void clear();
|
||||
void updateDive();
|
||||
|
|
|
@ -15,10 +15,10 @@ public:
|
|||
NICKNAME
|
||||
};
|
||||
DiveComputerModel(QObject *parent = 0);
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
Qt::ItemFlags flags(const QModelIndex &index) const override;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
Qt::ItemFlags flags(const QModelIndex &index) const;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
|
||||
void keepWorkingList();
|
||||
|
||||
public
|
||||
|
|
|
@ -20,9 +20,9 @@ class DivePictureModel : public QAbstractTableModel {
|
|||
Q_OBJECT
|
||||
public:
|
||||
static DivePictureModel *instance();
|
||||
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
int columnCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
void updateDivePictures();
|
||||
void removePictures(const QVector<QString> &fileUrls);
|
||||
void updateDivePictureOffset(int diveId, const QString &filename, int offsetSeconds);
|
||||
|
|
|
@ -26,12 +26,12 @@ public:
|
|||
PLAN,
|
||||
ADD
|
||||
};
|
||||
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
|
||||
Qt::ItemFlags flags(const QModelIndex &index) const override;
|
||||
int columnCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
|
||||
Qt::ItemFlags flags(const QModelIndex &index) const;
|
||||
void gasChange(const QModelIndex &index, int newcylinderid);
|
||||
void cylinderRenumber(int mapping[]);
|
||||
void removeSelectedPoints(const QVector<int> &rows);
|
||||
|
|
|
@ -72,10 +72,10 @@ public:
|
|||
COLUMNS
|
||||
};
|
||||
explicit DivePlotDataModel(QObject *parent = 0);
|
||||
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
int columnCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
void clear();
|
||||
void setDive(struct dive *d, const plot_info &pInfo);
|
||||
const plot_info &data() const;
|
||||
|
|
|
@ -30,10 +30,10 @@ public:
|
|||
COLUMNS
|
||||
};
|
||||
|
||||
QVariant data(int column, int role) const override;
|
||||
QVariant data(int column, int role) const;
|
||||
int diveId;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
|
||||
Qt::ItemFlags flags(const QModelIndex &index) const override;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
|
||||
Qt::ItemFlags flags(const QModelIndex &index) const;
|
||||
QString displayDate() const;
|
||||
QString displayDuration() const;
|
||||
QString displayDepth() const;
|
||||
|
@ -52,7 +52,7 @@ public:
|
|||
struct TripItem : public TreeItem {
|
||||
Q_DECLARE_TR_FUNCTIONS(TripItem)
|
||||
public:
|
||||
QVariant data(int column, int role) const override;
|
||||
QVariant data(int column, int role) const;
|
||||
dive_trip_t *trip;
|
||||
};
|
||||
|
||||
|
@ -94,8 +94,8 @@ public:
|
|||
};
|
||||
|
||||
Qt::ItemFlags flags(const QModelIndex &index) const;
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
|
||||
DiveTripModel(QObject *parent = 0);
|
||||
Layout layout() const;
|
||||
void setLayout(Layout layout);
|
||||
|
|
|
@ -92,7 +92,7 @@ class MultiFilterSortModel : public QSortFilterProxyModel {
|
|||
Q_OBJECT
|
||||
public:
|
||||
static MultiFilterSortModel *instance();
|
||||
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
|
||||
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
|
||||
void addFilterModel(FilterModelBase *model);
|
||||
void removeFilterModel(FilterModelBase *model);
|
||||
int divesDisplayed;
|
||||
|
|
|
@ -56,8 +56,8 @@ public:
|
|||
~MapLocationModel();
|
||||
|
||||
Q_INVOKABLE MapLocation *get(int row);
|
||||
QVariant data(const QModelIndex &index, int role) const override;
|
||||
int rowCount(const QModelIndex &parent) const override;
|
||||
QVariant data(const QModelIndex &index, int role) const;
|
||||
int rowCount(const QModelIndex &parent) const;
|
||||
int count();
|
||||
void add(MapLocation *);
|
||||
void addList(QVector<MapLocation *>);
|
||||
|
@ -68,7 +68,7 @@ public:
|
|||
quint32 selectedUuid();
|
||||
|
||||
protected:
|
||||
QHash<int, QByteArray> roleNames() const override;
|
||||
QHash<int, QByteArray> roleNames() const;
|
||||
|
||||
private:
|
||||
QVector<MapLocation *> m_mapLocations;
|
||||
|
|
|
@ -10,9 +10,9 @@ class MessageHandlerModel : public QAbstractListModel {
|
|||
public:
|
||||
static MessageHandlerModel *self();
|
||||
enum MsgTypes {Message = Qt::UserRole + 1, Severity};
|
||||
int rowCount(const QModelIndex& parent = QModelIndex()) const override;
|
||||
QVariant data(const QModelIndex& idx, int role) const override;
|
||||
QHash<int, QByteArray> roleNames() const override;
|
||||
int rowCount(const QModelIndex& parent = QModelIndex()) const;
|
||||
QVariant data(const QModelIndex& idx, int role) const;
|
||||
QHash<int, QByteArray> roleNames() const;
|
||||
void addLog(QtMsgType type, const QString& message);
|
||||
const QString logAsString();
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ class GasSelectionModel : public QStringListModel {
|
|||
public:
|
||||
static GasSelectionModel *instance();
|
||||
Qt::ItemFlags flags(const QModelIndex &index) const;
|
||||
QVariant data(const QModelIndex &index, int role) const override;
|
||||
QVariant data(const QModelIndex &index, int role) const;
|
||||
public
|
||||
slots:
|
||||
void repopulate();
|
||||
|
@ -38,7 +38,7 @@ class DiveTypeSelectionModel : public QStringListModel {
|
|||
public:
|
||||
static DiveTypeSelectionModel *instance();
|
||||
Qt::ItemFlags flags(const QModelIndex &index) const;
|
||||
QVariant data(const QModelIndex &index, int role) const override;
|
||||
QVariant data(const QModelIndex &index, int role) const;
|
||||
public
|
||||
slots:
|
||||
void repopulate();
|
||||
|
@ -49,8 +49,8 @@ class LanguageModel : public QAbstractListModel {
|
|||
Q_OBJECT
|
||||
public:
|
||||
static LanguageModel *instance();
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
|
||||
private:
|
||||
LanguageModel(QObject *parent = 0);
|
||||
|
|
|
@ -17,9 +17,9 @@ class SsrfSortFilterProxyModel : public QSortFilterProxyModel {
|
|||
|
||||
public:
|
||||
SsrfSortFilterProxyModel(QObject *parent = 0);
|
||||
bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const override;
|
||||
bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
|
||||
bool filterAcceptsColumn(int source_column, const QModelIndex& source_parent) const override;
|
||||
bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const;
|
||||
bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
|
||||
bool filterAcceptsColumn(int source_column, const QModelIndex& source_parent) const;
|
||||
|
||||
void setLessThan(less_than_cb func);
|
||||
void setFilterRow(filter_accepts_row_cb func);
|
||||
|
|
|
@ -18,10 +18,10 @@ public:
|
|||
};
|
||||
TankInfoModel();
|
||||
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex());
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
|
||||
const QString &biggerString() const;
|
||||
void clear();
|
||||
public
|
||||
|
|
|
@ -26,11 +26,11 @@ class TreeModel : public QAbstractItemModel {
|
|||
public:
|
||||
TreeModel(QObject *parent = 0);
|
||||
~TreeModel();
|
||||
QVariant data(const QModelIndex &index, int role) const override;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
|
||||
QModelIndex parent(const QModelIndex &child) const override;
|
||||
QVariant data(const QModelIndex &index, int role) const;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
int columnCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
|
||||
QModelIndex parent(const QModelIndex &child) const;
|
||||
|
||||
protected:
|
||||
int columns;
|
||||
|
|
|
@ -17,10 +17,10 @@ public:
|
|||
};
|
||||
|
||||
explicit WeightModel(QObject *parent = 0);
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
Qt::ItemFlags flags(const QModelIndex &index) const override;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
Qt::ItemFlags flags(const QModelIndex &index) const;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
|
||||
|
||||
void passInData(const QModelIndex &index, const QVariant &value);
|
||||
void add();
|
||||
|
|
|
@ -16,10 +16,10 @@ public:
|
|||
};
|
||||
WSInfoModel();
|
||||
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
||||
bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||
int rowCount(const QModelIndex &parent = QModelIndex()) const;
|
||||
bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex());
|
||||
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
|
||||
const QString &biggerString() const;
|
||||
void clear();
|
||||
void update();
|
||||
|
|
|
@ -26,7 +26,7 @@ public:
|
|||
COLUMNS
|
||||
};
|
||||
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
|
||||
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
|
||||
YearlyStatisticsModel(QObject *parent = 0);
|
||||
void update_yearly_stats();
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue