Skip to content

Commit

Permalink
Merge pull request #289 from netromdk/fix_warnings
Browse files Browse the repository at this point in the history
Fix warnings
  • Loading branch information
raoulh authored Jun 11, 2018
2 parents bd9eb21 + c539f4f commit c028c14
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions src/AppGui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ bool AppGui::initialize()
mainWindowHide();
}
#else
Q_UNUSED(this)
Q_UNUSED(reason)
#endif
});
Expand Down
4 changes: 2 additions & 2 deletions src/CredentialModelFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ class CredentialModelFilter : public QSortFilterProxyModel
QModelIndexList getNextRow(const QModelIndex &rowIdx);

protected:
virtual bool filterAcceptsRow(int iSrcRow, const QModelIndex &srcParent) const;
virtual bool lessThan(const QModelIndex &srcLeft, const QModelIndex &srcRight) const;
virtual bool filterAcceptsRow(int iSrcRow, const QModelIndex &srcParent) const override;
virtual bool lessThan(const QModelIndex &srcLeft, const QModelIndex &srcRight) const override;

private:
bool acceptRow(int iSrcRow, const QModelIndex &srcParent) const;
Expand Down
3 changes: 2 additions & 1 deletion src/ItemDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ class ItemDelegate : public QStyledItemDelegate
{
public:
explicit ItemDelegate(QWidget* parent = nullptr);
virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
virtual QSize sizeHint(const QStyleOptionViewItem &option,
const QModelIndex &index) const override;
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option,
const QModelIndex &index) const override;
void emitSizeHintChanged(const QModelIndex &index);
Expand Down
2 changes: 1 addition & 1 deletion src/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ MainWindow::MainWindow(WSClient *client, DbMasterController *mc, QWidget *parent
refreshAppLangCb();

ui->checkBoxLongPress->setChecked(s.value("settings/long_press_cancel", true).toBool());
connect(ui->checkBoxLongPress, &QCheckBox::toggled, [this](bool checked)
connect(ui->checkBoxLongPress, &QCheckBox::toggled, [](bool checked)
{
QSettings settings;
settings.setValue("settings/long_press_cancel", checked);
Expand Down

0 comments on commit c028c14

Please sign in to comment.