diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-03-09 20:25:09 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-03-09 21:50:34 -0800 |
| commit | b8fbf7218268ae5f82d610fdddb686c1e85aff6e (patch) | |
| tree | 2707904ac8ced763780057f1d6f5a84fa0439863 | |
| parent | b4bb1321bf42798754f841d819b8ceec7b04525e (diff) | |
| download | subsurface-b8fbf7218268ae5f82d610fdddb686c1e85aff6e.tar.gz | |
Silence warnings in divelogimportdialog.cpp
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | desktop-widgets/divelogimportdialog.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp index 363be800e..4e5607ed3 100644 --- a/desktop-widgets/divelogimportdialog.cpp +++ b/desktop-widgets/divelogimportdialog.cpp @@ -9,17 +9,19 @@ static QString subsurface_mimedata = "subsurface/csvcolumns"; static QString subsurface_index = "subsurface/csvindex"; +#define SILENCE_WARNING 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "" + const DiveLogImportDialog::CSVAppConfig DiveLogImportDialog::CSVApps[CSVAPPS] = { // time, depth, temperature, po2, sensor1, sensor2, sensor3, cns, ndl, tts, stopdepth, pressure, setpoint // indices are 0 based, -1 means the column doesn't exist - { "Manual import", }, + { "Manual import", SILENCE_WARNING }, { "APD Log Viewer - DC1", 0, 1, 15, 6, 3, 4, 5, 17, -1, -1, 18, -1, 2, "Tab" }, { "APD Log Viewer - DC2", 0, 1, 15, 6, 7, 8, 9, 17, -1, -1, 18, -1, 2, "Tab" }, { "XP5", 0, 1, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, "Tab" }, { "SensusCSV", 9, 10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, "," }, { "Seabear CSV", 0, 1, 5, -1, -1, -1, -1, -1, 2, 3, 4, 6, -1, ";" }, { "SubsurfaceCSV", -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, "Tab" }, - { NULL, } + { NULL, SILENCE_WARNING } }; enum Known { @@ -44,6 +46,8 @@ ColumnNameProvider::ColumnNameProvider(QObject *parent) : QAbstractListModel(par bool ColumnNameProvider::insertRows(int row, int count, const QModelIndex &parent) { + Q_UNUSED(count) + Q_UNUSED(parent) beginInsertRows(QModelIndex(), row, row); columnNames.append(QString()); endInsertRows(); @@ -52,6 +56,8 @@ bool ColumnNameProvider::insertRows(int row, int count, const QModelIndex &paren bool ColumnNameProvider::removeRows(int row, int count, const QModelIndex &parent) { + Q_UNUSED(count) + Q_UNUSED(parent) beginRemoveRows(QModelIndex(), row, row); columnNames.removeAt(row); endRemoveRows(); @@ -100,6 +106,7 @@ int ColumnNameProvider::mymatch(QString value) const ColumnNameView::ColumnNameView(QWidget *parent) { + Q_UNUSED(parent) setAcceptDrops(true); setDragEnabled(true); } @@ -161,6 +168,7 @@ void ColumnNameView::dropEvent(QDropEvent *event) ColumnDropCSVView::ColumnDropCSVView(QWidget *parent) { + Q_UNUSED(parent) setAcceptDrops(true); } |