rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Matthew Hodgson 2017-05-01 17:44:56 +01:00 committed by GitHub
commit 24c51f0cfd
6 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -1,3 +1,5 @@
SRC := $(shell find include src -type f -type f \( -iname "*.cc" -o -iname "*.h" \))
debug: debug:
@cmake -H. -GNinja -Bbuild -DCMAKE_BUILD_TYPE=Debug @cmake -H. -GNinja -Bbuild -DCMAKE_BUILD_TYPE=Debug
@cmake --build build @cmake --build build
@ -9,6 +11,9 @@ release-debug:
run: run:
@./build/nheko @./build/nheko
lint:
@clang-format -i $(SRC)
clean: clean:
rm -rf build rm -rf build

2
include/Sync.h
View File

@ -177,7 +177,7 @@ inline QMap<QString, JoinedRoom> Rooms::join() const
class SyncResponse : public Deserializable class SyncResponse : public Deserializable
{ {
public: public:
void deserialize(const QJsonDocument &data) override; void deserialize(const QJsonDocument &data) override;
inline QString nextBatch() const; inline QString nextBatch() const;
inline Rooms rooms() const; inline Rooms rooms() const;

2
include/TimelineItem.h
View File

@ -22,8 +22,8 @@
#include <QLabel> #include <QLabel>
#include <QWidget> #include <QWidget>
#include "Sync.h"
#include "ImageItem.h" #include "ImageItem.h"
#include "Sync.h"
class TimelineItem : public QWidget class TimelineItem : public QWidget
{ {

2
include/TimelineViewManager.h
View File

@ -23,10 +23,10 @@
#include <QStackedWidget> #include <QStackedWidget>
#include <QWidget> #include <QWidget>
#include "TimelineView.h"
#include "MatrixClient.h" #include "MatrixClient.h"
#include "RoomInfo.h" #include "RoomInfo.h"
#include "Sync.h" #include "Sync.h"
#include "TimelineView.h"
class TimelineViewManager : public QStackedWidget class TimelineViewManager : public QStackedWidget
{ {

3
src/Deserializable.cc
View File

@ -21,7 +21,8 @@
#include "Deserializable.h" #include "Deserializable.h"
DeserializationException::DeserializationException(const std::string &msg) : msg_(msg) DeserializationException::DeserializationException(const std::string &msg)
: msg_(msg)
{ {
} }

2
src/main.cc
View File

@ -28,6 +28,8 @@ int main(int argc, char *argv[])
QCoreApplication::setApplicationName("nheko"); QCoreApplication::setApplicationName("nheko");
QCoreApplication::setApplicationVersion("Ωμέγa"); QCoreApplication::setApplicationVersion("Ωμέγa");
QCoreApplication::setOrganizationName("Nheko"); QCoreApplication::setOrganizationName("Nheko");
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Regular.ttf"); QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Regular.ttf");
QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Italic.ttf"); QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Italic.ttf");