diff options
| author | Szabolcs Dezsi <dezsiszabi@hotmail.com> | 2012-03-02 17:01:52 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-03-05 10:44:54 +0200 |
| commit | db74590950afc8def36a42abae786be5ebad85d9 (patch) | |
| tree | 37f42727817cf781f7f1f3d5571bff02128364bd /hwpfilter/source/hbox.h | |
| parent | 0847fd63d773732ff3e441ef868957c55760d69a (diff) | |
Kill LinkedList in hwpfilter
Diffstat (limited to 'hwpfilter/source/hbox.h')
| -rw-r--r-- | hwpfilter/source/hbox.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index bbd5a3756d12..74c771334563 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -29,7 +29,7 @@ #ifndef _HBOX_H_ #define _HBOX_H_ -#include "list.hxx" +#include <list> #include "hwplib.h" #include "hwpfile.h" @@ -381,11 +381,11 @@ struct TxtBox: public FBox /** * Paragraph list */ - LinkedList<HWPPara> *plists; + std::list<HWPPara*> *plists; /** * Caption */ - LinkedList<HWPPara> caption; + std::list<HWPPara*> caption; TxtBox(); virtual ~TxtBox(); @@ -536,13 +536,13 @@ struct Table { Table(){}; ~Table(){ - LinkedListIterator<TCell> it(&cells); - for( ; it.current(); ++it) - delete it.current(); + std::list<TCell*>::iterator it = cells.begin(); + for( ; it != cells.end(); ++it) + delete *it; }; Columns columns; Rows rows; - LinkedList<TCell> cells; + std::list<TCell*> cells; TxtBox *box; }; @@ -651,7 +651,7 @@ struct Picture: public FBox PicDef picinfo; char reserved3[9]; - LinkedList<HWPPara> caption; + std::list<HWPPara*> caption; /** * It's for the Drawing object */ @@ -697,7 +697,7 @@ struct Hidden: public HBox hchar dummy; unsigned char info[8]; // h, next, dummy - LinkedList<HWPPara> plist; + std::list<HWPPara*> plist; Hidden(); virtual ~Hidden(); @@ -726,7 +726,7 @@ struct HeaderFooter: public HBox /** * Paragraph list of header or footer */ - LinkedList<HWPPara> plist; + std::list<HWPPara*> plist; HeaderFooter(); virtual ~HeaderFooter(); @@ -759,7 +759,7 @@ struct Footnote: public HBox /** * Paragraph list of Footnote objects */ - LinkedList<HWPPara> plist; + std::list<HWPPara*> plist; Footnote(); virtual ~Footnote(); |