[Uml-devel] KDE_3_2_BRANCH: kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

Backport recent commit
--
CVS commit by jriddell:

Patches to allow compile on Tru64 from Albert Chin <uml-devel-AT-mlists.thewrittenword.com>
--
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).


  M +2 -0      associationwidget.cpp   1.80.2.6
  M +6 -0      classifier.cpp   1.27.2.4
  M +2 -0      codegenerationpolicy.cpp   1.8.2.2
  M +1 -1      interface.cpp   1.14.2.1
  M +2 -0      linepath.cpp   1.23.2.1
  M +1 -1      umlcanvasobject.cpp   1.17.2.1
  M +2 -0      clipboard/umldrag.cpp   1.20.2.1


--- kdesdk/umbrello/umbrello/associationwidget.cpp  #1.80.2.5:1.80.2.6
@@ -28,4 +28,6 @@
 #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

--- kdesdk/umbrello/umbrello/classifier.cpp  #1.27.2.3:1.27.2.4
@@ -116,5 +116,7 @@ bool UMLClassifier::addStereotype(UMLSte
                 this->insertChild(newStereotype);
                 // What is this?? do we really want to store stereotypes in opsList?!?? -b.t.
+#ifdef __GNUC__
 #warning "addStereotype method needs review..conflicts with set/getStereoType in umlobject aswell as opList storage issues"
+#endif
                 if (list == ot_Operation) {
                         m_OpsList.append(newStereotype);
@@ -136,5 +138,7 @@ bool UMLClassifier::addStereotype(UMLSte
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 int UMLClassifier::removeStereotype(UMLStereotype * /* stype*/) {
+#ifdef __GNUC__
 #warning "removeStereotype method not implemented yet"
+#endif
         kdError() << "can't find stereotype given in list" << endl;
         return -1;
@@ -290,5 +294,7 @@ void UMLClassifier::init() {
 
         // make connections so that parent document is updated of list of uml objects
+#ifdef __GNUC__
 #warning "Cheap add/removeOperation fix for slot add/RemoveUMLObject calls. Need long-term solution"
+#endif
         UMLDoc * parent = UMLApp::app()->getDocument();
         connect(this,SIGNAL(childObjectAdded(UMLObject *)),parent,SLOT(addUMLObject(UMLObject*)));

--- kdesdk/umbrello/umbrello/codegenerationpolicy.cpp  #1.8.2.1:1.8.2.2
@@ -27,4 +27,6 @@
 #include "codegenerationpolicy.h"
 
+using namespace std;
+
 #define MAXLINES 256
 

--- kdesdk/umbrello/umbrello/interface.cpp  #1.14:1.14.2.1
@@ -32,5 +32,5 @@ bool UMLInterface::operator==( UMLInterf
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-QString UMLInterface::uniqChildName(UMLObject_Type type) {
+QString UMLInterface::uniqChildName(const UMLObject_Type type) {
         QString currentName;
         if (type == ot_Association) {

--- kdesdk/umbrello/umbrello/linepath.cpp  #1.23:1.23.2.1
@@ -23,4 +23,6 @@
 #include "linepath.h"
 
+using namespace std;
+
 LinePath::LinePath() {
         m_RectList.setAutoDelete( true );

--- kdesdk/umbrello/umbrello/umlcanvasobject.cpp  #1.17:1.17.2.1
@@ -63,5 +63,5 @@ int UMLCanvasObject::removeAssociation(U
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-QString UMLCanvasObject::uniqChildName(UMLObject_Type type) {
+QString UMLCanvasObject::uniqChildName(const UMLObject_Type type) {
         QString currentName;
         if (type == ot_Association) {

--- kdesdk/umbrello/umbrello/clipboard/umldrag.cpp  #1.20:1.20.2.1
@@ -683,5 +683,7 @@ bool UMLDrag::decodeClip4(const QMimeSou
 }
 
+#ifdef __GNUC__
 #warning "decodeClip5 needs fixing"
+#endif
 bool UMLDrag::decodeClip5(const QMimeSource* mimeSource, UMLObjectList& /* objects */,
                           UMLListViewItemList& umlListViewItems, UMLDoc* doc) {