From 9a8eee45ea211fce88ec9bf5dba2d7cfe474d8ad Mon Sep 17 00:00:00 2001 From: fluxgen <fluxgen> Date: Wed, 14 Aug 2002 23:01:05 +0000 Subject: from char to std string in getRcFilename and inherit FbAtom --- src/fluxbox.hh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/fluxbox.hh b/src/fluxbox.hh index b6b5beb..e92ce48 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.hh @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: fluxbox.hh,v 1.25 2002/08/14 00:00:16 fluxgen Exp $ +// $Id: fluxbox.hh,v 1.26 2002/08/14 23:01:05 fluxgen Exp $ #ifndef FLUXBOX_HH #define FLUXBOX_HH @@ -41,6 +41,7 @@ #endif // SLIT #include "SignalHandler.hh" +#include "FbAtoms.hh" #include <X11/Xlib.h> #include <X11/Xresource.h> @@ -67,7 +68,8 @@ main class for the window manager. singleton type */ -class Fluxbox : public BaseDisplay, public TimeoutHandler, public FbTk::SignalHandler::EventHandler { +class Fluxbox : public BaseDisplay, public TimeoutHandler, public FbTk::SignalHandler::EventHandler, + public FbAtoms { public: Fluxbox(int argc, char **argv, const char * dpy_name= 0, const char *rc = 0); virtual ~Fluxbox(); @@ -242,8 +244,7 @@ private: //default arguments for titlebar left and right static Fluxbox::Titlebar m_titlebar_left[], m_titlebar_right[]; -protected: - char *getRcFilename(); + std::string getRcFilename(); void getDefaultDataFilename(char *, std::string &); void load_rc(); -- cgit v0.11.2