diff options
author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2016-11-20 05:27:10 +0100 |
---|---|---|
committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2016-11-20 05:54:44 +0100 |
commit | 19675a1a4899f68a4e7afbd45cebc63b544650e4 (patch) | |
tree | 22815deaea7a791cd86ea276fe1b20de3c558512 /src/goto.h | |
parent | 255c8085c1132ce79db82fc620a76bab5f8709de (diff) | |
download | sciteco-19675a1a4899f68a4e7afbd45cebc63b544650e4.tar.gz |
optimized RBTree: avoid unnecessary virtual RBTree and RBEntry implementation classes
* whenever the implementation class was not exactly RBEntryType,
it had to have a virtual destructor since RBTree cared about
cleanup and had to delete its members.
* Since it does not allocate them, it is consistent to remove RBTree::clear().
The destructor now only checks that subclasses have cleaned up.
Implementing cleanup in the subclasses is trivial.
* Consequently, RBEntryString no longer has to be virtual.
HelpIndex and GotoTables are completely non-virtual now
which saves memory (and a bit of cleanup speed).
For QRegister, not much changes, though.
Diffstat (limited to 'src/goto.h')
-rw-r--r-- | src/goto.h | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -77,6 +77,11 @@ class GotoTable : private RBTreeString { public: GotoTable(bool _undo = true) : must_undo(_undo) {} + ~GotoTable() + { + clear(); + } + gint remove(const gchar *name); gint find(const gchar *name); @@ -91,7 +96,10 @@ public: inline void clear(void) { - RBTreeString::clear(); + Label *cur; + + while ((cur = (Label *)min())) + delete (Label *)RBTreeString::remove(cur); } inline gchar * |