diff options
Diffstat (limited to 'ui')
-rw-r--r-- | ui/qt/models/astringlist_list_model.cpp | 6 | ||||
-rw-r--r-- | ui/qt/models/coloring_rules_model.cpp | 14 | ||||
-rw-r--r-- | ui/qt/models/coloring_rules_model.h | 3 | ||||
-rw-r--r-- | ui/qt/models/credentials_model.h | 5 | ||||
-rw-r--r-- | ui/qt/models/filter_list_model.cpp | 4 | ||||
-rw-r--r-- | ui/qt/models/packet_list_model.h | 3 |
6 files changed, 26 insertions, 9 deletions
diff --git a/ui/qt/models/astringlist_list_model.cpp b/ui/qt/models/astringlist_list_model.cpp index 04ea879b99..752bf11952 100644 --- a/ui/qt/models/astringlist_list_model.cpp +++ b/ui/qt/models/astringlist_list_model.cpp @@ -97,10 +97,10 @@ bool AStringListListSortFilterProxyModel::lessThan(const QModelIndex &left, cons if ( numericColumns_.contains(left.column()) || numericColumns_.contains(right.column() ) ) { - float left = leftData.toFloat(); - float right = rightData.toFloat(); + float leftD = leftData.toFloat(); + float rightD = rightData.toFloat(); - return left < right; + return leftD < rightD; } return leftData.compare(rightData, sortCaseSensitivity()) < 0; diff --git a/ui/qt/models/coloring_rules_model.cpp b/ui/qt/models/coloring_rules_model.cpp index 7d574a2d26..6dbe77943f 100644 --- a/ui/qt/models/coloring_rules_model.cpp +++ b/ui/qt/models/coloring_rules_model.cpp @@ -60,6 +60,16 @@ ColoringRuleItem::ColoringRuleItem(const ColoringRuleItem& item) { } +ColoringRuleItem& ColoringRuleItem::operator=(ColoringRuleItem& rhs) +{ + disabled_ = rhs.disabled_; + name_ = rhs.name_; + filter_ = rhs.filter_; + foreground_ = rhs.foreground_; + background_ = rhs.background_; + return *this; +} + // Callback for color_filters_clone. void color_filter_add_cb(color_filter_t *colorf, gpointer user_data) @@ -454,9 +464,9 @@ bool ColoringRulesModel::dropMimeData(const QMimeData *data, Qt::DropAction acti QJsonArray dataArray = encodedData.object()["coloringrules"].toArray(); - for ( int row = 0; row < dataArray.count(); row++ ) + for ( int datarow = 0; datarow < dataArray.count(); datarow++ ) { - QJsonObject entry = dataArray.at(row).toObject(); + QJsonObject entry = dataArray.at(datarow).toObject(); if ( ! entry.contains("foreground") || ! entry.contains("background") || ! entry.contains("filter") ) continue; diff --git a/ui/qt/models/coloring_rules_model.h b/ui/qt/models/coloring_rules_model.h index ec4e0a6309..f9cb6583ec 100644 --- a/ui/qt/models/coloring_rules_model.h +++ b/ui/qt/models/coloring_rules_model.h @@ -37,6 +37,9 @@ public: QString filter_; QColor foreground_; QColor background_; + + ColoringRuleItem& operator=(ColoringRuleItem& rhs); + }; class ColoringRulesModel : public QAbstractItemModel diff --git a/ui/qt/models/credentials_model.h b/ui/qt/models/credentials_model.h index 8ef66c6f39..703b7f7ed6 100644 --- a/ui/qt/models/credentials_model.h +++ b/ui/qt/models/credentials_model.h @@ -10,6 +10,9 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef CREDENTIALS_MODELS_H +#define CREDENTIALS_MODELS_H + #include <QAbstractListModel> #include <QList> @@ -46,6 +49,8 @@ private: }; +#endif // CREDENTIALS_MODELS_H + /* * Editor modelines * diff --git a/ui/qt/models/filter_list_model.cpp b/ui/qt/models/filter_list_model.cpp index 43a5e6ca6a..b65e11f5b9 100644 --- a/ui/qt/models/filter_list_model.cpp +++ b/ui/qt/models/filter_list_model.cpp @@ -289,7 +289,7 @@ bool FilterListModel::dropMimeData(const QMimeData *data, Qt::DropAction action, if ( rows.count() > 0 ) { bool ok = false; - int row = rows[0].toInt(&ok); + int strow = rows[0].toInt(&ok); if ( ok ) { int storeTo = insertRow; @@ -297,7 +297,7 @@ bool FilterListModel::dropMimeData(const QMimeData *data, Qt::DropAction action, storeTo = storage.count() - 1; beginResetModel(); - storage.move(row, storeTo); + storage.move(strow, storeTo); endResetModel(); } } diff --git a/ui/qt/models/packet_list_model.h b/ui/qt/models/packet_list_model.h index 0c9d10a285..b12e17cbbc 100644 --- a/ui/qt/models/packet_list_model.h +++ b/ui/qt/models/packet_list_model.h @@ -45,8 +45,7 @@ public: int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex & = QModelIndex()) const; QVariant data(const QModelIndex &d_index, int role) const; - QVariant headerData(int section, Qt::Orientation orientation, - int role = Qt::DisplayRole | Qt::ToolTipRole) const; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; gint appendPacket(frame_data *fdata); frame_data *getRowFdata(int row); |