~mterry/qtmir/warn-on-xapp

Viewing changes to src/modules/Unity/Application/ubuntukeyboardinfo.cpp

Committer: Gerry Boland
Date: 2014-07-01 13:38:06 UTC
mto: This revision was merged to the branch mainline in revision 158.
Revision ID: gerry.boland@canonical.com-20140701133806-lwfnplkijthydzj4

Update QML plugin: rename to Unity.Application, merge latest unity-mir changes, add tests (not passing yet) and use category logging

files added:
src/modules/Unity/Application/applicationcontroller.h

src/modules/Unity/Application/proc_info.cpp

src/modules/Unity/Application/proc_info.h

src/modules/Unity/Application/processcontroller.cpp

src/modules/Unity/Application/processcontroller.h

src/modules/Unity/Application/upstart

src/modules/Unity/Application/upstart/applicationcontroller.cpp

src/modules/Unity/Application/upstart/applicationcontroller.h

tests

tests/modules

tests/modules/ApplicationManager

tests/modules/ApplicationManager/ApplicationManager.pro

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/TaskController

tests/modules/TaskController/TaskController.pro

tests/modules/TaskController/taskcontroller_test.cpp

tests/modules/common

tests/modules/common/common.pri

tests/modules/common/mock_application_controller.h

tests/modules/common/mock_desktop_file_reader.h

tests/modules/common/mock_focus_controller.h

tests/modules/common/mock_oom_controller.h

tests/modules/common/mock_proc_info.h

tests/modules/common/mock_process_controller.h

tests/modules/common/mock_session.h

tests/modules/modules.pro

tests/tests.pro

files removed:
src/platforms/common

src/platforms/common/logging.h

files renamed:
src/platforms/common/ubuntutheme.cpp => src/platforms/mirserver/ubuntutheme.cpp

src/platforms/common/ubuntutheme.h => src/platforms/mirserver/ubuntutheme.h

files modified:
qtmir.pro

src/modules/Unity/Application/Application.pro

src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application.h

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/applicationscreenshotprovider.cpp

src/modules/Unity/Application/applicationscreenshotprovider.h

src/modules/Unity/Application/dbuswindowstack.cpp

src/modules/Unity/Application/dbuswindowstack.h

src/modules/Unity/Application/desktopfilereader.cpp

src/modules/Unity/Application/desktopfilereader.h

src/modules/Unity/Application/mirbuffersgtexture.cpp

src/modules/Unity/Application/mirsurfaceitem.cpp

src/modules/Unity/Application/mirsurfaceitem.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/modules/Unity/Application/plugin.cpp

src/modules/Unity/Application/taskcontroller.cpp

src/modules/Unity/Application/taskcontroller.h

src/modules/Unity/Application/ubuntukeyboardinfo.cpp

src/modules/Unity/Application/ubuntukeyboardinfo.h

src/modules/Unity/Application/windowscreenshotprovider.cpp

src/modules/Unity/Application/windowscreenshotprovider.h

src/platforms/mirserver/logging.h

src/platforms/mirserver/mirplacementstrategy.cpp

src/platforms/mirserver/mirserver.pro

src/platforms/mirserver/mirserverconfiguration.cpp

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/mirserverstatuslistener.cpp

src/platforms/mirserver/sessionauthorizer.cpp

src/platforms/mirserver/sessionlistener.cpp

Show diffs side-by-side

added added

removed removed

src/modules/Unity/Application/ubuntukeyboardinfo.cpp

#include <QDir>

namespace qtmir {

namespace {

const int gConnectionAttemptIntervalMs = 5000;

const int gMaxConsecutiveAttempts = 10;

149

151

} else {

150

152

m_socketFilePath = QDir("/tmp").filePath(gServerName);

151

153

}

154

}

152

155

153

}

156

} // namespace qtmir

Older »