diff options
author | Dominik Wenger <domonoky@googlemail.com> | 2009-05-09 16:59:14 +0000 |
---|---|---|
committer | Dominik Wenger <domonoky@googlemail.com> | 2009-05-09 16:59:14 +0000 |
commit | 33d9cf091a62cb217987092d03bf110c35444845 (patch) | |
tree | 4ee6be3018e0b71c38d4857f86ad17a08668afdd /rbutil/rbutilqt/base/encoders.h | |
parent | 8e63df19cbeee2de9470049feae8ae0f9c5a339e (diff) | |
download | rockbox-33d9cf091a62cb217987092d03bf110c35444845.tar.gz rockbox-33d9cf091a62cb217987092d03bf110c35444845.zip |
rbutil: make RbSettings a static class. (FS#10183 with improvements)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20890 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/base/encoders.h')
-rw-r--r-- | rbutil/rbutilqt/base/encoders.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/base/encoders.h b/rbutil/rbutilqt/base/encoders.h index d5d1723a46..a70f775e98 100644 --- a/rbutil/rbutilqt/base/encoders.h +++ b/rbutil/rbutilqt/base/encoders.h | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #include <QtCore> | 25 | #include <QtCore> |
26 | 26 | ||
27 | #include "rbsettings.h" | ||
28 | #include "encttssettings.h" | 27 | #include "encttssettings.h" |
29 | #include "rbspeex.h" | 28 | #include "rbspeex.h" |
30 | 29 | ||
@@ -54,15 +53,11 @@ class EncBase : public EncTtsSettingInterface | |||
54 | static QString getEncoderName(QString name); | 53 | static QString getEncoderName(QString name); |
55 | static EncBase* getEncoder(QObject* parent,QString name); | 54 | static EncBase* getEncoder(QObject* parent,QString name); |
56 | static QStringList getEncoderList(void); | 55 | static QStringList getEncoderList(void); |
57 | 56 | ||
58 | //set the config. users of Encoder classes, always have to call this first | ||
59 | void setCfg(RbSettings *sett){settings = sett;} | ||
60 | private: | 57 | private: |
61 | static void initEncodernamesList(void); | 58 | static void initEncodernamesList(void); |
62 | 59 | ||
63 | protected: | 60 | protected: |
64 | RbSettings* settings; | ||
65 | |||
66 | static QMap<QString,QString> encoderList; | 61 | static QMap<QString,QString> encoderList; |
67 | }; | 62 | }; |
68 | 63 | ||