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 int encoderComplexity(QString enc); double encoderVolume(QString enc); bool encoderNarrowband(QString enc); - + QStringList allPlatforms(); QString name(QString plattform); QString brand(QString plattform); @@ -88,8 +88,7 @@ class RbSettings : public QObject QMap<int, QString> usbIdMap(); QMap<int, QString> usbIdErrorMap(); QMap<int, QString> usbIdIncompatMap(); - - bool curNeedsBootloader(); + QString curBrand(); QString curName(); QString curPlatform(); @@ -135,21 +134,21 @@ class RbSettings : public QObject void setEncoderNarrowband(QString enc,bool nb); private: - + //! helper function to get an entry in the current platform section QVariant deviceSettingCurGet(QString entry,QString def=""); //! helper function to get an entry out of a group in the userSettings QVariant userSettingsGroupGet(QString group,QString entry,QVariant def=""); //! helper function to set an entry in a group in the userSettings void userSettingsGroupSet(QString group,QString entry,QVariant value); - - + + //! private copy constructors to prvent copying RbSettings& operator= (const RbSettings& other) { (void)other; return *this; } RbSettings(const RbSettings& other) :QObject() { (void)other; } - + //! pointers to our setting objects QSettings *devices; QSettings *userSettings; |