From c09bf559f698e05d46bf891a0881c3acf4fff4e2 Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Wed, 19 Aug 2020 17:00:44 +0200
Subject: [PATCH] Temporarily patch up things to allow building

---
 src/mainwindow.cpp | 27 +++++++++++++--------------
 src/mainwindow.h   |  4 ++--
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9af1e2b..a5269b9 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -54,7 +54,9 @@
 
 // Own
 
-#include "libdanbooru/danbooruservice.h"
+#include "libdanbooru/servicebase.h"
+#include "libdanbooru/moebooru.h"
+#include "libdanbooru/danbooru_donmai.h"
 #include "libdanbooru/danboorupost.h"
 #include "libdanbooru/danboorupool.h"
 #include "model/danboorupostmodel.h"
@@ -103,9 +105,6 @@ DanbooruMainWindow::DanbooruMainWindow(QWidget *parent)
 
     loadSettings();
 
-    m_cache = new KImageCache(qApp->applicationName(), DanbooruSettings::self()->cacheSize());
-    m_service->setImageCache(m_cache);
-
     m_proxyModel->setSortRole(DanbooruTagModel::TagCountRole);
     m_proxyModel->setSourceModel(m_tagModel);
     m_proxyModel->setDynamicSortFilter(true);
@@ -118,12 +117,12 @@ DanbooruMainWindow::DanbooruMainWindow(QWidget *parent)
     m_view->setResizeMode(QQuickWidget::SizeRootObjectToView);
     KDeclarative::KDeclarative declarative;
     declarative.setDeclarativeEngine(m_view->engine());
-    declarative.setupBindings();
+    declarative.setupContext();
+    declarative.setupEngine(m_view->engine());
     m_view->setFocusPolicy(Qt::StrongFocus);
     m_view->setFocus();
 
-    auto qmlViewPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
-                       qApp->applicationName() +                                             QStringLiteral("/danbooruimageview.qml"));
+    auto qmlViewPath = QString("qrc:/danbooru-client/qml/danbooruimageview.qml");
 
     QQmlContext *ctxt = m_view->rootContext();
     ctxt->setContextProperty(QStringLiteral("danbooruModel"), m_model);
@@ -595,13 +594,13 @@ void DanbooruMainWindow::handlePostDownload(const QStringList &tags, bool relate
     m_view->rootObject()->setProperty("poolMode", QVariant(false));
     m_service->setPostTags(tags);
 
-    if (minimumWidth > 0) {
-        m_service->setMinimumWidth(minimumWidth);
-    }
-
-    if (minimumHeight > 0) {
-        m_service->setMinimumHeight(minimumHeight);
-    }
+//     if (minimumWidth > 0) {
+//         m_service->setMinimumWidth(minimumWidth);
+//     }
+//
+//     if (minimumHeight > 0) {
+//         m_service->setMinimumHeight(minimumHeight);
+//     }
 
     if (relatedTags) {
         m_service->getRelatedTags(tags);
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 73f0bd6..a553d1e 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -39,7 +39,7 @@ namespace Danbooru
 {
 
 class DanbooruClientView;
-class DanbooruService;
+class DanbooruServiceBase;
 class DanbooruPostModel;
 class DanbooruPoolModel;
 class DanbooruTagModel;
@@ -64,7 +64,7 @@ private:
     DanbooruPostModel *m_model;
     DanbooruPoolModel *m_poolModel;
     DanbooruTagModel *m_tagModel;
-    DanbooruService *m_service;
+    DanbooruServiceBase *m_service;
     DanbooruConnectWidget *m_connectWidget;
     DanbooruSearchWidget *m_searchWidget;
     DanbooruTagWidget *m_tagWidget;