juicy compiler error

2017-01-11 18:52:09 +01:00
parent 580a411e9d
commit 854566b57f
63 changed files with 1481 additions and 1067 deletions
@@ -1,38 +1,84 @@
 #ifndef LAZYLOADEDIMAGE_H
 #define LAZYLOADEDIMAGE_H

-#include "QString"
-#include "QImage"
+#include <QImage>
+#include <QString>

 class LazyLoadedImage
 {
 public:
-    LazyLoadedImage(const QString& url, qreal scale = 1, const QString& name = "", const QString& tooltip = "", const QMargins& margin = QMargins(), bool isHat = false);
-    LazyLoadedImage(QImage* image, qreal scale = 1, const QString& name = "", const QString& tooltip = "", const QMargins& margin = QMargins(), bool isHat = false);
+    LazyLoadedImage(const QString &url, qreal scale = 1,
+                    const QString &name = "", const QString &tooltip = "",
+                    const QMargins &margin = QMargins(), bool isHat = false);
+    LazyLoadedImage(QImage *image, qreal scale = 1, const QString &name = "",
+                    const QString &tooltip = "",
+                    const QMargins &margin = QMargins(), bool isHat = false);

-    const QImage* image() const {
+    const QImage *
+    image()
+    {
+        if (!m_isLoading) {
+            m_isLoading = true;
+
+            loadImage();
+        }
        return m_image;
    }

-    qreal scale() const {
+    qreal
+    scale() const
+    {
        return m_scale;
    }

-    const QString& url() const { return m_url; }
-    const QString& name() const { return m_name; }
-    const QString& tooltip() const { return m_tooltip; }
-    const QMargins& margin() const { return m_margin; }
-    bool animated() const { return m_animated; }
-    bool isHat() const { return m_ishat; }
+    const QString &
+    url() const
+    {
+        return m_url;
+    }

-    const long width() const {
+    const QString &
+    name() const
+    {
+        return m_name;
+    }
+
+    const QString &
+    tooltip() const
+    {
+        return m_tooltip;
+    }
+
+    const QMargins &
+    margin() const
+    {
+        return m_margin;
+    }
+
+    bool
+    animated() const
+    {
+        return m_animated;
+    }
+
+    bool
+    isHat() const
+    {
+        return m_ishat;
+    }
+
+    const long
+    width() const
+    {
        if (m_image == NULL) {
            return 16;
        }
        return m_image->width();
    }

-    const long height() const {
+    const long
+    height() const
+    {
        if (m_image == NULL) {
            return 16;
        }
@@ -40,7 +86,7 @@ public:
    }

 private:
-    QImage* m_image;
+    QImage *m_image;
    qreal m_scale;

    QString m_url;
@@ -49,6 +95,10 @@ private:
    bool m_animated;
    QMargins m_margin;
    bool m_ishat;
+
+    bool m_isLoading;
+
+    void loadImage();
 };

-#endif // LAZYLOADEDIMAGE_H
+#endif  // LAZYLOADEDIMAGE_H