~gerboland/unity-mir/enable-OSK-surface

« back to all changes in this revision

Viewing changes to src/unity-mir/surfacebuilder.h

  • Committer: Albert Astals
  • Date: 2013-08-12 11:19:52 UTC
  • mfrom: (31.1.1 fix-FTBFS2)
  • Revision ID: albert.astals@canonical.com-20130812111952-fs0q8s9hcwp50oee
Fix FTBFS due to Mir commit 951

Show diffs side-by-side

added added

removed removed

Lines of Context:
19
19
 
20
20
#include <QObject>
21
21
 
22
 
#include "mirserver/mir/shell/surface_builder.h"
 
22
#include "mir/shell/surface_builder.h"
23
23
 
24
24
namespace mir { namespace surfaces { class SurfaceStackModel; }}
25
25
 
31
31
    explicit SurfaceBuilder(const std::shared_ptr<mir::surfaces::SurfaceStackModel>& surfaceStack, QObject *parent = 0);
32
32
    ~SurfaceBuilder();
33
33
 
34
 
    virtual std::weak_ptr<mir::surfaces::Surface> create_surface(const mir::shell::SurfaceCreationParameters &params) override;
 
34
    virtual std::weak_ptr<mir::surfaces::Surface> create_surface(
 
35
            mir::shell::Session* session,
 
36
            const mir::shell::SurfaceCreationParameters &params) override;
 
37
 
35
38
    virtual void destroy_surface(const std::weak_ptr<mir::surfaces::Surface>& surface) override;
36
39
 
37
40
private: