summaryrefslogtreecommitdiff
path: root/utils/rbutilqt/base
diff options
context:
space:
mode:
Diffstat (limited to 'utils/rbutilqt/base')
-rw-r--r--utils/rbutilqt/base/bootloaderinstallbase.h2
-rw-r--r--utils/rbutilqt/base/bootloaderinstallfile.h1
-rw-r--r--utils/rbutilqt/base/bootloaderinstallmi4.h1
-rw-r--r--utils/rbutilqt/base/mspackutil.cpp2
-rw-r--r--utils/rbutilqt/base/progressloglevels.h (renamed from utils/rbutilqt/base/progressloggerinterface.h)35
-rw-r--r--utils/rbutilqt/base/talkfile.h2
-rw-r--r--utils/rbutilqt/base/talkgenerator.h2
-rw-r--r--utils/rbutilqt/base/uninstall.h2
-rw-r--r--utils/rbutilqt/base/voicefile.h2
-rw-r--r--utils/rbutilqt/base/zipinstaller.h2
-rw-r--r--utils/rbutilqt/base/ziputil.cpp2
11 files changed, 10 insertions, 43 deletions
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 @@
20#define BOOTLOADERINSTALLBASE_H 20#define BOOTLOADERINSTALLBASE_H
21 21
22#include <QtCore> 22#include <QtCore>
23#include "progressloggerinterface.h" 23#include "progressloglevels.h"
24#include "httpget.h" 24#include "httpget.h"
25 25
26//! baseclass for all Bootloader installs 26//! 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 @@
20#define BOOTLOADERINSTALLFILE_H 20#define BOOTLOADERINSTALLFILE_H
21 21
22#include <QtCore> 22#include <QtCore>
23#include "progressloggerinterface.h"
24#include "bootloaderinstallbase.h" 23#include "bootloaderinstallbase.h"
25 24
26//! install a bootloader by putting a single file on the player. 25//! 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 @@
20#define BOOTLOADERINSTALLMI4_H 20#define BOOTLOADERINSTALLMI4_H
21 21
22#include <QtCore> 22#include <QtCore>
23#include "progressloggerinterface.h"
24#include "bootloaderinstallbase.h" 23#include "bootloaderinstallbase.h"
25 24
26 25
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 @@
19#include <QtCore> 19#include <QtCore>
20#include "Logger.h" 20#include "Logger.h"
21#include "mspackutil.h" 21#include "mspackutil.h"
22#include "progressloggerinterface.h" 22#include "progressloglevels.h"
23 23
24MsPackUtil::MsPackUtil(QObject* parent) 24MsPackUtil::MsPackUtil(QObject* parent)
25 :ArchiveUtil(parent) 25 :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 @@
18 * 18 *
19 ****************************************************************************/ 19 ****************************************************************************/
20 20
21#ifndef PROGRESSLOGGERINTERFACE_H 21#ifndef PROGRESSLOGLEVELS_H
22#define PROGRESSLOGGERINTERFACE_H 22#define PROGRESSLOGLEVELS_H
23
24#include <QtCore>
25 23
26enum { 24enum {
27 LOGNOICON, LOGOK, LOGINFO, LOGWARNING, LOGERROR 25 LOGNOICON, LOGOK, LOGINFO, LOGWARNING, LOGERROR
28}; 26};
29 27
30
31
32class ProgressloggerInterface : public QObject
33{
34 Q_OBJECT
35
36public:
37 ProgressloggerInterface(QObject* parent) : QObject(parent) {}
38
39 virtual void setProgressValue(int value)=0;
40 virtual void setProgressMax(int max)=0;
41 virtual int getProgressMax()=0;
42
43signals:
44 void aborted();
45
46
47public slots:
48 virtual void addItem(const QString &text, int flag)=0; //! add a string to the list, with icon
49
50 virtual void close()=0;
51 virtual void show()=0;
52 virtual void setRunning()=0;
53 virtual void setFinished()=0;
54
55private:
56
57};
58
59#endif 28#endif
60 29
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 @@
23#define TALKFILE_H 23#define TALKFILE_H
24 24
25#include <QtCore> 25#include <QtCore>
26#include "progressloggerinterface.h" 26#include "progressloglevels.h"
27 27
28#include "talkgenerator.h" 28#include "talkgenerator.h"
29 29
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 @@
23#define TALKGENERATOR_H 23#define TALKGENERATOR_H
24 24
25#include <QtCore> 25#include <QtCore>
26#include "progressloggerinterface.h" 26#include "progressloglevels.h"
27 27
28#include "encoderbase.h" 28#include "encoderbase.h"
29#include "ttsbase.h" 29#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 @@
24 24
25#include <QtCore> 25#include <QtCore>
26 26
27#include "progressloggerinterface.h" 27#include "progressloglevels.h"
28 28
29 29
30class Uninstaller : public QObject 30class 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 @@
23#define VOICEFILE_H 23#define VOICEFILE_H
24 24
25#include <QtCore> 25#include <QtCore>
26#include "progressloggerinterface.h" 26#include "progressloglevels.h"
27 27
28#include "httpget.h" 28#include "httpget.h"
29#include "voicefont.h" 29#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 @@
24 24
25#include <QtCore> 25#include <QtCore>
26 26
27#include "progressloggerinterface.h" 27#include "progressloglevels.h"
28#include "httpget.h" 28#include "httpget.h"
29#include "Logger.h" 29#include "Logger.h"
30 30
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 @@
19#include <QtCore> 19#include <QtCore>
20#include <QDebug> 20#include <QDebug>
21#include "ziputil.h" 21#include "ziputil.h"
22#include "progressloggerinterface.h" 22#include "progressloglevels.h"
23#include "Logger.h" 23#include "Logger.h"
24 24
25#include "quazip/quazip.h" 25#include "quazip/quazip.h"