diff options
Diffstat (limited to 'ktuberling/soundfactory.cpp')
-rw-r--r-- | ktuberling/soundfactory.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ktuberling/soundfactory.cpp b/ktuberling/soundfactory.cpp index 5bb309d8..f10d0a8c 100644 --- a/ktuberling/soundfactory.cpp +++ b/ktuberling/soundfactory.cpp @@ -25,10 +25,10 @@ SoundFactory::SoundFactory(TopLevel *tqparent, const char *name, uint selectedLa namesList = filesList = 0; - TQDomDocument tqlayoutsDocument; - bool ok = topLevel->loadLayout(tqlayoutsDocument); - if (ok) ok = registerLanguages(tqlayoutsDocument); - if (ok) ok = loadLanguage(tqlayoutsDocument, selectedLanguage); + TQDomDocument layoutsDocument; + bool ok = topLevel->loadLayout(layoutsDocument); + if (ok) ok = registerLanguages(layoutsDocument); + if (ok) ok = loadLanguage(layoutsDocument, selectedLanguage); if (!ok) loadFailure(); } @@ -42,9 +42,9 @@ SoundFactory::~SoundFactory() // Change the language void SoundFactory::change(uint selectedLanguage) { - TQDomDocument tqlayoutsDocument; - bool ok = topLevel->loadLayout(tqlayoutsDocument); - if (ok) ok = loadLanguage(tqlayoutsDocument, selectedLanguage); + TQDomDocument layoutsDocument; + bool ok = topLevel->loadLayout(layoutsDocument); + if (ok) ok = loadLanguage(layoutsDocument, selectedLanguage); if (!ok) loadFailure(); } @@ -74,14 +74,14 @@ void SoundFactory::loadFailure() } // Register the various languages -bool SoundFactory::registerLanguages(TQDomDocument &tqlayoutDocument) +bool SoundFactory::registerLanguages(TQDomDocument &layoutDocument) { TQDomNodeList languagesList, menuItemsList, labelsList; TQDomElement languageElement, menuItemElement, labelElement; TQDomAttr codeAttribute, actionAttribute; bool enabled; - languagesList = tqlayoutDocument.elementsByTagName("language"); + languagesList = layoutDocument.elementsByTagName("language"); if (languagesList.count() < 1) return false; @@ -110,7 +110,7 @@ bool SoundFactory::registerLanguages(TQDomDocument &tqlayoutDocument) } // Load the sounds of one given language -bool SoundFactory::loadLanguage(TQDomDocument &tqlayoutDocument, uint toLoad) +bool SoundFactory::loadLanguage(TQDomDocument &layoutDocument, uint toLoad) { TQDomNodeList languagesList, soundNamesList; @@ -118,7 +118,7 @@ bool SoundFactory::loadLanguage(TQDomDocument &tqlayoutDocument, uint toLoad) soundNameElement; TQDomAttr nameAttribute, fileAttribute; - languagesList = tqlayoutDocument.elementsByTagName("language"); + languagesList = layoutDocument.elementsByTagName("language"); if (toLoad >= languagesList.count()) return false; |