[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kphotoalbum/category_l10n_removal] XMLDB: Commenting out XMLDB::FileReader::loadSettings for now.
From:       Tobias Leupold <tobias.leupold () web ! de>
Date:       2015-12-02 12:41:48
Message-ID: E1a46jE-0005Nv-9E () scm ! kde ! org
[Download RAW message or body]

Git commit a036c2563d499a29087d39bc4c996ee6f5181149 by Tobias Leupold.
Committed on 02/12/2015 at 12:41.
Pushed by tleupold into branch 'category_l10n_removal'.

Commenting out XMLDB::FileReader::loadSettings for now.

M  +1    -1    XMLDB/Database.h
M  +3    -1    XMLDB/FileReader.cpp
M  +1    -1    XMLDB/FileReader.h

http://commits.kde.org/kphotoalbum/a036c2563d499a29087d39bc4c996ee6f5181149

diff --git a/XMLDB/Database.h b/XMLDB/Database.h
index 0ed0bcc..98c3f65 100644
--- a/XMLDB/Database.h
+++ b/XMLDB/Database.h
@@ -108,7 +108,7 @@ namespace XMLDB {
         XMLCategoryCollection m_categoryCollection;
         DB::MemberMap m_members;
         DB::MD5Map m_md5map;
-        QMap<QString, QString> m_settings;
+        //QMap<QString, QString> m_settings;
 
         DB::StackID m_nextStackId;
         typedef QMap<DB::StackID, DB::FileNameList> StackMap;
diff --git a/XMLDB/FileReader.cpp b/XMLDB/FileReader.cpp
index 4bd7d0c..c6b2138 100644
--- a/XMLDB/FileReader.cpp
+++ b/XMLDB/FileReader.cpp
@@ -77,7 +77,7 @@ void XMLDB::FileReader::read( const QString& configFile )
     loadImages( reader );
     loadBlockList( reader );
     loadMemberGroups( reader );
-    loadSettings(reader);
+    //loadSettings(reader);
 
     m_db->m_members.setLoading( false );
 
@@ -324,6 +324,7 @@ void XMLDB::FileReader::loadMemberGroups( ReaderPtr reader )
     }
 }
 
+/*
 void XMLDB::FileReader::loadSettings(ReaderPtr reader)
 {
     static QString settingsString = QString::fromUtf8("settings");
@@ -346,6 +347,7 @@ void XMLDB::FileReader::loadSettings(ReaderPtr reader)
         }
     }
 }
+*/
 
 void XMLDB::FileReader::checkIfImagesAreSorted()
 {
diff --git a/XMLDB/FileReader.h b/XMLDB/FileReader.h
index 674134e..5107f90 100644
--- a/XMLDB/FileReader.h
+++ b/XMLDB/FileReader.h
@@ -46,7 +46,7 @@ protected:
     void loadImages( ReaderPtr reader );
     void loadBlockList( ReaderPtr reader );
     void loadMemberGroups( ReaderPtr reader );
-    void loadSettings(ReaderPtr reader);
+    //void loadSettings(ReaderPtr reader);
 
     DB::ImageInfoPtr load( const DB::FileName& filename, ReaderPtr reader );
     ReaderPtr readConfigFile( const QString& configFile );
[prev in list] [next in list] [prev in thread] [next in thread]