From f46f16f11976234debb6c98f5c0b318170ed8e9e Mon Sep 17 00:00:00 2001
From: RPJosh <RPJosh@rpjosh.de>
Date: Mon, 24 Jul 2023 20:21:43 +0200
Subject: [PATCH] Add compatibility with nc 26

---
 appinfo/info.xml                          | 2 +-
 db/citymapper.php                         | 4 ++--
 db/settingsmapper.php                     | 4 ++--
 lib/Controller/IntermediateController.php | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 4f55bce..b2ac3aa 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -11,7 +11,7 @@
     <screenshot>https://raw.githubusercontent.com/nextcloud/weather/master/screenshots/1.png</screenshot>
     <screenshot>https://raw.githubusercontent.com/nextcloud/weather/master/screenshots/2.png</screenshot>
     <dependencies>
-        <nextcloud min-version="22" max-version="25"/>
+        <nextcloud min-version="22" max-version="26"/>
     </dependencies>
     <website>https://github.com/nextcloud/weather</website>
     <bugs>https://github.com/nextcloud/weather/issues</bugs>
diff --git a/db/citymapper.php b/db/citymapper.php
index cacf5c4..15901b9 100644
--- a/db/citymapper.php
+++ b/db/citymapper.php
@@ -14,9 +14,9 @@ namespace OCA\Weather\Db;
 
 use \OCP\IDBConnection;
 
-use \OCP\AppFramework\Db\Mapper;
+use \OCP\AppFramework\Db\QbMapper;
 
-class CityMapper extends Mapper {
+class CityMapper extends QbMapper {
         public function __construct (IDBConnection $db) {
                 parent::__construct($db, 'weather_city');
         }
diff --git a/db/settingsmapper.php b/db/settingsmapper.php
index 3df15eb..991cbe2 100644
--- a/db/settingsmapper.php
+++ b/db/settingsmapper.php
@@ -14,9 +14,9 @@ namespace OCA\Weather\Db;
 
 use \OCP\IDBConnection;
 
-use \OCP\AppFramework\Db\Mapper;
+use \OCP\AppFramework\Db\QbMapper;
 
-class SettingsMapper extends Mapper {
+class SettingsMapper extends QbMapper {
         public function __construct (IDBConnection $db) {
                 parent::__construct($db, 'weather_config');
         }
diff --git a/lib/Controller/IntermediateController.php b/lib/Controller/IntermediateController.php
index 84c2255..b058521 100644
--- a/lib/Controller/IntermediateController.php
+++ b/lib/Controller/IntermediateController.php
@@ -13,7 +13,6 @@ namespace OCA\Weather\Controller;
 
 use \OCP\IRequest;
 use \OCP\AppFramework\Controller;
-use \OCA\Weather\Controller\IntermediateController;
 
 class IntermediateController extends Controller {
 	private $curl;