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

« back to all changes in this revision

Viewing changes to src/modules/Unity/ApplicationManager/application.cpp

  • Committer: Tarmac
  • Author(s): Gerry Boland
  • Date: 2013-08-15 17:42:16 UTC
  • mfrom: (28.2.6 fix-screenshots)
  • Revision ID: tarmac-20130815174216-1n903w48j0o2ni90
Remove unnecessary Application id, use app_id instead. Fix screenshots to remove white padding pixels. Application only focused when it creates its surface.

Approved by Michał Sawicz, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
37
37
    DASSERT(desktopData != NULL);
38
38
    DLOG("Application::Application (this=%p, desktopData=%p, pid=%lld, stage=%d, state=%d",
39
39
         this, desktopData, pid, static_cast<int>(stage), static_cast<int>(state));
40
 
    m_id = qrand();
41
40
}
42
41
 
43
42
Application::~Application()
46
45
    delete m_desktopData;
47
46
}
48
47
 
49
 
int Application::id() const
50
 
{
51
 
    return m_id;
52
 
}
53
 
 
54
48
QString Application::desktopFile() const
55
49
{
56
50
    return m_desktopData->file();