Config ignores comment lines now (all lines that start with a '#'). This is

necessary to load some pixmap themes from KDE and shouldn't change anything
else ('#' not at the beginning of a line are not treated as a comment)

1 files changed, 4 insertions, 0 deletions

diff --git a/library/config.cpp b/library/config.cpp
index e07eecb..1121cd4 100644
--- a/library/config.cpp
+++ b/library/config.cpp
@@ -513,42 +513,46 @@ void Config::read()
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
     // The below should work, but doesn't in Qt 2.3.0
     s.setCodec( QTextCodec::codecForMib( 106 ) );
 #else
     s.setEncoding( QTextStream::UnicodeUTF8 );
 #endif
 
     QStringList list = QStringList::split('\n', s.read() );
     f.close();
 
     for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
         if ( !parse( *it ) ) {
             git = groups.end();
             return;
         }
     }
 }
 
 /*!
   \internal
 */
 bool Config::parse( const QString &l )
 {
     QString line = l.stripWhiteSpace();
+    
+    if ( line [0] == QChar ( '#' ))
+    	return true; // ignore comments
+    
     if ( line[ 0 ] == QChar( '[' ) ) {
 	QString gname = line;
 	gname = gname.remove( 0, 1 );
 	if ( gname[ (int)gname.length() - 1 ] == QChar( ']' ) )
 	    gname = gname.remove( gname.length() - 1, 1 );
 	git = groups.insert( gname, ConfigGroup() );
     } else if ( !line.isEmpty() ) {
 	if ( git == groups.end() )
 	    return FALSE;
 	int eq = line.find( '=' );
 	if ( eq == -1 )
 	    return FALSE;
 	QString key = line.left(eq).stripWhiteSpace();
 	QString value = line.mid(eq+1).stripWhiteSpace();
 	( *git ).insert( key, value );
     }
     return TRUE;
 }