Merge lp:~mandel/ubuntu-download-manager/group-files into lp:ubuntu-download-manager

[Manuel de la Peña]

Group all system related files under the same dir.

The project is getting very large and is hard to keep track of all the files. I'm starting to group them by function, in this branch all files related to system functions are grouped under the same directory.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:151
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/112/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/1

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-download-manager-ci/112/rebuild

review: Approve (continuous-integration)

[Mike McCracken (mikemc)]

review: Approve

=== modified file 'libubuntudownloadmanager/download.cpp'
--- libubuntudownloadmanager/download.cpp	2013-10-24 11:45:03 +0000
+++ libubuntudownloadmanager/download.cpp	2013-10-24 11:45:03 +0000
@@ -18,7 +18,7 @@
 
 #include <QDebug>
 #include <QStringList>
-#include "logger.h"
+#include "system/logger.h"
 #include "download.h"
 
 /**

=== modified file 'libubuntudownloadmanager/download.h'
--- libubuntudownloadmanager/download.h	2013-10-24 11:45:03 +0000
+++ libubuntudownloadmanager/download.h	2013-10-24 11:45:03 +0000
@@ -24,9 +24,9 @@
 #include <QProcess>
 #include <QSharedPointer>
 #include "app-downloader-lib_global.h"
-#include "process_factory.h"
-#include "request_factory.h"
-#include "system_network_info.h"
+#include "system/process_factory.h"
+#include "system/request_factory.h"
+#include "system/system_network_info.h"
 
 class DownloadPrivate;
 class APPDOWNLOADERLIBSHARED_EXPORT Download : public QObject {

=== modified file 'libubuntudownloadmanager/download_daemon.cpp'
--- libubuntudownloadmanager/download_daemon.cpp	2013-10-17 15:06:29 +0000
+++ libubuntudownloadmanager/download_daemon.cpp	2013-10-24 11:45:03 +0000
@@ -20,8 +20,8 @@
 #include <QDebug>
 #include <QSharedPointer>
 #include <QSslCertificate>
-#include "application.h"
-#include "logger.h"
+#include "system/application.h"
+#include "system/logger.h"
 #include "download_manager.h"
 #include "download_manager_adaptor.h"
 #include "download_daemon.h"

=== modified file 'libubuntudownloadmanager/download_daemon.h'
--- libubuntudownloadmanager/download_daemon.h	2013-09-20 15:54:50 +0000
+++ libubuntudownloadmanager/download_daemon.h	2013-10-24 11:45:03 +0000
@@ -21,11 +21,11 @@
 
 #include <QObject>
 #include <QSharedPointer>
-#include "./app-downloader-lib_global.h"
-#include "./application.h"
-#include "./dbus_connection.h"
-#include "./download_manager.h"
-#include "./timer.h"
+#include "app-downloader-lib_global.h"
+#include "system/application.h"
+#include "system/dbus_connection.h"
+#include "download_manager.h"
+#include "system/timer.h"
 
 class DownloadDaemonPrivate;
 class APPDOWNLOADERLIBSHARED_EXPORT DownloadDaemon : public QObject {

=== modified file 'libubuntudownloadmanager/download_factory.cpp'
--- libubuntudownloadmanager/download_factory.cpp	2013-10-24 11:45:03 +0000
+++ libubuntudownloadmanager/download_factory.cpp	2013-10-24 11:45:03 +0000
@@ -21,7 +21,7 @@
 #include "group_download.h"
 #include "group_download_adaptor.h"
 #include "single_download.h"
-#include "logger.h"
+#include "system/logger.h"
 #include "download_factory.h"
 
 #define OBJECT_PATH_KEY "objectpath"

=== modified file 'libubuntudownloadmanager/download_factory.h'
--- libubuntudownloadmanager/download_factory.h	2013-09-24 12:08:24 +0000
+++ libubuntudownloadmanager/download_factory.h	2013-10-24 11:45:03 +0000
@@ -21,11 +21,11 @@
 
 #include <QObject>
 #include <QSharedPointer>
-#include "./apparmor.h"
-#include "./metatypes.h"
-#include "./system_network_info.h"
-#include "./download.h"
-#include "./uuid_factory.h"
+#include "system/apparmor.h"
+#include "metatypes.h"
+#include "system/system_network_info.h"
+#include "download.h"
+#include "system/uuid_factory.h"
 
 class DownloadFactoryPrivate;
 class DownloadFactory : public QObject {

=== modified file 'libubuntudownloadmanager/download_manager.cpp'
--- libubuntudownloadmanager/download_manager.cpp	2013-10-17 15:06:29 +0000
+++ libubuntudownloadmanager/download_manager.cpp	2013-10-24 11:45:03 +0000
@@ -18,10 +18,10 @@
 
 #include <functional>
 #include <QRegExp>
-#include "apparmor.h"
+#include "system/apparmor.h"
 #include "download_queue.h"
-#include "request_factory.h"
-#include "system_network_info.h"
+#include "system/request_factory.h"
+#include "system/system_network_info.h"
 #include "download_manager.h"
 
 /**

=== modified file 'libubuntudownloadmanager/download_manager.h'
--- libubuntudownloadmanager/download_manager.h	2013-09-20 15:30:24 +0000
+++ libubuntudownloadmanager/download_manager.h	2013-10-24 11:45:03 +0000
@@ -25,13 +25,13 @@
 #include <QtDBus/QDBusContext>
 #include <QSharedPointer>
 #include <QSslCertificate>
-#include "./application.h"
-#include "./dbus_connection.h"
-#include "./download.h"
-#include "./download_queue.h"
-#include "./download_factory.h"
-#include "./metatypes.h"
-#include "./system_network_info.h"
+#include "system/application.h"
+#include "system/dbus_connection.h"
+#include "download.h"
+#include "download_queue.h"
+#include "download_factory.h"
+#include "metatypes.h"
+#include "system/system_network_info.h"
 
 class DownloadManagerPrivate;
 class DownloadManager : public QObject, public QDBusContext {

=== modified file 'libubuntudownloadmanager/download_queue.cpp'
--- libubuntudownloadmanager/download_queue.cpp	2013-10-17 15:06:29 +0000
+++ libubuntudownloadmanager/download_queue.cpp	2013-10-24 11:45:03 +0000
@@ -18,7 +18,7 @@
 
 #include <QDebug>
 #include <QSignalMapper>
-#include "logger.h"
+#include "system/logger.h"
 #include "download_queue.h"
 
 /*

=== modified file 'libubuntudownloadmanager/download_queue.h'
--- libubuntudownloadmanager/download_queue.h	2013-10-09 16:37:23 +0000
+++ libubuntudownloadmanager/download_queue.h	2013-10-24 11:45:03 +0000
@@ -22,9 +22,9 @@
 #include <QList>
 #include <QPair>
 #include <QSharedPointer>
-#include "./download.h"
-#include "./download_adaptor.h"
-#include "./system_network_info.h"
+#include "download.h"
+#include "download_adaptor.h"
+#include "system/system_network_info.h"
 
 class DownloadQueuePrivate;
 class DownloadQueue : public QObject {

=== modified file 'libubuntudownloadmanager/downloads_db.cpp'
--- libubuntudownloadmanager/downloads_db.cpp	2013-10-24 11:45:03 +0000
+++ libubuntudownloadmanager/downloads_db.cpp	2013-10-24 11:45:03 +0000
@@ -26,7 +26,7 @@
 #include <QSqlQuery>
 #include <QSqlError>
 #include "hash_algorithm.h"
-#include "logger.h"
+#include "system/logger.h"
 #include "downloads_db.h"
 
 #define SINGLE_DOWNLOAD_TABLE "CREATE TABLE SingleDownload("\

=== modified file 'libubuntudownloadmanager/downloads_db.h'
--- libubuntudownloadmanager/downloads_db.h	2013-09-04 07:31:03 +0000
+++ libubuntudownloadmanager/downloads_db.h	2013-10-24 11:45:03 +0000
@@ -21,8 +21,8 @@
 
 #include <QSqlDatabase>
 #include <QObject>
-#include "./single_download.h"
-#include "./file_manager.h"
+#include "single_download.h"
+#include "system/file_manager.h"
 
 class DownloadsDbPrivate;
 class DownloadsDb : public QObject {

=== modified file 'libubuntudownloadmanager/group_download.cpp'
--- libubuntudownloadmanager/group_download.cpp	2013-10-24 11:45:03 +0000
+++ libubuntudownloadmanager/group_download.cpp	2013-10-24 11:45:03 +0000
@@ -19,9 +19,9 @@
 #include <QDebug>
 #include "download_adaptor.h"
 #include "hash_algorithm.h"
-#include "logger.h"
+#include "system/logger.h"
 #include "single_download.h"
-#include "uuid_factory.h"
+#include "system/uuid_factory.h"
 #include "group_download.h"
 
 /*

=== modified file 'libubuntudownloadmanager/group_download.h'
--- libubuntudownloadmanager/group_download.h	2013-10-24 11:45:03 +0000
+++ libubuntudownloadmanager/group_download.h	2013-10-24 11:45:03 +0000
@@ -25,7 +25,7 @@
 #include <QSharedPointer>
 #include "download.h"
 #include "download_factory.h"
-#include "file_manager.h"
+#include "system/file_manager.h"
 #include "group_download_struct.h"
 
 class GroupDownloadPrivate;

=== modified file 'libubuntudownloadmanager/libubuntudownloadmanager.pro'
--- libubuntudownloadmanager/libubuntudownloadmanager.pro	2013-10-24 11:45:03 +0000
+++ libubuntudownloadmanager/libubuntudownloadmanager.pro	2013-10-24 11:45:03 +0000
@@ -10,9 +10,6 @@
 DEFINES += DEBUG
 
 SOURCES += \
-    application.cpp \
-    apparmor.cpp \
-    dbus_connection.cpp \
     dbus_proxy.cpp \
     download.cpp \
     download_adaptor.cpp \
@@ -23,27 +20,27 @@
     download_manager_adaptor.cpp \
     download_queue.cpp \
     download_struct.cpp \
-    file_manager.cpp \
     group_download.cpp \
     group_download_struct.cpp \
     group_download_adaptor.cpp \
     hash_algorithm.cpp \
-    logger.cpp \
-    network_reply.cpp \
-    process.cpp \
-    process_factory.cpp \
-    request_factory.cpp \
     single_download.cpp \
-    system_network_info.cpp \
-    timer.cpp \
-    uuid_factory.cpp \
-    uuid_utils.cpp
+    system/uuid_utils.cpp \
+    system/uuid_factory.cpp \
+    system/timer.cpp \
+    system/system_network_info.cpp \
+    system/request_factory.cpp \
+    system/process_factory.cpp \
+    system/process.cpp \
+    system/logger.cpp \
+    system/file_manager.cpp \
+    system/dbus_connection.cpp \
+    system/application.cpp \
+    system/apparmor.cpp \
+    system/network_reply.cpp
 
 HEADERS +=\
     app-downloader-lib_global.h \
-    apparmor.h \
-    application.h \
-    dbus_connection.h \
     dbus_proxy.h \
     download.h \
     download_adaptor.h \
@@ -54,22 +51,25 @@
     download_manager_adaptor.h \
     download_queue.h \
     download_struct.h \
-    file_manager.h \
     group_download.h \
     group_download_struct.h \
     group_download_adaptor.h \
     hash_algorithm.h \
-    logger.h \
     metatypes.h \
-    network_reply.h \
-    process.h \
-    process_factory.h \
-    request_factory.h \
     single_download.h \
-    system_network_info.h \
-    timer.h \
-    uuid_factory.h \
-    uuid_utils.h
+    system/uuid_utils.h \
+    system/uuid_factory.h \
+    system/timer.h \
+    system/system_network_info.h \
+    system/request_factory.h \
+    system/process_factory.h \
+    system/process.h \
+    system/logger.h \
+    system/file_manager.h \
+    system/dbus_connection.h \
+    system/application.h \
+    system/apparmor.h \
+    system/network_reply.h
 
 OTHER_FILES += \
     generate_adaptors.sh \

=== modified file 'libubuntudownloadmanager/single_download.cpp'
--- libubuntudownloadmanager/single_download.cpp	2013-10-24 11:45:03 +0000
+++ libubuntudownloadmanager/single_download.cpp	2013-10-24 11:45:03 +0000
@@ -25,9 +25,9 @@
 #include <QFileInfo>
 #include <QSslError>
 #include "hash_algorithm.h"
-#include "logger.h"
+#include "system/logger.h"
 #include "single_download.h"
-#include "network_reply.h"
+#include "system/network_reply.h"
 
 
 #define DATA_FILE_NAME "data.download"

=== added directory 'libubuntudownloadmanager/system'
=== renamed file 'libubuntudownloadmanager/apparmor.cpp' => 'libubuntudownloadmanager/system/apparmor.cpp'
=== renamed file 'libubuntudownloadmanager/apparmor.h' => 'libubuntudownloadmanager/system/apparmor.h'
=== renamed file 'libubuntudownloadmanager/application.cpp' => 'libubuntudownloadmanager/system/application.cpp'
=== renamed file 'libubuntudownloadmanager/application.h' => 'libubuntudownloadmanager/system/application.h'
=== renamed file 'libubuntudownloadmanager/dbus_connection.cpp' => 'libubuntudownloadmanager/system/dbus_connection.cpp'
=== renamed file 'libubuntudownloadmanager/dbus_connection.h' => 'libubuntudownloadmanager/system/dbus_connection.h'
=== renamed file 'libubuntudownloadmanager/file_manager.cpp' => 'libubuntudownloadmanager/system/file_manager.cpp'
=== renamed file 'libubuntudownloadmanager/file_manager.h' => 'libubuntudownloadmanager/system/file_manager.h'
=== renamed file 'libubuntudownloadmanager/logger.cpp' => 'libubuntudownloadmanager/system/logger.cpp'
=== renamed file 'libubuntudownloadmanager/logger.h' => 'libubuntudownloadmanager/system/logger.h'
=== renamed file 'libubuntudownloadmanager/network_reply.cpp' => 'libubuntudownloadmanager/system/network_reply.cpp'
=== renamed file 'libubuntudownloadmanager/network_reply.h' => 'libubuntudownloadmanager/system/network_reply.h'
=== renamed file 'libubuntudownloadmanager/process.cpp' => 'libubuntudownloadmanager/system/process.cpp'
=== renamed file 'libubuntudownloadmanager/process.h' => 'libubuntudownloadmanager/system/process.h'
=== renamed file 'libubuntudownloadmanager/process_factory.cpp' => 'libubuntudownloadmanager/system/process_factory.cpp'
=== renamed file 'libubuntudownloadmanager/process_factory.h' => 'libubuntudownloadmanager/system/process_factory.h'
=== renamed file 'libubuntudownloadmanager/request_factory.cpp' => 'libubuntudownloadmanager/system/request_factory.cpp'
=== renamed file 'libubuntudownloadmanager/request_factory.h' => 'libubuntudownloadmanager/system/request_factory.h'
=== renamed file 'libubuntudownloadmanager/system_network_info.cpp' => 'libubuntudownloadmanager/system/system_network_info.cpp'
=== renamed file 'libubuntudownloadmanager/system_network_info.h' => 'libubuntudownloadmanager/system/system_network_info.h'
=== renamed file 'libubuntudownloadmanager/timer.cpp' => 'libubuntudownloadmanager/system/timer.cpp'
=== renamed file 'libubuntudownloadmanager/timer.h' => 'libubuntudownloadmanager/system/timer.h'
=== renamed file 'libubuntudownloadmanager/uuid_factory.cpp' => 'libubuntudownloadmanager/system/uuid_factory.cpp'
=== renamed file 'libubuntudownloadmanager/uuid_factory.h' => 'libubuntudownloadmanager/system/uuid_factory.h'
=== renamed file 'libubuntudownloadmanager/uuid_utils.cpp' => 'libubuntudownloadmanager/system/uuid_utils.cpp'
=== renamed file 'libubuntudownloadmanager/uuid_utils.h' => 'libubuntudownloadmanager/system/uuid_utils.h'
=== modified file 'ubuntu-download-manager-tests/fake_apparmor.cpp'
--- ubuntu-download-manager-tests/fake_apparmor.cpp	2013-10-24 11:45:03 +0000
+++ ubuntu-download-manager-tests/fake_apparmor.cpp	2013-10-24 11:45:03 +0000
@@ -16,7 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <uuid_utils.h>
+#include <system/uuid_utils.h>
 #include "fake_apparmor.h"
 
 FakeAppArmor::FakeAppArmor(QSharedPointer<UuidFactory> uuidFactory,

=== modified file 'ubuntu-download-manager-tests/fake_apparmor.h'
--- ubuntu-download-manager-tests/fake_apparmor.h	2013-10-24 11:45:03 +0000
+++ ubuntu-download-manager-tests/fake_apparmor.h	2013-10-24 11:45:03 +0000
@@ -21,8 +21,8 @@
 
 #include <QObject>
 #include <QSharedPointer>
-#include <apparmor.h>
-#include <uuid_factory.h>
+#include <system/apparmor.h>
+#include <system/uuid_factory.h>
 #include "fake.h"
 
 class FakeAppArmor : public AppArmor, public Fake {

=== modified file 'ubuntu-download-manager-tests/fake_application.h'
--- ubuntu-download-manager-tests/fake_application.h	2013-09-17 10:37:08 +0000
+++ ubuntu-download-manager-tests/fake_application.h	2013-10-24 11:45:03 +0000
@@ -20,8 +20,8 @@
 #define FAKE_APPLICATION_H
 
 #include <QObject>
-#include <application.h>
-#include "./fake.h"
+#include <system/application.h>
+#include "fake.h"
 
 class FakeApplication : public Application, public Fake {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/fake_dbus_connection.h'
--- ubuntu-download-manager-tests/fake_dbus_connection.h	2013-07-23 16:41:25 +0000
+++ ubuntu-download-manager-tests/fake_dbus_connection.h	2013-10-24 11:45:03 +0000
@@ -18,8 +18,8 @@
 
 #ifndef FAKE_DBUS_CONNECTION_H
 #define FAKE_DBUS_CONNECTION_H
-#include <dbus_connection.h>
-#include "./fake.h"
+#include <system/dbus_connection.h>
+#include "fake.h"
 
 class RegisterOptionsWrapper : public QObject {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/fake_download.h'
--- ubuntu-download-manager-tests/fake_download.h	2013-10-24 11:45:03 +0000
+++ ubuntu-download-manager-tests/fake_download.h	2013-10-24 11:45:03 +0000
@@ -20,7 +20,7 @@
 #define FAKE_DOWNLOAD_H
 #include <QSharedPointer>
 #include <single_download.h>
-#include <system_network_info.h>
+#include <system/system_network_info.h>
 #include <metatypes.h>
 #include "fake.h"
 

=== modified file 'ubuntu-download-manager-tests/fake_download_manager.h'
--- ubuntu-download-manager-tests/fake_download_manager.h	2013-09-20 15:30:24 +0000
+++ ubuntu-download-manager-tests/fake_download_manager.h	2013-10-24 11:45:03 +0000
@@ -21,7 +21,7 @@
 
 #include <QObject>
 #include <download_manager.h>
-#include "./fake.h"
+#include "fake.h"
 
 
 class FakeDownloadManager : public DownloadManager, public Fake {

=== modified file 'ubuntu-download-manager-tests/fake_download_queue.h'
--- ubuntu-download-manager-tests/fake_download_queue.h	2013-09-09 16:05:49 +0000
+++ ubuntu-download-manager-tests/fake_download_queue.h	2013-10-24 11:45:03 +0000
@@ -20,8 +20,8 @@
 #define FAKE_DOWNLOAD_QUEUE_H
 #include <QSharedPointer>
 #include <download_queue.h>
-#include <system_network_info.h>
-#include "./fake.h"
+#include <system/system_network_info.h>
+#include "fake.h"
 
 class FakeDownloadQueue : public DownloadQueue, public Fake {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/fake_file_manager.h'
--- ubuntu-download-manager-tests/fake_file_manager.h	2013-08-28 14:03:51 +0000
+++ ubuntu-download-manager-tests/fake_file_manager.h	2013-10-24 11:45:03 +0000
@@ -20,8 +20,8 @@
 #define FAKE_FILE_MANAGER_H
 
 #include <QObject>
-#include <file_manager.h>
-#include "./fake.h"
+#include <system/file_manager.h>
+#include "fake.h"
 
 class FakeFileManager : public FileManager, public Fake {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/fake_network_reply.h'
--- ubuntu-download-manager-tests/fake_network_reply.h	2013-09-23 11:17:17 +0000
+++ ubuntu-download-manager-tests/fake_network_reply.h	2013-10-24 11:45:03 +0000
@@ -20,8 +20,8 @@
 #define FAKE_NETWORK_REPLY_H
 
 #include <QObject>
-#include <network_reply.h>
-#include "./fake.h"
+#include <system/network_reply.h>
+#include "fake.h"
 
 
 class SslErrorsListWrapper : public QObject {

=== modified file 'ubuntu-download-manager-tests/fake_process.h'
--- ubuntu-download-manager-tests/fake_process.h	2013-07-26 10:19:18 +0000
+++ ubuntu-download-manager-tests/fake_process.h	2013-10-24 11:45:03 +0000
@@ -20,8 +20,8 @@
 #define FAKE_PROCESS_H
 
 #include <QObject>
-#include <process.h>
-#include "./fake.h"
+#include <system/process.h>
+#include "fake.h"
 
 class OpenModeWrapper: public QObject {
     Q_OBJECT

=== modified file 'ubuntu-download-manager-tests/fake_process_factory.h'
--- ubuntu-download-manager-tests/fake_process_factory.h	2013-07-23 17:50:35 +0000
+++ ubuntu-download-manager-tests/fake_process_factory.h	2013-10-24 11:45:03 +0000
@@ -20,7 +20,7 @@
 #define FAKE_PROCESS_FACTORY_H
 
 #include <QObject>
-#include <process_factory.h>
+#include <system/process_factory.h>
 #include "./fake.h"
 
 class FakeProcessFactory : public ProcessFactory, public Fake {

=== modified file 'ubuntu-download-manager-tests/fake_request_factory.h'
--- ubuntu-download-manager-tests/fake_request_factory.h	2013-09-17 10:37:08 +0000
+++ ubuntu-download-manager-tests/fake_request_factory.h	2013-10-24 11:45:03 +0000
@@ -23,7 +23,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QPair>
-#include <request_factory.h>
+#include <system/request_factory.h>
 #include "./fake.h"
 
 class RequestWrapper : public QObject {

=== modified file 'ubuntu-download-manager-tests/fake_system_network_info.h'
--- ubuntu-download-manager-tests/fake_system_network_info.h	2013-10-11 15:12:55 +0000
+++ ubuntu-download-manager-tests/fake_system_network_info.h	2013-10-24 11:45:03 +0000
@@ -20,7 +20,7 @@
 #define FAKE_SYSTEM_NETWORK_INFO_H
 
 #include <QObject>
-#include <system_network_info.h>
+#include <system/system_network_info.h>
 #include "fake.h"
 
 class NetworkModeWrapper : public QObject {

=== modified file 'ubuntu-download-manager-tests/fake_timer.h'
--- ubuntu-download-manager-tests/fake_timer.h	2013-08-22 20:49:57 +0000
+++ ubuntu-download-manager-tests/fake_timer.h	2013-10-24 11:45:03 +0000
@@ -20,8 +20,8 @@
 #define FAKE_TIMER_H
 
 #include <QObject>
-#include <timer.h>
-#include "./fake.h"
+#include <system/timer.h>
+#include "fake.h"
 
 
 class FakeTimer : public Timer, public Fake {

=== modified file 'ubuntu-download-manager-tests/fake_uuid_factory.h'
--- ubuntu-download-manager-tests/fake_uuid_factory.h	2013-07-23 18:03:00 +0000
+++ ubuntu-download-manager-tests/fake_uuid_factory.h	2013-10-24 11:45:03 +0000
@@ -20,7 +20,7 @@
 #define FAKE_UUID_FACTORY_H
 
 #include <QObject>
-#include <uuid_factory.h>
+#include <system/uuid_factory.h>
 #include "./fake.h"
 
 class FakeUuidFactory : public UuidFactory, public Fake {

=== modified file 'ubuntu-download-manager-tests/test_download.cpp'
--- ubuntu-download-manager-tests/test_download.cpp	2013-10-24 11:45:03 +0000
+++ ubuntu-download-manager-tests/test_download.cpp	2013-10-24 11:45:03 +0000
@@ -21,7 +21,7 @@
 #include <QSignalSpy>
 #include <QSslError>
 #include <hash_algorithm.h>
-#include <uuid_utils.h>
+#include <system/uuid_utils.h>
 #include "fake_network_reply.h"
 #include "fake_process.h"
 #include "test_download.h"

=== modified file 'ubuntu-download-manager-tests/test_download_factory.cpp'
--- ubuntu-download-manager-tests/test_download_factory.cpp	2013-10-24 11:45:03 +0000
+++ ubuntu-download-manager-tests/test_download_factory.cpp	2013-10-24 11:45:03 +0000
@@ -18,7 +18,7 @@
 
 #include <single_download.h>
 #include <hash_algorithm.h>
-#include <uuid_utils.h>
+#include <system/uuid_utils.h>
 #include "test_download_factory.h"
 
 TestDownloadFactory::TestDownloadFactory(QObject *parent)

=== modified file 'ubuntu-download-manager-tests/test_download_manager.cpp'
--- ubuntu-download-manager-tests/test_download_manager.cpp	2013-10-24 11:45:03 +0000
+++ ubuntu-download-manager-tests/test_download_manager.cpp	2013-10-24 11:45:03 +0000
@@ -19,7 +19,7 @@
 #include <QSignalSpy>
 #include <download_factory.h>
 #include <download_struct.h>
-#include <uuid_utils.h>
+#include <system/uuid_utils.h>
 #include "fake_process_factory.h"
 #include "fake_system_network_info.h"
 #include "test_download_manager.h"

=== modified file 'ubuntu-download-manager-tests/test_download_queue.cpp'
--- ubuntu-download-manager-tests/test_download_queue.cpp	2013-10-24 11:45:03 +0000
+++ ubuntu-download-manager-tests/test_download_queue.cpp	2013-10-24 11:45:03 +0000
@@ -18,7 +18,7 @@
 
 #include <QDebug>
 #include <QSignalSpy>
-#include <uuid_utils.h>
+#include <system/uuid_utils.h>
 #include "test_download_queue.h"
 
 TestDownloadQueue::TestDownloadQueue(QObject *parent)

=== modified file 'ubuntu-download-manager-tests/test_downloads_db.cpp'
--- ubuntu-download-manager-tests/test_downloads_db.cpp	2013-10-24 11:45:03 +0000
+++ ubuntu-download-manager-tests/test_downloads_db.cpp	2013-10-24 11:45:03 +0000
@@ -24,7 +24,7 @@
 #include <QSqlError>
 #include <hash_algorithm.h>
 #include <metatypes.h>
-#include <uuid_utils.h>
+#include <system/uuid_utils.h>
 #include "fake_download.h"
 #include "fake_system_network_info.h"
 #include "fake_request_factory.h"

=== modified file 'ubuntu-download-manager-tests/test_group_download.cpp'
--- ubuntu-download-manager-tests/test_group_download.cpp	2013-10-24 11:45:03 +0000
+++ ubuntu-download-manager-tests/test_group_download.cpp	2013-10-24 11:45:03 +0000
@@ -18,7 +18,7 @@
 
 #include <QSignalSpy>
 #include <group_download.h>
-#include <uuid_utils.h>
+#include <system/uuid_utils.h>
 #include "fake_download.h"
 #include "test_group_download.h"
 

=== modified file 'ubuntu-download-manager-tests/test_group_download.h'
--- ubuntu-download-manager-tests/test_group_download.h	2013-10-24 11:45:03 +0000
+++ ubuntu-download-manager-tests/test_group_download.h	2013-10-24 11:45:03 +0000
@@ -20,7 +20,7 @@
 #define TEST_GROUP_DOWNLOAD_H
 
 #include <QObject>
-#include <uuid_factory.h>
+#include <system/uuid_factory.h>
 #include <group_download.h>
 #include "fake_apparmor.h"
 #include "fake_file_manager.h"

=== modified file 'ubuntu-download-manager-tests/test_network_reply.h'
--- ubuntu-download-manager-tests/test_network_reply.h	2013-09-25 10:30:57 +0000
+++ ubuntu-download-manager-tests/test_network_reply.h	2013-10-24 11:45:03 +0000
@@ -20,9 +20,9 @@
 #define TEST_NETWORK_REPLY_H
 
 #include <QObject>
-#include <network_reply.h>
-#include "./base_testcase.h"
-#include "./test_runner.h"
+#include <system/network_reply.h>
+#include "base_testcase.h"
+#include "test_runner.h"
 
 class TestNetworkReply : public BaseTestCase {
     Q_OBJECT