kdenonbeta/kdedebian/kapture

[Peter Rockai]

CVS commit by mornfall: 

compile!


  M +2 -11     kapture/kapture.cpp   1.16
  M +5 -5      tests/libcapture/grouper-test.cpp   1.2
  M +1 -1      tests/libcapture/tree-test.cpp   1.3


--- kdenonbeta/kdedebian/kapture/kapture/kapture.cpp  #1.15:1.16
@@ -6,12 +6,4 @@
 
 // includes                                                         {{{
-#include "kapture.h"
-
-#include "kapturepref.h"
-
-#include <kprinter.h>
-#include <qpainter.h>
-#include <qpaintdevicemetrics.h>
-
 #include <kdeversion.h>
 #include <kglobal.h>
@@ -22,6 +14,4 @@
 #include <kkeydialog.h>
 #include <kaccel.h>
-//#include <kio/netaccess.h>
-//#include <kfiledialog.h>
 #include <kconfig.h>
 #include <kurl.h>
@@ -53,5 +43,6 @@
 #include <libkapture/pkgnodeview.h>
 #include <libkapture/dpkgpm.h>
-#include "konsolewidget.h"
+#include "kapturepref.h"
+#include "kapture.h"
                                                                 /* }}} */
 

--- kdenonbeta/kdedebian/kapture/tests/libcapture/grouper-test.cpp  #1.1:1.2
@@ -22,18 +22,18 @@ namespace tut {
     void to::test<1> () 
     {
-        argmap a;
+        Param::Map a;
         GrouperChain *c;
         GrouperTNode *n0, *n1, *n2, *n3;
         c = new GrouperChain ("test");
-        n0 = c -> addFactory ("SectGrouper", a, "sect");
+        n0 = c -> addFactory ("SectGrouper", "sect");
         ensure (IT (0)); ensure (IT (0) == n0);
-        n1 = c -> addFactory ("EndGrouper", a, "end");
+        n1 = c -> addFactory ("EndGrouper", "end");
         ensure (IT (1)); ensure (IT (1) == n1);
-        n2 = c -> addFactory ("PkgExistFilter", a, "exist", Grouper::Custom, 
1);
+        n2 = c -> addFactory ("PkgExistFilter", "exist", a, Grouper::Custom, 
1);
         ensure (IT (2));
         ensure (IT (0) == n0);
         ensure (IT (1) == n2);
         ensure (IT (2) == n1);
-        n3 = c -> addFactory ("PkgNameFilter", a, "name", Grouper::BeforeLast);
+        n3 = c -> addFactory ("PkgNameFilter", "name", a, Grouper::BeforeLast);
         ensure (IT (3));
         ensure (IT (0) == n0);

--- kdenonbeta/kdedebian/kapture/tests/libcapture/tree-test.cpp  #1.2:1.3
@@ -56,5 +56,5 @@ namespace tut {
         Tree *t = new Tree;
         GrouperChain *c = new GrouperChain ("grouperchain");
-        c -> addFactory ("EndGrouper", argmap (), "end");
+        c -> addFactory ("EndGrouper", "end");
         t -> setGrouper (c);
         t -> setProducer (p);