kdenonbeta/kdedebian/kapture
CVS commit by mornfall:
- make CElemView base less brain-dead [fixes "don't open new tabs for
opened packages" after rebuild case]
- reduce stale code, slight formatting changes [sic]
M +4 -15 kapture/kapture.cpp 1.27
M +4 -1 libcapture/celem.h 1.6
M +1 -1 libkapture/celemview.cpp 1.3
M +1 -3 libkapture/celemview.h 1.4
M +1 -1 libkapture/pkgcelemview.cpp 1.8
M +1 -0 libkapture/pkgcelemview.h 1.7
--- kdenonbeta/kdedebian/kapture/kapture/kapture.cpp #1.26:1.27
@@ -147,21 +147,10 @@ void Kapture::showElem (CElemPtr e)
details -> showElem (e);
v = details;
- };
+ }
if (v) {
- /* if (m_nodesShown == 1) {
- m_nodeView = v;
- v -> reparent (m_nodeStack, QPoint (0, 0));
- m_nodeStack -> raiseWidget (v);
- } else */ {
- // if (m_nodesShown == 1 /* == 2 */) {
- /* m_nodeView -> reparent (m_nodeTabs, QPoint (0, 0));
- m_nodeTabs -> addTab (m_nodeView, m_nodeView -> caption ());
- m_nodeView = 0;
- } */
m_nodeTabs -> addTab (v, v -> caption ());
m_nodeTabs -> showPage (v);
m_nodeStack -> raiseWidget (m_nodeTabs);
}
- }
}
/* }}} */
--- kdenonbeta/kdedebian/kapture/libcapture/celem.h #1.5:1.6
@@ -196,5 +196,8 @@ namespace capture {
inline VerCElemPtr PkgCElem::VersionList () { return cElem (pkgCache::PkgIterator::VersionList ()); };
inline bool PkgCElem::operator == (CElem &e) { // bah, should be const
- if (pkgCElem (&e)) return pkgCache::PkgIterator::operator == (*pkgCElem (&e)); return false; };
+ if (pkgCElem (&e))
+ return pkgCache::PkgIterator::operator == (*pkgCElem (&e));
+ return false;
+ };
class CElemVisitor
--- kdenonbeta/kdedebian/kapture/libkapture/celemview.cpp #1.2:1.3
@@ -9,5 +9,5 @@ using namespace kapture;
/* {{{ */
CElemView::CElemView (QWidget *parent, const char *name)
- : QWidget (parent, name), m_elem (0)
+ : QWidget (parent, name)
{
//PkgManager::registerWatcher (this);
--- kdenonbeta/kdedebian/kapture/libkapture/celemview.h #1.3:1.4
@@ -32,9 +32,7 @@ namespace kapture {
CElemView (QWidget *parent = 0, const char *name = 0);
~CElemView ();
- CElemPtr elem () { return m_elem; };
+ virtual CElemPtr elem () = 0;
public slots:
virtual bool showElem (CElemPtr elem) = 0;
- protected:
- CElemPtr m_elem;
};
};
--- kdenonbeta/kdedebian/kapture/libkapture/pkgcelemview.cpp #1.7:1.8
@@ -77,5 +77,5 @@ PkgCElemView::PkgCElemView (QWidget *par
bool PkgCElemView::showElem (capture::CElemPtr e)
{
- m_elem = e;
+ // m_elem = e;
m_pkg = pkgCElem (e);
m_common -> setPackage (m_pkg);
--- kdenonbeta/kdedebian/kapture/libkapture/pkgcelemview.h #1.6:1.7
@@ -65,4 +65,5 @@ namespace kapture {
virtual void refresh ();
virtual void rebuild ();
+ CElemPtr elem () { return m_pkg; };
public slots:
void setVersion (capture::VerCElemPtr V);
Reply to: