mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	Commit df156a56c0 replaced "virtual"
by "override" where appropriate. Unfortunately, this had the
unintended consequence of producing numerous clang warnings. If
clang finds a override-modified function in a class definition,
it warns for *all* overriden virtual functions without the override
modifier.
To solve this, go the easy route and remove all overrides. At least
it is consistent.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
		
	
			
		
			
				
	
	
		
			44 lines
		
	
	
	
		
			1.2 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			44 lines
		
	
	
	
		
			1.2 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0
 | |
| #ifndef DIVEPICTUREMODEL_H
 | |
| #define DIVEPICTUREMODEL_H
 | |
| 
 | |
| #include "core/units.h"
 | |
| 
 | |
| #include <QAbstractTableModel>
 | |
| #include <QImage>
 | |
| #include <QFuture>
 | |
| 
 | |
| struct PictureEntry {
 | |
| 	int diveId;
 | |
| 	struct picture *picture;
 | |
| 	QString filename;
 | |
| 	QImage image;
 | |
| 	int offsetSeconds;
 | |
| };
 | |
| 
 | |
| class DivePictureModel : public QAbstractTableModel {
 | |
| 	Q_OBJECT
 | |
| public:
 | |
| 	static DivePictureModel *instance();
 | |
| 	int columnCount(const QModelIndex &parent = QModelIndex()) const;
 | |
| 	QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
 | |
| 	int rowCount(const QModelIndex &parent = QModelIndex()) const;
 | |
| 	void updateDivePictures();
 | |
| 	void removePictures(const QVector<QString> &fileUrls);
 | |
| 	void updateDivePictureOffset(int diveId, const QString &filename, int offsetSeconds);
 | |
| signals:
 | |
| 	void picturesRemoved(const QVector<QString> &fileUrls);
 | |
| public slots:
 | |
| 	void setZoomLevel(int level);
 | |
| 	void updateThumbnail(QString filename, QImage thumbnail, duration_t duration);
 | |
| private:
 | |
| 	DivePictureModel();
 | |
| 	QVector<PictureEntry> pictures;
 | |
| 	int findPictureId(const QString &filename);	// Return -1 if not found
 | |
| 	double zoomLevel;	// -1.0: minimum, 0.0: standard, 1.0: maximum
 | |
| 	int size;
 | |
| 	void updateThumbnails();
 | |
| 	void updateZoom();
 | |
| };
 | |
| 
 | |
| #endif
 |