[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

Remove some debugging lines of mine that seem to have been committed by mistake


  M +0 -1      association.cpp   1.34
  M +2 -5      classifiercodedocument.cpp   1.21
  M +0 -6      uml.cpp   1.85
  M +0 -2      umldoc.cpp   1.116


--- kdesdk/umbrello/umbrello/association.cpp  #1.33:1.34
@@ -33,5 +33,4 @@ UMLAssociation::UMLAssociation( UMLDoc* 
 UMLAssociation::~UMLAssociation( ) {
         // delete ourselves from the parent document
-        kdDebug() << k_funcinfo << "destructor!!" << endl;
         //((UMLDoc *)parent())->removeAssociation(this);
 }

--- kdesdk/umbrello/umbrello/classifiercodedocument.cpp  #1.20:1.21
@@ -38,9 +38,7 @@ ClassifierCodeDocument::ClassifierCodeDo
 ClassifierCodeDocument::~ClassifierCodeDocument ( )
 {
-        kdDebug() << k_funcinfo << "count:" << m_classfieldVector.count() << endl;
+        //FIXME this causes a crash sometimes
         for (CodeClassField * cf = m_classfieldVector.first(); cf; cf = m_classfieldVector.next())  {
-                if (cf)  { //FIXMEnow
-//                      delete cf;
-                }
+               delete cf;
         }
 }
@@ -171,5 +169,4 @@ void ClassifierCodeDocument::addAttribut
  */
 bool ClassifierCodeDocument::removeCodeClassField ( CodeClassField * remove_object ) {
-        kdDebug() << k_funcinfo << "!!!!!!!!!" << endl;
         UMLObject * umlobj = remove_object->getParentObject();
         if(m_classFieldMap->contains(umlobj))

--- kdesdk/umbrello/umbrello/uml.cpp  #1.84:1.85
@@ -587,5 +587,4 @@ void UMLApp::slotFileNew() {
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 void UMLApp::slotFileOpen() {
-        kdDebug() << k_funcinfo << "start" << endl;
         slotStatusMsg(i18n("Opening file..."));
         loading = true;
@@ -610,5 +609,4 @@ void UMLApp::slotFileOpen() {
         loading = false;
         slotStatusMsg(i18n("Ready."));
-        kdDebug() << k_funcinfo << "end" << endl;
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -863,10 +861,6 @@ void UMLApp::setModified(bool modified) 
 
         if (loading == false)  {
-                kdDebug() << k_funcinfo << "loading is false, modified:" << modified << endl;
                 setCaption(doc->URL().fileName(), modified); //add disk icon to taskbar if modified
-        } else { //FIXMEnow
-                kdDebug() << k_funcinfo << "loading is true, modified:" << modified << endl;
         }
-        kdDebug() << k_funcinfo << kdBacktrace() << endl;
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////

--- kdesdk/umbrello/umbrello/umldoc.cpp  #1.115:1.116
@@ -902,5 +902,4 @@ UMLOperation* UMLDoc::createOperation(UM
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 void UMLDoc::removeAssociation (UMLAssociation * assoc) {
-//FIXMEnow      kdDebug() << k_funcinfo << kdBacktrace() << endl;
         if(!assoc)
                 return;
@@ -1796,5 +1795,4 @@ bool UMLDoc::loadUMLObjectsFromXMI( QDom
                                 // UML:AssocWidget section.  --okellogg
                                 // removeAssociation((UMLAssociation*)pObject);
-                                kdDebug() << k_funcinfo << "delete pObject!!!!" << endl;
                                 delete pObject;
                         } else {