Add ChatRoom.qml and clean up code.

matrix/controller.h

@@ -4,6 +4,7 @@
 #include <QObject>
 
 #include "libqmatrixclient/connection.h"
+
 #include "roomlistmodel.h"
 
 namespace QMatrixClient {

matrix/imageprovider.cpp

@@ -1,12 +1,13 @@
 #include "imageprovider.h"
 
-#include "connection.h"
-#include "jobs/mediathumbnailjob.h"
-
 #include <QtCore/QWaitCondition>
 #include <QtCore/QDebug>
 #include <QMetaObject>
 
+#include "jobs/mediathumbnailjob.h"
+
+#include "connection.h"
+
 using QMatrixClient::MediaThumbnailJob;
 
 ImageProvider::ImageProvider(QObject *parent)

matrix/matriqueroom.cpp

@@ -1,8 +1,9 @@
 #include "matriqueroom.h"
 
-#include "user.h"
 #include "events/roommessageevent.h"
 
+#include "user.h"
+
 using namespace QMatrixClient;
 
 MatriqueRoom::MatriqueRoom(Connection* connection, QString roomId,

matrix/messageeventmodel.cpp

@@ -4,13 +4,14 @@
 #include <QtCore/QDebug>
 #include <QtQml> // for qmlRegisterType()
 
-#include "connection.h"
-#include "user.h"
-#include "settings.h"
 #include "events/roommemberevent.h"
 #include "events/simplestateevents.h"
 #include "events/redactionevent.h"
 
+#include "connection.h"
+#include "user.h"
+#include "settings.h"
+
 QHash<int, QByteArray> MessageEventModel::roleNames() const
 {
     QHash<int, QByteArray> roles = QAbstractItemModel::roleNames();

matrix/roomlistmodel.cpp

@@ -1,10 +1,11 @@
 #include "roomlistmodel.h"
+
+#include <QtGui/QIcon>
+
 #include "matriqueroom.h"
 #include "connection.h"
 #include "user.h"
 
-#include <QtGui/QIcon>
-
 RoomListModel::RoomListModel(QObject* parent)
     : QAbstractListModel(parent)
 { }
@@ -165,9 +166,11 @@ QVariant RoomListModel::data(const QModelIndex& index, int role) const
 //                    return QIcon(":/irc-channel-parted.svg");
 //            }
             if(room->avatarUrl().toString() != "") {
+                qInfo() << "Room avatar:" << room->avatarUrl();
                 return room->avatarUrl();
             } else if(room->users().length() == 2) {
                 QMatrixClient::User* user = room->users().at(0);
+                qInfo() << "User avatar:" << user->avatarUrl();
                 return user->avatarUrl();
             }
         }