[PATCH] fix gcc4.1 build failure on xconfig
Dave Jones [Sun, 8 Jan 2006 09:05:02 +0000 (01:05 -0800)]
scripts/kconfig/qconf.h:25: error: extra qualification â\200\230ConfigSettings::â\200\231 on member â\200\230readSizesâ\200\231
scripts/kconfig/qconf.h:26: error: extra qualification â\200\230ConfigSettings::â\200\231 on member â\200\230writeSizesâ\200\231
scripts/kconfig/qconf.h:127: error: extra qualification â\200\230ConfigList::â\200\231 on member â\200\230updateMenuListâ\200\231

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>

scripts/kconfig/qconf.h

index 7c03927..e52f3e9 100644 (file)
@@ -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;