diff options
Diffstat (limited to 'conduits/docconduit/DOC-converter.h')
| -rw-r--r-- | conduits/docconduit/DOC-converter.h | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/conduits/docconduit/DOC-converter.h b/conduits/docconduit/DOC-converter.h index 25eab65..4eed37e 100644 --- a/conduits/docconduit/DOC-converter.h +++ b/conduits/docconduit/DOC-converter.h @@ -36,7 +36,7 @@ #define BMK_SUFFIX ".bmk" #define PDBBMK_SUFFIX ".bm" -#include <tqptrlist.h> +#include <list> #include <tqobject.h> class PilotDatabase; @@ -49,8 +49,7 @@ class PilotDatabase; ****************************************************************************************************/ class docBookmark; -#define bmkList TQPtrList<docBookmark> -#define bmkSortedList TQPtrList<docBookmark> +#define bmkList std::list<docBookmark*> class docBookmark { public: @@ -61,7 +60,7 @@ public: virtual ~ docBookmark() { }; virtual int findMatches(TQString, bmkList &fBookmarks) { FUNCTIONSETUP; - fBookmarks.append(new docBookmark(*this)); + fBookmarks.push_back(new docBookmark(*this)); return 1; }; @@ -140,16 +139,24 @@ public: bool convertPDBtoTXT(); int setBookmarks(bmkList bookmarks) { + for (docBookmark *bmk : fBookmarks) + { + delete bmk; + } fBookmarks = bookmarks; - return fBookmarks.count(); + return fBookmarks.size(); }; int clearBookmarks() { + for (docBookmark *bmk : fBookmarks) + { + delete bmk; + } fBookmarks.clear(); - return fBookmarks.count(); + return fBookmarks.size(); }; - int addBookmark(docBookmark*bookmark) { - fBookmarks.append(bookmark); - return fBookmarks.count(); + int addBookmark(docBookmark *bookmark) { + fBookmarks.push_back(bookmark); + return fBookmarks.size(); }; int findBmkEndtags(TQString &, bmkList&); |