Skip to content

Commit

Permalink
[PATCH] fix gcc4.1 build failure on xconfig
Browse files Browse the repository at this point in the history
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: Dave Jones <davej@redhat.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Dave Jones authored and Linus Torvalds committed Jan 9, 2006
1 parent 1dac06b commit 19144d0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions scripts/kconfig/qconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ class ConfigSettings : public QSettings {

#if QT_VERSION >= 300
void readListSettings();
QValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok);
bool ConfigSettings::writeSizes(const QString& key, const QValueList<int>& value);
QValueList<int> readSizes(const QString& key, bool *ok);
bool writeSizes(const QString& key, const QValueList<int>& value);
#endif

bool showAll;
Expand Down Expand Up @@ -124,7 +124,7 @@ public slots:
void setParentMenu(void);

template <class P>
void ConfigList::updateMenuList(P*, struct menu*);
void updateMenuList(P*, struct menu*);

bool updateAll;

Expand Down

0 comments on commit 19144d0

Please sign in to comment.