Merge branch 'cmakeAndPreferences'

1 files changed, 0 insertions, 57 deletions

diff --git a/qt-ui/profile/divepixmapitem.h b/qt-ui/profile/divepixmapitem.h
deleted file mode 100644
index 02c1523f7..000000000
--- a/qt-ui/profile/divepixmapitem.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef DIVEPIXMAPITEM_H
-#define DIVEPIXMAPITEM_H
-
-#include <QObject>
-#include <QGraphicsPixmapItem>
-
-class DivePixmapItem : public QObject, public QGraphicsPixmapItem {
-	Q_OBJECT
-	Q_PROPERTY(qreal opacity WRITE setOpacity READ opacity)
-	Q_PROPERTY(QPointF pos WRITE setPos READ pos)
-	Q_PROPERTY(qreal x WRITE setX READ x)
-	Q_PROPERTY(qreal y WRITE setY READ y)
-public:
-	DivePixmapItem(QObject *parent = 0);
-};
-
-class DivePictureItem : public DivePixmapItem {
-	Q_OBJECT
-	Q_PROPERTY(qreal scale WRITE setScale READ scale)
-public:
-	DivePictureItem(QObject *parent = 0);
-	virtual ~DivePictureItem();
-	void setPixmap(const QPixmap& pix);
-public slots:
-	void settingsChanged();
-	void removePicture();
-	void setFileUrl(const QString& s);
-protected:
-	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
-	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
-	void mousePressEvent(QGraphicsSceneMouseEvent *event);
-private:
-	QString fileUrl;
-	QGraphicsRectItem *canvas;
-	QGraphicsRectItem *shadow;
-};
-
-class DiveButtonItem : public DivePixmapItem {
-	Q_OBJECT
-public:
-	DiveButtonItem(QObject *parent = 0);
-protected:
-	virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
-signals:
-	void clicked();
-};
-
-class CloseButtonItem : public DiveButtonItem {
-	Q_OBJECT
-public:
-	CloseButtonItem(QObject *parent = 0);
-public slots:
-	void hide();
-	void show();
-};
-
-#endif // DIVEPIXMAPITEM_H