[PATCH] fix gcc4.1 build failure on xconfig

scripts/kconfig/qconf.h:25: error: extra qualification â\80\98ConfigSettings::â\80\99 on member â\80\98readSizesâ\80\99
scripts/kconfig/qconf.h:26: error: extra qualification â\80\98ConfigSettings::â\80\99 on member â\80\98writeSizesâ\80\99
scripts/kconfig/qconf.h:127: error: extra qualification â\80\98ConfigList::â\80\99 on member â\80\98updateMenuListâ\80\99

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>

diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index 7c03927d4c7c23d126f510369e8ada72eb6e36a2..e52f3e90bf0cea264738a9ba0d1117bcf4afa724 100644 (file)
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -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;