using a Screen reference instead of pointer in Workspace

[chaz/openbox] / src / Image.cc

diff --git a/src/Image.cc b/src/Image.cc
index d42d1d12876c654e1e408ee6425dd0147fbdaf94..401191e34307fd1ec8e98deaca4b42b6067268f8 100644 (file)
--- a/src/Image.cc
+++ b/src/Image.cc
@@ -1774,7 +1774,7 @@ BImageControl::BImageControl(BaseDisplay *dpy, ScreenInfo *scrn, Bool _dither,
   cache_max = cmax;
 #ifdef    TIMEDCACHE
   if (cache_timeout) {
-    timer = new BTimer(basedisplay, this);
+    timer = new BTimer(*basedisplay, *this);
     timer->setTimeout(cache_timeout);
     timer->start();
   } else
@@ -2343,7 +2343,7 @@ unsigned long BImageControl::getSqrt(unsigned int x) {
 }
 
 
-void BImageControl::parseTexture(BTexture *texture, char *t) {
+void BImageControl::parseTexture(BTexture *texture, const char *t) {
   if ((! texture) || (! t)) return;
 
   int t_len = strlen(t) + 1, i;
@@ -2409,7 +2409,7 @@ void BImageControl::parseTexture(BTexture *texture, char *t) {
 }
 
 
-void BImageControl::parseColor(BColor *color, char *c) {
+void BImageControl::parseColor(BColor *color, const char *c) {
   if (! color) return;
 
   if (color->isAllocated()) {