Code style update

This commit is contained in:
Sanel Zukan 2009-02-24 16:27:38 +00:00
parent bbf6870788
commit 901d0a6071
4 changed files with 49 additions and 48 deletions

View File

@ -20,6 +20,7 @@
#include <edelib/StrUtil.h> #include <edelib/StrUtil.h>
#include <edelib/MessageBox.h> #include <edelib/MessageBox.h>
#include <edelib/Nls.h> #include <edelib/Nls.h>
#include <edelib/Run.h>
#include "EvokeService.h" #include "EvokeService.h"
#include "Splash.h" #include "Splash.h"
@ -39,8 +40,8 @@ EDELIB_NS_USING(str_trim)
#define CONFIG_GET_STRVAL(object, section, key, buff) object.get(section, key, buff, sizeof(buff), RES_SYS_ONLY) #define CONFIG_GET_STRVAL(object, section, key, buff) object.get(section, key, buff, sizeof(buff), RES_SYS_ONLY)
#endif #endif
static Atom XA_EDE_EVOKE_SHUTDOWN_ALL; static Atom XA_EDE_EVOKE_SHUTDOWN_ALL;
static Atom XA_EDE_EVOKE_QUIT; static Atom XA_EDE_EVOKE_QUIT;
static int get_int_property_value(Atom at) { static int get_int_property_value(Atom at) {
Atom real; Atom real;

View File

@ -29,32 +29,32 @@ typedef edelib::list<StartupItem*>::iterator StartupItemListIter;
class Xsm; class Xsm;
class EvokeService { class EvokeService {
private: private:
char* lock_name; char* lock_name;
Xsm* xsm; Xsm* xsm;
bool is_running; bool is_running;
StartupItemList startup_items; StartupItemList startup_items;
edelib::String splash_theme; edelib::String splash_theme;
void clear_startup_items(void); void clear_startup_items(void);
public: public:
EvokeService(); EvokeService();
~EvokeService(); ~EvokeService();
static EvokeService* instance(void); static EvokeService* instance(void);
bool setup_lock(const char* name); bool setup_lock(const char* name);
void remove_lock(void); void remove_lock(void);
void start(void) { is_running = true; } void start(void) { is_running = true; }
void stop(void) { is_running = false; } void stop(void) { is_running = false; }
bool running(void) { return is_running; } bool running(void) { return is_running; }
void read_startup(void); void read_startup(void);
void run_startup(bool splash, bool dryrun); void run_startup(bool splash, bool dryrun);
int handle(const XEvent* xev); int handle(const XEvent* xev);
void start_xsettings_manager(void); void start_xsettings_manager(void);
void stop_xsettings_manager(bool serialize); void stop_xsettings_manager(bool serialize);
}; };
#endif #endif

View File

@ -19,29 +19,29 @@
#include "EvokeService.h" #include "EvokeService.h"
class Splash : public Fl_Double_Window { class Splash : public Fl_Double_Window {
private: private:
StartupItemList* slist; StartupItemList* slist;
StartupItemListIter slist_it; StartupItemListIter slist_it;
edelib::String* splash_theme; edelib::String* splash_theme;
unsigned int counter; unsigned int counter;
bool show_splash; bool show_splash;
bool dryrun; bool dryrun;
Fl_Box* msgbox; Fl_Box* msgbox;
Fl_Box** icons; Fl_Box** icons;
public: public:
Splash(StartupItemList& s, edelib::String& theme, bool show_it, bool dr); Splash(StartupItemList& s, edelib::String& theme, bool show_it, bool dr);
~Splash(); ~Splash();
bool next_client(void); bool next_client(void);
bool next_client_nosplash(void); bool next_client_nosplash(void);
void run(void); void run(void);
#if EDEWM_HAVE_NET_SPLASH #if EDEWM_HAVE_NET_SPLASH
virtual void show(void); virtual void show(void);
#endif #endif
}; };

View File

@ -20,17 +20,17 @@
* Also it will write/undo to xrdb (X Resource database). * Also it will write/undo to xrdb (X Resource database).
*/ */
class Xsm : public edelib::XSettingsManager { class Xsm : public edelib::XSettingsManager {
public: public:
Xsm(); Xsm();
~Xsm(); ~Xsm();
bool load_serialized(void); bool load_serialized(void);
bool save_serialized(void); bool save_serialized(void);
/* replace XResource values from one from XSETTINGS */ /* replace XResource values from one from XSETTINGS */
void xresource_replace(void); void xresource_replace(void);
/* undo old XResource values */ /* undo old XResource values */
void xresource_undo(void); void xresource_undo(void);
}; };
#endif #endif