[Uml-devel] branches/work/soc-umbrello/umbrello

[Andi Fischer]

SVN commit 1273352 by fischer:

Smale changes from trunk also applied to branch.

 M  +1 -1      docwindow.cpp  
 M  +2 -0      icon_utils.cpp  
 M  +1 -0      icon_utils.h  
 M  +2 -1      model_utils.cpp  
 M  +0 -3      umllistview.h  
 U             umlrole.cpp  


--- branches/work/soc-umbrello/umbrello/docwindow.cpp #1273351:1273352
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2011                                               *
+ *   copyright (C) 2002-2012                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
--- branches/work/soc-umbrello/umbrello/icon_utils.cpp #1273351:1273352
@@ -191,6 +191,8 @@
             return "preferences-desktop-theme";
         case it_Properties_Class:
             return "document-properties";
+        case it_Properties_CodeImport:
+            return "text-x-generic";
         case it_Properties_CodeGeneration:
             return "text-x-generic";
         case it_Properties_CodeViewer:
--- branches/work/soc-umbrello/umbrello/icon_utils.h #1273351:1273352
@@ -68,6 +68,7 @@
         it_Properties_Roles,
         it_Properties_UserInterface,
         it_Properties_Class,
+        it_Properties_CodeImport,
         it_Properties_CodeGeneration,
         it_Properties_CodeViewer,
         it_Properties_Columns,
--- branches/work/soc-umbrello/umbrello/model_utils.cpp #1273351:1273352
@@ -292,6 +292,7 @@
                             UMLObject::ObjectType type /* = ot_UMLObject */,
                             UMLObject *currentObj /*= 0*/)
 {
+    Q_UNUSED(currentObj);
     for (UMLObjectListIt oit(inList); oit.hasNext(); ) {
         UMLObject *obj = oit.next();
         if (obj->name() == name && type == obj->baseType())
@@ -628,7 +629,7 @@
     int pos = dirx.indexIn(input);
     if (pos == -1)
         return 0;
-    const QString& dirStr = dirx.capturedTexts().first();
+    const QString dirStr = dirx.capturedTexts().first();
     int dirLen = dirStr.length();
     if (input.length() > dirLen && !input[dirLen].isSpace())
         return 0;       // no match after all.
--- branches/work/soc-umbrello/umbrello/umllistview.h #1273351:1273352
@@ -49,7 +49,6 @@
 {
     Q_OBJECT
 public:
-
     UMLListView(QWidget *parent = 0);
     ~UMLListView();
 
@@ -132,7 +131,6 @@
     friend QDebug operator<<(QDebug out, const UMLListView& view);
 
 protected:
-
     bool event(QEvent *e);
     bool eventFilter(QObject *o, QEvent *e);
     void mouseReleaseEvent(QMouseEvent *me);
@@ -191,7 +189,6 @@
     void slotCollapsed(QTreeWidgetItem* item);
 
 private:
-
     UMLListViewItem* recursiveSearchForView(UMLListViewItem* folder,
                                             UMLListViewItem::ListViewType type, Uml::IDType id);