kdenonbeta/kdedebian/kapture

[Peter Rockai]

CVS commit by mornfall: 

Fix a rather nasty contract violation in Param::mergeMaps (swapped
argument meanings).


  M +1 -0      libcapture/filters.cpp   1.12
  M +4 -3      libcapture/param.h   1.3
  M +2 -0      libkapture/listtreeview.cpp   1.12


--- kdenonbeta/kdedebian/kapture/libcapture/filters.cpp  #1.11:1.12
@@ -90,4 +90,5 @@ PkgNameFilter::PkgNameFilter (const Para
 {
     m_str = ParamStr::value (Param::get (a, "string"));
+    // cerr << "PkgNameFilter::PkgNameFilter: m_str = " << m_str << endl;
 }
                                                                 /* }}} */

--- kdenonbeta/kdedebian/kapture/libcapture/param.h  #1.2:1.3
@@ -41,7 +41,8 @@ namespace capture
             }
             static Map mergeMaps (const Map &m1, const Map &m2) {
-                Map ret = m1;
-                for (Map::const_iterator i = m2 . begin (); i != m2 . end (); 
++ i)
-                    ret . insert (*i);
+                Map ret = m2; // m2 has priority
+                for (Map::const_iterator i = m1 . begin (); i != m1 . end (); 
++ i) {
+                    ret . insert (*i); // will not overwrite existing entries
+                }
                 return ret;
             }

--- kdenonbeta/kdedebian/kapture/libkapture/listtreeview.cpp  #1.11:1.12
@@ -44,4 +44,6 @@ void ListTreeView::filterStringChanged (
     Param::Map a;
     Param::set (a, "string", ParamStr::create (string (text.utf8 ())));
+    /* kdDebug () << "string param: " << ParamStr::value (Param::get (a,
+                "string")) . c_str () << endl; */
     m_quickGrouper -> applyArgs (a);
 }