From 6343111e00da93a8b792b4e6245184be31b8feff Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 25 Jan 2009 17:48:38 +0000 Subject: 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 --- rbutil/rbutilqt/rbsettings.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'rbutil/rbutilqt/rbsettings.h') 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 usbIdMap(); QMap usbIdErrorMap(); QMap 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; -- cgit