← Back to branch summary

~alan-griffiths/unity-system-compositor/compatibility-with-mir-changes

« back to all changes in this revision

Viewing changes to src/system_compositor.h

  • Committer: Alan Griffiths
  • Date: 2013-11-20 10:46:10 UTC
  • mfrom: (100 unity-system-compositor)
  • mto: This revision was merged to the branch mainline in revision 103.
  • Revision ID: alan@octopull.co.uk-20131120104610-5t1ueb2plxs5knib
merge lp:unity-system-compositor

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/system_compositor.h
29
29
class SystemCompositor : public DMMessageHandler
30
30
{
31
31
public:
32
 
    void run(int argc, char const** argv);
 
32
    void run(int argc, char **argv);
33
33
    void pause();
34
34
    void resume();
35
35
 
42
42
    void set_active_session(std::string client_name);
43
43
    void set_next_session(std::string client_name);
44
44
    void main();
 
45
    void qt_main(int argc, char **argv);
45
46
};
46
47
 
47
48
#endif /* SYSTEM_COMPOSITOR_H_ */