From 4535d02fd8f1ab7271430b99c1c4e2adefe45943 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Sun, 8 Jan 2006 01:05:02 -0800
Subject: [PATCH] --- yaml --- r: 17023 b: refs/heads/master c:
 19144d0beab077950f3e767385e3c1050061b475 h: refs/heads/master i:   17021:
 8f5ce41992eb7cbc119b071c565b7c49a0523536   17019:
 52e5e95edda3130f44f19f6accfa9a97611d4fc3   17015:
 4f41e012e7a4d0388c04cbaceef7e7e060beb7d1   17007:
 ba66f4aff18194ff528d73fd22dbc244779b2cd4   16991:
 54619c1ff67cf96a958b2ed9f584215dfb9a7727   16959:
 66773f3168989c2383ea032dcfa61ba368372ad6   16895:
 a85d3e6e5abd1aa966e773f78ae5fd6257f8cfd6 v: v3

---
 [refs]                        | 2 +-
 trunk/scripts/kconfig/qconf.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d2604398f004..cdb03dc79cfd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1dac06b20dcc8078dab037bd70652c69c67ba672
+refs/heads/master: 19144d0beab077950f3e767385e3c1050061b475
diff --git a/trunk/scripts/kconfig/qconf.h b/trunk/scripts/kconfig/qconf.h
index 7c03927d4c7c..e52f3e90bf0c 100644
--- a/trunk/scripts/kconfig/qconf.h
+++ b/trunk/scripts/kconfig/qconf.h
@@ -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;
@@ -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;