juicy compiler error

2017-01-11 18:52:09 +01:00
parent 580a411e9d
commit 854566b57f
63 changed files with 1481 additions and 1067 deletions
@@ -4,9 +4,9 @@
 #include "concurrentmap.h"
 #include "lazyloadedimage.h"

-#include <QString>
 #include <QMap>
 #include <QMutex>
+#include <QString>
 #include <QVector>
 #include <memory>

@@ -14,39 +14,87 @@ class Message;

 class Channel
 {
-// static
+    // static

 public:
    static Channel whispers;
    static Channel mentions;

-    static Channel* addChannel(const QString &channel);
-    static Channel* getChannel(const QString &channel);
-    static void  removeChannel(const QString &channel);
+    static Channel *addChannel(const QString &channel);
+    static Channel *getChannel(const QString &channel);
+    static void removeChannel(const QString &channel);

 private:
-    static QMap<QString, Channel*> channels;
+    static QMap<QString, Channel *> channels;

-// members
+    // members

 public:
    // properties
-    const ConcurrentMap<QString, LazyLoadedImage*>& bttvChannelEmotes() const { return m_bttvChannelEmotes; }
-    const ConcurrentMap<QString, LazyLoadedImage*>& ffzChannelEmotes() const { return m_ffzChannelEmotes; }
+    const ConcurrentMap<QString, LazyLoadedImage *> &
+    bttvChannelEmotes() const
+    {
+        return m_bttvChannelEmotes;
+    }
+    const ConcurrentMap<QString, LazyLoadedImage *> &
+    ffzChannelEmotes() const
+    {
+        return m_ffzChannelEmotes;
+    }

-    const QMutex& messageMutex() const { return m_messageMutex; }
+    const QMutex &
+    messageMutex() const
+    {
+        return m_messageMutex;
+    }

-    const QString& name() const { return m_name; }
-    int roomID() const { return m_roomID; }
+    const QString &
+    name() const
+    {
+        return m_name;
+    }
+    int
+    roomID() const
+    {
+        return m_roomID;
+    }

-    const QString& subLink() const { return m_subLink; }
-    const QString& channelLink() const { return m_channelLink; }
-    const QString& popoutPlayerLink() const { return m_popoutPlayerLink; }
+    const QString &
+    subLink() const
+    {
+        return m_subLink;
+    }
+    const QString &
+    channelLink() const
+    {
+        return m_channelLink;
+    }
+    const QString &
+    popoutPlayerLink() const
+    {
+        return m_popoutPlayerLink;
+    }

-    bool isLive() const { return m_isLive; }
-    int streamViewerCount() const { return m_streamViewerCount; }
-    const QString& streamStatus() const { return m_streamStatus; }
-    const QString& streamGame() const { return m_streamGame; }
+    bool
+    isLive() const
+    {
+        return m_isLive;
+    }
+    int
+    streamViewerCount() const
+    {
+        return m_streamViewerCount;
+    }
+    const QString &
+    streamStatus() const
+    {
+        return m_streamStatus;
+    }
+    const QString &
+    streamGame() const
+    {
+        return m_streamGame;
+    }

    // methods
    void addMessage(std::shared_ptr<Message> message);
@@ -56,25 +104,25 @@ public:
 private:
    Channel(QString channel);

-    ConcurrentMap<QString, LazyLoadedImage*> m_bttvChannelEmotes;
-    ConcurrentMap<QString, LazyLoadedImage*> m_ffzChannelEmotes;
-    QMutex  m_messageMutex;
+    ConcurrentMap<QString, LazyLoadedImage *> m_bttvChannelEmotes;
+    ConcurrentMap<QString, LazyLoadedImage *> m_ffzChannelEmotes;
+    QMutex m_messageMutex;

-    int     m_referenceCount = 0;
+    int m_referenceCount = 0;

    QVector<std::shared_ptr<Message>> m_messages;

    QString m_name;
-    int     m_roomID;
+    int m_roomID;

    QString m_subLink;
    QString m_channelLink;
    QString m_popoutPlayerLink;

-    bool    m_isLive;
-    int     m_streamViewerCount;
+    bool m_isLive;
+    int m_streamViewerCount;
    QString m_streamStatus;
    QString m_streamGame;
 };

-#endif // CHANNEL_H
+#endif  // CHANNEL_H