Perform initial refactoring work

Things that were once singletons are no longer singletons, but are
instead stored in the "Application" singleton

Some singletons still remain, and some renaming/renamespacing is left
This commit is contained in:
Rasmus Karlsson
2018-04-27 22:11:19 +02:00
parent 32b6417a55
commit ae26b835b6
78 changed files with 850 additions and 773 deletions
@@ -1,4 +1,5 @@
#include "messages/layouts/messagelayoutelement.hpp"
#include "application.hpp"
#include "messages/messageelement.hpp"
#include "util/debugcount.hpp"
@@ -239,9 +240,11 @@ int TextIconLayoutElement::getSelectionIndexCount()
void TextIconLayoutElement::paint(QPainter &painter)
{
auto app = getApp();
QFont font = singletons::FontManager::getInstance().getFont(FontStyle::Tiny, this->scale);
painter.setPen(singletons::ThemeManager::getInstance().messages.textColors.system);
painter.setPen(app->themes->messages.textColors.system);
painter.setFont(font);
QTextOption option;