projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix broken logic and possible NULL pointer dereference for Bundle XML.
[ardour.git]
/
libs
/
canvas
/
canvas
/
lookup_table.h
diff --git
a/libs/canvas/canvas/lookup_table.h
b/libs/canvas/canvas/lookup_table.h
index 5be33c1bca0d9df555acae60ee52ae7bc87fe87d..29452365cdb2db38bd50617042a3949e07cfba55 100644
(file)
--- a/
libs/canvas/canvas/lookup_table.h
+++ b/
libs/canvas/canvas/lookup_table.h
@@
-31,12
+31,11
@@
class OptimizingLookupTableTest;
namespace ArdourCanvas {
class Item;
namespace ArdourCanvas {
class Item;
-class Group;
class LIBCANVAS_API LookupTable
{
public:
class LIBCANVAS_API LookupTable
{
public:
- LookupTable (
Group
const &);
+ LookupTable (
Item
const &);
virtual ~LookupTable ();
virtual std::vector<Item*> get (Rect const &) = 0;
virtual ~LookupTable ();
virtual std::vector<Item*> get (Rect const &) = 0;
@@
-45,13
+44,13
@@
public:
protected:
protected:
-
Group const & _group
;
+
Item const & _item
;
};
class LIBCANVAS_API DumbLookupTable : public LookupTable
{
public:
};
class LIBCANVAS_API DumbLookupTable : public LookupTable
{
public:
-
DumbLookupTable (Group
const &);
+
DumbLookupTable (Item
const &);
std::vector<Item*> get (Rect const &);
std::vector<Item*> items_at_point (Duple const &) const;
std::vector<Item*> get (Rect const &);
std::vector<Item*> items_at_point (Duple const &) const;
@@
-61,7
+60,7
@@
public:
class LIBCANVAS_API OptimizingLookupTable : public LookupTable
{
public:
class LIBCANVAS_API OptimizingLookupTable : public LookupTable
{
public:
- OptimizingLookupTable (
Group
const &, int);
+ OptimizingLookupTable (
Item
const &, int);
~OptimizingLookupTable ();
std::vector<Item*> get (Rect const &);
std::vector<Item*> items_at_point (Duple const &) const;
~OptimizingLookupTable ();
std::vector<Item*> get (Rect const &);
std::vector<Item*> items_at_point (Duple const &) const;