Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdewidgets: replace KConfig with KSettings

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-01-01 12:19:53 +00:00
parent 62fd359884
commit 689b24bae9
1 changed files with 54 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
kdewidgets/makekdewidgets.cpp
View file

@ -2,10 +2,9 @@
#include <kaboutdata.h>
#include <kcomponentdata.h>
#include <kcmdlineargs.h>
#include <kconfig.h>
#include <ksettings.h>
#include <kmacroexpander.h>
#include <kdebug.h>
#include <kconfiggroup.h>
#include <klocale.h>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
@ -73,9 +72,9 @@ static const char classDef[] = "class %PluginName : public QObject, public QDes
"};\n\n";
static QString denamespace ( const QString &str );
static QString buildCollClass( KConfig &input, const QStringList& classes );
static QString buildWidgetClass( const QString &name, KConfig &input, const QString &group );
static QString buildWidgetInclude( const QString &name, KConfig &input );
static QString buildCollClass( KSettings &input, const QStringList& classes );
static QString buildWidgetClass( const QString &name, KSettings &input, const QString &group );
static QString buildWidgetInclude( const QString &name, KSettings &input );
static void buildFile( QTextStream &stream, const QString& group, const QString& fileName, const QString& pluginName );
int main( int argc, char **argv ) {
@ -126,30 +125,47 @@ int main( int argc, char **argv ) {
}
void buildFile( QTextStream &ts, const QString& group, const QString& fileName, const QString& pluginName ) {
KConfig input( fileName, KConfig::NoGlobals );
KConfigGroup cg(&input, "Global" );
KSettings input( fileName, KSettings::SimpleConfig );
QHash<QString, QString> MainMap;
MainMap.insert( "PluginName", cg.readEntry( "PluginName", pluginName ) );
MainMap.insert( "PluginNameLower", cg.readEntry( "PluginName", pluginName ).toLower() );
MainMap.insert( "Init", cg.readEntry( "Init", "" ) );
MainMap.insert( "Destroy", cg.readEntry( "Destroy", "" ) );
MainMap.insert( "PluginName", input.value( "Global/PluginName", pluginName ).toString() );
MainMap.insert( "PluginNameLower", input.value( "Global/PluginName", pluginName ).toString().toLower() );
MainMap.insert( "Init", input.value( "Global/Init" ).toString() );
MainMap.insert( "Destroy", input.value( "Global/Destroy" ).toString() );
ts << classHeader << endl;
QStringList includes = cg.readEntry( "Includes", QStringList() );
QStringList classes = input.groupList();
QStringList includes = input.value( "Global/Includes" ).toStringList();
QStringList classes;
#ifndef QT_KATIE
foreach (const QString &key, input.allKeys()) {
const QString &klass = key.split('/').at(0);
if (classes.contains(klass))
continue;
classes.append(klass);
}
#else
foreach (const QString &key, input.keys()) {
const QString klass = key.split('/').at(0);
if (classes.contains(klass))
continue;
classes.append(klass);
}
#endif
classes.removeAll( "Global" );
foreach ( const QString &myInclude, classes )
includes += buildWidgetInclude( myInclude, input );
foreach ( const QString &myInclude, classes ) {
includes += buildWidgetInclude( myInclude, input );
}
foreach ( const QString &myInclude, includes)
foreach ( const QString &myInclude, includes) {
ts << "#include <" << myInclude << ">" << endl;
}
ts << QLatin1String("\n\n");
// Autogenerate widget defs here
foreach ( const QString &myClass, classes )
foreach ( const QString &myClass, classes ) {
ts << buildWidgetClass( myClass, input, group ) << endl;
}
ts << buildCollClass( input, classes );
@ -161,15 +177,13 @@ QString denamespace ( const QString &str ) {
return denamespaced;
}
QString buildCollClass( KConfig &_input, const QStringList& classes ) {
KConfigGroup input(&_input, "Global");
QString buildCollClass( KSettings &input, const QStringList& classes ) {
QHash<QString, QString> defMap;
defMap.insert( "CollName", input.readEntry( "PluginName" ) );
defMap.insert( "CollName", input.value( "Global/PluginName" ).toString() );
QString genCode;
foreach ( const QString &myClass, classes )
{
genCode += QString("\t\tm_plugins.append( new %1(this) );\n").arg(denamespace( myClass ) +"Plugin");
foreach ( const QString &myClass, classes ) {
genCode += QString("\t\tm_plugins.append( new %1(this) );\n").arg(denamespace( myClass ) +"Plugin");
}
defMap.insert( "CollectionAdd", genCode );
@ -179,43 +193,40 @@ QString buildCollClass( KConfig &_input, const QStringList& classes ) {
return str;
}
QString buildWidgetClass( const QString &name, KConfig &_input, const QString &group ) {
KConfigGroup input(&_input, name);
QString buildWidgetClass( const QString &name, KSettings &input, const QString &group ) {
QHash<QString, QString> defMap;
defMap.insert( "Group", input.readEntry( "Group", group ).replace( '\"', "\\\"" ) );
defMap.insert( "IconSet", input.readEntry( "IconSet", QString(name.toLower() + ".png") ).replace( ':', '_' ) );
defMap.insert( "Group", input.value( name + "/Group", group ).toString().replace( '\"', "\\\"" ) );
defMap.insert( "IconSet", input.value( name + "/IconSet", QString(name.toLower() + ".png") ).toString().replace( ':', '_' ) );
defMap.insert( "Pixmap", name.toLower().replace( ':', '_' ) + "_xpm" );
defMap.insert( "IncludeFile", input.readEntry( "IncludeFile", QString(name.toLower() + ".h") ).remove( ':' ) );
defMap.insert( "ToolTip", input.readEntry( "ToolTip", QString(name + " Widget") ).replace( '\"', "\\\"" ) );
defMap.insert( "WhatsThis", input.readEntry( "WhatsThis", QString(name + " Widget") ).replace( '\"', "\\\"" ) );
defMap.insert( "IsContainer", input.readEntry( "IsContainer", "false" ) );
defMap.insert( "IconName", input.readEntry( "IconName", QString::fromLatin1(":/pics/%1.png").arg( denamespace( name ).toLower() ) ) );
defMap.insert( "IncludeFile", input.value( name + "/IncludeFile", QString(name.toLower() + ".h") ).toString().remove( ':' ) );
defMap.insert( "ToolTip", input.value( name + "/ToolTip", QString(name + " Widget") ).toString().replace( '\"', "\\\"" ) );
defMap.insert( "WhatsThis", input.value( name + "/WhatsThis", QString(name + " Widget") ).toString().replace( '\"', "\\\"" ) );
defMap.insert( "IsContainer", input.value( name + "/IsContainer", "false" ).toString() );
defMap.insert( "IconName", input.value( name + "/IconName", QString::fromLatin1(":/pics/%1.png").arg( denamespace( name ).toLower() ) ).toString() );
defMap.insert( "Class", name );
defMap.insert( "PluginName", denamespace( name ) + QLatin1String( "Plugin" ) );
// FIXME: ### make this more useful, i.e. outsource to separate file
QString domXml = input.readEntry("DomXML", QString());
QString domXml = input.value( name + "/DomXML").toString();
// If domXml is empty then we shoud call base class function
if ( domXml.isEmpty() ) {
domXml = QLatin1String("QDesignerCustomWidgetInterface::domXml()");
}
else {
} else {
// Wrap domXml value into QLatin1String
domXml = QString(QLatin1String("QLatin1String(\"%1\")")).arg(domXml.replace( '\"', "\\\"" ));
}
defMap.insert( "DomXml", domXml );
defMap.insert( "CodeTemplate", input.readEntry( "CodeTemplate" ) );
defMap.insert( "CreateWidget", input.readEntry( "CreateWidget",
defMap.insert( "CodeTemplate", input.value( name + "/CodeTemplate" ).toString() );
defMap.insert( "CreateWidget", input.value( name + "/CreateWidget",
QString( "\n\t\treturn new %1%2;" )
.arg( input.readEntry( "ImplClass", name ) )
.arg( input.readEntry( "ConstructorArgs", "( parent )" ) ) ) );
defMap.insert( "Initialize", input.readEntry( "Initialize", "\n\t\tQ_UNUSED(core);\n\t\tif (mInitialized) return;\n\t\tmInitialized=true;" ) );
.arg( input.value( name + "/ImplClass", name ).toString() )
.arg( input.value( name + "/ConstructorArgs", "( parent )" ).toString() ) ).toString() );
defMap.insert( "Initialize", input.value( name + "/Initialize", "\n\t\tQ_UNUSED(core);\n\t\tif (mInitialized) return;\n\t\tmInitialized=true;" ).toString() );
return KMacroExpander::expandMacros( classDef, defMap );
}
QString buildWidgetInclude( const QString &name, KConfig &_input ) {
KConfigGroup input(&_input, name);
return input.readEntry( "IncludeFile", QString(name.toLower() + ".h") );
QString buildWidgetInclude( const QString &name, KSettings &input ) {
return input.value( name + "/IncludeFile", QVariant(name.toLower() + ".h") ).toString();
}