[Uml-devel] branches/KDE/3.5/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 688198 by okellogg:

minor sync with trunk

 M  +0 -1      association.h  
 M  +0 -1      classifier.cpp  
 M  +1 -0      classifierwidget.cpp  
 M  +1 -0      clipboard/umlclipboard.cpp  
 M  +1 -1      clipboard/umlclipboard.h  
 M  +1 -1      codedocument.cpp  
 M  +12 -12    codeimport/kdevcppparser/cpptree2uml.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/association.h #688197:688198
@@ -16,7 +16,6 @@
 #include "umlnamespace.h"
 #include "umlobject.h"
 
-class UMLDoc;
 class UMLRole;
 
 /**
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/classifier.cpp #688197:688198
@@ -1001,7 +1001,6 @@
                 totalSuccess = false;
             }
         } else if (!Model_Utils::isCommonXMIAttribute(tag)) {
-            UMLDoc *umldoc = UMLApp::app()->getDocument();
             UMLObject *pObject = Object_Factory::makeObjectFromXMI(tag);
             if (pObject == NULL) {
                 // Not setting totalSuccess to false
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/classifierwidget.cpp #688197:688198
@@ -397,6 +397,7 @@
     switch (mt) {
     case ListPopupMenu::mt_Attribute:
     case ListPopupMenu::mt_Operation:
+    case ListPopupMenu::mt_Template:
         {
             UMLDoc *doc = UMLApp::app()->getDocument();
             Uml::Object_Type ot = ListPopupMenu::convert_MT_OT(mt);
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/clipboard/umlclipboard.cpp #688197:688198
@@ -691,3 +691,4 @@
                         i18n("Paste Error") );
 }
 
+#include "umlclipboard.moc"
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/clipboard/umlclipboard.h #688197:688198
@@ -21,7 +21,6 @@
 
 class IDChangeLog;
 class QMimeSource;
-class UMLDrag;
 
 /**
  * This class manages the uml's interaction with the KDE
@@ -33,6 +32,7 @@
  * Bugs and comments to uml-devel at lists.sf.net or http://bugs.kde.org
  */
 class UMLClipboard : public QObject {
+    Q_OBJECT
 public:
     /**
      * Constructor.
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codedocument.cpp #688197:688198
@@ -109,7 +109,7 @@
     QString path = getPackage();
 
     // Replace all white spaces with blanks
-    path.simplifyWhiteSpace();
+    path = path.simplifyWhiteSpace();
 
     // Replace all blanks with underscore
     path.replace(QRegExp(" "), "_");
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp #688197:688198
@@ -59,7 +59,7 @@
 void CppTree2Uml::parseNamespace( NamespaceAST* ast )
 {
     if (m_clsCnt > 0) {
-        kdDebug() << "CppTree2Uml::parseNamespace: error - cannot nest namespace inside class"
+        kDebug() << "CppTree2Uml::parseNamespace: error - cannot nest namespace inside class"
                   << endl;
         return;
     }
@@ -75,7 +75,7 @@
     }
 
 #ifdef DEBUG_CPPTREE2UML
-    kdDebug() << "CppTree2Uml::parseNamespace: " << nsName << endl;
+    kDebug() << "CppTree2Uml::parseNamespace: " << nsName << endl;
 #endif
     UMLObject * o = Import_Utils::createUMLObject( Uml::ot_Package, nsName,
                                                  m_currentNamespace[m_nsCnt],
@@ -139,7 +139,7 @@
                   id = d->declaratorId()->text();
             }
 //#ifdef DEBUG_CPPTREE2UML
-            kdDebug() << "CppTree2Uml::parseTypedef: name=" << id << ", type=" << type << endl;
+            kDebug() << "CppTree2Uml::parseTypedef: name=" << id << ", type=" << type << endl;
 //#endif
             /* @todo Trace typedefs back to their root type for deciding
                      whether to build a Datatype (for pointers.)  */
@@ -291,7 +291,7 @@
 
     UMLClassifier *c = m_currentClass[m_clsCnt];
     if (c == NULL) {
-        kdDebug() << "CppTree2Uml::parseFunctionDefinition (" << id
+        kDebug() << "CppTree2Uml::parseFunctionDefinition (" << id
                   << "): need a surrounding class." << endl;
         return;
     }
@@ -339,10 +339,10 @@
         className = ast->name()->unqualifiedName()->text().stripWhiteSpace();
     }
 //#ifdef DEBUG_CPPTREE2UML
-    kdDebug() << "CppTree2Uml::parseClassSpecifier: name=" << className << endl;
+    kDebug() << "CppTree2Uml::parseClassSpecifier: name=" << className << endl;
 //#endif
     if( !scopeOfName( ast->name(), QStringList() ).isEmpty() ){
-        kdDebug() << "skip private class declarations" << endl;
+        kDebug() << "skip private class declarations" << endl;
         return;
     }
 
@@ -410,7 +410,7 @@
     ///              - Using typeSpec->text() is probably not good, decode
     ///                the kind() instead.
     QString text = typeSpec->text();
-    kdDebug() << "CppTree2Uml::parseElaboratedTypeSpecifier: text is " << text << endl;
+    kDebug() << "CppTree2Uml::parseElaboratedTypeSpecifier: text is " << text << endl;
     text.remove(QRegExp("^class\\s+"));
     UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Class, text, m_currentNamespace[m_nsCnt]);
     flushTemplateParams( static_cast<UMLClassifier*>(o) );
@@ -439,14 +439,14 @@
         id = t->declaratorId()->unqualifiedName()->text();
 
     if( !scopeOfDeclarator(d, QStringList()).isEmpty() ){
-        kdDebug() << "CppTree2Uml::parseDeclaration (" << id << "): skipping."
+        kDebug() << "CppTree2Uml::parseDeclaration (" << id << "): skipping."
                   << endl;
         return;
     }
 
     UMLClassifier *c = m_currentClass[m_clsCnt];
     if (c == NULL) {
-        kdDebug() << "CppTree2Uml::parseDeclaration (" << id
+        kDebug() << "CppTree2Uml::parseDeclaration (" << id
                   << "): need a surrounding class." << endl;
         return;
     }
@@ -521,7 +521,7 @@
 
     UMLClassifier *c = m_currentClass[m_clsCnt];
     if (c == NULL) {
-        kdDebug() << "CppTree2Uml::parseFunctionDeclaration (" << id
+        kDebug() << "CppTree2Uml::parseFunctionDeclaration (" << id
                   << "): need a surrounding class." << endl;
         return;
     }
@@ -590,7 +590,7 @@
         ++it;
 
         if (baseSpecifier->name() == NULL) {
-                kdDebug() << "CppTree2Uml::parseBaseClause: baseSpecifier->name() is NULL"
+                kDebug() << "CppTree2Uml::parseBaseClause: baseSpecifier->name() is NULL"
                           << endl;
                 continue;
         }
@@ -629,7 +629,7 @@
         Model_Utils::NameAndType_ListIt it;
         for (it = m_templateParams.begin(); it != m_templateParams.end(); ++it) {
             const Model_Utils::NameAndType &nt = *it;
-            kdDebug() << "CppTree2Uml::parseClassSpecifier: adding template param: "
+            kDebug() << "CppTree2Uml::parseClassSpecifier: adding template param: "
                       << nt.m_name << endl;
             UMLTemplate *tmpl = klass->addTemplate(nt.m_name);
             tmpl->setType(nt.m_type);