← Back to branch summary

~robertcarr/qtubuntu/mir-with-packaging

« back to all changes in this revision

Viewing changes to src/platforms/ubuntu/ubuntucommon/integration.h

  • Committer: Robert Carr
  • Date: 2013-07-01 19:08:36 UTC
  • mfrom: (147.1.21 mir)
  • Revision ID: robert.carr@canonical.com-20130701190836-ii3f71ujo4kkaacr
Merge qtubuntu/mir

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/platforms/ubuntu/ubuntucommon/integration.h
21
21
#include <ubuntu/application/instance.h>
22
22
#include <ubuntu/application/ui/session.h>
23
23
 
 
24
class QUbuntuInputAdaptorFactory;
24
25
class QUbuntuInput;
25
26
 
26
27
class QUbuntuIntegration : public QUbuntuBaseIntegration {
27
28
 public:
28
 
  QUbuntuIntegration();
 
29
  QUbuntuIntegration(QUbuntuInputAdaptorFactory* input_factory);
29
30
  ~QUbuntuIntegration();
30
31
 
31
32
  // QPlatformIntegration methods.