diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2017-07-28 22:01:33 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2017-07-28 22:01:36 -0700 |
commit | c59cdd6efdbf2f946cd750d78bff79f431d68a50 (patch) | |
tree | 051505c037b70164c710bf2060c9654c703eb7c1 /desktop-widgets | |
parent | 5be6fd2f8e957a3c668104b5ea8abdae6db3342b (diff) | |
download | subsurface-c59cdd6efdbf2f946cd750d78bff79f431d68a50.tar.gz |
Switch new files to unix line endings
I thought we had this automated, but Lubomirs commits introduced a few
files with dos line endings. This is purely a change of line endings, no
other changes.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'desktop-widgets')
-rw-r--r-- | desktop-widgets/mapwidget.cpp | 204 | ||||
-rw-r--r-- | desktop-widgets/mapwidget.h | 90 |
2 files changed, 147 insertions, 147 deletions
diff --git a/desktop-widgets/mapwidget.cpp b/desktop-widgets/mapwidget.cpp index 0b7624371..adda11c26 100644 --- a/desktop-widgets/mapwidget.cpp +++ b/desktop-widgets/mapwidget.cpp @@ -1,102 +1,102 @@ -// SPDX-License-Identifier: GPL-2.0
-#include <QQmlContext>
-#include <QDebug>
-#include <QQuickItem>
-#include <QModelIndex>
-
-#include "mapwidget.h"
-#include "core/dive.h"
-#include "core/divesite.h"
-#include "mobile-widgets/qmlmapwidgethelper.h"
-#include "qt-models/maplocationmodel.h"
-#include "mainwindow.h"
-#include "divelistview.h"
-
-static bool skipReload = false;
-
-MapWidget *MapWidget::m_instance = NULL;
-
-MapWidget::MapWidget(QWidget *parent) : QQuickWidget(parent)
-{
- qmlRegisterType<MapWidgetHelper>("org.subsurfacedivelog.mobile", 1, 0, "MapWidgetHelper");
- qmlRegisterType<MapLocationModel>("org.subsurfacedivelog.mobile", 1, 0, "MapLocationModel");
- qmlRegisterType<MapLocation>("org.subsurfacedivelog.mobile", 1, 0, "MapLocation");
-
- setSource(QUrl(QStringLiteral("qrc:/MapWidget.qml")));
- setResizeMode(QQuickWidget::SizeRootObjectToView);
-
- m_rootItem = qobject_cast<QQuickItem *>(rootObject());
- m_mapHelper = rootObject()->findChild<MapWidgetHelper *>();
- connect(m_mapHelper, SIGNAL(selectedDivesChanged(QList<int>)),
- this, SLOT(selectedDivesChanged(QList<int>)));
- connect(m_mapHelper, SIGNAL(coordinatesChanged()),
- this, SLOT(coordinatesChangedLocal()));
-}
-
-void MapWidget::centerOnDiveSite(struct dive_site *ds)
-{
- if (!skipReload)
- m_mapHelper->centerOnDiveSite(ds);
-}
-
-void MapWidget::centerOnIndex(const QModelIndex& idx)
-{
- struct dive_site *ds = get_dive_site_by_uuid(idx.model()->index(idx.row(), 0).data().toInt());
- if (!ds || !dive_site_has_gps_location(ds))
- centerOnDiveSite(&displayed_dive_site);
- else
- centerOnDiveSite(ds);
-}
-
-void MapWidget::repopulateLabels()
-{
- m_mapHelper->reloadMapLocations();
-}
-
-void MapWidget::reload()
-{
- setEditMode(false);
- if (!skipReload)
- m_mapHelper->reloadMapLocations();
-}
-
-void MapWidget::setEditMode(bool editMode)
-{
- m_mapHelper->setEditMode(editMode);
-}
-
-void MapWidget::endGetDiveCoordinates()
-{
- setEditMode(false);
-}
-
-void MapWidget::prepareForGetDiveCoordinates()
-{
- setEditMode(true);
-}
-
-void MapWidget::selectedDivesChanged(QList<int> list)
-{
- skipReload = true;
- MainWindow::instance()->dive_list()->unselectDives();
- if (!list.empty())
- MainWindow::instance()->dive_list()->selectDives(list);
- skipReload = false;
-}
-
-void MapWidget::coordinatesChangedLocal()
-{
- emit coordinatesChanged();
-}
-
-MapWidget::~MapWidget()
-{
- m_instance = NULL;
-}
-
-MapWidget *MapWidget::instance()
-{
- if (m_instance == NULL)
- m_instance = new MapWidget();
- return m_instance;
-}
+// SPDX-License-Identifier: GPL-2.0 +#include <QQmlContext> +#include <QDebug> +#include <QQuickItem> +#include <QModelIndex> + +#include "mapwidget.h" +#include "core/dive.h" +#include "core/divesite.h" +#include "mobile-widgets/qmlmapwidgethelper.h" +#include "qt-models/maplocationmodel.h" +#include "mainwindow.h" +#include "divelistview.h" + +static bool skipReload = false; + +MapWidget *MapWidget::m_instance = NULL; + +MapWidget::MapWidget(QWidget *parent) : QQuickWidget(parent) +{ + qmlRegisterType<MapWidgetHelper>("org.subsurfacedivelog.mobile", 1, 0, "MapWidgetHelper"); + qmlRegisterType<MapLocationModel>("org.subsurfacedivelog.mobile", 1, 0, "MapLocationModel"); + qmlRegisterType<MapLocation>("org.subsurfacedivelog.mobile", 1, 0, "MapLocation"); + + setSource(QUrl(QStringLiteral("qrc:/MapWidget.qml"))); + setResizeMode(QQuickWidget::SizeRootObjectToView); + + m_rootItem = qobject_cast<QQuickItem *>(rootObject()); + m_mapHelper = rootObject()->findChild<MapWidgetHelper *>(); + connect(m_mapHelper, SIGNAL(selectedDivesChanged(QList<int>)), + this, SLOT(selectedDivesChanged(QList<int>))); + connect(m_mapHelper, SIGNAL(coordinatesChanged()), + this, SLOT(coordinatesChangedLocal())); +} + +void MapWidget::centerOnDiveSite(struct dive_site *ds) +{ + if (!skipReload) + m_mapHelper->centerOnDiveSite(ds); +} + +void MapWidget::centerOnIndex(const QModelIndex& idx) +{ + struct dive_site *ds = get_dive_site_by_uuid(idx.model()->index(idx.row(), 0).data().toInt()); + if (!ds || !dive_site_has_gps_location(ds)) + centerOnDiveSite(&displayed_dive_site); + else + centerOnDiveSite(ds); +} + +void MapWidget::repopulateLabels() +{ + m_mapHelper->reloadMapLocations(); +} + +void MapWidget::reload() +{ + setEditMode(false); + if (!skipReload) + m_mapHelper->reloadMapLocations(); +} + +void MapWidget::setEditMode(bool editMode) +{ + m_mapHelper->setEditMode(editMode); +} + +void MapWidget::endGetDiveCoordinates() +{ + setEditMode(false); +} + +void MapWidget::prepareForGetDiveCoordinates() +{ + setEditMode(true); +} + +void MapWidget::selectedDivesChanged(QList<int> list) +{ + skipReload = true; + MainWindow::instance()->dive_list()->unselectDives(); + if (!list.empty()) + MainWindow::instance()->dive_list()->selectDives(list); + skipReload = false; +} + +void MapWidget::coordinatesChangedLocal() +{ + emit coordinatesChanged(); +} + +MapWidget::~MapWidget() +{ + m_instance = NULL; +} + +MapWidget *MapWidget::instance() +{ + if (m_instance == NULL) + m_instance = new MapWidget(); + return m_instance; +} diff --git a/desktop-widgets/mapwidget.h b/desktop-widgets/mapwidget.h index 2d33ee85b..d104da1a3 100644 --- a/desktop-widgets/mapwidget.h +++ b/desktop-widgets/mapwidget.h @@ -1,45 +1,45 @@ -// SPDX-License-Identifier: GPL-2.0
-#ifndef MAPWIDGET_H
-#define MAPWIDGET_H
-
-#include <QQuickWidget>
-#include <QList>
-
-#undef IGNORE
-
-class QResizeEvent;
-class QQuickItem;
-class MapWidgetHelper;
-struct dive_site;
-
-class MapWidget : public QQuickWidget {
-
- Q_OBJECT
-
-public:
- MapWidget(QWidget *parent = NULL);
- ~MapWidget();
-
- static MapWidget *instance();
- void reload();
-
-signals:
- void coordinatesChanged();
-
-public slots:
- void centerOnDiveSite(struct dive_site *);
- void centerOnIndex(const QModelIndex& idx);
- void endGetDiveCoordinates();
- void repopulateLabels();
- void prepareForGetDiveCoordinates();
- void selectedDivesChanged(QList<int>);
- void coordinatesChangedLocal();
-
-private:
- void setEditMode(bool editMode);
- static MapWidget *m_instance;
- QQuickItem *m_rootItem;
- MapWidgetHelper *m_mapHelper;
-};
-
-#endif // MAPWIDGET_H
+// SPDX-License-Identifier: GPL-2.0 +#ifndef MAPWIDGET_H +#define MAPWIDGET_H + +#include <QQuickWidget> +#include <QList> + +#undef IGNORE + +class QResizeEvent; +class QQuickItem; +class MapWidgetHelper; +struct dive_site; + +class MapWidget : public QQuickWidget { + + Q_OBJECT + +public: + MapWidget(QWidget *parent = NULL); + ~MapWidget(); + + static MapWidget *instance(); + void reload(); + +signals: + void coordinatesChanged(); + +public slots: + void centerOnDiveSite(struct dive_site *); + void centerOnIndex(const QModelIndex& idx); + void endGetDiveCoordinates(); + void repopulateLabels(); + void prepareForGetDiveCoordinates(); + void selectedDivesChanged(QList<int>); + void coordinatesChangedLocal(); + +private: + void setEditMode(bool editMode); + static MapWidget *m_instance; + QQuickItem *m_rootItem; + MapWidgetHelper *m_mapHelper; +}; + +#endif // MAPWIDGET_H |