[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdevelop/parts/classview
From:       Alexander Dymo <cloudtemple () mksat ! net>
Date:       2003-11-18 19:27:11
[Download RAW message or body]

CVS commit by dymo: 

do not let the namespaces combobox to be cleared (it doesn't make sence), there is \
always "global namespace" to be shown


  M +10 -2     classviewpart.cpp   1.56
  M +3 -0      classviewpart.h   1.22
  M +4 -4      viewcombos.cpp   1.10


--- kdevelop/parts/classview/classviewpart.cpp  #1.55:1.56
@@ -67,4 +67,6 @@ ClassViewPart::ClassViewPart(QObject *pa
     setupActions();
 
+    global_item = 0;
+
     m_widget = new ClassViewWidget(this);
     m_widget->setIcon( SmallIcon("view_tree") );
@@ -708,6 +710,8 @@ void ClassViewPart::removeFile( const QS
 
     if (ViewCombosOp::removeNamespacesItems(this, m_namespaces->view()->listView(), \
                model_cast<NamespaceDom>(file)))
-        if (nsmap[codeModel()->globalNamespace()->name()])
-            m_namespaces->view()->setCurrentActiveItem(nsmap[codeModel()->globalNamespace()->name()]);
 +    {
+        if (global_item)
+            m_namespaces->view()->setCurrentActiveItem(global_item);
+    }
 
     ViewCombosOp::removeClassItems(this, m_namespaces->view()->listView(), \
model_cast<ClassDom>(file)); @@ -845,5 +849,9 @@ void ClassViewPart::removeNamespace( \
con  NamespaceItem *i = nsmap[name];
         if (i)
+        {
             m_namespaces->view()->removeItem(i);
+            if (global_item)
+                m_namespaces->view()->setCurrentActiveItem(global_item);
+        }
     }
 }

--- kdevelop/parts/classview/classviewpart.h  #1.21:1.22
@@ -47,4 +47,5 @@ class KListViewAction;
 class QListViewItem;
 class KToolBarPopupAction;
+class NamespaceItem;
 
 class ClassViewPart : public KDevPlugin
@@ -64,4 +65,6 @@ public:
     KListViewAction *m_classes;
     KListViewAction *m_functions;
+
+    NamespaceItem *global_item;
 
     void updateClassesForAdd(NamespaceDom nsdom);

--- kdevelop/parts/classview/viewcombos.cpp  #1.9:1.10
@@ -128,7 +128,7 @@ void refreshNamespaces(ClassViewPart *pa
     view->clear();
 
-    NamespaceItem *global_item = new NamespaceItem( part, view->listView(), \
                i18n("(Global Namespace)"), part->codeModel()->globalNamespace() );
-    view->addItem(global_item);
-    global_item->setPixmap( 0, UserIcon("CVnamespace", KIcon::DefaultState, \
part->instance()) ); +    part->global_item = new NamespaceItem( part, \
view->listView(), i18n("(Global Namespace)"), part->codeModel()->globalNamespace() ); \
+    view->addItem(part->global_item); +    part->global_item->setPixmap( 0, \
                UserIcon("CVnamespace", KIcon::DefaultState, part->instance()) );
     NamespaceList namespaces = \
                part->codeModel()->globalNamespace()->namespaceList();
     for (NamespaceList::const_iterator it = namespaces.begin(); it != \
namespaces.end(); ++it) @@ -139,5 +139,5 @@ void refreshNamespaces(ClassViewPart *pa
         processNamespace(part, view, item);
     }
-    view->setCurrentActiveItem(global_item);
+    view->setCurrentActiveItem(part->global_item);
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]