aboutsummaryrefslogtreecommitdiff
path: root/src/kconfig_compiler/kconfig_compiler.cpp
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2014-03-16 23:30:59 +0100
committerDavid Faure <faure@kde.org>2014-03-23 23:00:03 +0100
commitc1980dbc51c9aa2770d09850e69529ea2211924b (patch)
tree2bbccf3cdebbd6d1149eb1ae615c832570cfa000 /src/kconfig_compiler/kconfig_compiler.cpp
parent41ccd7bcd61c478a4243165b1df0c48e2ecad0df (diff)
downloadkconfig-c1980dbc51c9aa2770d09850e69529ea2211924b.tar.gz
kconfig-c1980dbc51c9aa2770d09850e69529ea2211924b.tar.bz2
Add KCoreConfigSkeleton::read() which doesn't call reparseConfiguration.
Call it from generated singletons, since the constructor creates a KConfig from a filename, which already loads from disk. This removes the need for using DelayedParsing. REVIEW: 116845
Diffstat (limited to 'src/kconfig_compiler/kconfig_compiler.cpp')
-rw-r--r--src/kconfig_compiler/kconfig_compiler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp
index 7d84cfbc..28b151c5 100644
--- a/src/kconfig_compiler/kconfig_compiler.cpp
+++ b/src/kconfig_compiler/kconfig_compiler.cpp
@@ -2249,7 +2249,7 @@ int main(int argc, char **argv)
} else {
cpp << " if (!s_global" << cfg.className << "()->q) {" << endl;
cpp << " new " << cfg.className << ';' << endl;
- cpp << " s_global" << cfg.className << "()->q->readConfig();" << endl;
+ cpp << " s_global" << cfg.className << "()->q->read();" << endl;
cpp << " }" << endl << endl;
}
cpp << " return s_global" << cfg.className << "()->q;" << endl;
@@ -2263,7 +2263,7 @@ int main(int argc, char **argv)
cpp << " return;" << endl;
cpp << " }" << endl;
cpp << " new " << cfg.className << "(cfgfilename);" << endl;
- cpp << " s_global" << cfg.className << "()->q->readConfig();" << endl;
+ cpp << " s_global" << cfg.className << "()->q->read();" << endl;
cpp << "}" << endl << endl;
}
}