Ignore:
Timestamp:
2000-02-17T15:42:25+13:00 (24 years ago)
Author:
sjboddie
Message:

minor stuff - fixed some cvs conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/src/recpt/browsetools.h

    r928 r941  
    4545            outconvertclass &outconvert, ostream &textout,
    4646            ostream &logout);
     47
    4748void contracted_contents (cgiargsclass &args, int tabcount, bool fulltoc,
    4849              browsermapclass *browsermap, formatinfo_t &formatinfo,
     
    5657                 ostream &textout, ostream &logout);
    5758
     59void output_titles (cgiargsclass &args, recptproto *collectproto,
     60            formatinfo_t &formatinfo, displayclass &disp,
     61            outconvertclass &outconvert, ostream &textout,
     62            ostream &logout);
    5863
    59 // output_controls displays the detach, expand/contract contents,
    60 // expand/contract text and highlighting/no highlighting buttons
    61  void output_controls (cgiargsclass &args, const text_tarray &ibuttons,
    62                  recptproto * /*collectproto*/, displayclass &disp,
    63                  outconvertclass &outconvert, ostream &textout,
    64                  ostream &/*logout*/);
     64void output_controls (cgiargsclass &args, const text_tarray &ibuttons,
     65              recptproto *collectproto, displayclass &disp,
     66              outconvertclass &outconvert, ostream &textout,
     67              ostream &logout);
    6568   
    66  void output_cover_image (cgiargsclass &args, recptproto * /*collectproto*/,
    67                 displayclass &disp, outconvertclass &outconvert,
    68                 ostream &textout, ostream &/*logout*/);
    69 
    70  void output_titles (cgiargsclass &args, recptproto *collectproto,
    71                formatinfo_t &formatinfo, displayclass &disp,
    72                outconvertclass &outconvert, ostream &textout,
    73                ostream &logout);
    74 void contracted_contents (cgiargsclass &args, int tabcount, bool fulltoc,
    75                  browsermapclass *browsermap, formatinfo_t &formatinfo,
    76                  recptproto *collectproto, displayclass &disp,
    77                  outconvertclass &outconvert, ostream &textout,
    78                  ostream &logout);
    79 
    80  void expanded_contents (cgiargsclass &args, int tabcount, bool fulltoc,
    81                    browsermapclass *browsermap, formatinfo_t &formatinfo,
    82                    recptproto *collectproto, displayclass &disp,
    83                    outconvertclass &outconvert, ostream &textout,
    84                    ostream &logout);
     69void output_cover_image (cgiargsclass &args, recptproto *collectproto,
     70             displayclass &disp, outconvertclass &outconvert,
     71             ostream &textout, ostream &logout);
    8572
    8673
Note: See TracChangeset for help on using the changeset viewer.