pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/uml Fix some C++ issues that gcc 3.3 complained on.
details: https://anonhg.NetBSD.org/pkgsrc/rev/bdd5f9edc267
branches: trunk
changeset: 476619:bdd5f9edc267
user: kristerw <kristerw%pkgsrc.org@localhost>
date: Tue Jun 15 17:48:35 2004 +0000
description:
Fix some C++ issues that gcc 3.3 complained on.
diffstat:
devel/uml/distinfo | 15 ++++++++++++++-
devel/uml/patches/patch-aa | 29 +++++++++++++++++++++++++++++
devel/uml/patches/patch-ab | 11 +++++++++++
devel/uml/patches/patch-ac | 26 ++++++++++++++++++++++++++
devel/uml/patches/patch-ad | 11 +++++++++++
devel/uml/patches/patch-ae | 20 ++++++++++++++++++++
devel/uml/patches/patch-af | 11 +++++++++++
devel/uml/patches/patch-ag | 20 ++++++++++++++++++++
devel/uml/patches/patch-ah | 11 +++++++++++
devel/uml/patches/patch-ai | 29 +++++++++++++++++++++++++++++
devel/uml/patches/patch-aj | 11 +++++++++++
devel/uml/patches/patch-ak | 45 +++++++++++++++++++++++++++++++++++++++++++++
devel/uml/patches/patch-al | 38 ++++++++++++++++++++++++++++++++++++++
devel/uml/patches/patch-am | 11 +++++++++++
14 files changed, 287 insertions(+), 1 deletions(-)
diffs (truncated from 347 to 300 lines):
diff -r 7e945d48c049 -r bdd5f9edc267 devel/uml/distinfo
--- a/devel/uml/distinfo Tue Jun 15 17:19:23 2004 +0000
+++ b/devel/uml/distinfo Tue Jun 15 17:48:35 2004 +0000
@@ -1,4 +1,17 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/12/04 10:01:44 wulf Exp $
+$NetBSD: distinfo,v 1.2 2004/06/15 17:48:35 kristerw Exp $
SHA1 (uml-1.0.3-1.tar.gz) = da2c249c31d0890d856e6c9578db8eec07d59032
Size (uml-1.0.3-1.tar.gz) = 783519 bytes
+SHA1 (patch-aa) = 569fdb15462e2c99f7abc815c0908dfe65c526c4
+SHA1 (patch-ab) = 04a07a62c238841e8ca06f5a7ee0594009842581
+SHA1 (patch-ac) = f0b0320b421aaed3c669d4970a68681660db95a3
+SHA1 (patch-ad) = 7c0e79b6415482ab940169b52d2a0cd2486cfa83
+SHA1 (patch-ae) = 4603bb58c78c1628d0fc89953176d56d2fc0172d
+SHA1 (patch-af) = 8d7cb24713c981b23af375ba09882158fe6fbea6
+SHA1 (patch-ag) = 960d49bf338b05ce0d45b176301f79f7641bd2b8
+SHA1 (patch-ah) = b8ebebbacbdcba578db8985e8ecbb965fa9f4ae1
+SHA1 (patch-ai) = 4ed510a5d066c818a210a6e8ab20a6dbbfb94a69
+SHA1 (patch-aj) = c3facd7145132010a5ff83db83ed4061f1321609
+SHA1 (patch-ak) = e2127e7bc29281a581d02dcdc1a4a66f1d915b19
+SHA1 (patch-al) = c29453965b9d7ca2ffa92cd4007dc6601c77d3fb
+SHA1 (patch-am) = bdb2adfcbd1e09aa42bb4aa3ad172752f8709385
diff -r 7e945d48c049 -r bdd5f9edc267 devel/uml/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/uml/patches/patch-aa Tue Jun 15 17:48:35 2004 +0000
@@ -0,0 +1,29 @@
+--- uml/association.cpp.orig 2004-06-15 19:35:27.000000000 +0200
++++ uml/association.cpp 2004-06-15 19:36:19.000000000 +0200
+@@ -203,7 +203,7 @@
+ wB = view -> findWidget(bID);
+ if(!wA || !wB)
+ {
+- cerr<<"Can't make association"<<endl;
++ std::cerr<<"Can't make association"<<std::endl;
+ return false;
+ }
+ if(assoc == 408)
+@@ -252,7 +252,7 @@
+ wB = view -> findWidget(bID);
+ if(!wA || !wB)
+ {
+- cerr<<"Can't make association"<<endl;
++ std::cerr<<"Can't make association"<<std::endl;
+ return false;
+ }
+
+@@ -302,7 +302,7 @@
+ wB = view -> findWidget(bID);
+ if(!wA || !wB)
+ {
+- cerr<<"Can't make association"<<endl;
++ std::cerr<<"Can't make association"<<std::endl;
+ return false;
+ }
+
diff -r 7e945d48c049 -r bdd5f9edc267 devel/uml/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/uml/patches/patch-ab Tue Jun 15 17:48:35 2004 +0000
@@ -0,0 +1,11 @@
+--- uml/classattpage.cpp.orig 2004-06-15 19:34:42.000000000 +0200
++++ uml/classattpage.cpp 2004-06-15 19:35:19.000000000 +0200
+@@ -283,7 +283,7 @@
+ Attribute * a = (Attribute *)concept -> findChildObject(ATTRIBUTE, s);
+ if(!a && id != NEWATT)
+ {
+- cerr<<"can't find att from selection"<<endl;
++ std::cerr<<"can't find att from selection"<<std::endl;
+ return;
+ }
+ switch(id)
diff -r 7e945d48c049 -r bdd5f9edc267 devel/uml/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/uml/patches/patch-ac Tue Jun 15 17:48:35 2004 +0000
@@ -0,0 +1,26 @@
+--- uml/classopspage.cpp.orig 2004-06-15 19:33:30.000000000 +0200
++++ uml/classopspage.cpp 2004-06-15 19:34:27.000000000 +0200
+@@ -308,12 +308,12 @@
+ oldA = o -> findParm( parmsLB -> currentText());
+ if(!o)
+ {
+- cerr<<"can't find op from selection"<<endl;
++ std::cerr<<"can't find op from selection"<<std::endl;
+ return;
+ }
+ if(id == RENAME || id == PROPERTIES)
+ {
+- if(!oldA){cerr<<"THE impossible has occurred for:"<<parmsLB -> currentText()<<endl;
++ if(!oldA){std::cerr<<"THE impossible has occurred for:"<<parmsLB -> currentText()<<std::endl;
+ return;}//should never occur
+ ParmPropDlg d((QWidget *)doc, oldA);
+ result = d.exec();
+@@ -420,7 +420,7 @@
+ Operation * o = (Operation *)concept -> findChildObject(OPERATION, s);
+ if(!o && id != NEWOP)
+ {
+- cerr<<"can't find op from selection"<<endl;
++ std::cerr<<"can't find op from selection"<<std::endl;
+ return;
+ }
+ switch(id)
diff -r 7e945d48c049 -r bdd5f9edc267 devel/uml/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/uml/patches/patch-ad Tue Jun 15 17:48:35 2004 +0000
@@ -0,0 +1,11 @@
+--- uml/classpropdlg.cpp.orig 2004-06-15 19:32:55.000000000 +0200
++++ uml/classpropdlg.cpp 2004-06-15 19:33:20.000000000 +0200
+@@ -87,7 +87,7 @@
+ UMLObject * o = ((Concept*)object) -> findChildObject(id);
+ if(o)
+ doc -> signalChildUMLObjectUpdate(o);
+- else cerr<<"slot dlg: can't find child"<<endl;
++ else std::cerr<<"slot dlg: can't find child"<<std::endl;
+ }
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+ void ClassPropDlg::slotApply()
diff -r 7e945d48c049 -r bdd5f9edc267 devel/uml/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/uml/patches/patch-ae Tue Jun 15 17:48:35 2004 +0000
@@ -0,0 +1,20 @@
+--- uml/concept.cpp.orig 2004-06-15 19:32:07.000000000 +0200
++++ uml/concept.cpp 2004-06-15 19:32:46.000000000 +0200
+@@ -30,7 +30,7 @@
+ {
+ if(!attsList.remove((Attribute *)a))
+ {
+- cerr<<"can't find att given in list"<<endl;
++ std::cerr<<"can't find att given in list"<<std::endl;
+ return -1;
+ }
+ return attsList.count();
+@@ -47,7 +47,7 @@
+ {
+ if(!opsList.remove((Operation *)o))
+ {
+- cerr<<"can't find opp given in list"<<endl;
++ std::cerr<<"can't find opp given in list"<<std::endl;
+ return -1;
+ }
+ return opsList.count();
diff -r 7e945d48c049 -r bdd5f9edc267 devel/uml/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/uml/patches/patch-af Tue Jun 15 17:48:35 2004 +0000
@@ -0,0 +1,11 @@
+--- uml/diagramprintpage.cpp.orig 2004-06-15 19:20:34.000000000 +0200
++++ uml/diagramprintpage.cpp 2004-06-15 19:21:13.000000000 +0200
+@@ -71,7 +71,7 @@
+ disconnect(typeCB, SIGNAL(activated(const QString&)), this, SLOT(slotActivated(const QString&)));
+ }
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+-void DiagramPrintPage::getOptions( QMap<QString,QString>& opts, bool incldef = false )
++void DiagramPrintPage::getOptions( QMap<QString,QString>& opts, bool incldef )
+ {
+ int listCount = selectLB -> count();
+ int count = 0;
diff -r 7e945d48c049 -r bdd5f9edc267 devel/uml/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/uml/patches/patch-ag Tue Jun 15 17:48:35 2004 +0000
@@ -0,0 +1,20 @@
+--- uml/floatingtext.cpp.orig 2004-06-15 19:31:02.000000000 +0200
++++ uml/floatingtext.cpp 2004-06-15 19:31:35.000000000 +0200
+@@ -19,7 +19,7 @@
+ init();
+ }
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+-FloatingText::FloatingText(QWidget * parent, bool copying = false) : UMLWidget(parent, copying)
++FloatingText::FloatingText(QWidget * parent, bool copying) : UMLWidget(parent, copying)
+ {
+ text = "";
+ role = type = UNDEFINED;
+@@ -175,7 +175,7 @@
+ {
+ //here to delete assoc./message on collab diagram.
+ if(!assoc)
+- {cerr<<"Error in floating text:no assoc set."<<endl;return;}
++ {std::cerr<<"Error in floating text:no assoc set."<<std::endl;return;}
+ view -> getWidgetAssocContainer() -> removeAssoc(assoc);
+ return;
+ }
diff -r 7e945d48c049 -r bdd5f9edc267 devel/uml/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/uml/patches/patch-ah Tue Jun 15 17:48:35 2004 +0000
@@ -0,0 +1,11 @@
+--- uml/messagewidget.cpp.orig 2004-06-15 19:30:28.000000000 +0200
++++ uml/messagewidget.cpp 2004-06-15 19:30:43.000000000 +0200
+@@ -201,7 +201,7 @@
+ connect(wB, SIGNAL(sigWidgetMoved(int)), this, SLOT(slotWidgetMoved(int)));
+ if(!wA || !wB)
+ {
+- cerr<<"Can't make message"<<endl;
++ std::cerr<<"Can't make message"<<std::endl;
+ status = false;
+ }
+
diff -r 7e945d48c049 -r bdd5f9edc267 devel/uml/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/uml/patches/patch-ai Tue Jun 15 17:48:35 2004 +0000
@@ -0,0 +1,29 @@
+--- uml/mylistview.cpp.orig 2004-06-15 19:29:10.000000000 +0200
++++ uml/mylistview.cpp 2004-06-15 19:30:09.000000000 +0200
+@@ -264,7 +264,7 @@
+ }else if(pt == ACTOR || pt == USECASE)
+ {
+ item = ucv;
+- }else{ cerr<<"ERROR:listview:find"<<endl;return 0;}
++ }else{ std::cerr<<"ERROR:listview:find"<<std::endl;return 0;}
+ temp = (MyListViewItem *)item->firstChild();
+ while(temp)
+ {
+@@ -333,7 +333,7 @@
+ }
+ item =(MyListViewItem *)item -> nextSibling();
+ }//end while
+- cerr<<"Error findchild"<<endl;
++ std::cerr<<"Error findchild"<<std::endl;
+ return 0;
+ }
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+@@ -379,7 +379,7 @@
+ for( ; (temp = (MyListViewItem*)it.current()); ++it )
+ if(temp->getID() == id)
+ return temp;
+- cerr<<"Can't find list item by id"<<endl;
++ std::cerr<<"Can't find list item by id"<<std::endl;
+ return 0;
+ }
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
diff -r 7e945d48c049 -r bdd5f9edc267 devel/uml/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/uml/patches/patch-aj Tue Jun 15 17:48:35 2004 +0000
@@ -0,0 +1,11 @@
+--- uml/operation.cpp.orig 2004-06-15 19:28:32.000000000 +0200
++++ uml/operation.cpp 2004-06-15 19:28:43.000000000 +0200
+@@ -40,7 +40,7 @@
+ {
+ if(obj == a)
+ if(!list.remove(obj))
+- cerr<<"Error removing parm"<<endl;
++ std::cerr<<"Error removing parm"<<std::endl;
+ }
+ }
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
diff -r 7e945d48c049 -r bdd5f9edc267 devel/uml/patches/patch-ak
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/uml/patches/patch-ak Tue Jun 15 17:48:35 2004 +0000
@@ -0,0 +1,45 @@
+--- uml/umldoc.cpp.orig 2004-06-15 19:25:09.000000000 +0200
++++ uml/umldoc.cpp 2004-06-15 19:27:14.000000000 +0200
+@@ -352,7 +352,7 @@
+ }
+ else
+ {
+- cerr<<"CreateUMLObject(int) error"<<endl;
++ std::cerr<<"CreateUMLObject(int) error"<<std::endl;
+ return;
+ }
+ objectList.append(o);
+@@ -398,7 +398,7 @@
+ }
+ else
+ {
+- cerr<<"ERROR _CREATEUMLOBJECT"<<endl;
++ std::cerr<<"ERROR _CREATEUMLOBJECT"<<std::endl;
+ return;
+ }
+ loop = false;
+@@ -514,7 +514,7 @@
+ bool loop = true;
+ UMLObject *p = (UMLObject *)o->parent();
+ if(!p){
+- cerr<<"Can't create object, no parent found"<<endl;
++ std::cerr<<"Can't create object, no parent found"<<std::endl;
+ return;}
+ QString oldName= o->name();
+ while(loop)
+@@ -844,13 +844,13 @@
+ {
+ if(!clipboard)
+ {
+- cerr <<"clipboard deleted and trying to paste. WHAT!!!"<<endl;
++ std::cerr <<"clipboard deleted and trying to paste. WHAT!!!"<<std::endl;
+ return;
+ }
+ currentView -> pasteSelection(clipboard);
+ }
+
+-void UMLDoc::setModified(bool _m=true)
++void UMLDoc::setModified(bool _m)
+ {
+ modified = _m;
+ ((UMLApp *) parent()) -> setModified(_m);
diff -r 7e945d48c049 -r bdd5f9edc267 devel/uml/patches/patch-al
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/uml/patches/patch-al Tue Jun 15 17:48:35 2004 +0000
@@ -0,0 +1,38 @@
+--- uml/umlview.cpp.orig 2004-06-15 19:23:17.000000000 +0200
++++ uml/umlview.cpp 2004-06-15 19:24:59.000000000 +0200
+@@ -512,7 +512,7 @@
+ ObjectWidget * ow = new ObjectWidget(viewport(), o, ++localID);
+ temp = (UMLWidget *)ow;
+ }
Home |
Main Index |
Thread Index |
Old Index