diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-01-25 17:48:38 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-01-25 17:48:38 +0000 |
commit | 6343111e00da93a8b792b4e6245184be31b8feff (patch) | |
tree | 531790bb8bebad377717a66f390f097da83a91de /rbutil/rbutilqt/rbsettings.h | |
parent | 07894de36dd2af7054db87fc00dc953f73c72f0d (diff) | |
download | rockbox-6343111e00da93a8b792b4e6245184be31b8feff.tar.gz rockbox-6343111e00da93a8b792b4e6245184be31b8feff.zip |
Remove "needsbootloader" configuration value as it is implicitly available from "bootloadermethod". Explicitly use bootloadermethod "none" if no bootloader is needed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19855 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/rbsettings.h')
-rw-r--r-- | rbutil/rbutilqt/rbsettings.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/rbutil/rbutilqt/rbsettings.h b/rbutil/rbutilqt/rbsettings.h index beea602977..afa1900e7b 100644 --- a/rbutil/rbutilqt/rbsettings.h +++ b/rbutil/rbutilqt/rbsettings.h | |||
@@ -79,7 +79,7 @@ class RbSettings : public QObject | |||
79 | int encoderComplexity(QString enc); | 79 | int encoderComplexity(QString enc); |
80 | double encoderVolume(QString enc); | 80 | double encoderVolume(QString enc); |
81 | bool encoderNarrowband(QString enc); | 81 | bool encoderNarrowband(QString enc); |
82 | 82 | ||
83 | QStringList allPlatforms(); | 83 | QStringList allPlatforms(); |
84 | QString name(QString plattform); | 84 | QString name(QString plattform); |
85 | QString brand(QString plattform); | 85 | QString brand(QString plattform); |
@@ -88,8 +88,7 @@ class RbSettings : public QObject | |||
88 | QMap<int, QString> usbIdMap(); | 88 | QMap<int, QString> usbIdMap(); |
89 | QMap<int, QString> usbIdErrorMap(); | 89 | QMap<int, QString> usbIdErrorMap(); |
90 | QMap<int, QString> usbIdIncompatMap(); | 90 | QMap<int, QString> usbIdIncompatMap(); |
91 | 91 | ||
92 | bool curNeedsBootloader(); | ||
93 | QString curBrand(); | 92 | QString curBrand(); |
94 | QString curName(); | 93 | QString curName(); |
95 | QString curPlatform(); | 94 | QString curPlatform(); |
@@ -135,21 +134,21 @@ class RbSettings : public QObject | |||
135 | void setEncoderNarrowband(QString enc,bool nb); | 134 | void setEncoderNarrowband(QString enc,bool nb); |
136 | 135 | ||
137 | private: | 136 | private: |
138 | 137 | ||
139 | //! helper function to get an entry in the current platform section | 138 | //! helper function to get an entry in the current platform section |
140 | QVariant deviceSettingCurGet(QString entry,QString def=""); | 139 | QVariant deviceSettingCurGet(QString entry,QString def=""); |
141 | //! helper function to get an entry out of a group in the userSettings | 140 | //! helper function to get an entry out of a group in the userSettings |
142 | QVariant userSettingsGroupGet(QString group,QString entry,QVariant def=""); | 141 | QVariant userSettingsGroupGet(QString group,QString entry,QVariant def=""); |
143 | //! helper function to set an entry in a group in the userSettings | 142 | //! helper function to set an entry in a group in the userSettings |
144 | void userSettingsGroupSet(QString group,QString entry,QVariant value); | 143 | void userSettingsGroupSet(QString group,QString entry,QVariant value); |
145 | 144 | ||
146 | 145 | ||
147 | //! private copy constructors to prvent copying | 146 | //! private copy constructors to prvent copying |
148 | RbSettings& operator= (const RbSettings& other) | 147 | RbSettings& operator= (const RbSettings& other) |
149 | { (void)other; return *this; } | 148 | { (void)other; return *this; } |
150 | RbSettings(const RbSettings& other) :QObject() | 149 | RbSettings(const RbSettings& other) :QObject() |
151 | { (void)other; } | 150 | { (void)other; } |
152 | 151 | ||
153 | //! pointers to our setting objects | 152 | //! pointers to our setting objects |
154 | QSettings *devices; | 153 | QSettings *devices; |
155 | QSettings *userSettings; | 154 | QSettings *userSettings; |