[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeaccessibility/kmouth
From: Mickael Marchand <marchand () kde ! org>
Date: 2007-08-24 17:22:16
Message-ID: 1187976136.483026.4870.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 704344 by marchand:
kconfig deprecated methods cleanup
M +9 -9 configwizard.cpp
M +13 -13 optionsdialog.cpp
M +10 -10 phraselist.cpp
M +13 -13 texttospeechsystem.cpp
M +5 -5 wordcompletion/dictionarycreationwizard.cpp
M +4 -4 wordcompletion/wordcompletion.cpp
M +10 -10 wordcompletion/wordcompletionwidget.cpp
--- trunk/KDE/kdeaccessibility/kmouth/configwizard.cpp #704343:704344
@@ -44,11 +44,11 @@
}
void ConfigWizard::initCommandPage(KConfig *config) {
- config->setGroup("TTS System");
+ KConfigGroup cg(config, "TTS System");
bool displayCommand = false;
- if (!config->hasKey("Command")) displayCommand = true;
- if (!config->hasKey("StdIn")) displayCommand = true;
- if (!config->hasKey("Codec")) displayCommand = true;
+ if (!cg.hasKey("Command")) displayCommand = true;
+ if (!cg.hasKey("StdIn")) displayCommand = true;
+ if (!cg.hasKey("Codec")) displayCommand = true;
if (displayCommand) {
commandWidget = new TextToSpeechConfigurationWidget (this, "ttsPage");
@@ -84,11 +84,11 @@
if (file.exists()) {
// If there is a word completion dictionary but no entry in the
// configuration file, we need to add it there.
- config->setGroup("Dictionary 0");
- config->writeEntry ("Filename", "dictionary.txt");
- config->writeEntry ("Name", "Default");
- config->writeEntry ("Language", QString());
- config->sync();
+ KConfigGroup cg (config ,"Dictionary 0");
+ cg.writeEntry ("Filename", "dictionary.txt");
+ cg.writeEntry ("Name", "Default");
+ cg.writeEntry ("Language", QString());
+ cg.sync();
}
}
--- trunk/KDE/kdeaccessibility/kmouth/optionsdialog.cpp #704343:704344
@@ -68,18 +68,18 @@
}
void PreferencesWidget::readOptions (KConfig *config) {
- config->setGroup("Preferences");
- if (config->hasKey("AutomaticSpeak"))
- if (config->readEntry ("AutomaticSpeak") == "Yes")
+ KConfigGroup cg ( config,"Preferences");
+ if (cg.hasKey("AutomaticSpeak"))
+ if (cg.readEntry ("AutomaticSpeak") == "Yes")
speak = true;
else
speak = false;
else
speak = false;
- config->setGroup("Notification Messages");
- if (config->hasKey("AutomaticSave"))
- if (config->readEntry ("AutomaticSave") == "Yes")
+ KConfigGroup cg2 ( config ,"Notification Messages");
+ if (cg2.hasKey("AutomaticSave"))
+ if (cg2.readEntry ("AutomaticSave") == "Yes")
save = 0;
else
save = 1;
@@ -94,19 +94,19 @@
}
void PreferencesWidget::saveOptions (KConfig *config) {
- config->setGroup("Preferences");
+ KConfigGroup cg (config, "Preferences");
if (speak)
- config->writeEntry ("AutomaticSpeak", "Yes");
+ cg.writeEntry ("AutomaticSpeak", "Yes");
else
- config->writeEntry ("AutomaticSpeak", "No");
+ cg.writeEntry ("AutomaticSpeak", "No");
- config->setGroup("Notification Messages");
+ KConfigGroup cg2 (config, "Notification Messages");
if (save == 0)
- config->writeEntry ("AutomaticSave", "Yes");
+ cg2.writeEntry ("AutomaticSave", "Yes");
else if (save == 1)
- config->writeEntry ("AutomaticSave", "No");
+ cg2.writeEntry ("AutomaticSave", "No");
else
- config->deleteEntry ("AutomaticSave");
+ cg2.deleteEntry ("AutomaticSave");
}
bool PreferencesWidget::isSpeakImmediately () {
--- trunk/KDE/kdeaccessibility/kmouth/phraselist.cpp #704343:704344
@@ -180,25 +180,25 @@
}
void PhraseList::saveCompletionOptions(KConfig *config) {
- config->setGroup("General Options");
- config->writeEntry("Show speak button", speakButton->isVisible() || !lineEdit->isVisible());
+ KConfigGroup cg(config,"General Options");
+ cg.writeEntry("Show speak button", speakButton->isVisible() || !lineEdit->isVisible());
- config->setGroup("Completion");
- config->writeEntry("Mode", static_cast<int>(lineEdit->completionMode()));
- config->writeEntry("List", completion->currentWordList());
+ KConfigGroup cg2(config,"Completion");
+ cg2.writeEntry("Mode", static_cast<int>(lineEdit->completionMode()));
+ cg2.writeEntry("List", completion->currentWordList());
}
void PhraseList::readCompletionOptions(KConfig *config) {
- config->setGroup("General Options");
- if (!config->readEntry("Show speak button", true))
+ KConfigGroup cg(config,"General Options");
+ if (!cg.readEntry("Show speak button", true))
speakButton->hide();
if (config->hasGroup ("Completion")) {
- config->setGroup("Completion");
- int mode = config->readEntry ("Mode", int(KGlobalSettings::completionMode()));
+ KConfigGroup cg2(config, "Completion");
+ int mode = cg2.readEntry ("Mode", int(KGlobalSettings::completionMode()));
lineEdit->setCompletionMode (static_cast<KGlobalSettings::Completion>(mode));
- QString current = config->readEntry ("List", QString());
+ QString current = cg2.readEntry ("List", QString());
QStringList list = completion->wordLists();
QStringList::ConstIterator it;
int i = 0;
--- trunk/KDE/kdeaccessibility/kmouth/texttospeechsystem.cpp #704343:704344
@@ -70,12 +70,12 @@
}
void TextToSpeechSystem::readOptions (KConfig *config, const QString &langGroup) {
- config->setGroup(langGroup);
- ttsCommand = config->readPathEntry("Command");
- stdIn = config->readEntry("StdIn", true);
- useKttsd = config->readEntry("useKttsd", true);
+ KConfigGroup cg(config, langGroup);
+ ttsCommand = cg.readPathEntry("Command");
+ stdIn = cg.readEntry("StdIn", true);
+ useKttsd = cg.readEntry("useKttsd", true);
- QString codecString = config->readEntry("Codec", "Local");
+ QString codecString = cg.readEntry("Codec", "Local");
if (codecString == "Local")
codec = Speech::Local;
else if (codecString == "Latin1")
@@ -91,19 +91,19 @@
}
void TextToSpeechSystem::saveOptions (KConfig *config, const QString &langGroup) {
- config->setGroup(langGroup);
- config->writePathEntry("Command", ttsCommand);
- config->writeEntry("StdIn", stdIn);
- config->writeEntry("useKttsd", useKttsd);
+ KConfigGroup cg(config, langGroup);
+ cg.writePathEntry("Command", ttsCommand);
+ cg.writeEntry("StdIn", stdIn);
+ cg.writeEntry("useKttsd", useKttsd);
if (codec == Speech::Local)
- config->writeEntry("Codec", "Local");
+ cg.writeEntry("Codec", "Local");
else if (codec == Speech::Latin1)
- config->writeEntry("Codec", "Latin1");
+ cg.writeEntry("Codec", "Latin1");
else if (codec == Speech::Unicode)
- config->writeEntry("Codec", "Unicode");
+ cg.writeEntry("Codec", "Unicode");
else {
QString codeName = codecList->at (codec-Speech::UseCodec)->name();
- config->writeEntry("Codec", codeName);
+ cg.writeEntry("Codec", codeName);
}
}
--- trunk/KDE/kdeaccessibility/kmouth/wordcompletion/dictionarycreationwizard.cpp #704343:704344
@@ -367,11 +367,11 @@
dictionaryFile = KGlobal::dirs()->saveLocation ("appdata", "/") + "wordcompletion1.dict";
if (WordList::saveWordList (map, dictionaryFile)) {
- config->setGroup("Dictionary 0");
- config->writeEntry ("Filename", "wordcompletion1.dict");
- config->writeEntry ("Name", i18n("Default"));
- config->writeEntry ("Language", language);
- config->sync();
+ KConfigGroup cg(config, "Dictionary 0");
+ cg.writeEntry ("Filename", "wordcompletion1.dict");
+ cg.writeEntry ("Name", i18n("Default"));
+ cg.writeEntry ("Language", language);
+ cg.sync();
}
}
--- trunk/KDE/kdeaccessibility/kmouth/wordcompletion/wordcompletion.cpp #704343:704344
@@ -118,11 +118,11 @@
QStringList groups = config->groupList();
for (QStringList::Iterator it = groups.begin(); it != groups.end(); ++it)
if ((*it).startsWith ("Dictionary ")) {
- config->setGroup(*it);
+ KConfigGroup cg(config, *it);
WordCompletionPrivate::DictionaryDetails details;
- details.filename = config->readEntry("Filename");
- details.language = config->readEntry("Language");
- QString name = config->readEntry("Name");
+ details.filename = cg.readEntry("Filename");
+ details.language = cg.readEntry("Language");
+ QString name = cg.readEntry("Name");
d->dictDetails[name] = details;
d->dictionaries += name;
}
--- trunk/KDE/kdeaccessibility/kmouth/wordcompletion/wordcompletionwidget.cpp #704343:704344
@@ -73,8 +73,8 @@
languageCode + QString::fromLatin1("/entry.desktop"));
KConfig entry(filename, KConfig::OnlyLocal);
- entry.setGroup(QString::fromLatin1("KCM Locale"));
- QString name = entry.readEntry(QString::fromLatin1("Name"), i18n("without name"));
+ KConfigGroup cg (&entry, "KCM Locale");
+ QString name = cg.readEntry(QString::fromLatin1("Name"), i18n("without name"));
setLanguage (name + " (" + languageCode + ')', languageCode);
}
@@ -135,11 +135,11 @@
DictionaryListItem *last = 0;
for (QStringList::Iterator it = groups.begin(); it != groups.end(); ++it)
if ((*it).startsWith ("Dictionary ")) {
- config->setGroup(*it);
- QString languageTag = config->readEntry("Language");
+ KConfigGroup cg (config, *it);
+ QString languageTag = cg.readEntry("Language");
last = new DictionaryListItem (dictionaryList, last,
- config->readEntry("Filename"),
- config->readEntry("Name"),
+ cg.readEntry("Filename"),
+ cg.readEntry("Name"),
languageTag);
if (!languageButton->contains(languageTag))
languageButton->insertLanguage(languageTag, i18n("without name"));
@@ -165,10 +165,10 @@
while (it.current()) {
DictionaryListItem *item = dynamic_cast<DictionaryListItem*>(it.current());
if (item != 0) {
- config->setGroup(QString("Dictionary %1").arg(number));
- config->writeEntry ("Filename", item->filename());
- config->writeEntry ("Name", item->text (0));
- config->writeEntry ("Language", item->languageCode());
+ KConfigGroup cg (config, QString("Dictionary %1").arg(number));
+ cg.writeEntry ("Filename", item->filename());
+ cg.writeEntry ("Name", item->text (0));
+ cg.writeEntry ("Language", item->languageCode());
number++;
}
++it;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic