kdenonbeta/kdedebian/kapture/libkapture

[Peter Rockai]

CVS commit by mornfall: 

Move cElemTooltip to a more appropriate place (from CElemView ->
TreeView). Reduce debug output.


  M +0 -17     celemview.cpp   1.6
  M +0 -1      celemview.h   1.7
  M +3 -3      listtreewidget.cpp   1.26
  M +20 -1     treeview.cpp   1.7
  M +1 -0      treeview.h   1.8


--- kdenonbeta/kdedebian/kapture/libkapture/celemview.cpp  #1.5:1.6
@@ -28,21 +28,4 @@ CElemView *CElemViewFactory::create (QWi
 }
 
-QString kapture::cElemTooltip (CElemPtr _e)
-{
-    QString str;
-    if (pkgCElem (_e)) {
-        PkgCElemPtr e = pkgCElem (_e);
-        str . append (QString ("<b>Package:</b>&nbsp;") + e -> Name () + 
"<br>");
-        str . append (QString ("<b>Description:</b>&nbsp;") + e -> shortDesc
-                () + "<br>");
-        str . append (QString ("<b>Candidate&nbsp;version:</b>&nbsp;") +
-                PkgManager::cache () -> GetCandidateVer (*e) . VerStr () +
-                "<br>"); // XXX: guard for GetCandidateVer (...) == 0
-        str . append (QString ("<b>Current&nbsp;version:</b>&nbsp;") +
-                (e -> CurrentVer () -> end () ? "-" : e -> CurrentVer () ->
-                VerStr ()));
-    }
-    return str;
-}
 
 #include "celemview.moc"

--- kdenonbeta/kdedebian/kapture/libkapture/celemview.h  #1.6:1.7
@@ -44,5 +44,4 @@ namespace kapture {
     };
 
-    QString cElemTooltip (CElemPtr e);
 };
 

--- kdenonbeta/kdedebian/kapture/libkapture/listtreewidget.cpp  #1.25:1.26
@@ -4,5 +4,5 @@
 #include <libcapture/pkgcache.h>
 #include "listtreewidget.h"
-#include "celemview.h"
+#include "treeview.h"
 
 #include <iostream>
@@ -259,9 +259,9 @@ void ListTreeWidgetTooltip::maybeTip (co
     if (! m_parent)
         return;
-    std::cerr << "ListTreeWidgetTooltip::maybeTip ()" << std::endl;
+    // std::cerr << "ListTreeWidgetTooltip::maybeTip ()" << std::endl;
     KListViewItemCustom *i = dynamic_cast <KListViewItemCustom *> (m_parent ->
             itemAt (p));
     if (i)
-        tip (m_parent -> itemRect (i), cElemTooltip (**(i -> m_treeNode)));
+        tip (m_parent -> itemRect (i), TreeView::cElemTooltip (**(i -> 
m_treeNode)));
 }
 

--- kdenonbeta/kdedebian/kapture/libkapture/treeview.cpp  #1.6:1.7
@@ -31,6 +31,20 @@ TreeView::~TreeView ()
 }
 
-TreeViewFactory::TreeViewFactory ()
+QString TreeView::cElemTooltip (CElemPtr _e)
 {
+    QString str;
+    if (pkgCElem (_e)) {
+        PkgCElemPtr e = pkgCElem (_e);
+        str . append (QString ("<b>Package:</b>&nbsp;") + e -> Name () + 
"<br>");
+        str . append (QString ("<b>Description:</b>&nbsp;") + e -> shortDesc
+                () + "<br>");
+        str . append (QString ("<b>Candidate&nbsp;version:</b>&nbsp;") +
+                PkgManager::cache () -> GetCandidateVer (*e) . VerStr () +
+                "<br>"); // XXX: guard for GetCandidateVer (...) == 0
+        str . append (QString ("<b>Current&nbsp;version:</b>&nbsp;") +
+                (e -> CurrentVer () -> end () ? "-" : e -> CurrentVer () ->
+                VerStr ()));
+    }
+    return str;
 }
 
@@ -57,3 +71,8 @@ TreeView *TreeViewFactory::create (const
 }
 
+TreeViewFactory::TreeViewFactory ()
+{
+}
+
+
 #include "treeview.moc"

--- kdenonbeta/kdedebian/kapture/libkapture/treeview.h  #1.7:1.8
@@ -57,4 +57,5 @@ namespace kapture {
             virtual capture::Tree *tree () { return m_tree; };
             virtual capture::GrouperChain *grouper () { return m_tree -> 
grouper (); };
+            static QString cElemTooltip (capture::CElemPtr e);
             // void setMainView (MainView *mv) { m_mainView = mv; };
         signals: