last patches for the real final ivtools-1.2.6
ivtools patch distribution <[email protected]> Wed, 9 Jul 2008 11:37:50 -0700
| Newsgroups | gmane.comp.lib.ivtools.patches |
|---|---|
| Message-ID | <[email protected]> |
--Apple-Mail-38--1049214283 Content-Disposition: attachment; filename=ivtools-080507-johnston-015 Content-Type: application/octet-stream; x-unix-mode=0644; name="ivtools-080507-johnston-015" Content-Transfer-Encoding: 7bit Patch: ivtools-080507-johnston-015 For: ivtools-1.2 Author: [email protected] Subject: some last minute changes for ivtools-1.2.6 Requires: This is an intermediate patch to ivtools-1.2. To apply, cd to the top-level directory of the ivtools source tree (the directory with src and config subdirs), and apply like this: patch -p0 <ThisFile Summary of Changes: Index: ComTerp/assignfunc.h diff -c ComTerp/assignfunc.h:1.1 ComTerp/assignfunc.h:1.2 *** ComTerp/assignfunc.h:1.1 Wed Aug 29 10:37:48 2007 --- src/ComTerp/assignfunc.h Wed May 7 15:39:01 2008 *************** *** 49,55 **** virtual void execute(); virtual const char* docstring() { ! return "%= is the mod assignment operator"; } }; //: *= (multiply assign) operator . --- 49,55 ---- virtual void execute(); virtual const char* docstring() { ! return "\%= is the mod assignment operator"; } }; //: *= (multiply assign) operator . Index: ComUtil/symbols.c diff -c ComUtil/symbols.c:1.1 ComUtil/symbols.c:1.2 *** ComUtil/symbols.c:1.1 Wed Aug 29 10:37:45 2007 --- src/ComUtil/symbols.c Wed May 7 15:39:00 2008 *************** *** 72,78 **** #define SYM_ALLOC_NUM_LOW 512 #define SYMID_ALLOC_NUM_LOW 32 /* These are used when you have lots of memory */ ! #define SYM_ALLOC_NUM_HIGH 4096 #define SYMID_ALLOC_NUM_HIGH 256 /*=============*/ --- 72,78 ---- #define SYM_ALLOC_NUM_LOW 512 #define SYMID_ALLOC_NUM_LOW 32 /* These are used when you have lots of memory */ ! #define SYM_ALLOC_NUM_HIGH 32768 #define SYMID_ALLOC_NUM_HIGH 256 /*=============*/ *** /dev/null Wed May 7 15:39:09 PDT 2008 --- patches/ivtools-080507-johnston-015 *************** patches/ivtools-080507-johnston-015 *** 0 **** --- 1 ---- + ivtools-080507-johnston-015 --Apple-Mail-38--1049214283 Content-Disposition: attachment; filename=ivtools-080516-johnston-016 Content-Type: application/octet-stream; x-unix-mode=0644; name="ivtools-080516-johnston-016" Content-Transfer-Encoding: 7bit Patch: ivtools-080516-johnston-016 For: ivtools-1.2 Author: [email protected] Subject: gcc-4.3 work and ipl work Requires: This is an intermediate patch to ivtools-1.2. To apply, cd to the top-level directory of the ivtools source tree (the directory with src and config subdirs), and apply like this: patch -p0 <ThisFile Summary of Changes: Index: AttrGlyph/attredit.c diff -c AttrGlyph/attredit.c:1.1 AttrGlyph/attredit.c:1.2 *** AttrGlyph/attredit.c:1.1 Wed Aug 29 10:38:41 2007 --- src/AttrGlyph/attredit.c Fri May 16 10:47:50 2008 *************** *** 47,55 **** #if __GNUC__==2 && __GNUC_MINOR__<=7 #else #define STL_VECTOR ! #include <vector.h> #endif declareActionCallback(AttributeListEditor) implementActionCallback(AttributeListEditor) declareFieldEditorCallback(AttributeListEditor) --- 47,57 ---- #if __GNUC__==2 && __GNUC_MINOR__<=7 #else #define STL_VECTOR ! #include <vector> #endif + using std::vector; + declareActionCallback(AttributeListEditor) implementActionCallback(AttributeListEditor) declareFieldEditorCallback(AttributeListEditor) Index: Attribute/attrlist.c diff -c Attribute/attrlist.c:1.5 Attribute/attrlist.c:1.6 *** Attribute/attrlist.c:1.5 Fri Oct 12 08:11:22 2007 --- src/Attribute/attrlist.c Fri May 16 10:47:36 2008 *************** *** 38,43 **** --- 38,44 ---- #include <iostream.h> #include <string.h> + #include <fstream> #include <IV-2_6/_enter.h> *************** *** 50,55 **** --- 51,57 ---- /*****************************************************************************/ + using std::cerr; int AttributeList::_symid = -1; Index: Attribute/paramlist.c diff -c Attribute/paramlist.c:1.2 Attribute/paramlist.c:1.3 *** Attribute/paramlist.c:1.2 Wed Nov 7 07:55:07 2007 --- src/Attribute/paramlist.c Fri May 16 10:47:36 2008 *************** *** 36,41 **** --- 36,42 ---- #include <ctype.h> #include <iostream.h> + #include <fstream> #include <stdio.h> #include <string.h> #ifndef __APPLE__ *************** *** 43,48 **** --- 44,50 ---- #endif /*****************************************************************************/ + using std::cerr; static const int BUFSIZE = 10000; static char textbuf[BUFSIZE]; Index: comdraw/main.c diff -c comdraw/main.c:1.1 comdraw/main.c:1.2 *** comdraw/main.c:1.1 Wed Aug 29 10:38:55 2007 --- src/comdraw/main.c Fri May 16 10:47:59 2008 *************** *** 50,55 **** --- 50,58 ---- #include <string.h> #include <math.h> #include <version.h> + #include <iostream> + + using std::cerr; static int nmsg = 0; Index: ComGlyph/comtextview.c diff -c ComGlyph/comtextview.c:1.2 ComGlyph/comtextview.c:1.3 *** ComGlyph/comtextview.c:1.2 Sun Sep 23 09:11:32 2007 --- src/ComGlyph/comtextview.c Fri May 16 10:47:51 2008 *************** *** 51,56 **** --- 51,60 ---- #include <iostream.h> #include <strstream> #include <string.h> + #include <fstream> + + using std::cerr; + using std::cout; #define XK_MISCELLANY /* to get the keysym's we need */ #include <X11/keysymdef.h> Index: ComTerp/assignfunc.c diff -c ComTerp/assignfunc.c:1.3 ComTerp/assignfunc.c:1.4 *** ComTerp/assignfunc.c:1.3 Sat Oct 6 11:10:28 2007 --- src/ComTerp/assignfunc.c Fri May 16 10:47:37 2008 *************** *** 29,34 **** --- 29,38 ---- #include <Attribute/attribute.h> #include <InterViews/resource.h> + #include <fstream> + #include <iostream> + using std::cerr; + #define TITLE "AssignFunc" /*****************************************************************************/ Index: ComTerp/comterp.c diff -c ComTerp/comterp.c:1.8 ComTerp/comterp.c:1.9 *** ComTerp/comterp.c:1.8 Tue May 6 10:55:04 2008 --- src/ComTerp/comterp.c Fri May 16 10:47:37 2008 *************** *** 87,92 **** --- 87,95 ---- extern int _detail_matched_delims; + using std::cerr; + using std::cout; + implementTable(ComValueTable,int,void*) ComTerp* ComTerp::_instance = nil; Index: ComTerp/ctrlfunc.c diff -c ComTerp/ctrlfunc.c:1.6 ComTerp/ctrlfunc.c:1.7 *** ComTerp/ctrlfunc.c:1.6 Tue May 6 10:55:04 2008 --- src/ComTerp/ctrlfunc.c Fri May 16 10:47:37 2008 *************** *** 22,27 **** --- 22,28 ---- */ #include <fstream.h> + #include <iostream> #include <ComTerp/comhandler.h> #include <ComTerp/ctrlfunc.h> *************** *** 42,47 **** --- 43,49 ---- #endif #endif + using std::cerr; /*****************************************************************************/ *************** *** 79,85 **** if (handler) { if (nargs()) { if (timeoutstr.type() == ComValue::StringType) { ! handler->timeoutseconds(sec_val.int_val()); handler->timeoutscriptid(timeoutstr.string_val()); push_stack(timeoutstr); } else --- 81,87 ---- if (handler) { if (nargs()) { if (timeoutstr.type() == ComValue::StringType) { ! handler->timeoutseconds(sec_val.int_val()); handler->timeoutscriptid(timeoutstr.string_val()); push_stack(timeoutstr); } else Index: ComTerp/debugfunc.c diff -c ComTerp/debugfunc.c:1.2 ComTerp/debugfunc.c:1.3 *** ComTerp/debugfunc.c:1.2 Fri Feb 15 10:42:48 2008 --- src/ComTerp/debugfunc.c Fri May 16 10:47:37 2008 *************** *** 24,30 **** #if __GNUC__==2 && __GNUC_MINOR__<=7 #else ! #include <vector.h> #endif #if __GNUC__>=3 #include <fstream.h> --- 24,30 ---- #if __GNUC__==2 && __GNUC_MINOR__<=7 #else ! #include <vector> #endif #if __GNUC__>=3 #include <fstream.h> *************** *** 35,40 **** --- 35,45 ---- #include <ComTerp/debugfunc.h> #include <ComTerp/comterpserv.h> #include <strstream> + #include <iostream> + #include <fstream> + + using std::cerr; + using std::vector; #define TITLE "DebugFunc" Index: ComTerp/dotfunc.c diff -c ComTerp/dotfunc.c:1.1 ComTerp/dotfunc.c:1.2 *** ComTerp/dotfunc.c:1.1 Wed Aug 29 10:37:48 2007 --- src/ComTerp/dotfunc.c Fri May 16 10:47:37 2008 *************** *** 27,35 **** --- 27,39 ---- #include <ComTerp/comterp.h> #include <Attribute/attrlist.h> #include <Attribute/attribute.h> + #include <iostream> + #include <fstream> #define TITLE "DotFunc" + using std::cerr; + /*****************************************************************************/ int DotFunc::_symid = -1; Index: ComTerp/helpfunc.c diff -c ComTerp/helpfunc.c:1.2 ComTerp/helpfunc.c:1.3 *** ComTerp/helpfunc.c:1.2 Fri Oct 12 08:11:23 2007 --- src/ComTerp/helpfunc.c Fri May 16 10:47:37 2008 *************** *** 38,43 **** --- 38,45 ---- #if __GNUC__>=3 #include <fstream.h> #endif + #include <streambuf> + using std::streambuf; #define TITLE "HelpFunc" Index: ComTerp/iofunc.c diff -c ComTerp/iofunc.c:1.1 ComTerp/iofunc.c:1.2 *** ComTerp/iofunc.c:1.1 Wed Aug 29 10:37:48 2007 --- src/ComTerp/iofunc.c Fri May 16 10:47:37 2008 *************** *** 35,43 **** --- 35,46 ---- #if __GNUC__>=3 #include <fstream.h> #endif + #include <streambuf> #define TITLE "IoFunc" + using std::streambuf; + /*****************************************************************************/ PrintFunc::PrintFunc(ComTerp* comterp) : ComFunc(comterp) { Index: comtest/main.c diff -c comtest/main.c:1.1 comtest/main.c:1.2 *** comtest/main.c:1.1 Wed Aug 29 10:37:50 2007 --- src/comtest/main.c Fri May 16 10:47:38 2008 *************** *** 25,30 **** --- 25,35 ---- #include <iostream.h> #include <string.h> + #include <fstream> + + using std::cerr; + using std::cout; + using std::endl; char* type_names[] = { "None", Index: ComUnidraw/comeditor.c diff -c ComUnidraw/comeditor.c:1.3 ComUnidraw/comeditor.c:1.4 *** ComUnidraw/comeditor.c:1.3 Thu Nov 15 14:18:09 2007 --- src/ComUnidraw/comeditor.c Fri May 16 10:47:58 2008 *************** *** 60,65 **** --- 60,69 ---- #include <strstream> #include <string.h> + #include <fstream> + #include <iostream> + + using std::cout; /*****************************************************************************/ Index: ComUnidraw/grdotfunc.c diff -c ComUnidraw/grdotfunc.c:1.1 ComUnidraw/grdotfunc.c:1.2 *** ComUnidraw/grdotfunc.c:1.1 Wed Aug 29 10:38:54 2007 --- src/ComUnidraw/grdotfunc.c Fri May 16 10:47:58 2008 *************** *** 28,33 **** --- 28,37 ---- #include <ComTerp/comterp.h> #include <Attribute/attrlist.h> #include <Attribute/attribute.h> + #include <fstream> + #include <iostream> + + using std::cerr; #define TITLE "GrDotFunc" Index: ComUnidraw/grfunc.c diff -c ComUnidraw/grfunc.c:1.4 ComUnidraw/grfunc.c:1.5 *** ComUnidraw/grfunc.c:1.4 Thu Nov 15 14:18:09 2007 --- src/ComUnidraw/grfunc.c Fri May 16 10:47:58 2008 *************** *** 165,171 **** comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("RectComp"), new ComponentView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); --- 165,171 ---- comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("RectComp"), new OverlayView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); *************** *** 231,237 **** comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("ArrowLineComp"), new ComponentView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); --- 231,237 ---- comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("ArrowLineComp"), new OverlayView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); *************** *** 296,302 **** comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("EllipseComp"), new ComponentView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); --- 296,302 ---- comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("EllipseComp"), new OverlayView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); *************** *** 363,369 **** comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("TextComp"), new ComponentView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); --- 363,369 ---- comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("TextComp"), new OverlayView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); *************** *** 430,436 **** comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("ArrowMultiLineComp"), new ComponentView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); --- 430,436 ---- comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("ArrowMultiLineComp"), new OverlayView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); *************** *** 497,503 **** comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("ArrowSplineComp"), new ComponentView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); --- 497,503 ---- comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("ArrowSplineComp"), new OverlayView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); *************** *** 562,568 **** comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("PolygonComp"), new ComponentView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); --- 562,568 ---- comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("PolygonComp"), new OverlayView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); *************** *** 628,634 **** comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("ClosedSplineComp"), new ComponentView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); --- 628,634 ---- comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("ClosedSplineComp"), new OverlayView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); *************** *** 699,705 **** comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("RasterComp"), new ComponentView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); --- 699,705 ---- comp->SetAttributeList(al); if (PasteModeFunc::paste_mode()==0) cmd = new PasteCmd(_ed, new Clipboard(comp)); ! ComValue compval(symbol_add("RasterComp"), new OverlayView(comp)); compval.object_compview(true); push_stack(compval); execute_log(cmd); *************** *** 965,971 **** GraphicView* subgv = gv->GetView(i); newSel->Append(subgv); OverlayComp* comp = (OverlayComp*)subgv->GetGraphicComp(); ! ComValue* compval = new ComValue(comp->classid(), new ComponentView(comp)); compval->object_compview(true); avl->Append(compval); } --- 965,971 ---- GraphicView* subgv = gv->GetView(i); newSel->Append(subgv); OverlayComp* comp = (OverlayComp*)subgv->GetGraphicComp(); ! ComValue* compval = new ComValue(comp->classid(), new OverlayView(comp)); compval->object_compview(true); avl->Append(compval); } *************** *** 976,982 **** for (sel->First(i); !sel->Done(i); sel->Next(i)) { GraphicView* grview = sel->GetView(i); OverlayComp* comp = grview ? (OverlayComp*)grview->GetSubject() : nil; ! ComValue* compval = comp ? new ComValue(comp->classid(), new ComponentView(comp)) : nil; if (compval) { compval->object_compview(true); --- 976,982 ---- for (sel->First(i); !sel->Done(i); sel->Next(i)) { GraphicView* grview = sel->GetView(i); OverlayComp* comp = grview ? (OverlayComp*)grview->GetSubject() : nil; ! ComValue* compval = comp ? new ComValue(comp->classid(), new OverlayView(comp)) : nil; if (compval) { compval->object_compview(true); *************** *** 995,1001 **** OverlayComp* comp = (OverlayComp*)comview->GetSubject(); if (comp) { newSel->Append(comp->FindView(viewer)); ! ComValue* compval = new ComValue(comp->classid(), new ComponentView(comp)); compval->object_compview(true); avl->Append(compval); } --- 995,1001 ---- OverlayComp* comp = (OverlayComp*)comview->GetSubject(); if (comp) { newSel->Append(comp->FindView(viewer)); ! ComValue* compval = new ComValue(comp->classid(), new OverlayView(comp)); compval->object_compview(true); avl->Append(compval); } *************** *** 1361,1367 **** Transformer t(a00, a01, a10, a11, a20, a21); *gr->GetTransformer()=t; ! ComValue compval(comp->class_symid(), new ComponentView(comp)); compval.object_compview(true); push_stack(compval); } --- 1361,1367 ---- Transformer t(a00, a01, a10, a11, a20, a21); *gr->GetTransformer()=t; ! ComValue compval(comp->class_symid(), new OverlayView(comp)); compval.object_compview(true); push_stack(compval); } Index: ComUnidraw/grlistfunc.c diff -c ComUnidraw/grlistfunc.c:1.1 ComUnidraw/grlistfunc.c:1.2 *** ComUnidraw/grlistfunc.c:1.1 Wed Aug 29 10:38:54 2007 --- src/ComUnidraw/grlistfunc.c Fri May 16 10:47:58 2008 *************** *** 25,31 **** #include <ComUnidraw/grlistfunc.h> #include <OverlayUnidraw/ovclasses.h> #include <OverlayUnidraw/ovcomps.h> ! #include <Unidraw/Components/compview.h> #include <Unidraw/iterator.h> #include <ComTerp/listfunc.h> --- 25,31 ---- #include <ComUnidraw/grlistfunc.h> #include <OverlayUnidraw/ovclasses.h> #include <OverlayUnidraw/ovcomps.h> ! #include <OverlayUnidraw/ovviews.h> #include <Unidraw/iterator.h> #include <ComTerp/listfunc.h> *************** *** 56,62 **** if (count==nv.int_val()) { OverlayComp* retcomp = (OverlayComp*)comps->GetComp(i); if (retcomp) { ! ComValue retval(retcomp->classid(), new ComponentView(retcomp)); retval.object_compview(true); push_stack(retval); return; --- 56,62 ---- if (count==nv.int_val()) { OverlayComp* retcomp = (OverlayComp*)comps->GetComp(i); if (retcomp) { ! ComValue retval(retcomp->classid(), new OverlayView(retcomp)); retval.object_compview(true); push_stack(retval); return; Index: ComUnidraw/groupfunc.c diff -c ComUnidraw/groupfunc.c:1.1 ComUnidraw/groupfunc.c:1.2 *** ComUnidraw/groupfunc.c:1.1 Wed Aug 29 10:38:54 2007 --- src/ComUnidraw/groupfunc.c Fri May 16 10:47:58 2008 *************** *** 87,93 **** mcmd->Append(gcmd); execute_log(mcmd); ! ComValue retval(OverlaysComp::class_symid(), new ComponentView(grgroup)); retval.object_compview(true); push_stack(retval); return; --- 87,93 ---- mcmd->Append(gcmd); execute_log(mcmd); ! ComValue retval(OverlaysComp::class_symid(), new OverlayView(grgroup)); retval.object_compview(true); push_stack(retval); return; *************** *** 154,160 **** mcmd->Append(gcmd); execute_log(mcmd); ! ComValue retval(OverlaysComp::class_symid(), new ComponentView(grgroup)); retval.object_compview(true); push_stack(retval); return; --- 154,160 ---- mcmd->Append(gcmd); execute_log(mcmd); ! ComValue retval(OverlaysComp::class_symid(), new OverlayView(grgroup)); retval.object_compview(true); push_stack(retval); return; Index: ComUnidraw/plotfunc.c diff -c ComUnidraw/plotfunc.c:1.1 ComUnidraw/plotfunc.c:1.2 *** ComUnidraw/plotfunc.c:1.1 Wed Aug 29 10:38:54 2007 --- src/ComUnidraw/plotfunc.c Fri May 16 10:47:58 2008 *************** *** 31,36 **** --- 31,38 ---- #define TITLE "PlotFunc" + using std::ofstream; + /*****************************************************************************/ BarPlotFunc::BarPlotFunc(ComTerp* comterp, Editor* ed) : UnidrawFunc(comterp, ed) { Index: ComUnidraw/unifunc.c diff -c ComUnidraw/unifunc.c:1.3 ComUnidraw/unifunc.c:1.4 *** ComUnidraw/unifunc.c:1.3 Sat Oct 6 11:10:35 2007 --- src/ComUnidraw/unifunc.c Fri May 16 10:47:58 2008 *************** *** 62,67 **** --- 62,70 ---- #include <fstream.h> #endif #include <string.h> + #include <iostream> + + using std::cerr; #define TITLE "UnidrawFunc" *************** *** 319,325 **** if ((cmd = import(next_flag ? lastpath : pathnamev.string_ptr(), popen_flag)) && cmd->component()) { ComValue compval(((OverlayComp*)cmd->component())->classid(), ! new ComponentView(cmd->component())); delete cmd; compval.object_compview(true); push_stack(compval); --- 322,328 ---- if ((cmd = import(next_flag ? lastpath : pathnamev.string_ptr(), popen_flag)) && cmd->component()) { ComValue compval(((OverlayComp*)cmd->component())->classid(), ! new OverlayView((OverlayComp*)cmd->component())); delete cmd; compval.object_compview(true); push_stack(compval); *************** *** 329,335 **** for (int i=0; i<nargs(); i++) if (cmd = import(stack_arg(i).string_ptr(), popen_flag)) { ComValue compval(((OverlayComp*)cmd->component())->classid(), ! new ComponentView(cmd->component())); delete cmd; compval.object_compview(true); push_stack(compval); --- 332,338 ---- for (int i=0; i<nargs(); i++) if (cmd = import(stack_arg(i).string_ptr(), popen_flag)) { ComValue compval(((OverlayComp*)cmd->component())->classid(), ! new OverlayView((OverlayComp*)cmd->component())); delete cmd; compval.object_compview(true); push_stack(compval); *************** *** 345,351 **** while(!inlist->Done(it)) { cmd = import(inlist->GetAttrVal(it)->string_ptr(), popen_flag); ComValue* val = new ComValue(((OverlayComp*)cmd->component())->classid(), ! new ComponentView(cmd->component())); delete cmd; val->object_compview(true); outlist->Append(val); --- 348,354 ---- while(!inlist->Done(it)) { cmd = import(inlist->GetAttrVal(it)->string_ptr(), popen_flag); ComValue* val = new ComValue(((OverlayComp*)cmd->component())->classid(), ! new OverlayView((OverlayComp*)cmd->component())); delete cmd; val->object_compview(true); outlist->Append(val); *************** *** 630,636 **** OverlaysView* frameview = ed->GetFrame(indexv.int_val()); if (frameview && frameview->GetSubject()) { OverlayComp* comp = (OverlayComp*)frameview->GetSubject(); ! ComValue retval(comp->classid(), new ComponentView(comp)); retval.object_compview(true); push_stack(retval); } else --- 633,639 ---- OverlaysView* frameview = ed->GetFrame(indexv.int_val()); if (frameview && frameview->GetSubject()) { OverlayComp* comp = (OverlayComp*)frameview->GetSubject(); ! ComValue retval(comp->classid(), new OverlayView(comp)); retval.object_compview(true); push_stack(retval); } else *************** *** 685,691 **** OverlayEditor* ed = (OverlayEditor*)GetEditor(); OverlayComp* comp = ed->overlay_kit()->add_tool_button(pathnamev.symbol_ptr()); if (comp) { ! ComValue retval(comp->classid(), new ComponentView(comp)); retval.object_compview(true); push_stack(retval); } else { --- 688,694 ---- OverlayEditor* ed = (OverlayEditor*)GetEditor(); OverlayComp* comp = ed->overlay_kit()->add_tool_button(pathnamev.symbol_ptr()); if (comp) { ! ComValue retval(comp->classid(), new OverlayView(comp)); retval.object_compview(true); push_stack(retval); } else { Index: DrawServ/drawcomps.c diff -c DrawServ/drawcomps.c:1.3 DrawServ/drawcomps.c:1.4 *** DrawServ/drawcomps.c:1.3 Sat Oct 6 11:10:38 2007 --- src/DrawServ/drawcomps.c Fri May 16 10:48:04 2008 *************** *** 40,45 **** --- 40,48 ---- #include <Attribute/attrlist.h> #include <iostream.h> #include <string.h> + #include <fstream> + + using std::cerr; /*****************************************************************************/ Index: DrawServ/drawfunc.c diff -c DrawServ/drawfunc.c:1.1 DrawServ/drawfunc.c:1.2 *** DrawServ/drawfunc.c:1.1 Wed Aug 29 10:39:00 2007 --- src/DrawServ/drawfunc.c Fri May 16 10:48:04 2008 *************** *** 27,38 **** #include <DrawServ/drawlinkcomp.h> #include <DrawServ/drawserv.h> #include <DrawServ/drawserv-handler.h> ! #include <ComTerp/comterp.h> #include <Attribute/attrlist.h> #include <Attribute/attrvalue.h> #include <fstream.h> #define TITLE "DrawLinkFunc" /*****************************************************************************/ --- 27,40 ---- #include <DrawServ/drawlinkcomp.h> #include <DrawServ/drawserv.h> #include <DrawServ/drawserv-handler.h> ! #include <OverlayUnidraw/ovviews.h> #include <ComTerp/comterp.h> #include <Attribute/attrlist.h> #include <Attribute/attrvalue.h> #include <fstream.h> + #include <cstdio> + #define TITLE "DrawLinkFunc" /*****************************************************************************/ *************** *** 148,154 **** if (link) { DrawLinkComp* linkcomp = new DrawLinkComp(link); ! ComValue result(DrawLinkComp::class_symid(), new ComponentView(linkcomp)); result.object_compview(true); push_stack(result); } --- 150,156 ---- if (link) { DrawLinkComp* linkcomp = new DrawLinkComp(link); ! ComValue result(DrawLinkComp::class_symid(), new OverlayView(linkcomp)); result.object_compview(true); push_stack(result); } Index: drawserv_/main.c diff -c drawserv_/main.c:1.1 drawserv_/main.c:1.2 *** drawserv_/main.c:1.1 Wed Aug 29 10:39:01 2007 --- src/drawserv_/main.c Fri May 16 10:48:05 2008 *************** *** 57,62 **** --- 57,66 ---- #include <string.h> #include <math.h> #include <version.h> + #include <fstream> + #include <iostream> + + using std::cerr; static int nmsg = 0; Index: drawtool/main.c diff -c drawtool/main.c:1.1 drawtool/main.c:1.2 *** drawtool/main.c:1.1 Wed Aug 29 10:38:53 2007 --- src/drawtool/main.c Fri May 16 10:47:57 2008 *************** *** 49,54 **** --- 49,58 ---- #include <string.h> #include <math.h> #include <version.h> + #include <iostream> + #include <fstream> + + using std::cerr; /*****************************************************************************/ Index: examples3.1_drag/main.c diff -c examples3.1_drag/main.c:1.1 examples3.1_drag/main.c:1.2 *** examples3.1_drag/main.c:1.1 Wed Aug 29 10:38:30 2007 --- src/glyphs/examples3.1/drag/main.c Fri May 16 10:47:48 2008 *************** *** 32,37 **** --- 32,39 ---- #include <InterViews/window.h> #include <IV-look/kit.h> + using std::cout; + /////////////////////////////////////////////// // Glyph that can be dragged to a drag zone. // /////////////////////////////////////////////// *************** *** 111,117 **** } void DragZoneDemo::drop(Event& event, const char* data, int) { ! cout << data << endl; leave(event); } --- 113,119 ---- } void DragZoneDemo::drop(Event& event, const char* data, int) { ! cout << data << '\n'; leave(event); } Index: examples3.1_print/main.c diff -c examples3.1_print/main.c:1.1 examples3.1_print/main.c:1.2 *** examples3.1_print/main.c:1.1 Wed Aug 29 10:38:38 2007 --- src/glyphs/examples3.1/print/main.c Fri May 16 10:47:49 2008 *************** *** 8,13 **** --- 8,15 ---- #include <InterViews/window.h> #include <fstream.h> + using std::ofstream; + class Printable : public Patch { public: Printable(Glyph*); Index: flipbook/main.c diff -c flipbook/main.c:1.1 flipbook/main.c:1.2 *** flipbook/main.c:1.1 Wed Aug 29 10:38:57 2007 --- src/flipbook/main.c Fri May 16 10:48:01 2008 *************** *** 45,50 **** --- 45,53 ---- #include <string.h> #include <math.h> #include <version.h> + #include <iostream> + + using std::cerr; /*****************************************************************************/ Index: FrameUnidraw/framefile.c diff -c FrameUnidraw/framefile.c:1.1 FrameUnidraw/framefile.c:1.2 *** FrameUnidraw/framefile.c:1.1 Wed Aug 29 10:38:56 2007 --- src/FrameUnidraw/framefile.c Fri May 16 10:48:00 2008 *************** *** 39,44 **** --- 39,47 ---- #include <stdio.h> #include <stream.h> #include <string.h> + #include <iostream> + + using std::cerr; /*****************************************************************************/ Index: FrameUnidraw/framefunc.c diff -c FrameUnidraw/framefunc.c:1.1 FrameUnidraw/framefunc.c:1.2 *** FrameUnidraw/framefunc.c:1.1 Wed Aug 29 10:38:56 2007 --- src/FrameUnidraw/framefunc.c Fri May 16 10:48:00 2008 *************** *** 33,38 **** --- 33,41 ---- #include <Attribute/attrlist.h> #include <OS/math.h> #include <iostream.h> + #include <fstream> + + using std::cerr; static int on_symid = symbol_add("on"); static int off_symid = symbol_add("off"); Index: FrameUnidraw/framescripts.c diff -c FrameUnidraw/framescripts.c:1.1 FrameUnidraw/framescripts.c:1.2 *** FrameUnidraw/framescripts.c:1.1 Wed Aug 29 10:38:56 2007 --- src/FrameUnidraw/framescripts.c Fri May 16 10:48:00 2008 *************** *** 55,60 **** --- 55,63 ---- #include <stdio.h> #include <stream.h> #include <string.h> + #include <iostream> + + using std::cerr; /*****************************************************************************/ Index: graphdraw/main.c diff -c graphdraw/main.c:1.1 graphdraw/main.c:1.2 *** graphdraw/main.c:1.1 Wed Aug 29 10:38:59 2007 --- src/graphdraw/main.c Fri May 16 10:48:03 2008 *************** *** 45,50 **** --- 45,55 ---- #include <math.h> #include <version.h> + #include <iostream> + #include <fstream> + + using std::cerr; + /*****************************************************************************/ Index: GraphUnidraw/nodecomp.c diff -c GraphUnidraw/nodecomp.c:1.8 GraphUnidraw/nodecomp.c:1.9 *** GraphUnidraw/nodecomp.c:1.8 Thu Nov 15 14:18:10 2007 --- src/GraphUnidraw/nodecomp.c Fri May 16 10:48:02 2008 *************** *** 80,85 **** --- 80,88 ---- #include <stdio.h> #include <string.h> #include <strstream> + #include <fstream> + + using std::cerr; FullGraphic* NodeView::_nv_gs = nil; *************** *** 406,411 **** --- 409,415 ---- TextGraphic* NodeComp::GetText() { Picture* pic = (Picture*)GetGraphic(); + if (!pic) return nil; Iterator i; pic->First(i); pic->Next(i); Index: iclass/main.c diff -c iclass/main.c:1.1 iclass/main.c:1.2 *** iclass/main.c:1.1 Wed Aug 29 10:38:03 2007 --- src/iclass/main.c Fri May 16 10:47:42 2008 *************** *** 34,39 **** --- 34,42 ---- #include <string.h> #include <iostream.h> + #include <fstream> + + using std::cout; /*****************************************************************************/ Index: idemo/main.c diff -c idemo/main.c:1.1 idemo/main.c:1.2 *** idemo/main.c:1.1 Wed Aug 29 10:38:04 2007 --- src/idemo/main.c Fri May 16 10:47:43 2008 *************** *** 41,47 **** #include <InterViews/transformer.h> #include <InterViews/window.h> #include <OS/string.h> ! #include <stdio.h> static const Coord tool_scale = 12.0; --- 41,47 ---- #include <InterViews/transformer.h> #include <InterViews/window.h> #include <OS/string.h> ! #include <cstdio> static const Coord tool_scale = 12.0; Index: idraw/main.c diff -c idraw/main.c:1.1 idraw/main.c:1.2 *** idraw/main.c:1.1 Wed Aug 29 10:38:47 2007 --- src/idraw/main.c Fri May 16 10:47:54 2008 *************** *** 36,41 **** --- 36,46 ---- #include <version.h> + #include <iostream> + #include <fstream> + + using std::cerr; + /*****************************************************************************/ static PropertyData properties[] = { Index: include_interviews/raster.h diff -c include_interviews/raster.h:1.1 include_interviews/raster.h:1.2 *** include_interviews/raster.h:1.1 Wed Aug 29 10:39:10 2007 --- src/include/InterViews/raster.h Fri May 16 10:48:06 2008 *************** *** 69,75 **** ); virtual void flush() const; ! virtual void flushrect(IntCoord l, IntCoord b, IntCoord t, IntCoord t) const; // flush rectangular region of internal XImage data structure // to a pixmap on the X server. --- 69,75 ---- ); virtual void flush() const; ! virtual void flushrect(IntCoord l, IntCoord b, IntCoord s, IntCoord t) const; // flush rectangular region of internal XImage data structure // to a pixmap on the X server. Index: include_std/fstream.h diff -c include_std/fstream.h:1.1 include_std/fstream.h:1.2 *** include_std/fstream.h:1.1 Wed Aug 29 10:39:19 2007 --- src/include/ivstd/fstream.h Fri May 16 10:48:08 2008 *************** *** 1,6 **** #ifndef _iv_fstream_ #define _iv_fstream_ ! #include_next <fstream.h> #if __GNUC__>=3 #define input ios_base::in #define output ios_base::out --- 1,6 ---- #ifndef _iv_fstream_ #define _iv_fstream_ ! #include_next <fstream> #if __GNUC__>=3 #define input ios_base::in #define output ios_base::out Index: include_std/iostream.h diff -c include_std/iostream.h:1.1 include_std/iostream.h:1.2 *** include_std/iostream.h:1.1 Wed Aug 29 10:39:19 2007 --- src/include/ivstd/iostream.h Fri May 16 10:48:08 2008 *************** *** 1,7 **** #ifndef _iv_iostream_h_ #define _iv_iostream_h_ #include <iosfwd> ! #include_next <iostream.h> #if __GNUC__>=3 #if 0 --- 1,7 ---- #ifndef _iv_iostream_h_ #define _iv_iostream_h_ #include <iosfwd> ! #include_next <iostream> #if __GNUC__>=3 #if 0 Index: IVGlyph/bdfltform.c diff -c IVGlyph/bdfltform.c:1.1 IVGlyph/bdfltform.c:1.2 *** IVGlyph/bdfltform.c:1.1 Wed Aug 29 10:38:06 2007 --- src/IVGlyph/bdfltform.c Fri May 16 10:47:45 2008 *************** *** 34,40 **** #include <InterViews/patch.h> #include <InterViews/session.h> #include <IV-look/kit.h> ! #include <stdio.h> #include <string.h> /*****************************************************************************/ --- 34,40 ---- #include <InterViews/patch.h> #include <InterViews/session.h> #include <IV-look/kit.h> ! #include <cstdio> #include <string.h> /*****************************************************************************/ Index: IVGlyph/bdvalue.c diff -c IVGlyph/bdvalue.c:1.1 IVGlyph/bdvalue.c:1.2 *** IVGlyph/bdvalue.c:1.1 Wed Aug 29 10:38:06 2007 --- src/IVGlyph/bdvalue.c Fri May 16 10:47:45 2008 *************** *** 47,53 **** /* derived from idemo/main.c */ #include <IVGlyph/bdvalue.h> ! #include <stdio.h> #include <string.h> /* class BoundedValue */ --- 47,53 ---- /* derived from idemo/main.c */ #include <IVGlyph/bdvalue.h> ! #include <cstdio> #include <string.h> /* class BoundedValue */ Index: IVGlyph/fieldedit.c diff -c IVGlyph/fieldedit.c:1.1 IVGlyph/fieldedit.c:1.2 *** IVGlyph/fieldedit.c:1.1 Wed Aug 29 10:38:07 2007 --- src/IVGlyph/fieldedit.c Fri May 16 10:47:45 2008 *************** *** 39,44 **** --- 39,47 ---- #include <iostream.h> #include <string.h> + #include <fstream> + + using std::cerr; /*****************************************************************************/ Index: IVGlyph/figure.h diff -c IVGlyph/figure.h:1.1 IVGlyph/figure.h:1.2 *** IVGlyph/figure.h:1.1 Wed Aug 29 10:38:07 2007 --- src/IVGlyph/figure.h Fri May 16 10:47:45 2008 *************** *** 286,292 **** public: Rectangle31 ( const Brush* brush, const Color* stroke, const Color* fill, ! Coord l, Coord b, Coord r, Coord t, Transformer* t = nil ); virtual Glyph* clone() const; --- 286,292 ---- public: Rectangle31 ( const Brush* brush, const Color* stroke, const Color* fill, ! Coord l, Coord b, Coord r, Coord s, Transformer* t = nil ); virtual Glyph* clone() const; Index: IVGlyph/textview.c diff -c IVGlyph/textview.c:1.1 IVGlyph/textview.c:1.2 *** IVGlyph/textview.c:1.1 Wed Aug 29 10:38:07 2007 --- src/IVGlyph/textview.c Fri May 16 10:47:45 2008 *************** *** 44,50 **** #include <IV-2_6/InterViews/textdisplay.h> #include <ctype.h> ! #include <stdio.h> #include <string.h> #define XK_MISCELLANY /* to get the keysym's we need */ --- 44,50 ---- #include <IV-2_6/InterViews/textdisplay.h> #include <ctype.h> ! #include <cstdio> #include <string.h> #define XK_MISCELLANY /* to get the keysym's we need */ Index: IVGlyph/valuator.c diff -c IVGlyph/valuator.c:1.1 IVGlyph/valuator.c:1.2 *** IVGlyph/valuator.c:1.1 Wed Aug 29 10:38:07 2007 --- src/IVGlyph/valuator.c Fri May 16 10:47:45 2008 *************** *** 59,65 **** #include <InterViews/patch.h> #include <InterViews/style.h> #include <OS/string.h> ! #include <stdio.h> #include <string.h> DragValuator::DragValuator(BoundedValue* bv, Style* style, Action* up, Action* down) --- 59,65 ---- #include <InterViews/patch.h> #include <InterViews/style.h> #include <OS/string.h> ! #include <cstdio> #include <string.h> DragValuator::DragValuator(BoundedValue* bv, Style* style, Action* up, Action* down) Index: OverlayUnidraw/ovarrow.c diff -c OverlayUnidraw/ovarrow.c:1.3 OverlayUnidraw/ovarrow.c:1.4 *** OverlayUnidraw/ovarrow.c:1.3 Sun Sep 30 22:22:09 2007 --- src/OverlayUnidraw/ovarrow.c Fri May 16 10:47:55 2008 *************** *** 66,71 **** --- 66,75 ---- #include <math.h> #include <stdio.h> #include <stream.h> + #include <iostream> + #include <fstream> + + using std::cerr; /****************************************************************************/ Index: OverlayUnidraw/ovcatalog.c diff -c OverlayUnidraw/ovcatalog.c:1.1 OverlayUnidraw/ovcatalog.c:1.2 *** OverlayUnidraw/ovcatalog.c:1.1 Wed Aug 29 10:38:50 2007 --- src/OverlayUnidraw/ovcatalog.c Fri May 16 10:47:55 2008 *************** *** 67,72 **** --- 67,75 ---- #include <stream.h> #include <string.h> #include <fstream.h> + #include <iostream> + + using std::cerr; /*****************************************************************************/ Index: OverlayUnidraw/ovcmds.c diff -c OverlayUnidraw/ovcmds.c:1.1 OverlayUnidraw/ovcmds.c:1.2 *** OverlayUnidraw/ovcmds.c:1.1 Wed Aug 29 10:38:50 2007 --- src/OverlayUnidraw/ovcmds.c Fri May 16 10:47:55 2008 *************** *** 87,92 **** --- 87,95 ---- #include <fstream.h> #include <iostream.h> + using std::cerr; + using std::ofstream; + /*****************************************************************************/ static const float GRID_XINCR = 8; // default grid spacing *************** *** 417,423 **** CompNameVar* compNameVar = (CompNameVar*) ed->GetState("CompNameVar"); const char* name = (compNameVar == nil) ? nil : compNameVar->GetName(); ! comp_ = ed->GetComponent(); if (name == nil) { OvSaveCompAsCmd saveCompAs(ed, chooser_); saveCompAs.Execute(); --- 420,426 ---- CompNameVar* compNameVar = (CompNameVar*) ed->GetState("CompNameVar"); const char* name = (compNameVar == nil) ? nil : compNameVar->GetName(); ! comp_ = (OverlayComp*)ed->GetComponent(); if (name == nil) { OvSaveCompAsCmd saveCompAs(ed, chooser_); saveCompAs.Execute(); Index: OverlayUnidraw/ovcomps.c diff -c OverlayUnidraw/ovcomps.c:1.3 OverlayUnidraw/ovcomps.c:1.4 *** OverlayUnidraw/ovcomps.c:1.3 Wed Nov 7 07:55:12 2007 --- src/OverlayUnidraw/ovcomps.c Fri May 16 10:47:55 2008 *************** *** 60,65 **** --- 60,69 ---- #include <unistd.h> #include <stdlib.h> + #include <fstream> + + using std::cerr; + #if __GNUC__<2 || __GNUC__==2 && __GNUC_MINOR__<96 extern "C" { Index: OverlayUnidraw/oved.c diff -c OverlayUnidraw/oved.c:1.1 OverlayUnidraw/oved.c:1.2 *** OverlayUnidraw/oved.c:1.1 Wed Aug 29 10:38:50 2007 --- src/OverlayUnidraw/oved.c Fri May 16 10:47:55 2008 *************** *** 75,81 **** #include <OS/math.h> #include <ctype.h> ! #include <stdio.h> #include <stdlib.h> #include <string.h> --- 75,81 ---- #include <OS/math.h> #include <ctype.h> ! #include <cstdio> #include <stdlib.h> #include <string.h> Index: OverlayUnidraw/ovfile.c diff -c OverlayUnidraw/ovfile.c:1.1 OverlayUnidraw/ovfile.c:1.2 *** OverlayUnidraw/ovfile.c:1.1 Wed Aug 29 10:38:50 2007 --- src/OverlayUnidraw/ovfile.c Fri May 16 10:47:55 2008 *************** *** 39,44 **** --- 39,47 ---- #include <stream.h> #include <string.h> #include <fstream.h> + #include <iostream> + + using std::cerr; /*****************************************************************************/ Index: OverlayUnidraw/ovimport.c diff -c OverlayUnidraw/ovimport.c:1.3 OverlayUnidraw/ovimport.c:1.4 *** OverlayUnidraw/ovimport.c:1.3 Sun Sep 30 22:22:09 2007 --- src/OverlayUnidraw/ovimport.c Fri May 16 10:47:55 2008 *************** *** 104,109 **** --- 104,114 ---- #include <fcntl.h> #include <errno.h> #include <phold.h> + #include <iostream> + + using std::cerr; + using std::endl; + using std::ifstream; declarePtrList(PipeList,FILE) declarePtrList(FileList,FILE) Index: OverlayUnidraw/ovline.c diff -c OverlayUnidraw/ovline.c:1.1 OverlayUnidraw/ovline.c:1.2 *** OverlayUnidraw/ovline.c:1.1 Wed Aug 29 10:38:50 2007 --- src/OverlayUnidraw/ovline.c Fri May 16 10:47:55 2008 *************** *** 64,69 **** --- 64,74 ---- #include <math.h> #include <stream.h> + #include <fstream> + #include <iostream> + + using std::cerr; + /*****************************************************************************/ ParamList* LineOvComp::_ovline_params = nil; Index: OverlayUnidraw/ovpolygon.c diff -c OverlayUnidraw/ovpolygon.c:1.1 OverlayUnidraw/ovpolygon.c:1.2 *** OverlayUnidraw/ovpolygon.c:1.1 Wed Aug 29 10:38:50 2007 --- src/OverlayUnidraw/ovpolygon.c Fri May 16 10:47:55 2008 *************** *** 54,59 **** --- 54,64 ---- #include <stream.h> + #include <iostream> + #include <fstream> + + using std::cerr; + /****************************************************************************/ ParamList* PolygonOvComp::_ovpolygon_params = nil; Index: OverlayUnidraw/ovraster.c diff -c OverlayUnidraw/ovraster.c:1.3 OverlayUnidraw/ovraster.c:1.4 *** OverlayUnidraw/ovraster.c:1.3 Sun Sep 30 22:22:09 2007 --- src/OverlayUnidraw/ovraster.c Fri May 16 10:47:55 2008 *************** *** 73,78 **** --- 73,82 ---- #include <stdio.h> #include <stream.h> #include <string.h> + #include <iostream> + #include <fstream> + + using std::cerr; implementList(CopyStringList,CopyString) Index: OverlayUnidraw/ovraster.h diff -c OverlayUnidraw/ovraster.h:1.1 OverlayUnidraw/ovraster.h:1.2 *** OverlayUnidraw/ovraster.h:1.1 Wed Aug 29 10:38:51 2007 --- src/OverlayUnidraw/ovraster.h Fri May 16 10:47:55 2008 *************** *** 360,366 **** virtual void flush() const; // flush internal XImage data structure to a pixmap on the X server. ! virtual void flushrect(IntCoord l, IntCoord b, IntCoord t, IntCoord t) const; // flush rectangular region of internal XImage data structure // to a pixmap on the X server. --- 360,366 ---- virtual void flush() const; // flush internal XImage data structure to a pixmap on the X server. ! virtual void flushrect(IntCoord l, IntCoord b, IntCoord s, IntCoord t) const; // flush rectangular region of internal XImage data structure // to a pixmap on the X server. Index: OverlayUnidraw/ovspline.c diff -c OverlayUnidraw/ovspline.c:1.1 OverlayUnidraw/ovspline.c:1.2 *** OverlayUnidraw/ovspline.c:1.1 Wed Aug 29 10:38:51 2007 --- src/OverlayUnidraw/ovspline.c Fri May 16 10:47:55 2008 *************** *** 51,56 **** --- 51,60 ---- #include <Attribute/attrlist.h> #include <stream.h> + #include <iostream> + #include <fstream> + + using std::cerr; /****************************************************************************/ Index: OverlayUnidraw/ovstates.c diff -c OverlayUnidraw/ovstates.c:1.1 OverlayUnidraw/ovstates.c:1.2 *** OverlayUnidraw/ovstates.c:1.1 Wed Aug 29 10:38:51 2007 --- src/OverlayUnidraw/ovstates.c Fri May 16 10:47:55 2008 *************** *** 26,31 **** --- 26,36 ---- #include <OverlayUnidraw/ovviewer.h> #include <stdio.h> + #include <iostream> + #include <fstream> + + using std::cerr; + /*****************************************************************************/ PtrLocState::PtrLocState(PixelCoord x, PixelCoord y, OverlayEditor* ed) :NameState(nil) Index: OverlayUnidraw/ovstencil.c diff -c OverlayUnidraw/ovstencil.c:1.1 OverlayUnidraw/ovstencil.c:1.2 *** OverlayUnidraw/ovstencil.c:1.1 Wed Aug 29 10:38:51 2007 --- src/OverlayUnidraw/ovstencil.c Fri May 16 10:47:55 2008 *************** *** 46,51 **** --- 46,55 ---- #include <stdio.h> #include <stream.h> #include <string.h> + #include <fstream> + #include <iostream> + + using std::cerr; /*****************************************************************************/ Index: OverlayUnidraw/ovviews.h diff -c OverlayUnidraw/ovviews.h:1.1 OverlayUnidraw/ovviews.h:1.2 *** OverlayUnidraw/ovviews.h:1.1 Wed Aug 29 10:38:51 2007 --- src/OverlayUnidraw/ovviews.h Fri May 16 10:47:55 2008 *************** *** 130,137 **** Manipulator* CreateStretchManip(Viewer*, Event&, Transformer*, Tool*); // specialized method to construct OpaqueDragManip instead of DragManip. ! protected: OverlayView(OverlayComp* = nil); OverlayView* View(UList*); OverlayView* GetOverlayView(Graphic*); --- 130,138 ---- Manipulator* CreateStretchManip(Viewer*, Event&, Transformer*, Tool*); // specialized method to construct OpaqueDragManip instead of DragManip. ! OverlayView(OverlayComp* = nil); + protected: OverlayView* View(UList*); OverlayView* GetOverlayView(Graphic*); Index: OverlayUnidraw/scriptview.c diff -c OverlayUnidraw/scriptview.c:1.1 OverlayUnidraw/scriptview.c:1.2 *** OverlayUnidraw/scriptview.c:1.1 Wed Aug 29 10:38:51 2007 --- src/OverlayUnidraw/scriptview.c Fri May 16 10:47:55 2008 *************** *** 65,70 **** --- 65,74 ---- #include <stream.h> #include <stdio.h> #include <string.h> + #include <fstream> + #include <iostream> + + using std::cerr; /*****************************************************************************/ Index: src_interviews/fchooser.c diff -c src_interviews/fchooser.c:1.1 src_interviews/fchooser.c:1.2 *** src_interviews/fchooser.c:1.1 Wed Aug 29 10:37:53 2007 --- src/InterViews/fchooser.c Fri May 16 10:47:39 2008 *************** *** 41,47 **** #include <InterViews/target.h> #include <OS/directory.h> #include <OS/string.h> ! #include <stdio.h> class FileChooserImpl { private: --- 41,47 ---- #include <InterViews/target.h> #include <OS/directory.h> #include <OS/string.h> ! #include <cstdio> class FileChooserImpl { private: Index: src_interviews/field.c diff -c src_interviews/field.c:1.1 src_interviews/field.c:1.2 *** src_interviews/field.c:1.1 Wed Aug 29 10:37:53 2007 --- src/InterViews/field.c Fri May 16 10:47:39 2008 *************** *** 60,66 **** #include <OS/math.h> #include <OS/string.h> ! #include <stdio.h> #include <string.h> class FieldStringEditor : public StringEditor { --- 60,66 ---- #include <OS/math.h> #include <OS/string.h> ! #include <cstdio> #include <string.h> class FieldStringEditor : public StringEditor { Index: src_interviews/kit.c diff -c src_interviews/kit.c:1.1 src_interviews/kit.c:1.2 *** src_interviews/kit.c:1.1 Wed Aug 29 10:37:53 2007 --- src/InterViews/kit.c Fri May 16 10:47:39 2008 *************** *** 71,77 **** #include <OS/list.h> #include <OS/string.h> #include <OS/ustring.h> ! #include <stdio.h> declareActionCallback(Session) implementActionCallback(Session) --- 71,77 ---- #include <OS/list.h> #include <OS/string.h> #include <OS/ustring.h> ! #include <cstdio> declareActionCallback(Session) implementActionCallback(Session) Index: src_interviews/ol_kit.c diff -c src_interviews/ol_kit.c:1.1 src_interviews/ol_kit.c:1.2 *** src_interviews/ol_kit.c:1.1 Wed Aug 29 10:37:54 2007 --- src/InterViews/ol_kit.c Fri May 16 10:47:39 2008 *************** *** 43,49 **** #include <InterViews/telltale.h> #include <InterViews/window.h> #include <OS/string.h> ! #include <stdio.h> /* * character definitions --- 43,49 ---- #include <InterViews/telltale.h> #include <InterViews/window.h> #include <OS/string.h> ! #include <cstdio> /* * character definitions Index: src_interviews/regexp.c diff -c src_interviews/regexp.c:1.1 src_interviews/regexp.c:1.2 *** src_interviews/regexp.c:1.1 Wed Aug 29 10:37:54 2007 --- src/InterViews/regexp.c Fri May 16 10:47:39 2008 *************** *** 29,34 **** --- 29,35 ---- #include <InterViews/regexp.h> #include <stream.h> #include <string.h> + using std::cerr; /* * This version is based on the Henry Spencers public domain reimplementation Index: src_interviews/session.c diff -c src_interviews/session.c:1.1 src_interviews/session.c:1.2 *** src_interviews/session.c:1.1 Wed Aug 29 10:37:54 2007 --- src/InterViews/session.c Fri May 16 10:47:39 2008 *************** *** 39,45 **** #include <OS/list.h> #include <OS/string.h> #include <ctype.h> ! #include <stdio.h> #include <stdlib.h> #ifdef sgi --- 39,45 ---- #include <OS/list.h> #include <OS/string.h> #include <ctype.h> ! #include <cstdio> #include <stdlib.h> #ifdef sgi Index: src_os/file.c diff -c src_os/file.c:1.1 src_os/file.c:1.2 *** src_os/file.c:1.1 Wed Aug 29 10:37:58 2007 --- src/OS/file.c Fri May 16 10:47:41 2008 *************** *** 27,33 **** #include <OS/types.h> #include <assert.h> #include <fcntl.h> ! #include <stdio.h> #include <sys/stat.h> #ifdef sgi --- 27,33 ---- #include <OS/types.h> #include <assert.h> #include <fcntl.h> ! #include <cstdio> #include <sys/stat.h> #ifdef sgi Index: src_os/string.c diff -c src_os/string.c:1.2 src_os/string.c:1.3 *** src_os/string.c:1.2 Wed Nov 7 07:55:08 2007 --- src/OS/string.c Fri May 16 10:47:41 2008 *************** *** 26,32 **** #include <ctype.h> #include <string.h> #include <iostream.h> ! #include <streambuf.h> /* * Just to be sure ... --- 26,32 ---- #include <ctype.h> #include <string.h> #include <iostream.h> ! #include <streambuf> /* * Just to be sure ... Index: src_x11/xfont.c diff -c src_x11/xfont.c:1.1 src_x11/xfont.c:1.2 *** src_x11/xfont.c:1.1 Wed Aug 29 10:37:57 2007 --- src/IV-X11/xfont.c Fri May 16 10:47:40 2008 *************** *** 38,44 **** #include <OS/ustring.h> #include <OS/table.h> #include <X11/Xatom.h> ! #include <stdio.h> #include <string.h> /** class FontImpl **/ --- 38,44 ---- #include <OS/ustring.h> #include <OS/table.h> #include <X11/Xatom.h> ! #include <cstdio> #include <string.h> /** class FontImpl **/ Index: src_x11/xraster.c diff -c src_x11/xraster.c:1.1 src_x11/xraster.c:1.2 *** src_x11/xraster.c:1.1 Wed Aug 29 10:37:57 2007 --- src/IV-X11/xraster.c Fri May 16 10:47:40 2008 *************** *** 46,51 **** --- 46,57 ---- #include <X11/extensions/XShm.h> #include <IV-X11/Xundefs.h> + #include <iostream> + #include <fstream> + + using std::cerr; + using std::endl; + // no X prototype extern "C" int XShmGetEventBase(XDisplay*); Index: src_x11/xwindow.c diff -c src_x11/xwindow.c:1.1 src_x11/xwindow.c:1.2 *** src_x11/xwindow.c:1.1 Wed Aug 29 10:37:57 2007 --- src/IV-X11/xwindow.c Fri May 16 10:47:40 2008 *************** *** 58,63 **** --- 58,67 ---- #include <X11/Xatom.h> #include <sys/ioctl.h> #include <iostream.h> + #include <fstream> + + using std::cerr; + #if defined(sun) && defined(__svr4__) #include <stropts.h> #include <sys/conf.h> Index: strchooser/main.c diff -c strchooser/main.c:1.1 strchooser/main.c:1.2 *** strchooser/main.c:1.1 Wed Aug 29 10:38:18 2007 --- src/glyphs/strchooser/main.c Fri May 16 10:47:47 2008 *************** *** 31,37 **** #include <IV-look/fbrowser.h> #include <OS/string.h> #include <IVGlyph/strchooser.h> ! #include <iostream.h> static OptionDesc options[] = { { nil } --- 31,39 ---- #include <IV-look/fbrowser.h> #include <OS/string.h> #include <IVGlyph/strchooser.h> ! #include <iostream> ! using std::cout; ! static OptionDesc options[] = { { nil } *************** *** 115,121 **** selectme = choices->item_ref(pickme->selected()); else selectme = ""; ! cout << "You picked \"" << selectme.string() << "\"" << endl; } declareActionCallback(Session) --- 117,123 ---- selectme = choices->item_ref(pickme->selected()); else selectme = ""; ! cout << "You picked \"" << selectme.string() << "\"" << '\n'; } declareActionCallback(Session) Index: Time/Time.c diff -c Time/Time.c:1.1 Time/Time.c:1.2 *** Time/Time.c:1.1 Wed Aug 29 10:38:05 2007 --- src/Time/Time.c Fri May 16 10:47:44 2008 *************** *** 51,57 **** #endif - /************************ end of edits ************************************************/ static long TIME_ZONE; /* seconds west of GMT */ static int DST_OBSERVED; /* flags U.S. daylight saving time observed */ --- 51,56 ---- Index: Time/Time.h diff -c Time/Time.h:1.1 Time/Time.h:1.2 *** Time/Time.h:1.1 Wed Aug 29 10:38:05 2007 --- src/Time/Time.h Fri May 16 10:47:44 2008 *************** *** 102,107 **** --- 102,109 ---- typedef unsigned long clockTy; #endif + using std::cout; + class Time { public: // type definitions Index: top_ivtools/INSTALL diff -c top_ivtools/INSTALL:1.4 top_ivtools/INSTALL:1.5 *** top_ivtools/INSTALL:1.4 Wed May 7 08:52:34 2008 --- ./INSTALL Fri May 16 10:47:34 2008 *************** *** 25,36 **** with "make -v" 0.c. The gcc compiler. Almost any recent version of gcc will work, up ! to but not including gcc-4.3, which has a backward compatibility ! problem that is yet to be overcome. You will also need an equivalent ! copy of libstdc++. libstdc++ comes bundled with gcc-3.0 and greater. ! Before that the libstdc++ version numbers stay roughly in synch with ! the gcc version numbers. If you have gcc-2.8.1 you'd want ! libstdc++-2.8.1, etc.. Be aware that sometimes the include files for libstdc++ are in /usr/local/include/g++-2, a place that cannot be auto-determined by --- 25,34 ---- with "make -v" 0.c. The gcc compiler. Almost any recent version of gcc will work, up ! to gcc-4.3. You will also need an equivalent copy of libstdc++. ! libstdc++ comes bundled with gcc-3.0 and greater. Before that the ! libstdc++ version numbers stay roughly in synch with the gcc version ! numbers. If you have gcc-2.8.1 you'd want libstdc++-2.8.1, etc.. Be aware that sometimes the include files for libstdc++ are in /usr/local/include/g++-2, a place that cannot be auto-determined by Index: top_ivtools/README diff -c top_ivtools/README:1.3 top_ivtools/README:1.4 *** top_ivtools/README:1.3 Wed May 7 08:52:34 2008 --- ./README Fri May 16 10:47:34 2008 *************** *** 121,137 **** * More ivtools details ! ivtools is known to build with many versions of gcc (up to but not ! including gcc-4.3, which has a backward compatibility problem) and on ! a variety of Unix'es: SunOS 4.1 (MIT's X11R5), Solaris 2.6 (X11R6), ! Irix 5.2 (SGI's X11R5), Linux 1.2 (Slackware 3.0, XFree86 3.1), Linux ! 2.* (RedHat 4.0 thru 7.0, Debian 2.* and 3.*), NetBSD, FreeBSD, and ! Darwin (Mac OS X). There are contributed configs that are out of date ! for HPUX and Dec Alpha (though the HPUX contrib might almost have it ! right). It has been built on Windows NT 4.0 using Cygwin from Cygnus ! Solutions (see README.cygwin). You can find links to available ! binaries on the ivtools web page (http://www.ivtools.org) and ivtools ! download page (http://www.ivtools.org/ivtools/download.html) If you have a question about this software, desire to add code, found a bug, want to request a feature, or wonder how to get further --- 121,137 ---- * More ivtools details ! ivtools is known to build with many versions of gcc (up to gcc-4.3) ! and on a variety of Unix'es: SunOS 4.1 (MIT's X11R5), Solaris 2.6 ! (X11R6), Irix 5.2 (SGI's X11R5), Linux 1.2 (Slackware 3.0, XFree86 ! 3.1), Linux 2.* (RedHat 4.0 thru 7.0, Debian 2.* and 3.*), NetBSD, ! FreeBSD, and Darwin (Mac OS X). There are contributed configs that ! are out of date for HPUX and Dec Alpha (though the HPUX contrib might ! almost have it right). It has been built on Windows NT 4.0 using ! Cygwin from Cygnus Solutions (see README.cygwin). You can find links ! to available binaries on the ivtools web page (http://www.ivtools.org) ! and ivtools download page ! (http://www.ivtools.org/ivtools/download.html) If you have a question about this software, desire to add code, found a bug, want to request a feature, or wonder how to get further Index: Unidraw/catalog.c diff -c Unidraw/catalog.c:1.1 Unidraw/catalog.c:1.2 *** Unidraw/catalog.c:1.1 Wed Aug 29 10:38:45 2007 --- src/Unidraw/catalog.c Fri May 16 10:47:52 2008 *************** *** 69,76 **** --- 69,79 ---- #include <unistd.h> #endif #include <sys/file.h> + #include <iostream> #include <fstream.h> + using std::cerr; + #ifdef __DECCXX extern "C" { extern int access(char*, int); Index: Unidraw/csolver.c diff -c Unidraw/csolver.c:1.3 Unidraw/csolver.c:1.4 *** Unidraw/csolver.c:1.3 Sun Sep 30 22:22:07 2007 --- src/Unidraw/csolver.c Fri May 16 10:47:52 2008 *************** *** 46,51 **** --- 46,56 ---- #include <math.h> #include <stream.h> #include <string.h> + #include <iostream> + #include <fstream> + + using std::cerr; + using std::cout; /*****************************************************************************/ Index: Unidraw/grview.c diff -c Unidraw/grview.c:1.1 Unidraw/grview.c:1.2 *** Unidraw/grview.c:1.1 Wed Aug 29 10:38:45 2007 --- src/Unidraw/grview.c Fri May 16 10:47:52 2008 *************** *** 434,440 **** } ComponentView* GraphicView::GetParent () { ! Graphic* parent = GetGraphic()->Parent(); if (parent == nil) { return nil; --- 434,440 ---- } ComponentView* GraphicView::GetParent () { ! Graphic* parent = GetGraphic() ? GetGraphic()->Parent() : nil; if (parent == nil) { return nil; Index: Unidraw/gvupdater.c diff -c Unidraw/gvupdater.c:1.1 Unidraw/gvupdater.c:1.2 *** Unidraw/gvupdater.c:1.1 Wed Aug 29 10:38:45 2007 --- src/Unidraw/gvupdater.c Fri May 16 10:47:52 2008 *************** *** 39,44 **** --- 39,47 ---- #include <iostream.h> #include <stdlib.h> + #include <fstream> + + using std::cerr; /*****************************************************************************/ Index: Unidraw/import.c diff -c Unidraw/import.c:1.1 Unidraw/import.c:1.2 *** Unidraw/import.c:1.1 Wed Aug 29 10:38:45 2007 --- src/Unidraw/import.c Fri May 16 10:47:52 2008 *************** *** 54,60 **** #include <TIFF/format.h> #include <OS/string.h> ! #include <stdio.h> #include <string.h> /*****************************************************************************/ --- 54,60 ---- #include <TIFF/format.h> #include <OS/string.h> ! #include <cstdio> #include <string.h> /*****************************************************************************/ Index: Unidraw/selection.c diff -c Unidraw/selection.c:1.1 Unidraw/selection.c:1.2 *** Unidraw/selection.c:1.1 Wed Aug 29 10:38:45 2007 --- src/Unidraw/selection.c Fri May 16 10:47:52 2008 *************** *** 37,42 **** --- 37,46 ---- #include <IV-2_6/_enter.h> #include <stream.h> + #include <iostream> + #include <fstream> + + using std::cerr; /*****************************************************************************/ Index: Unidraw/stateview.c diff -c Unidraw/stateview.c:1.1 Unidraw/stateview.c:1.2 *** Unidraw/stateview.c:1.1 Wed Aug 29 10:38:45 2007 --- src/Unidraw/stateview.c Fri May 16 10:47:52 2008 *************** *** 26,31 **** --- 26,32 ---- #include <Unidraw/statevar.h> #include <Unidraw/stateview.h> + #include <cstdio> /*****************************************************************************/ Index: Unidraw/stateviews.c diff -c Unidraw/stateviews.c:1.3 Unidraw/stateviews.c:1.4 *** Unidraw/stateviews.c:1.3 Sun Sep 30 22:22:07 2007 --- src/Unidraw/stateviews.c Fri May 16 10:47:52 2008 *************** *** 38,44 **** #include <IV-2_6/_enter.h> ! #include <stdio.h> #include <string.h> #include <stdlib.h> --- 38,44 ---- #include <IV-2_6/_enter.h> ! #include <cstdio> #include <string.h> #include <stdlib.h> Index: UniIdraw/idcatalog.c diff -c UniIdraw/idcatalog.c:1.3 UniIdraw/idcatalog.c:1.4 *** UniIdraw/idcatalog.c:1.3 Sun Sep 30 22:22:08 2007 --- src/UniIdraw/idcatalog.c Fri May 16 10:47:53 2008 *************** *** 56,61 **** --- 56,64 ---- #include <stream.h> #include <string.h> #include <fstream.h> + #include <iostream> + + using std::cerr; /*****************************************************************************/ Index: UniIdraw/ided.c diff -c UniIdraw/ided.c:1.1 UniIdraw/ided.c:1.2 *** UniIdraw/ided.c:1.1 Wed Aug 29 10:38:46 2007 --- src/UniIdraw/ided.c Fri May 16 10:47:53 2008 *************** *** 97,103 **** #include <OS/math.h> ! #include <stdio.h> #include <stdlib.h> #include <string.h> --- 97,103 ---- #include <OS/math.h> ! #include <cstdio> #include <stdlib.h> #include <string.h> Index: y2k_test/y2ktest.cc diff -c y2k_test/y2ktest.cc:1.1 y2k_test/y2ktest.cc:1.2 *** y2k_test/y2ktest.cc:1.1 Wed Aug 29 10:39:23 2007 --- src/tests/y2k/y2ktest.cc Fri May 16 10:48:09 2008 *************** *** 21,27 **** */ #include <Time/Date.h> ! #include <iostream.h> main() { Date date(1, "Jan", 1999); --- 21,29 ---- */ #include <Time/Date.h> ! #include <iostream> ! using std::cin; ! using std::cout; main() { Date date(1, "Jan", 1999); *** /dev/null Fri May 16 10:48:13 PDT 2008 --- patches/ivtools-080516-johnston-016 *************** patches/ivtools-080516-johnston-016 *** 0 **** --- 1 ---- + ivtools-080516-johnston-016 --Apple-Mail-38--1049214283 Content-Disposition: attachment; filename=ivtools-080709-johnston-017 Content-Type: application/octet-stream; x-unix-mode=0644; name="ivtools-080709-johnston-017" Content-Transfer-Encoding: 7bit Patch: ivtools-080709-johnston-017 For: ivtools-1.2.5 Author: [email protected] Subject: last patch before 1.2.6 Requires: This is an intermediate patch to ivtools-1.2.5. To apply, cd to the top-level directory of the ivtools source tree (the directory with src and config subdirs), and apply like this: patch -p0 <ThisFile Summary of Changes: Index: top_ivtools/CHANGES diff -c top_ivtools/CHANGES:1.4 top_ivtools/CHANGES:1.5 *** top_ivtools/CHANGES:1.4 Wed May 7 08:52:34 2008 --- ./CHANGES Wed Jul 9 11:24:40 2008 *************** *** 1,4 **** ! May 7th, 2008 ivtools-1.2.6 - bug fix for dispatcher.c contributed by Damon Permezel --- 1,4 ---- ! July 9th, 2008 ivtools-1.2.6 - bug fix for dispatcher.c contributed by Damon Permezel Index: top_ivtools/VERSION diff -c top_ivtools/VERSION:1.1 top_ivtools/VERSION:1.2 *** top_ivtools/VERSION:1.1 Wed Aug 29 10:37:43 2007 --- ./VERSION Wed Jul 9 11:24:40 2008 *************** *** 1 **** ! Release 1.2.4 --- 1 ---- ! Release 1.2.6 *** /dev/null Wed Jul 9 11:24:48 PDT 2008 --- patches/ivtools-080709-johnston-017 *************** patches/ivtools-080709-johnston-017 *** 0 **** --- 1 ---- + ivtools-080709-johnston-017 --Apple-Mail-38--1049214283 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------- Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 --Apple-Mail-38--1049214283 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Ivtools-patch mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ivtools-patch --Apple-Mail-38--1049214283--