← Back to branch summary

~ken-vandine/keeper/ual_api_change

~ken-vandine/keeper/ual_api_change

« back to all changes in this revision

Viewing changes to src/service/main.cpp

Committer: Tarmac
Author(s): Xavi Garcia Mena
Date: 2016-12-19 09:36:51 UTC
mfrom: (122.1.6 keeper-command-line-charles)
Revision ID: tarmac-20161219093651-lo4o8avupwxh2mz3

Changes to command line client and some bugs fixed.

Approved by unity-api-1-bot, Charles Kerr.

files added:
src/cli/command-line-client-view.cpp

src/cli/command-line-client-view.h

src/cli/command-line-client.cpp

src/cli/command-line-client.h

src/cli/command-line.cpp

src/cli/command-line.h

src/helper/folder-restore.sh.in

src/qdbus-stubs/org.freedesktop.DBus.Properties.xml

files modified:
data/CMakeLists.txt

debian/keeper.install

include/client/client.h

src/cli/CMakeLists.txt

src/cli/main.cpp

src/client/CMakeLists.txt

src/client/client.cpp

src/helper/CMakeLists.txt

src/helper/restore-helper.cpp

src/qdbus-stubs/CMakeLists.txt

src/qdbus-stubs/dbus-types.h

src/service/keeper.cpp

src/service/main.cpp

src/service/task-manager.cpp

src/service/task-manager.h

src/storage-framework/storage_framework_client.cpp

tests/unit/helper/CMakeLists.txt

tests/unit/manifest/CMakeLists.txt

tests/unit/metadata-providers/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

src/service/main.cpp

20

20

21

21

#include "dbus-types.h"

22

22

#include "helper/data-dir-registry.h"

23

#include "helper/helper.h"

23

24

#include "service/backup-choices.h"

24

25

#include "service/restore-choices.h"

25

26

#include "service/keeper.h"

45

46

46

47

QCoreApplication app(argc, argv);

47

48

DBusTypes::registerMetaTypes();

48

// Variant::registerMetaTypes();

49

Helper::registerMetaTypes();

49

50

std::srand(unsigned(std::time(nullptr)));

50

51

51

52

util::UnixSignalHandler handler([]{

Older »