Commit 19144d0b authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] fix gcc4.1 build failure on xconfig

scripts/kconfig/qconf.h:25: error: extra qualification ‘ConfigSettings::’ on member ‘readSizes’
scripts/kconfig/qconf.h:26: error: extra qualification ‘ConfigSettings::’ on member ‘writeSizes’
scripts/kconfig/qconf.h:127: error: extra qualification ‘ConfigList::’ on member ‘updateMenuList’
Signed-off-by: default avatarDave Jones <davej@redhat.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1dac06b2
...@@ -22,8 +22,8 @@ class ConfigSettings : public QSettings { ...@@ -22,8 +22,8 @@ class ConfigSettings : public QSettings {
#if QT_VERSION >= 300 #if QT_VERSION >= 300
void readListSettings(); void readListSettings();
QValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok); QValueList<int> readSizes(const QString& key, bool *ok);
bool ConfigSettings::writeSizes(const QString& key, const QValueList<int>& value); bool writeSizes(const QString& key, const QValueList<int>& value);
#endif #endif
bool showAll; bool showAll;
...@@ -124,7 +124,7 @@ public slots: ...@@ -124,7 +124,7 @@ public slots:
void setParentMenu(void); void setParentMenu(void);
template <class P> template <class P>
void ConfigList::updateMenuList(P*, struct menu*); void updateMenuList(P*, struct menu*);
bool updateAll; bool updateAll;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment