kdenonbeta/kdedebian/kapture

[Peter Rockai <mornfall@logisys.dyndns.org>]

CVS commit by mornfall: 

Fix a compile failure with gcc 3.3.4 (a typo, instead of CElemPtrT<T>::operator
CElemPtrT<CElem> it was CElemPtr<T>::...). Update TODO, add HasParser
flag to PkgStatusFilter, add libtagcoll-dev to build-deps.


  M +2 -2      TODO   1.46
  M +1 -1      debian/control   1.6
  M +3 -1      kapture/kapture.cpp   1.32
  M +1 -1      libcapture/celem.h   1.9
  M +8 -1      libcapture/filters.h   1.20


--- kdenonbeta/kdedebian/kapture/TODO  #1.45:1.46
@@ -168,9 +168,9 @@
 
   BETTER FEEDBACK SYSTEM [done: 0%]
-  Imprve the current progress and status feedback system to a point where it
+  Improve the current progress and status feedback system to a point where it
   would be more reliable than not ;). Make it nice, make it slick, etc.
   Whatever. Improve the _error handling thing as well. Make it rock. :D.
 
-  FIX APT HOOK SCRIPT HANDLING [done: 0%]
+  FIX APT HOOK SCRIPT HANDLING [done: 70%]
   So that apt-listchanges and friends don't hang kapture ui and they output
   their stuff into the embedded konsole.

--- kdenonbeta/kdedebian/kapture/debian/control  #1.5:1.6
@@ -4,5 +4,5 @@
 Maintainer: Peter Rockai (mornfall) <mornfall@logisys.dyndns.org>
 Build-Depends: automake1.7, debhelper (>> 4.0.18), gettext, kdelibs4-dev,
- libapt-pkg-dev (>= 0.5.15)
+ libapt-pkg-dev (>= 0.5.15), libtagcoll-dev
 Standards-Version: 3.5.8.0
 

--- kdenonbeta/kdedebian/kapture/kapture/kapture.cpp  #1.31:1.32
@@ -62,5 +62,4 @@ Kapture::Kapture()
     // to automatically save settings if changed: window size, toolbar
     // position, icon size, etc.
-    setAutoSaveSettings();
 
     m_mainDock = createDockWidget ("main-dock", QPixmap (), 0);
@@ -127,4 +126,7 @@ Kapture::Kapture()
 
     m_elemViewFact = new CElemViewFactory;
+
+    adjustSize ();
+    setAutoSaveSettings ();
 }
                                                                     /* }}} */

--- kdenonbeta/kdedebian/kapture/libcapture/celem.h  #1.8:1.9
@@ -189,5 +189,5 @@ namespace capture {
     }
     template <typename T> inline
-        CElemPtr<T>::operator CElemPtrT <CElem> () {
+        CElemPtrT<T>::operator CElemPtrT <CElem> () {
             // std::cerr << "ref1: " << p -> _refc << std::endl;
             // CElemPtrT <CElem> ret (p); // = CElemPtrT <CElem> (p);

--- kdenonbeta/kdedebian/kapture/libcapture/filters.h  #1.19:1.20
@@ -114,5 +114,12 @@ namespace capture {
      * ----------------------------------------------------------------------
      */
-    FILTER_DEF (PkgStatusFilter, "Package Status", FilterGrouper, PkgManager::InstallChange, int m_status;);
+    class PkgStatusFilter : public FilterGrouper {
+        public:
+            FILT_CLASS (PkgStatusFilter, "Package Status");
+            GRP_AFFECT (PkgManager::InstallChange);
+            FILT_FLAGS (HasParser);
+        protected:
+            int m_status;
+    };
                                                                     /* }}} */
 };