rbutil: Remove ProgressLogger interface class.

Since we're using signals to connect to the Logger we don't need an
interface class, and the only thing still used was the log level enum.
Put those values in a dedicated header instead.

Change-Id: Ic3aee14ba13b81e283b477d11b1c15a5c26ffeab

15 files changed, 16 insertions, 51 deletions

diff --git a/utils/rbutilqt/CMakeLists.txt b/utils/rbutilqt/CMakeLists.txt
index e7a36de369..dfa0350f1b 100644
--- a/utils/rbutilqt/CMakeLists.txt
+++ b/utils/rbutilqt/CMakeLists.txt
@@ -195,7 +195,7 @@ add_library(rbbase
     ${CMAKE_CURRENT_LIST_DIR}/base/httpget.h
     ${CMAKE_CURRENT_LIST_DIR}/base/mspackutil.cpp
     ${CMAKE_CURRENT_LIST_DIR}/base/mspackutil.h
-    ${CMAKE_CURRENT_LIST_DIR}/base/progressloggerinterface.h
+    ${CMAKE_CURRENT_LIST_DIR}/base/progressloglevels.h
     ${CMAKE_CURRENT_LIST_DIR}/base/playerbuildinfo.cpp
     ${CMAKE_CURRENT_LIST_DIR}/base/playerbuildinfo.h
     ${CMAKE_CURRENT_LIST_DIR}/base/rbsettings.cpp
diff --git a/utils/rbutilqt/base/bootloaderinstallbase.h b/utils/rbutilqt/base/bootloaderinstallbase.h
index 23aac4f92f..9a216a632c 100644
--- a/utils/rbutilqt/base/bootloaderinstallbase.h
+++ b/utils/rbutilqt/base/bootloaderinstallbase.h
@@ -20,7 +20,7 @@
 #define BOOTLOADERINSTALLBASE_H
 
 #include <QtCore>
-#include "progressloggerinterface.h"
+#include "progressloglevels.h"
 #include "httpget.h"
 
 //! baseclass for all Bootloader installs
diff --git a/utils/rbutilqt/base/bootloaderinstallfile.h b/utils/rbutilqt/base/bootloaderinstallfile.h
index 9f9586279c..d529939c8b 100644
--- a/utils/rbutilqt/base/bootloaderinstallfile.h
+++ b/utils/rbutilqt/base/bootloaderinstallfile.h
@@ -20,7 +20,6 @@
 #define BOOTLOADERINSTALLFILE_H
 
 #include <QtCore>
-#include "progressloggerinterface.h"
 #include "bootloaderinstallbase.h"
 
 //! install a bootloader by putting a single file on the player.
diff --git a/utils/rbutilqt/base/bootloaderinstallmi4.h b/utils/rbutilqt/base/bootloaderinstallmi4.h
index c56669b99f..4ba878caac 100644
--- a/utils/rbutilqt/base/bootloaderinstallmi4.h
+++ b/utils/rbutilqt/base/bootloaderinstallmi4.h
@@ -20,7 +20,6 @@
 #define BOOTLOADERINSTALLMI4_H
 
 #include <QtCore>
-#include "progressloggerinterface.h"
 #include "bootloaderinstallbase.h"
 
 
diff --git a/utils/rbutilqt/base/mspackutil.cpp b/utils/rbutilqt/base/mspackutil.cpp
index b794272199..49c064e4d2 100644
--- a/utils/rbutilqt/base/mspackutil.cpp
+++ b/utils/rbutilqt/base/mspackutil.cpp
@@ -19,7 +19,7 @@
 #include <QtCore>
 #include "Logger.h"
 #include "mspackutil.h"
-#include "progressloggerinterface.h"
+#include "progressloglevels.h"
 
 MsPackUtil::MsPackUtil(QObject* parent)
     :ArchiveUtil(parent)
diff --git a/utils/rbutilqt/base/progressloggerinterface.h b/utils/rbutilqt/base/progressloglevels.h
index ae4270ae6b..95d479ca29 100644
--- a/utils/rbutilqt/base/progressloggerinterface.h
+++ b/utils/rbutilqt/base/progressloglevels.h
@@ -18,43 +18,12 @@
  *
  ****************************************************************************/
 
-#ifndef PROGRESSLOGGERINTERFACE_H
-#define PROGRESSLOGGERINTERFACE_H
-
-#include <QtCore>
+#ifndef PROGRESSLOGLEVELS_H
+#define PROGRESSLOGLEVELS_H
 
 enum {
     LOGNOICON, LOGOK, LOGINFO, LOGWARNING, LOGERROR
 };
 
-
-
-class ProgressloggerInterface : public QObject
-{
-   Q_OBJECT
-
-public:
-    ProgressloggerInterface(QObject* parent) : QObject(parent) {}
-
-    virtual void setProgressValue(int value)=0;
-    virtual void setProgressMax(int max)=0;
-    virtual int getProgressMax()=0;
-
-signals:
-    void aborted();
-
-
-public slots:
-    virtual void addItem(const QString &text, int flag)=0; //! add a string to the list, with icon
-
-    virtual void close()=0;
-    virtual void show()=0;
-    virtual void setRunning()=0;
-    virtual void setFinished()=0;
-
-private:
-
-};
-
 #endif
 
diff --git a/utils/rbutilqt/base/talkfile.h b/utils/rbutilqt/base/talkfile.h
index 11dd95ca14..014753da2a 100644
--- a/utils/rbutilqt/base/talkfile.h
+++ b/utils/rbutilqt/base/talkfile.h
@@ -23,7 +23,7 @@
 #define TALKFILE_H
 
 #include <QtCore>
-#include "progressloggerinterface.h"
+#include "progressloglevels.h"
 
 #include "talkgenerator.h"
 
diff --git a/utils/rbutilqt/base/talkgenerator.h b/utils/rbutilqt/base/talkgenerator.h
index 3e2f9394fb..bb026190d8 100644
--- a/utils/rbutilqt/base/talkgenerator.h
+++ b/utils/rbutilqt/base/talkgenerator.h
@@ -23,7 +23,7 @@
 #define TALKGENERATOR_H
 
 #include <QtCore>
-#include "progressloggerinterface.h"
+#include "progressloglevels.h"
 
 #include "encoderbase.h"
 #include "ttsbase.h"
diff --git a/utils/rbutilqt/base/uninstall.h b/utils/rbutilqt/base/uninstall.h
index d8c9815117..3858b779fa 100644
--- a/utils/rbutilqt/base/uninstall.h
+++ b/utils/rbutilqt/base/uninstall.h
@@ -24,7 +24,7 @@
 
 #include <QtCore>
 
-#include "progressloggerinterface.h"
+#include "progressloglevels.h"
 
 
 class Uninstaller : public QObject
diff --git a/utils/rbutilqt/base/voicefile.h b/utils/rbutilqt/base/voicefile.h
index d34535e700..c813910a69 100644
--- a/utils/rbutilqt/base/voicefile.h
+++ b/utils/rbutilqt/base/voicefile.h
@@ -23,7 +23,7 @@
 #define VOICEFILE_H
 
 #include <QtCore>
-#include "progressloggerinterface.h"
+#include "progressloglevels.h"
 
 #include "httpget.h"
 #include "voicefont.h"
diff --git a/utils/rbutilqt/base/zipinstaller.h b/utils/rbutilqt/base/zipinstaller.h
index 59a0f785d9..35967af6b1 100644
--- a/utils/rbutilqt/base/zipinstaller.h
+++ b/utils/rbutilqt/base/zipinstaller.h
@@ -24,7 +24,7 @@
 
 #include <QtCore>
 
-#include "progressloggerinterface.h"
+#include "progressloglevels.h"
 #include "httpget.h"
 #include "Logger.h"
 
diff --git a/utils/rbutilqt/base/ziputil.cpp b/utils/rbutilqt/base/ziputil.cpp
index 45119f7d99..3527e8e881 100644
--- a/utils/rbutilqt/base/ziputil.cpp
+++ b/utils/rbutilqt/base/ziputil.cpp
@@ -19,7 +19,7 @@
 #include <QtCore>
 #include <QDebug>
 #include "ziputil.h"
-#include "progressloggerinterface.h"
+#include "progressloglevels.h"
 #include "Logger.h"
 
 #include "quazip/quazip.h"
diff --git a/utils/rbutilqt/progressloggergui.cpp b/utils/rbutilqt/progressloggergui.cpp
index 78fc00db8f..f04de395a3 100644
--- a/utils/rbutilqt/progressloggergui.cpp
+++ b/utils/rbutilqt/progressloggergui.cpp
@@ -22,7 +22,7 @@
 #include "sysinfo.h"
 #include "systrace.h"
 
-ProgressLoggerGui::ProgressLoggerGui(QWidget* parent): ProgressloggerInterface(parent)
+ProgressLoggerGui::ProgressLoggerGui(QWidget* parent): QObject(parent)
 {
     downloadProgress = new QDialog(parent);
     downloadProgress->setModal(true);
@@ -103,7 +103,7 @@ void ProgressLoggerGui::setRunning()
     disconnect(dp.buttonAbort, &QAbstractButton::clicked, downloadProgress, &QWidget::close);
     // emit aborted() once button is pressed but not closed().
     disconnect(dp.buttonAbort, &QAbstractButton::clicked, this, &ProgressLoggerGui::closed);
-    connect(dp.buttonAbort, SIGNAL(clicked()), this, SIGNAL(aborted()));
+    connect(dp.buttonAbort, &QAbstractButton::clicked, this, &ProgressLoggerGui::aborted);
 
 }
 
@@ -120,7 +120,7 @@ void ProgressLoggerGui::setFinished()
     // close the window on button press.
     connect(dp.buttonAbort, &QAbstractButton::clicked, downloadProgress, &QWidget::close);
     // emit closed() once button is pressed but not aborted().
-    disconnect(dp.buttonAbort, SIGNAL(clicked()), this, SIGNAL(aborted()));
+    disconnect(dp.buttonAbort, &QAbstractButton::clicked, this, &ProgressLoggerGui::aborted);
     connect(dp.buttonAbort, &QAbstractButton::clicked, this, &ProgressLoggerGui::closed);
 }
 
diff --git a/utils/rbutilqt/progressloggergui.h b/utils/rbutilqt/progressloggergui.h
index ce9a8c9fa7..cc9b7df323 100644
--- a/utils/rbutilqt/progressloggergui.h
+++ b/utils/rbutilqt/progressloggergui.h
@@ -22,10 +22,10 @@
 
 #include <QWidget>
 
-#include "progressloggerinterface.h"
+#include "progressloglevels.h"
 #include "ui_progressloggerfrm.h"
 
-class ProgressLoggerGui :public ProgressloggerInterface
+class ProgressLoggerGui :public QObject
 {
     Q_OBJECT
 public:
diff --git a/utils/rbutilqt/rbutilqt.cpp b/utils/rbutilqt/rbutilqt.cpp
index 1a0841c0f3..7c11f44806 100644
--- a/utils/rbutilqt/rbutilqt.cpp
+++ b/utils/rbutilqt/rbutilqt.cpp
@@ -42,8 +42,6 @@
 #include "backupdialog.h"
 #include "changelog.h"
 
-#include "progressloggerinterface.h"
-
 #include "bootloaderinstallbase.h"
 #include "bootloaderinstallhelper.h"