- void watch_resource(const Resource &, ResourceWatcher &);
- void unwatch_resource(const Resource &, ResourceWatcher &);
+ void observe_resource(const Resource &, ResourceObserver &);
+ void unobserve_resource(const Resource &, ResourceObserver &);
+
+ // Deprecated names
+ void watch_resource(const Resource &r, ResourceObserver &o) { observe_resource(r, o); }
+ void unwatch_resource(const Resource &r, ResourceObserver &o) { unobserve_resource(r, o); }