kdenonbeta/kdedebian/kapture/kapture

[Peter Rockai]

CVS commit by mornfall: 

try fix compile on 3.1


  M +1 -2      Makefile.am   1.4
  M +2 -0      kaptureconfig.h   1.2
  M +2 -0      mainview.cpp   1.3
  M +1 -1      mainview.h   1.2


--- kdenonbeta/kdedebian/kapture/kapture/Makefile.am  #1.3:1.4
@@ -58,6 +58,5 @@
 libkapturepart_la_SOURCES = kapture_part.cpp pkglistview.cpp pkglistviewui.ui \
     pkglist.cpp pkgview.cpp pkgdetailscommonui.ui pkgdetails.cpp \
-    pkgdetailscommon.cpp mainviewui.ui mainview.cpp operationmenuui.ui \
-    kaptureconfigbase.kcfgc kaptureconfig.cpp
+    pkgdetailscommon.cpp mainviewui.ui mainview.cpp operationmenuui.ui
 
 libkapturepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)

--- kdenonbeta/kdedebian/kapture/kapture/kaptureconfig.h  #1.1:1.2
@@ -10,4 +10,5 @@
 #  define KAPTURECONFIG_H
 
+#if 0
 #include "kaptureconfigbase.h"
 
@@ -27,4 +28,5 @@ namespace kapture {
     };
 }
+#endif
 
 #endif /* ifndef KAPTURECONFIG_H */

--- kdenonbeta/kdedebian/kapture/kapture/mainview.cpp  #1.2:1.3
@@ -48,4 +48,5 @@ void MainView::showPackage (pkgCache::Pk
 }
 
+#if 0
 void MainView::createView (Config *)
 {
@@ -54,4 +55,5 @@ void MainView::createView (Config *)
     addView (v); */
 }
+#endif
 
 void MainView::addView (PkgView *view)

--- kdenonbeta/kdedebian/kapture/kapture/mainview.h  #1.1:1.2
@@ -34,5 +34,5 @@ namespace kapture {
         public:
             MainView (QWidget *parent = 0, const char *name = 0);
-            void createView (kapture::Config *cfg);
+            // XXX(3.1) void createView (kapture::Config *cfg);
         public slots: // consider making some of these ordinary methods!
             void addView (PkgView *view);