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 ConfigSettings::readSizes(const QString& key, bool *ok); - bool ConfigSettings::writeSizes(const QString& key, const QValueList& value); + QValueList readSizes(const QString& key, bool *ok); + bool writeSizes(const QString& key, const QValueList& value); #endif bool showAll; @@ -124,7 +124,7 @@ public slots: void setParentMenu(void); template - void ConfigList::updateMenuList(P*, struct menu*); + void updateMenuList(P*, struct menu*); bool updateAll;