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

[Andi Fischer]

SVN commit 1250353 by fischer:

Krazy issues fixed.

 M  +3 -7      codeaccessormethod.h  
 M  +0 -1      codeaccessormethodlist.h  
 M  +3 -3      codeimport/javaimport.cpp  
 M  +2 -2      codeimport/kdevcppparser/cpptree2uml.h  
 M  +1 -1      codeimport/nativeimportbase.h  
 M  +1 -1      codeimpwizard/codeimpstatuspage.cpp  
 M  +1 -1      codeimpwizard/codeimpthread.h  
 M  +1 -1      widgets/notewidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/codeaccessormethod.h #1250352:1250353
@@ -1,18 +1,14 @@
-
 /***************************************************************************
- *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
+ *   copyright (C) 2003      thomas                                        *
+ *   copyright (C) 2004-2011                                               *
+ *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
-/*  This code generated by:
- *      Author : thomas
- *      Date   : Tue Jul 1 2003
- */
-
 #ifndef CODEACCESSORMETHOD_H
 #define CODEACCESSORMETHOD_H
 
--- trunk/KDE/kdesdk/umbrello/umbrello/codeaccessormethodlist.h #1250352:1250353
@@ -1,5 +1,4 @@
 /***************************************************************************
- *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/javaimport.cpp #1250352:1250353
@@ -275,7 +275,7 @@
         const QStringList names = qualifiedName.split('.');
         for (QStringList::ConstIterator it = names.begin(); it != names.end(); ++it) {
             QString name = (*it);
-            log(keyword + " " + name);
+            log(keyword + ' ' + name);
             UMLObject *ns = Import_Utils::createUMLObject(UMLObject::ot_Package,
                             name, m_scope[m_scopeIndex], m_comment);
             m_scope[++m_scopeIndex] = static_cast<UMLPackage*>(ns);
@@ -289,7 +289,7 @@
     if (keyword == "class" || keyword == "interface") {
         const QString& name = advance();
         const UMLObject::ObjectType t = (keyword == "class" ? UMLObject::ot_Class : UMLObject::ot_Interface);
-        log(keyword + " " + name);
+        log(keyword + ' ' + name);
         UMLObject *ns = Import_Utils::createUMLObject(t, name, m_scope[m_scopeIndex], m_comment);
         m_scope[++m_scopeIndex] = m_klass = static_cast<UMLClassifier*>(ns);
         m_klass->setAbstract(m_isAbstract);
@@ -374,7 +374,7 @@
     }
     if (keyword == "enum") {
         const QString& name = advance();
-        log(keyword + " " + name);
+        log(keyword + ' ' + name);
         UMLObject *ns = Import_Utils::createUMLObject(UMLObject::ot_Enum,
                         name, m_scope[m_scopeIndex], m_comment);
         UMLEnum *enumType = static_cast<UMLEnum*>(ns);
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h #1250352:1250353
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2005-2010                                               *
+ *   copyright (C) 2005-2011                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -25,7 +25,7 @@
 class CppTree2Uml: public TreeParser
 {
 public:
-    CppTree2Uml( const QString& fileName, CodeImpThread* thread = 0);
+    explicit CppTree2Uml( const QString& fileName, CodeImpThread* thread = 0);
     virtual ~CppTree2Uml();
 
     //FileDom file() { return m_file; }
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/nativeimportbase.h #1250352:1250353
@@ -44,7 +44,7 @@
 class NativeImportBase : public ClassImport
 {
 public:
-    NativeImportBase(const QString &singleLineCommentIntro, CodeImpThread* thread = 0);
+    explicit NativeImportBase(const QString &singleLineCommentIntro, CodeImpThread* thread = 0);
     virtual ~NativeImportBase();
 
 protected:
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimpwizard/codeimpstatuspage.cpp #1250352:1250353
@@ -214,7 +214,7 @@
             QTableWidgetItem* status = ui_tableWidgetStatus->item(row, 1);
             CodeImport::LedStatus* led =
                 (CodeImport::LedStatus*)ui_tableWidgetStatus->cellWidget(row, 2);
-            if (text == QString()) {
+            if (text.isEmpty()) {
                 status->setText( i18n("Not Imported") );
                 led->setColor(Qt::red);
                 led->setOn(true);
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimpwizard/codeimpthread.h #1250352:1250353
@@ -37,7 +37,7 @@
 {
     Q_OBJECT
 public:
-    CodeImpThread(QFileInfo file, QObject* parent = 0);
+    explicit CodeImpThread(QFileInfo file, QObject* parent = 0);
     virtual ~CodeImpThread();
 
     virtual void run();
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/notewidget.cpp #1250352:1250353
@@ -247,7 +247,7 @@
     else {
         // not all text can be drawn
         QStringList lines = text.split(QChar('\n'));
-        foreach(QString line, lines) {
+        foreach(const QString& line, lines) {
             int lineWidth = fm.width(line);
             if (lineWidth < width) {
                 // line is small enough - draw it