From b064a6cbb58a0db1a70fbac2e82242ce0c7509b1 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Sat, 28 Nov 2020 20:47:28 +0100
Subject: rbutil: Rework and merge player and build server info handling.

Handling the data for players from rbutil.ini and the build-info data
from the server is closely related. Splitting things up into different
classes only creates tightly coupling, which is unnecessary, and the
need to differentiate between them in the application.

Merge both classes into a single one and rework handling so the
application doesn't have to deal with two separate classes anymore.

Furthermore, change URL templates to use new values from build-info
instead of hard coding them.

Change-Id: Ica550973ce23d1559110782add52bc214eba552d
---
 rbutil/rbutilqt/base/serverinfo.h | 71 ---------------------------------------
 1 file changed, 71 deletions(-)
 delete mode 100644 rbutil/rbutilqt/base/serverinfo.h

(limited to 'rbutil/rbutilqt/base/serverinfo.h')

diff --git a/rbutil/rbutilqt/base/serverinfo.h b/rbutil/rbutilqt/base/serverinfo.h
deleted file mode 100644
index 0746ec2c4f..0000000000
--- a/rbutil/rbutilqt/base/serverinfo.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- *
- *   Copyright (C) 2010 by Dominik Wenger
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-// Parse and provide information from build server via build-info file.
-// This is a singleton.
-
-#ifndef SERVERINFO_H
-#define SERVERINFO_H
-
-#include <QtCore>
-#define STATUS_RETIRED  0
-#define STATUS_UNUSABLE 1
-#define STATUS_UNSTABLE 2
-#define STATUS_STABLE   3
-
-class ServerInfo : public QObject
-{
-    Q_OBJECT
-    public:
-
-        //! All Server infos
-        enum ServerInfos {
-            CurReleaseVersion,
-            CurStatus,
-            CurReleaseUrl,
-            CurDevelUrl,
-            BleedingRevision,
-            BleedingDate,
-            RelCandidateVersion,
-            RelCandidateUrl,
-            DailyVersion,
-            DailyUrl
-        };
-
-        static ServerInfo* instance();
-
-        //! read in buildinfo file
-        void readBuildInfo(QString file);
-        //! get a value from server info for a named platform.
-        QVariant platformValue(enum ServerInfos setting, QString platform = "");
-        //! Get status number as string
-        QString statusAsString(QString platform = "");
-
-    protected:
-        ServerInfo() : serverSettings(nullptr) {}
-
-    private:
-        static ServerInfo* infoInstance;
-        QSettings* serverSettings;
-
-};
-
-#endif
-
-- 
cgit v1.2.3