Changeset 1173

Timestamp:

05/29/09 08:45:52 (4 years ago)

Author:

mauser

Message:

QtXml: fixed serverList , recentlyUsedFX and patternCategories

Files:

• branches/qtxml/libs/hydrogen/src/preferences.cpp (modified) (4 diffs)

branches/qtxml/libs/hydrogen/src/preferences.cpp

@@ -259 +259 @@
                                 }
                                 pSongElement = pRecentUsedSongsNode.nextSiblingElement( "song" );
-
                                 
                         } else {
@@ -267 +266 @@
                         QDomNode pRecentFXNode = rootNode.firstChildElement( "recentlyUsedEffects" );
                         if ( ! pRecentFXNode.isNull() ) {
-                                QDomNode pFXNode = pRecentFXNode.firstChildElement( "FX" );
-                                while ( !pFXNode.isNull()  ) {
-                                        QString sFXName = pFXNode.firstChildElement().nodeValue();
-                                        m_recentFX.push_back( sFXName );
-                                        pFXNode = pFXNode.nextSiblingElement( "FX" );
+                                QDomElement pFXElement = pRecentFXNode.firstChildElement( "FX" );
+                                if ( !pFXElement.isNull()  && ! pFXElement.text().isEmpty()) {
+                                        m_recentFX.push_back( pFXElement.text() );
                                 }
+                                pFXElement = pRecentFXNode.nextSiblingElement( "FX" );
                         } else {
                                 WARNINGLOG( "recentlyUsedEffects node not found" );
@@ -280 +278 @@
                         QDomNode pServerListNode = rootNode.firstChildElement( "serverList" );
                         if ( !pServerListNode.isNull() ) {
-                                QDomNode pServerNode = pServerListNode.firstChildElement( "server" );
-                                while ( !pServerNode.isNull()  ) {
-                                        QString sFilename = pServerNode.firstChildElement().nodeValue();
-                                        sServerList.push_back( sFilename );
-                                        pServerNode = pServerNode.nextSiblingElement( "server" );
+                                QDomElement pServerElement = pServerListNode.firstChildElement( "server" );
+                                if ( !pServerElement.isNull() && !pServerElement.text().isEmpty() ) {
+                                        sServerList.push_back( pServerElement.text() );
                                 }
+                                pServerElement = pServerListNode.nextSiblingElement( "server" );
                         } else {
                                 WARNINGLOG( "serverList node not found" );
@@ -293 +290 @@
                         QDomNode pPatternCategoriesNode = rootNode.firstChildElement( "patternCategories" );
                         if ( !pPatternCategoriesNode.isNull() ) {
-                                QDomNode pCategoriesNode = pPatternCategoriesNode.firstChildElement( "categories" );
-                                while ( !pCategoriesNode.isNull() ) {
-                                        QString sFilename = pCategoriesNode.firstChildElement().nodeValue();
-                                        m_patternCategories.push_back( sFilename );
-                                        pCategoriesNode = pCategoriesNode.nextSiblingElement( "categories" );
+                                QDomElement pPatternCategoriesElement = pPatternCategoriesNode.firstChildElement( "categories" );
+                                if ( !pPatternCategoriesElement.isNull() && !pPatternCategoriesElement.text().isEmpty() ) {
+                                        m_patternCategories.push_back( pPatternCategoriesElement.text() );
                                 }
+                                pPatternCategoriesElement = pPatternCategoriesNode.nextSiblingElement( "categories" );
                         } else {
                                 WARNINGLOG( "patternCategories node not found" );