SVN commit 494332 by mlaurent: Adapt to new kconfig API M +6 -6 iraction.cpp M +3 -3 mode.cpp M +1 -1 modes.cpp --- trunk/KDE/kdeutils/kdelirc/kdelirc/iraction.cpp #494331:494332 @@ -48,12 +48,12 @@ theArguments.last().cast(theType); } - theProgram = theConfig.readEntry(Binding + "Program"); - theObject = theConfig.readEntry(Binding + "Object"); - theMethod.setPrototype(theConfig.readEntry(Binding + "Method")); - theRemote = theConfig.readEntry(Binding + "Remote"); - theMode = theConfig.readEntry(Binding + "Mode"); - theButton = theConfig.readEntry(Binding + "Button"); + theProgram = theConfig.readEntry(Binding + "Program",QString()); + theObject = theConfig.readEntry(Binding + "Object",QString()); + theMethod.setPrototype(theConfig.readEntry(Binding + "Method",QString())); + theRemote = theConfig.readEntry(Binding + "Remote",QString()); + theMode = theConfig.readEntry(Binding + "Mode",QString()); + theButton = theConfig.readEntry(Binding + "Button",QString()); theRepeat = theConfig.readBoolEntry(Binding + "Repeat"); theDoBefore = theConfig.readBoolEntry(Binding + "DoBefore"); theDoAfter = theConfig.readBoolEntry(Binding + "DoAfter"); --- trunk/KDE/kdeutils/kdelirc/kdelirc/mode.cpp #494331:494332 @@ -34,9 +34,9 @@ const Mode &Mode::loadFromConfig(KConfig &theConfig, int index) { QString Prefix = "Mode" + QString().setNum(index); - theName = theConfig.readEntry(Prefix + "Name"); - theRemote = theConfig.readEntry(Prefix + "Remote"); - theIconFile = theConfig.readEntry(Prefix + "IconFile"); + theName = theConfig.readEntry(Prefix + "Name",QString()); + theRemote = theConfig.readEntry(Prefix + "Remote",QString()); + theIconFile = theConfig.readEntry(Prefix + "IconFile",QString()); if(theIconFile.isEmpty()) theIconFile = QString::null; return *this; } --- trunk/KDE/kdeutils/kdelirc/kdelirc/modes.cpp #494331:494332 @@ -35,7 +35,7 @@ } for(iterator i = begin(); i != end(); ++i) - theDefaults[i.key()] = theConfig.readEntry("Default" + i.key()); + theDefaults[i.key()] = theConfig.readEntry("Default" + i.key(),QString()); } void Modes::generateNulls(const QStringList &theRemotes)