[Uml-devel] kdesdk/umbrello/umbrello

[Albert Chin]

On Mon, Mar 08, 2004 at 10:27:58PM +0100, Jonathan Riddell wrote:
> CVS commit by jriddell: 
> 
> Remove duplicate method which confused Tru64 compiler
> 
> 
>   M +0 -4      umlwidget.cpp   1.73
>   M +0 -1      umlwidget.h   1.26

Thanks. The patches below are needed as well.

1. [umbrello/umbrello/clipboard/umldrag.cpp,
   umbrello/umbrello/classifier.cpp]
   #warning is GCC-specific.
2. [umbrello/umbrello/associationwidget.cpp,
   umbrello/umbrello/codegenerationpolicy.cpp,
   umbrello/umbrello/linepath.cpp]
   IRIX 6.5 puts <cmath>, <cstdlib> entries in std:: namespace.
3. [umbrello/umbrello/interface.cpp,
   umbrello/umbrello/umlcanvasobject.cpp]
   Sync functions definitions with corresponding prototype in .h
   file (Tru64 UNIX gives unresolved symbols at link otherwise).

-- 
albert chin (china at thewrittenword.com)

-- snip snip
--- umbrello/umbrello/clipboard/umldrag.cpp.orig	2004-03-08 13:09:33.277496000 -0600
+++ umbrello/umbrello/clipboard/umldrag.cpp	2004-03-08 13:09:40.835440000 -0600
@@ -682,7 +682,9 @@
 	return true;
 }
 
+#ifdef __GNUC__
 #warning "decodeClip5 needs fixing"
+#endif
 bool UMLDrag::decodeClip5(const QMimeSource* mimeSource, UMLObjectList& /* objects */,
 			  UMLListViewItemList& umlListViewItems, UMLDoc* doc) {
 	if ( !mimeSource->provides("application/x-uml-clip5") ) {
--- umbrello/umbrello/classifier.cpp.orig	2004-03-08 13:29:12.701743000 -0600
+++ umbrello/umbrello/classifier.cpp	2004-03-08 13:29:20.897806000 -0600
@@ -117,7 +117,9 @@
 			emit childObjectAdded(newStereotype);
 			connect(newStereotype, SIGNAL(modified()), this, SIGNAL(modified()));
 //			emit operationAdded(newStereotype);
+#ifdef __GNUC__
 #warning "FIXME change operationAdded listeners to childObject, or create stereotypeAdded signal"
+#endif
 		} else {
 			kdWarning() << "unknown list type in addStereotype()" << endl;
 		}
--- umbrello/umbrello/associationwidget.cpp.orig	2004-03-08 13:27:42.449802000 -0600
+++ umbrello/umbrello/associationwidget.cpp	2004-03-08 13:34:26.470358000 -0600
@@ -27,6 +27,8 @@
 #include <kdebug.h>
 #include <klocale.h>
 
+using namespace std;
+
 // this constructor really only for loading from XMI, otherwise it
 // is bad..and shouldnt be allowed as it creates an incomplete
 // associationwidget.
--- umbrello/umbrello/codegenerationpolicy.cpp.orig	2004-03-08 13:30:27.999865000 -0600
+++ umbrello/umbrello/codegenerationpolicy.cpp	2004-03-08 13:35:03.245279000 -0600
@@ -26,6 +26,8 @@
 #include "dialogs/codegenerationpolicypage.h"
 #include "codegenerationpolicy.h"
 
+using namespace std;
+
 #define MAXLINES 256
 
 const CodeGenerationPolicy::OverwritePolicy CodeGenerationPolicy::DEFAULT_OVERWRITE_POLICY = Ask;
--- umbrello/umbrello/linepath.cpp.orig	2004-03-08 13:31:43.660030000 -0600
+++ umbrello/umbrello/linepath.cpp	2004-03-08 13:33:47.819751000 -0600
@@ -22,6 +22,8 @@
 #include "umlview.h"
 #include "linepath.h"
 
+using namespace std;
+
 LinePath::LinePath() {
 	m_RectList.setAutoDelete( true );
 	m_LineList.setAutoDelete( true );
--- umbrello/umbrello/interface.cpp.orig	2004-03-08 15:32:07.973143000 -0600
+++ umbrello/umbrello/interface.cpp	2004-03-08 15:32:15.240413000 -0600
@@ -31,7 +31,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-QString UMLInterface::uniqChildName(UMLObject_Type type) {
+QString UMLInterface::uniqChildName(const UMLObject_Type type) {
 	QString currentName;
 	if (type == ot_Association) {
 		return UMLCanvasObject::uniqChildName(type);
--- umbrello/umbrello/umlcanvasobject.cpp.orig	2004-03-08 15:34:14.801724000 -0600
+++ umbrello/umbrello/umlcanvasobject.cpp	2004-03-08 15:34:28.492343000 -0600
@@ -62,7 +62,7 @@
 	return m_AssocsList.count();
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-QString UMLCanvasObject::uniqChildName(UMLObject_Type type) {
+QString UMLCanvasObject::uniqChildName(const UMLObject_Type type) {
 	QString currentName;
 	if (type == ot_Association) {
 		currentName = i18n("new_association");