diff options
author | Dave Jones <davej@redhat.com> | 2006-01-08 04:05:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 23:14:06 -0500 |
commit | 19144d0beab077950f3e767385e3c1050061b475 (patch) | |
tree | b34c3b7337bf9d6c12298f7c1fc7a4fef744302b /scripts/kconfig/qconf.h | |
parent | 1dac06b20dcc8078dab037bd70652c69c67ba672 (diff) |
[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: 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>
Diffstat (limited to 'scripts/kconfig/qconf.h')
-rw-r--r-- | scripts/kconfig/qconf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h index 7c03927d4c7c..e52f3e90bf0c 100644 --- a/scripts/kconfig/qconf.h +++ b/scripts/kconfig/qconf.h | |||
@@ -22,8 +22,8 @@ public: | |||
22 | 22 | ||
23 | #if QT_VERSION >= 300 | 23 | #if QT_VERSION >= 300 |
24 | void readListSettings(); | 24 | void readListSettings(); |
25 | QValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok); | 25 | QValueList<int> readSizes(const QString& key, bool *ok); |
26 | bool ConfigSettings::writeSizes(const QString& key, const QValueList<int>& value); | 26 | bool writeSizes(const QString& key, const QValueList<int>& value); |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | bool showAll; | 29 | bool showAll; |
@@ -124,7 +124,7 @@ public: | |||
124 | void setParentMenu(void); | 124 | void setParentMenu(void); |
125 | 125 | ||
126 | template <class P> | 126 | template <class P> |
127 | void ConfigList::updateMenuList(P*, struct menu*); | 127 | void updateMenuList(P*, struct menu*); |
128 | 128 | ||
129 | bool updateAll; | 129 | bool updateAll; |
130 | 130 | ||