[Uml-devel] kdesdk/umbrello/umbrello/refactoring

[Jonathan Riddell]

CVS commit by jriddell: 

remove some compiler warnings


  M +42 -35    refactoringassistant.cpp   1.8


--- kdesdk/umbrello/umbrello/refactoring/refactoringassistant.cpp  #1.7:1.8
@@ -85,5 +85,5 @@ void RefactoringAssistant::itemExecuted(
                 return;
         }
-        QWidget *page(0);
+        //FIXME unused QWidget *page(0);
         UMLObject *obj = m_umlObjectMap[item];
         if(typeid(*obj) == typeid(UMLOperation))
@@ -119,5 +119,5 @@ void RefactoringAssistant::itemExecuted(
 }
 
-void RefactoringAssistant::showContextMenu(KListView *v,QListViewItem *item, const QPoint &p)
+void RefactoringAssistant::showContextMenu(KListView * /* v */,QListViewItem *item, const QPoint &p)
 {
         m_menu->clear();
@@ -170,9 +170,10 @@ void RefactoringAssistant::addSuperClass
                 text = i18n("Enter a name for exisiting or new super class");
                 type = ot_Class;
-        }
-        else if(typeid(*obj) == typeid(UMLInterface))
-        {
+        } else if(typeid(*obj) == typeid(UMLInterface)) {
                 text = i18n("Enter a name for exisiting or new super interface");
                 type = ot_Interface;
+        } else {
+                kdWarning() << "unknown typeid" << endl;
+                type = ot_Class;
         }
         name = KLineEditDlg::getText(text, QString::null ,&inputOk,this);
@@ -243,4 +244,7 @@ void RefactoringAssistant::addClassifier
                 }
                 
+        } else {
+                kdWarning() << "unknown typeid in addClassifier" << endl;
+                attsFolder = 0;
         }
         
@@ -425,4 +429,7 @@ void RefactoringAssistant::movableDropEv
                 {
                         parentObject = m_umlObjectMap[i];
+                } else {
+                        kdWarning() << "uninitialised parentObject pointer" << endl;
+                        parentObject = 0;
                 }
         }