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

[Andi Fischer]

SVN commit 1214826 by fischer:

Umlnamespace::DISABLE_COPY deleted and replaced with the Qt macro.

 M  +1 -5      umlnamespace.h  
 M  +1 -1      widgets/umlwidget.h  
 M  +2 -4      widgets/widgetbase.h  


--- branches/work/soc-umbrello/umbrello/umlnamespace.h #1214825:1214826
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2009                                               *
+ *   copyright (C) 2002-2011                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -347,10 +347,6 @@
 #define uError()   kError(8060)
 #define uWarning() kWarning(8060)
 
-#define DISABLE_COPY(Class)                     \
-    Class(const Class &);                       \
-    Class &operator=(const Class &);
-
 #define uIgnoreZeroPointer(a) if (!a) { uDebug() << "zero pointer detected" << __FILE__ << __LINE__; continue; }
 
 /**
--- branches/work/soc-umbrello/umbrello/widgets/umlwidget.h #1214825:1214826
@@ -215,7 +215,7 @@
     QGraphicsSceneMouseEvent *m_mouseMoveEventStore;
 
     // Disable copy constructor and operator=
-    DISABLE_COPY(UMLWidget);
+    Q_DISABLE_COPY(UMLWidget);
 };
 
 #endif
--- branches/work/soc-umbrello/umbrello/widgets/widgetbase.h #1214825:1214826
@@ -227,10 +227,8 @@
     bool m_usesDiagramFont:1;
     bool m_usesDiagramTextColor:1;
 
-    /**
-     * Disable the copy constructor and assignment operator.
-     */
-    DISABLE_COPY(WidgetBase);
+    // Disable the copy constructor and assignment operator.
+    Q_DISABLE_COPY(WidgetBase);
 
 
 public: