[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

formatComment(): Renamed from doxyComment. Accomodate non-doxy comments too.


  M +5 -5      classimport.cpp   1.69
  M +2 -4      classimport.h   1.24


--- kdesdk/umbrello/umbrello/classimport.cpp  #1.68:1.69
@@ -50,7 +50,7 @@ ClassImport::ClassImport(UMLDoc * parent
 ClassImport::~ClassImport() {}
 
-QString ClassImport::doxyComment(const QString &comment) {
+QString ClassImport::formatComment(const QString &comment) {
         QStringList lines = QStringList::split("\n", comment);
-        if (lines.first() != "/**")
+        if (!lines.first().contains("/*"))
                 return "";
         lines.pop_front();  // remove comment start
@@ -154,5 +154,5 @@ UMLObject *ClassImport::createUMLObject(
                 o->setUMLPackage(parentPkg);
         }
-        QString strippedComment = doxyComment(comment);
+        QString strippedComment = formatComment(comment);
         if (! strippedComment.isEmpty()) {
                 o->setDoc(strippedComment);
@@ -191,5 +191,5 @@ UMLObject* ClassImport::insertAttribute(
         UMLAttribute *attr = owner->addAttribute(name, attrType, scope);
         attr->setStatic(isStatic);
-        QString strippedComment = doxyComment(comment);
+        QString strippedComment = formatComment(comment);
         if (! strippedComment.isEmpty()) {
                 attr->setDoc(strippedComment);
@@ -223,5 +223,5 @@ void ClassImport::insertMethod(UMLClass 
         klass->addOperation(op);
         //m_umldoc->signalUMLObjectCreated(op);
-        QString strippedComment = doxyComment(comment);
+        QString strippedComment = formatComment(comment);
         if (! strippedComment.isEmpty()) {
                 op->setDoc(strippedComment);

--- kdesdk/umbrello/umbrello/classimport.h  #1.23:1.24
@@ -98,9 +98,7 @@ public:
 
         /**
-         * Check that a given comment conforms to the Doxygen convention, i.e.
-         * check that it begins with slash-star-star.
-         * Strip the comment lines of leading whitespace and stars.
+         * Strip comment lines of leading whitespace and stars.
          */
-        QString doxyComment(const QString &comment);
+        QString formatComment(const QString &comment);
 
 private: