made bsetroot compile with the new code for references instead of pointers

[chaz/openbox] / src / BaseDisplay.h

diff --git a/src/BaseDisplay.h b/src/BaseDisplay.h
index 2aa82d76c6ab675693355fed29253c79b8f49f5a..8504261ee9aa638bd624d68b5a75f2b716bcfa8b 100644 (file)
--- a/src/BaseDisplay.h
+++ b/src/BaseDisplay.h
@@ -142,7 +142,7 @@ protected:
 
 
 public:
-  BaseDisplay(char *, char * = 0);
+  BaseDisplay(const char *, char * = 0);
   virtual ~BaseDisplay(void);
 
   inline const Atom &getWMChangeStateAtom(void) const
@@ -328,7 +328,7 @@ public:
 
 class ScreenInfo {
 private:
-  BaseDisplay *basedisplay;
+  BaseDisplay &basedisplay;
   Visual *visual;
   Window root_window;
   Colormap colormap;
@@ -338,9 +338,9 @@ private:
 
 
 public:
-  ScreenInfo(BaseDisplay *, int);
+  ScreenInfo(BaseDisplay &, int);
 
-  inline BaseDisplay *getBaseDisplay(void) { return basedisplay; }
+  inline BaseDisplay &getBaseDisplay(void) { return basedisplay; }
 
   inline Visual *getVisual(void) { return visual; }
   inline const Window &getRootWindow(void) const { return root_window; }