[Uml-devel] kdesdk/umbrello/umbrello

[Sebastian Stein]

CVS commit by sstein: 

KASTLE:
- remove a warning (unused function parameter)
- changed menu to m_pMenu


  M +12 -12    umllistview.cpp   1.46
  M +1 -1      umllistview.h   1.23


--- kdesdk/umbrello/umbrello/umllistview.h  #1.22:1.23
@@ -210,5 +210,5 @@ class UMLListView : public KListView {
         UMLListViewItem* deploymentView;//deployment view item
         UMLListViewItem* diagramFolder;
-        ListPopupMenu * menu;
+        ListPopupMenu * m_pMenu;
         QString oldText, message;
         UMLDoc *m_doc;

--- kdesdk/umbrello/umbrello/umllistview.cpp  #1.45:1.46
@@ -44,5 +44,5 @@
 //using Umbrello::Diagram;
 
-UMLListView::UMLListView(QWidget *parent,const char *name) : KListView(parent,name), menu(0) {
+UMLListView::UMLListView(QWidget *parent,const char *name) : KListView(parent,name), m_pMenu(0) {
         loadPixmaps();
 
@@ -144,14 +144,14 @@ void UMLListView::contentsMousePressEven
         if(me->button() == RightButton) {
                 //setSelected( item, true);
-                if(menu != 0) {
-                        menu->hide();
-                        disconnect(menu, SIGNAL(activated(int)), this, SLOT(popupMenuSel(int)));
-                        delete menu;
-                        menu = 0;
+                if(m_pMenu != 0) {
+                        m_pMenu->hide();
+                        disconnect(m_pMenu, SIGNAL(activated(int)), this, SLOT(popupMenuSel(int)));
+                        delete m_pMenu;
+                        m_pMenu = 0;
                 }
 
-                menu = new ListPopupMenu(this, type);
-                menu->popup(me->globalPos());
-                connect(menu, SIGNAL(activated(int)), this, SLOT(popupMenuSel(int)));
+                m_pMenu = new ListPopupMenu(this, type);
+                m_pMenu->popup(me->globalPos());
+                connect(m_pMenu, SIGNAL(activated(int)), this, SLOT(popupMenuSel(int)));
         }//end if right button
 
@@ -366,5 +366,5 @@ void UMLListView::popupMenuSel(int sel) 
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-void UMLListView::diagramCreated(Diagram* d) {
+void UMLListView::diagramCreated(Diagram* /* d */) {
 //Uncomment for using Luis diagram display code
 //      new UMLListViewItem( diagramFolder, d->name(),
@@ -744,6 +744,6 @@ void UMLListView::init() {
 
         //setup misc.
-        delete menu;
-        menu = 0;
+        delete m_pMenu;
+        m_pMenu = 0;
         m_bStartedCut = false;
         loading = false;