2005-12-30 01:59:19

by Dave Jones

[permalink] [raw]
Subject: 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: Dave Jones <[email protected]>

--- linux-2.6/scripts/kconfig/qconf.h~ 2005-12-29 20:57:36.000000000 -0500
+++ linux-2.6/scripts/kconfig/qconf.h 2005-12-29 20:57:55.000000000 -0500
@@ -22,8 +22,8 @@ public:

#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;
@@ -124,7 +124,7 @@ public:
void setParentMenu(void);

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

bool updateAll;