mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Silence warnings in divelogimportdialog.cpp

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-03-09 20:25:09 -08:00
parent b4bb1321bf
commit b8fbf72182
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
desktop-widgets/divelogimportdialog.cpp
View file

@ -9,17 +9,19 @@
static QString subsurface_mimedata = "subsurface/csvcolumns"; static QString subsurface_mimedata = "subsurface/csvcolumns";
static QString subsurface_index = "subsurface/csvindex"; 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] = { const DiveLogImportDialog::CSVAppConfig DiveLogImportDialog::CSVApps[CSVAPPS] = {
// time, depth, temperature, po2, sensor1, sensor2, sensor3, cns, ndl, tts, stopdepth, pressure, setpoint // time, depth, temperature, po2, sensor1, sensor2, sensor3, cns, ndl, tts, stopdepth, pressure, setpoint
// indices are 0 based, -1 means the column doesn't exist // 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 - 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" }, { "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" }, { "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, "," }, { "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, ";" }, { "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" }, { "SubsurfaceCSV", -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, "Tab" },
{ NULL, } { NULL, SILENCE_WARNING }
}; };
enum Known { enum Known {
@ -44,6 +46,8 @@ ColumnNameProvider::ColumnNameProvider(QObject *parent) : QAbstractListModel(par
bool ColumnNameProvider::insertRows(int row, int count, const QModelIndex &parent) bool ColumnNameProvider::insertRows(int row, int count, const QModelIndex &parent)
{ {
Q_UNUSED(count)
Q_UNUSED(parent)
beginInsertRows(QModelIndex(), row, row); beginInsertRows(QModelIndex(), row, row);
columnNames.append(QString()); columnNames.append(QString());
endInsertRows(); 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) bool ColumnNameProvider::removeRows(int row, int count, const QModelIndex &parent)
{ {
Q_UNUSED(count)
Q_UNUSED(parent)
beginRemoveRows(QModelIndex(), row, row); beginRemoveRows(QModelIndex(), row, row);
columnNames.removeAt(row); columnNames.removeAt(row);
endRemoveRows(); endRemoveRows();
@ -100,6 +106,7 @@ int ColumnNameProvider::mymatch(QString value) const
ColumnNameView::ColumnNameView(QWidget *parent) ColumnNameView::ColumnNameView(QWidget *parent)
{ {
Q_UNUSED(parent)
setAcceptDrops(true); setAcceptDrops(true);
setDragEnabled(true); setDragEnabled(true);
} }
@ -161,6 +168,7 @@ void ColumnNameView::dropEvent(QDropEvent *event)
ColumnDropCSVView::ColumnDropCSVView(QWidget *parent) ColumnDropCSVView::ColumnDropCSVView(QWidget *parent)
{ {
Q_UNUSED(parent)
setAcceptDrops(true); setAcceptDrops(true);
} }