X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FImage.h;h=b21535bcf547704fc5cc67b13912cf222305e1bf;hb=1b129560d033d6c560bb99e5e8465a3b075623cd;hp=249f2672c4b13f499b281fd4ecb1e0b5aa77d1ef;hpb=dfc5f034581f5a26cba5c4811500438f89f0634a;p=chaz%2Fopenbox

diff --git a/src/Image.h b/src/Image.h
index 249f2672..b21535bc 100644
--- a/src/Image.h
+++ b/src/Image.h
@@ -114,7 +114,7 @@ public:
 
 class BImage {
 private:
-  BImageControl *control;
+  BImageControl &control;
 
 #ifdef    INTERLACE
   Bool interlaced;
@@ -148,7 +148,7 @@ protected:
 
 
 public:
-  BImage(BImageControl *, unsigned int, unsigned int);
+  BImage(BImageControl &, unsigned int, unsigned int);
   ~BImage(void);
 
   Pixmap render(BTexture *);
@@ -160,8 +160,8 @@ public:
 class BImageControl : public TimeoutHandler {
 private:
   Bool dither;
-  BaseDisplay *basedisplay;
-  ScreenInfo *screeninfo;
+  BaseDisplay &basedisplay;
+  ScreenInfo &screeninfo;
 #ifdef    TIMEDCACHE
   BTimer *timer;
 #endif // TIMEDCACHE
@@ -195,19 +195,19 @@ protected:
 
 
 public:
-  BImageControl(BaseDisplay *, ScreenInfo *, Bool = False, int = 4,
+  BImageControl(BaseDisplay &, ScreenInfo &, Bool = False, int = 4,
                 unsigned long = 300000l, unsigned long = 200l);
   virtual ~BImageControl(void);
 
-  inline BaseDisplay *getBaseDisplay(void) { return basedisplay; }
+  inline BaseDisplay &getBaseDisplay(void) { return basedisplay; }
 
   inline const Bool &doDither(void) { return dither; }
 
-  inline ScreenInfo *getScreenInfo(void) { return screeninfo; }
+  inline ScreenInfo &getScreenInfo(void) { return screeninfo; }
 
   inline const Window &getDrawable(void) const { return window; }
 
-  inline Visual *getVisual(void) { return screeninfo->getVisual(); }
+  inline Visual *getVisual(void) { return screeninfo.getVisual(); }
 
   inline const int &getBitsPerPixel(void) const { return bits_per_pixel; }
   inline const int &getDepth(void) const { return screen_depth; }
@@ -230,8 +230,8 @@ public:
                           unsigned int **, unsigned int **);
   void setDither(Bool d) { dither = d; }
   void setColorsPerChannel(int);
-  void parseTexture(BTexture *, char *);
-  void parseColor(BColor *, char * = 0);
+  void parseTexture(BTexture *, const char *);
+  void parseColor(BColor *, const char * = 0);
 
   virtual void timeout(void);
 };