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

List:       kde-commits
Subject:    koffice/libs/kofficecore
From:       Stefan Nikolaus <stefan.nikolaus () kdemail ! net>
Date:       2006-03-28 11:49:08
Message-ID: 1143546548.157743.18579.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 523497 by nikolaus:

define compareMap() before it is called *sigh*


 M  +14 -14    KoGenStyle.cpp  


--- trunk/koffice/libs/kofficecore/KoGenStyle.cpp #523496:523497
@@ -24,7 +24,21 @@
 #include <Q3ValueList>
 
 
+// Returns -1, 0 (equal) or 1
+static int compareMap( const QMap<QString, QString>& map1, const QMap<QString, QString>& map2 )
+{
+  QMap<QString, QString>::const_iterator it = map1.begin();
+  QMap<QString, QString>::const_iterator oit = map2.begin();
+  for ( ; it != map1.end(); ++it, ++oit ) { // both maps have been checked for size already
+    if ( it.key() != oit.key() )
+      return it.key() < oit.key() ? -1 : +1;
+    if ( it.data() != oit.data() )
+      return it.data() < oit.data() ? -1 : +1;
+  }
+  return 0; // equal
+}
 
+
 KoGenStyle::KoGenStyle( int type, const char* familyName,
                         const QString& parentName )
     : m_type( type ), m_familyName( familyName ), m_parentName( parentName ),
@@ -256,17 +270,3 @@
     }
     return true;
 }
-
-// Returns -1, 0 (equal) or 1
-static int compareMap( const QMap<QString, QString>& map1, const QMap<QString, QString>& map2 )
-{
-  QMap<QString, QString>::const_iterator it = map1.begin();
-  QMap<QString, QString>::const_iterator oit = map2.begin();
-  for ( ; it != map1.end(); ++it, ++oit ) { // both maps have been checked for size already
-    if ( it.key() != oit.key() )
-      return it.key() < oit.key() ? -1 : +1;
-    if ( it.data() != oit.data() )
-      return it.data() < oit.data() ? -1 : +1;
-  }
-  return 0; // equal
-}
[prev in list] [next in list] [prev in thread] [next in thread]