[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: Re: [nepomuk-core/storage/mergeBackupService] services: Move all the backupsync code into the storag
From: Sebastian Trüg <trueg () kde ! org>
Date: 2012-01-23 18:11:30
Message-ID: 4F1DA2D2.4040105 () kde ! org
[Download RAW message or body]
can we decouple the ui?
On 01/23/2012 11:43 AM, Vishesh Handa wrote:
> Git commit 149a8fcb7faef6e71261299b1b56eb333a4e6622 by Vishesh Handa.
> Committed on 22/01/2012 at 22:47.
> Pushed by vhanda into branch 'storage/mergeBackupService'.
>
> Move all the backupsync code into the storage service
>
> It's a lot of code, then again a large part of it just needs to
> be thrown away.
>
> M +0 -1 services/CMakeLists.txt
> M +1 -0 services/storage/CMakeLists.txt
> R +0 -0 services/storage/backupsync/CMakeLists.txt [from: \
> services/backupsync/CMakeLists.txt - 100% similarity] R +5 -5 \
> services/storage/backupsync/gui/CMakeLists.txt [from: \
> services/backupsync/gui/CMakeLists.txt - 079% similarity] R +0 -0 \
> services/storage/backupsync/gui/Messages.sh [from: \
> services/backupsync/gui/Messages.sh - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/backuppage.ui [from: \
> services/backupsync/gui/backuppage.ui - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/backupsettingspage.ui [from: \
> services/backupsync/gui/backupsettingspage.ui - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/backupwizard.cpp [from: \
> services/backupsync/gui/backupwizard.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/backupwizard.h [from: \
> services/backupsync/gui/backupwizard.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/backupwizardpages.cpp [from: \
> services/backupsync/gui/backupwizardpages.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/backupwizardpages.h [from: \
> services/backupsync/gui/backupwizardpages.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/changelogmerger.cpp [from: \
> services/backupsync/gui/changelogmerger.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/changelogmerger.h [from: \
> services/backupsync/gui/changelogmerger.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/errorpage.ui [from: \
> services/backupsync/gui/errorpage.ui - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/filesystemtree.cpp [from: \
> services/backupsync/gui/filesystemtree.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/filesystemtree.h [from: \
> services/backupsync/gui/filesystemtree.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/guitest/CMakeLists.txt [from: \
> services/backupsync/gui/guitest/CMakeLists.txt - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/guitest/main.cpp [from: \
> services/backupsync/gui/guitest/main.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/guitest/testwidget.cpp [from: \
> services/backupsync/gui/guitest/testwidget.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/guitest/testwidget.h [from: \
> services/backupsync/gui/guitest/testwidget.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/identifier.cpp [from: \
> services/backupsync/gui/identifier.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/identifier.h [from: \
> services/backupsync/gui/identifier.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/identifiermodel.cpp [from: \
> services/backupsync/gui/identifiermodel.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/identifiermodel.h [from: \
> services/backupsync/gui/identifiermodel.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/identifiermodeltree.cpp [from: \
> services/backupsync/gui/identifiermodeltree.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/identifiermodeltree.h [from: \
> services/backupsync/gui/identifiermodeltree.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/identifierwidget.cpp [from: \
> services/backupsync/gui/identifierwidget.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/identifierwidget.h [from: \
> services/backupsync/gui/identifierwidget.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/intropage.ui [from: \
> services/backupsync/gui/intropage.ui - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/main.cpp [from: services/backupsync/gui/main.cpp - \
> 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/mergeconflictdelegate.cpp [from: \
> services/backupsync/gui/mergeconflictdelegate.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/mergeconflictdelegate.h [from: \
> services/backupsync/gui/mergeconflictdelegate.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/mergeconflictwidget.ui [from: \
> services/backupsync/gui/mergeconflictwidget.ui - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/merger.cpp [from: \
> services/backupsync/gui/merger.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/merger.h [from: services/backupsync/gui/merger.h - \
> 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/nepomukbackup.desktop [from: \
> services/backupsync/gui/nepomukbackup.desktop - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/resourcelog.cpp [from: \
> services/backupsync/gui/resourcelog.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/resourcelog.h [from: \
> services/backupsync/gui/resourcelog.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/restorefinal.ui [from: \
> services/backupsync/gui/restorefinal.ui - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/restoreselection.ui [from: \
> services/backupsync/gui/restoreselection.ui - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/syncfileidentifier.cpp [from: \
> services/backupsync/gui/syncfileidentifier.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/syncfileidentifier.h [from: \
> services/backupsync/gui/syncfileidentifier.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/test/CMakeLists.txt [from: \
> services/backupsync/gui/test/CMakeLists.txt - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/test/filesystemtreetest.cpp [from: \
> services/backupsync/gui/test/filesystemtreetest.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/gui/test/filesystemtreetest.h [from: \
> services/backupsync/gui/test/filesystemtreetest.h - 100% similarity] R +1 -1 \
> services/storage/backupsync/lib/CMakeLists.txt [from: \
> services/backupsync/lib/CMakeLists.txt - 094% similarity] R +0 -0 \
> services/storage/backupsync/lib/identificationsetgenerator.cpp [from: \
> services/backupsync/lib/identificationsetgenerator.cpp - 100% similarity] R +0 \
> -0 services/storage/backupsync/lib/identificationsetgenerator_p.h [from: \
> services/backupsync/lib/identificationsetgenerator_p.h - 100% similarity] R +0 \
> -0 services/storage/backupsync/lib/nepomuksync_export.h [from: \
> services/backupsync/lib/nepomuksync_export.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/lib/resourceidentifier.cpp [from: \
> services/backupsync/lib/resourceidentifier.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/lib/resourceidentifier.h [from: \
> services/backupsync/lib/resourceidentifier.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/lib/resourceidentifier_p.h [from: \
> services/backupsync/lib/resourceidentifier_p.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/lib/resourcemerger.cpp [from: \
> services/backupsync/lib/resourcemerger.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/lib/resourcemerger.h [from: \
> services/backupsync/lib/resourcemerger.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/lib/syncresource.cpp [from: \
> services/backupsync/lib/syncresource.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/lib/syncresource.h [from: \
> services/backupsync/lib/syncresource.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/lib/test/CMakeLists.txt [from: \
> services/backupsync/lib/test/CMakeLists.txt - 100% similarity] R +0 -0 \
> services/storage/backupsync/lib/test/nepomuksynctests.cpp [from: \
> services/backupsync/lib/test/nepomuksynctests.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/lib/test/nepomuksynctests.h [from: \
> services/backupsync/lib/test/nepomuksynctests.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/lib/test/testbase.cpp [from: \
> services/backupsync/lib/test/testbase.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/lib/test/testbase.h [from: \
> services/backupsync/lib/test/testbase.h - 100% similarity] R +3 -3 \
> services/storage/backupsync/service/CMakeLists.txt [from: \
> services/backupsync/service/CMakeLists.txt - 086% similarity] R +0 -0 \
> services/storage/backupsync/service/backupgenerationjob.cpp [from: \
> services/backupsync/service/backupgenerationjob.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/backupgenerationjob.h [from: \
> services/backupsync/service/backupgenerationjob.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/backupmanager.cpp [from: \
> services/backupsync/service/backupmanager.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/backupmanager.h [from: \
> services/backupsync/service/backupmanager.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/backupsyncservice.cpp [from: \
> services/backupsync/service/backupsyncservice.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/backupsyncservice.h [from: \
> services/backupsync/service/backupsyncservice.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/changelog.cpp [from: \
> services/backupsync/service/changelog.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/changelog.h [from: \
> services/backupsync/service/changelog.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/changelogrecord.cpp [from: \
> services/backupsync/service/changelogrecord.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/changelogrecord.h [from: \
> services/backupsync/service/changelogrecord.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/dbusoperators.cpp [from: \
> services/backupsync/service/dbusoperators.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/dbusoperators.h [from: \
> services/backupsync/service/dbusoperators.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/diffgenerator.cpp [from: \
> services/backupsync/service/diffgenerator.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/diffgenerator.h [from: \
> services/backupsync/service/diffgenerator.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/identificationset.cpp [from: \
> services/backupsync/service/identificationset.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/identificationset.h [from: \
> services/backupsync/service/identificationset.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/logstorage.cpp [from: \
> services/backupsync/service/logstorage.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/logstorage.h [from: \
> services/backupsync/service/logstorage.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/nepomukbackupsync.desktop [from: \
> services/backupsync/service/nepomukbackupsync.desktop - 100% similarity] R +0 \
> -0 services/storage/backupsync/service/syncfile.cpp [from: \
> services/backupsync/service/syncfile.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/syncfile.h [from: \
> services/backupsync/service/syncfile.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/syncmanager.cpp [from: \
> services/backupsync/service/syncmanager.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/syncmanager.h [from: \
> services/backupsync/service/syncmanager.h - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/tools.cpp [from: \
> services/backupsync/service/tools.cpp - 100% similarity] R +0 -0 \
> services/storage/backupsync/service/tools.h [from: \
> services/backupsync/service/tools.h - 100% similarity] M +1 -1 \
> services/storage/datamanagementmodel.cpp M +1 -1 \
> services/storage/resourceidentifier.cpp M +1 -1 \
> services/storage/resourceidentifier.h
> http://commits.kde.org/nepomuk-core/149a8fcb7faef6e71261299b1b56eb333a4e6622
>
> diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
> index 69f10dd..b9a17e1 100644
> --- a/services/CMakeLists.txt
> +++ b/services/CMakeLists.txt
> @@ -2,4 +2,3 @@ add_subdirectory(storage)
> add_subdirectory(filewatch)
> add_subdirectory(queryservice)
> add_subdirectory(fileindexer)
> -add_subdirectory(backupsync)
> diff --git a/services/storage/CMakeLists.txt b/services/storage/CMakeLists.txt
> index 9d52fc5..0742612 100644
> --- a/services/storage/CMakeLists.txt
> +++ b/services/storage/CMakeLists.txt
> @@ -66,5 +66,6 @@ install(
> DESTINATION ${PLUGIN_INSTALL_DIR})
> # -----------------------------
>
> +add_subdirectory(backupsync)
> add_subdirectory(rcgen)
> add_subdirectory(test)
> diff --git a/services/backupsync/CMakeLists.txt \
> b/services/storage/backupsync/CMakeLists.txt similarity index 100%
> rename from services/backupsync/CMakeLists.txt
> rename to services/storage/backupsync/CMakeLists.txt
> diff --git a/services/backupsync/gui/CMakeLists.txt \
> b/services/storage/backupsync/gui/CMakeLists.txt similarity index 79%
> rename from services/backupsync/gui/CMakeLists.txt
> rename to services/storage/backupsync/gui/CMakeLists.txt
> index 3fb277e..b425e7e 100644
> --- a/services/backupsync/gui/CMakeLists.txt
> +++ b/services/storage/backupsync/gui/CMakeLists.txt
> @@ -39,17 +39,17 @@ set( NepomukBackup_GUI_SRCS
> #----- DBus interfaces --------
>
> set_source_files_properties(
> - ../../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml
> + ../../../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml
> PROPERTIES INCLUDE "QtCore/QList")
> set_source_files_properties(
> - ../../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml
> + ../../../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml
> PROPERTIES INCLUDE "QtCore/QString")
>
> qt4_add_dbus_interface( NepomukBackup_GUI_SRCS
> - \
> ../../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml + \
> ../../../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml \
> syncmanagerinterface ) qt4_add_dbus_interface( NepomukBackup_GUI_SRCS
> - \
> ../../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml + \
> ../../../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml \
> backupmanagerinterface )
> #------UI Interface files ------
> @@ -66,7 +66,7 @@ kde4_add_ui_files( NepomukBackup_GUI_SRCS
>
> #--------- Ontologies -------#
> soprano_add_ontology(NepomukBackup_GUI_SRCS
> - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ontologies/nrio.trig
> + ${CMAKE_CURRENT_SOURCE_DIR}/../../../../ontologies/nrio.trig
> "NRIO"
> "Nepomuk::Vocabulary"
> "trig")
> diff --git a/services/backupsync/gui/Messages.sh \
> b/services/storage/backupsync/gui/Messages.sh similarity index 100%
> rename from services/backupsync/gui/Messages.sh
> rename to services/storage/backupsync/gui/Messages.sh
> diff --git a/services/backupsync/gui/backuppage.ui \
> b/services/storage/backupsync/gui/backuppage.ui similarity index 100%
> rename from services/backupsync/gui/backuppage.ui
> rename to services/storage/backupsync/gui/backuppage.ui
> diff --git a/services/backupsync/gui/backupsettingspage.ui \
> b/services/storage/backupsync/gui/backupsettingspage.ui similarity index 100%
> rename from services/backupsync/gui/backupsettingspage.ui
> rename to services/storage/backupsync/gui/backupsettingspage.ui
> diff --git a/services/backupsync/gui/backupwizard.cpp \
> b/services/storage/backupsync/gui/backupwizard.cpp similarity index 100%
> rename from services/backupsync/gui/backupwizard.cpp
> rename to services/storage/backupsync/gui/backupwizard.cpp
> diff --git a/services/backupsync/gui/backupwizard.h \
> b/services/storage/backupsync/gui/backupwizard.h similarity index 100%
> rename from services/backupsync/gui/backupwizard.h
> rename to services/storage/backupsync/gui/backupwizard.h
> diff --git a/services/backupsync/gui/backupwizardpages.cpp \
> b/services/storage/backupsync/gui/backupwizardpages.cpp similarity index 100%
> rename from services/backupsync/gui/backupwizardpages.cpp
> rename to services/storage/backupsync/gui/backupwizardpages.cpp
> diff --git a/services/backupsync/gui/backupwizardpages.h \
> b/services/storage/backupsync/gui/backupwizardpages.h similarity index 100%
> rename from services/backupsync/gui/backupwizardpages.h
> rename to services/storage/backupsync/gui/backupwizardpages.h
> diff --git a/services/backupsync/gui/changelogmerger.cpp \
> b/services/storage/backupsync/gui/changelogmerger.cpp similarity index 100%
> rename from services/backupsync/gui/changelogmerger.cpp
> rename to services/storage/backupsync/gui/changelogmerger.cpp
> diff --git a/services/backupsync/gui/changelogmerger.h \
> b/services/storage/backupsync/gui/changelogmerger.h similarity index 100%
> rename from services/backupsync/gui/changelogmerger.h
> rename to services/storage/backupsync/gui/changelogmerger.h
> diff --git a/services/backupsync/gui/errorpage.ui \
> b/services/storage/backupsync/gui/errorpage.ui similarity index 100%
> rename from services/backupsync/gui/errorpage.ui
> rename to services/storage/backupsync/gui/errorpage.ui
> diff --git a/services/backupsync/gui/filesystemtree.cpp \
> b/services/storage/backupsync/gui/filesystemtree.cpp similarity index 100%
> rename from services/backupsync/gui/filesystemtree.cpp
> rename to services/storage/backupsync/gui/filesystemtree.cpp
> diff --git a/services/backupsync/gui/filesystemtree.h \
> b/services/storage/backupsync/gui/filesystemtree.h similarity index 100%
> rename from services/backupsync/gui/filesystemtree.h
> rename to services/storage/backupsync/gui/filesystemtree.h
> diff --git a/services/backupsync/gui/guitest/CMakeLists.txt \
> b/services/storage/backupsync/gui/guitest/CMakeLists.txt similarity index 100%
> rename from services/backupsync/gui/guitest/CMakeLists.txt
> rename to services/storage/backupsync/gui/guitest/CMakeLists.txt
> diff --git a/services/backupsync/gui/guitest/main.cpp \
> b/services/storage/backupsync/gui/guitest/main.cpp similarity index 100%
> rename from services/backupsync/gui/guitest/main.cpp
> rename to services/storage/backupsync/gui/guitest/main.cpp
> diff --git a/services/backupsync/gui/guitest/testwidget.cpp \
> b/services/storage/backupsync/gui/guitest/testwidget.cpp similarity index 100%
> rename from services/backupsync/gui/guitest/testwidget.cpp
> rename to services/storage/backupsync/gui/guitest/testwidget.cpp
> diff --git a/services/backupsync/gui/guitest/testwidget.h \
> b/services/storage/backupsync/gui/guitest/testwidget.h similarity index 100%
> rename from services/backupsync/gui/guitest/testwidget.h
> rename to services/storage/backupsync/gui/guitest/testwidget.h
> diff --git a/services/backupsync/gui/identifier.cpp \
> b/services/storage/backupsync/gui/identifier.cpp similarity index 100%
> rename from services/backupsync/gui/identifier.cpp
> rename to services/storage/backupsync/gui/identifier.cpp
> diff --git a/services/backupsync/gui/identifier.h \
> b/services/storage/backupsync/gui/identifier.h similarity index 100%
> rename from services/backupsync/gui/identifier.h
> rename to services/storage/backupsync/gui/identifier.h
> diff --git a/services/backupsync/gui/identifiermodel.cpp \
> b/services/storage/backupsync/gui/identifiermodel.cpp similarity index 100%
> rename from services/backupsync/gui/identifiermodel.cpp
> rename to services/storage/backupsync/gui/identifiermodel.cpp
> diff --git a/services/backupsync/gui/identifiermodel.h \
> b/services/storage/backupsync/gui/identifiermodel.h similarity index 100%
> rename from services/backupsync/gui/identifiermodel.h
> rename to services/storage/backupsync/gui/identifiermodel.h
> diff --git a/services/backupsync/gui/identifiermodeltree.cpp \
> b/services/storage/backupsync/gui/identifiermodeltree.cpp similarity index 100%
> rename from services/backupsync/gui/identifiermodeltree.cpp
> rename to services/storage/backupsync/gui/identifiermodeltree.cpp
> diff --git a/services/backupsync/gui/identifiermodeltree.h \
> b/services/storage/backupsync/gui/identifiermodeltree.h similarity index 100%
> rename from services/backupsync/gui/identifiermodeltree.h
> rename to services/storage/backupsync/gui/identifiermodeltree.h
> diff --git a/services/backupsync/gui/identifierwidget.cpp \
> b/services/storage/backupsync/gui/identifierwidget.cpp similarity index 100%
> rename from services/backupsync/gui/identifierwidget.cpp
> rename to services/storage/backupsync/gui/identifierwidget.cpp
> diff --git a/services/backupsync/gui/identifierwidget.h \
> b/services/storage/backupsync/gui/identifierwidget.h similarity index 100%
> rename from services/backupsync/gui/identifierwidget.h
> rename to services/storage/backupsync/gui/identifierwidget.h
> diff --git a/services/backupsync/gui/intropage.ui \
> b/services/storage/backupsync/gui/intropage.ui similarity index 100%
> rename from services/backupsync/gui/intropage.ui
> rename to services/storage/backupsync/gui/intropage.ui
> diff --git a/services/backupsync/gui/main.cpp \
> b/services/storage/backupsync/gui/main.cpp similarity index 100%
> rename from services/backupsync/gui/main.cpp
> rename to services/storage/backupsync/gui/main.cpp
> diff --git a/services/backupsync/gui/mergeconflictdelegate.cpp \
> b/services/storage/backupsync/gui/mergeconflictdelegate.cpp similarity index 100%
> rename from services/backupsync/gui/mergeconflictdelegate.cpp
> rename to services/storage/backupsync/gui/mergeconflictdelegate.cpp
> diff --git a/services/backupsync/gui/mergeconflictdelegate.h \
> b/services/storage/backupsync/gui/mergeconflictdelegate.h similarity index 100%
> rename from services/backupsync/gui/mergeconflictdelegate.h
> rename to services/storage/backupsync/gui/mergeconflictdelegate.h
> diff --git a/services/backupsync/gui/mergeconflictwidget.ui \
> b/services/storage/backupsync/gui/mergeconflictwidget.ui similarity index 100%
> rename from services/backupsync/gui/mergeconflictwidget.ui
> rename to services/storage/backupsync/gui/mergeconflictwidget.ui
> diff --git a/services/backupsync/gui/merger.cpp \
> b/services/storage/backupsync/gui/merger.cpp similarity index 100%
> rename from services/backupsync/gui/merger.cpp
> rename to services/storage/backupsync/gui/merger.cpp
> diff --git a/services/backupsync/gui/merger.h \
> b/services/storage/backupsync/gui/merger.h similarity index 100%
> rename from services/backupsync/gui/merger.h
> rename to services/storage/backupsync/gui/merger.h
> diff --git a/services/backupsync/gui/nepomukbackup.desktop \
> b/services/storage/backupsync/gui/nepomukbackup.desktop similarity index 100%
> rename from services/backupsync/gui/nepomukbackup.desktop
> rename to services/storage/backupsync/gui/nepomukbackup.desktop
> diff --git a/services/backupsync/gui/resourcelog.cpp \
> b/services/storage/backupsync/gui/resourcelog.cpp similarity index 100%
> rename from services/backupsync/gui/resourcelog.cpp
> rename to services/storage/backupsync/gui/resourcelog.cpp
> diff --git a/services/backupsync/gui/resourcelog.h \
> b/services/storage/backupsync/gui/resourcelog.h similarity index 100%
> rename from services/backupsync/gui/resourcelog.h
> rename to services/storage/backupsync/gui/resourcelog.h
> diff --git a/services/backupsync/gui/restorefinal.ui \
> b/services/storage/backupsync/gui/restorefinal.ui similarity index 100%
> rename from services/backupsync/gui/restorefinal.ui
> rename to services/storage/backupsync/gui/restorefinal.ui
> diff --git a/services/backupsync/gui/restoreselection.ui \
> b/services/storage/backupsync/gui/restoreselection.ui similarity index 100%
> rename from services/backupsync/gui/restoreselection.ui
> rename to services/storage/backupsync/gui/restoreselection.ui
> diff --git a/services/backupsync/gui/syncfileidentifier.cpp \
> b/services/storage/backupsync/gui/syncfileidentifier.cpp similarity index 100%
> rename from services/backupsync/gui/syncfileidentifier.cpp
> rename to services/storage/backupsync/gui/syncfileidentifier.cpp
> diff --git a/services/backupsync/gui/syncfileidentifier.h \
> b/services/storage/backupsync/gui/syncfileidentifier.h similarity index 100%
> rename from services/backupsync/gui/syncfileidentifier.h
> rename to services/storage/backupsync/gui/syncfileidentifier.h
> diff --git a/services/backupsync/gui/test/CMakeLists.txt \
> b/services/storage/backupsync/gui/test/CMakeLists.txt similarity index 100%
> rename from services/backupsync/gui/test/CMakeLists.txt
> rename to services/storage/backupsync/gui/test/CMakeLists.txt
> diff --git a/services/backupsync/gui/test/filesystemtreetest.cpp \
> b/services/storage/backupsync/gui/test/filesystemtreetest.cpp similarity index 100%
> rename from services/backupsync/gui/test/filesystemtreetest.cpp
> rename to services/storage/backupsync/gui/test/filesystemtreetest.cpp
> diff --git a/services/backupsync/gui/test/filesystemtreetest.h \
> b/services/storage/backupsync/gui/test/filesystemtreetest.h similarity index 100%
> rename from services/backupsync/gui/test/filesystemtreetest.h
> rename to services/storage/backupsync/gui/test/filesystemtreetest.h
> diff --git a/services/backupsync/lib/CMakeLists.txt \
> b/services/storage/backupsync/lib/CMakeLists.txt similarity index 94%
> rename from services/backupsync/lib/CMakeLists.txt
> rename to services/storage/backupsync/lib/CMakeLists.txt
> index 4639767..852d8e5 100644
> --- a/services/backupsync/lib/CMakeLists.txt
> +++ b/services/storage/backupsync/lib/CMakeLists.txt
> @@ -24,7 +24,7 @@ set(nepomuksync_SRCS
> )
>
> soprano_add_ontology(nepomuksync_SRCS
> - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ontologies/nrio.trig
> + ${CMAKE_CURRENT_SOURCE_DIR}/../../../../ontologies/nrio.trig
> "NRIO"
> "Nepomuk::Vocabulary"
> "trig")
> diff --git a/services/backupsync/lib/identificationsetgenerator.cpp \
> b/services/storage/backupsync/lib/identificationsetgenerator.cpp similarity index \
> 100% rename from services/backupsync/lib/identificationsetgenerator.cpp
> rename to services/storage/backupsync/lib/identificationsetgenerator.cpp
> diff --git a/services/backupsync/lib/identificationsetgenerator_p.h \
> b/services/storage/backupsync/lib/identificationsetgenerator_p.h similarity index \
> 100% rename from services/backupsync/lib/identificationsetgenerator_p.h
> rename to services/storage/backupsync/lib/identificationsetgenerator_p.h
> diff --git a/services/backupsync/lib/nepomuksync_export.h \
> b/services/storage/backupsync/lib/nepomuksync_export.h similarity index 100%
> rename from services/backupsync/lib/nepomuksync_export.h
> rename to services/storage/backupsync/lib/nepomuksync_export.h
> diff --git a/services/backupsync/lib/resourceidentifier.cpp \
> b/services/storage/backupsync/lib/resourceidentifier.cpp similarity index 100%
> rename from services/backupsync/lib/resourceidentifier.cpp
> rename to services/storage/backupsync/lib/resourceidentifier.cpp
> diff --git a/services/backupsync/lib/resourceidentifier.h \
> b/services/storage/backupsync/lib/resourceidentifier.h similarity index 100%
> rename from services/backupsync/lib/resourceidentifier.h
> rename to services/storage/backupsync/lib/resourceidentifier.h
> diff --git a/services/backupsync/lib/resourceidentifier_p.h \
> b/services/storage/backupsync/lib/resourceidentifier_p.h similarity index 100%
> rename from services/backupsync/lib/resourceidentifier_p.h
> rename to services/storage/backupsync/lib/resourceidentifier_p.h
> diff --git a/services/backupsync/lib/resourcemerger.cpp \
> b/services/storage/backupsync/lib/resourcemerger.cpp similarity index 100%
> rename from services/backupsync/lib/resourcemerger.cpp
> rename to services/storage/backupsync/lib/resourcemerger.cpp
> diff --git a/services/backupsync/lib/resourcemerger.h \
> b/services/storage/backupsync/lib/resourcemerger.h similarity index 100%
> rename from services/backupsync/lib/resourcemerger.h
> rename to services/storage/backupsync/lib/resourcemerger.h
> diff --git a/services/backupsync/lib/syncresource.cpp \
> b/services/storage/backupsync/lib/syncresource.cpp similarity index 100%
> rename from services/backupsync/lib/syncresource.cpp
> rename to services/storage/backupsync/lib/syncresource.cpp
> diff --git a/services/backupsync/lib/syncresource.h \
> b/services/storage/backupsync/lib/syncresource.h similarity index 100%
> rename from services/backupsync/lib/syncresource.h
> rename to services/storage/backupsync/lib/syncresource.h
> diff --git a/services/backupsync/lib/test/CMakeLists.txt \
> b/services/storage/backupsync/lib/test/CMakeLists.txt similarity index 100%
> rename from services/backupsync/lib/test/CMakeLists.txt
> rename to services/storage/backupsync/lib/test/CMakeLists.txt
> diff --git a/services/backupsync/lib/test/nepomuksynctests.cpp \
> b/services/storage/backupsync/lib/test/nepomuksynctests.cpp similarity index 100%
> rename from services/backupsync/lib/test/nepomuksynctests.cpp
> rename to services/storage/backupsync/lib/test/nepomuksynctests.cpp
> diff --git a/services/backupsync/lib/test/nepomuksynctests.h \
> b/services/storage/backupsync/lib/test/nepomuksynctests.h similarity index 100%
> rename from services/backupsync/lib/test/nepomuksynctests.h
> rename to services/storage/backupsync/lib/test/nepomuksynctests.h
> diff --git a/services/backupsync/lib/test/testbase.cpp \
> b/services/storage/backupsync/lib/test/testbase.cpp similarity index 100%
> rename from services/backupsync/lib/test/testbase.cpp
> rename to services/storage/backupsync/lib/test/testbase.cpp
> diff --git a/services/backupsync/lib/test/testbase.h \
> b/services/storage/backupsync/lib/test/testbase.h similarity index 100%
> rename from services/backupsync/lib/test/testbase.h
> rename to services/storage/backupsync/lib/test/testbase.h
> diff --git a/services/backupsync/service/CMakeLists.txt \
> b/services/storage/backupsync/service/CMakeLists.txt similarity index 86%
> rename from services/backupsync/service/CMakeLists.txt
> rename to services/storage/backupsync/service/CMakeLists.txt
> index f466c5e..ac033e0 100644
> --- a/services/backupsync/service/CMakeLists.txt
> +++ b/services/storage/backupsync/service/CMakeLists.txt
> @@ -44,15 +44,15 @@ set( BackupSyncService_SRCS
> # \
> ../../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.merger.xml # \
> merger.h Nepomuk::Merger ) qt4_add_dbus_adaptor( BackupSyncService_SRCS
> - \
> ../../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml + \
> ../../../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml \
> backupmanager.h Nepomuk::BackupManager ) qt4_add_dbus_adaptor( \
> BackupSyncService_SRCS
> - \
> ../../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml + \
> ../../../../interfaces/org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml \
> syncmanager.h Nepomuk::SyncManager )
> #--------- Ontologies -------#
> soprano_add_ontology(BackupSyncService_SRCS
> - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ontologies/nrio.trig
> + ${CMAKE_CURRENT_SOURCE_DIR}/../../../../ontologies/nrio.trig
> "NRIO"
> "Nepomuk::Vocabulary"
> "trig")
> diff --git a/services/backupsync/service/backupgenerationjob.cpp \
> b/services/storage/backupsync/service/backupgenerationjob.cpp similarity index 100%
> rename from services/backupsync/service/backupgenerationjob.cpp
> rename to services/storage/backupsync/service/backupgenerationjob.cpp
> diff --git a/services/backupsync/service/backupgenerationjob.h \
> b/services/storage/backupsync/service/backupgenerationjob.h similarity index 100%
> rename from services/backupsync/service/backupgenerationjob.h
> rename to services/storage/backupsync/service/backupgenerationjob.h
> diff --git a/services/backupsync/service/backupmanager.cpp \
> b/services/storage/backupsync/service/backupmanager.cpp similarity index 100%
> rename from services/backupsync/service/backupmanager.cpp
> rename to services/storage/backupsync/service/backupmanager.cpp
> diff --git a/services/backupsync/service/backupmanager.h \
> b/services/storage/backupsync/service/backupmanager.h similarity index 100%
> rename from services/backupsync/service/backupmanager.h
> rename to services/storage/backupsync/service/backupmanager.h
> diff --git a/services/backupsync/service/backupsyncservice.cpp \
> b/services/storage/backupsync/service/backupsyncservice.cpp similarity index 100%
> rename from services/backupsync/service/backupsyncservice.cpp
> rename to services/storage/backupsync/service/backupsyncservice.cpp
> diff --git a/services/backupsync/service/backupsyncservice.h \
> b/services/storage/backupsync/service/backupsyncservice.h similarity index 100%
> rename from services/backupsync/service/backupsyncservice.h
> rename to services/storage/backupsync/service/backupsyncservice.h
> diff --git a/services/backupsync/service/changelog.cpp \
> b/services/storage/backupsync/service/changelog.cpp similarity index 100%
> rename from services/backupsync/service/changelog.cpp
> rename to services/storage/backupsync/service/changelog.cpp
> diff --git a/services/backupsync/service/changelog.h \
> b/services/storage/backupsync/service/changelog.h similarity index 100%
> rename from services/backupsync/service/changelog.h
> rename to services/storage/backupsync/service/changelog.h
> diff --git a/services/backupsync/service/changelogrecord.cpp \
> b/services/storage/backupsync/service/changelogrecord.cpp similarity index 100%
> rename from services/backupsync/service/changelogrecord.cpp
> rename to services/storage/backupsync/service/changelogrecord.cpp
> diff --git a/services/backupsync/service/changelogrecord.h \
> b/services/storage/backupsync/service/changelogrecord.h similarity index 100%
> rename from services/backupsync/service/changelogrecord.h
> rename to services/storage/backupsync/service/changelogrecord.h
> diff --git a/services/backupsync/service/dbusoperators.cpp \
> b/services/storage/backupsync/service/dbusoperators.cpp similarity index 100%
> rename from services/backupsync/service/dbusoperators.cpp
> rename to services/storage/backupsync/service/dbusoperators.cpp
> diff --git a/services/backupsync/service/dbusoperators.h \
> b/services/storage/backupsync/service/dbusoperators.h similarity index 100%
> rename from services/backupsync/service/dbusoperators.h
> rename to services/storage/backupsync/service/dbusoperators.h
> diff --git a/services/backupsync/service/diffgenerator.cpp \
> b/services/storage/backupsync/service/diffgenerator.cpp similarity index 100%
> rename from services/backupsync/service/diffgenerator.cpp
> rename to services/storage/backupsync/service/diffgenerator.cpp
> diff --git a/services/backupsync/service/diffgenerator.h \
> b/services/storage/backupsync/service/diffgenerator.h similarity index 100%
> rename from services/backupsync/service/diffgenerator.h
> rename to services/storage/backupsync/service/diffgenerator.h
> diff --git a/services/backupsync/service/identificationset.cpp \
> b/services/storage/backupsync/service/identificationset.cpp similarity index 100%
> rename from services/backupsync/service/identificationset.cpp
> rename to services/storage/backupsync/service/identificationset.cpp
> diff --git a/services/backupsync/service/identificationset.h \
> b/services/storage/backupsync/service/identificationset.h similarity index 100%
> rename from services/backupsync/service/identificationset.h
> rename to services/storage/backupsync/service/identificationset.h
> diff --git a/services/backupsync/service/logstorage.cpp \
> b/services/storage/backupsync/service/logstorage.cpp similarity index 100%
> rename from services/backupsync/service/logstorage.cpp
> rename to services/storage/backupsync/service/logstorage.cpp
> diff --git a/services/backupsync/service/logstorage.h \
> b/services/storage/backupsync/service/logstorage.h similarity index 100%
> rename from services/backupsync/service/logstorage.h
> rename to services/storage/backupsync/service/logstorage.h
> diff --git a/services/backupsync/service/nepomukbackupsync.desktop \
> b/services/storage/backupsync/service/nepomukbackupsync.desktop similarity index \
> 100% rename from services/backupsync/service/nepomukbackupsync.desktop
> rename to services/storage/backupsync/service/nepomukbackupsync.desktop
> diff --git a/services/backupsync/service/syncfile.cpp \
> b/services/storage/backupsync/service/syncfile.cpp similarity index 100%
> rename from services/backupsync/service/syncfile.cpp
> rename to services/storage/backupsync/service/syncfile.cpp
> diff --git a/services/backupsync/service/syncfile.h \
> b/services/storage/backupsync/service/syncfile.h similarity index 100%
> rename from services/backupsync/service/syncfile.h
> rename to services/storage/backupsync/service/syncfile.h
> diff --git a/services/backupsync/service/syncmanager.cpp \
> b/services/storage/backupsync/service/syncmanager.cpp similarity index 100%
> rename from services/backupsync/service/syncmanager.cpp
> rename to services/storage/backupsync/service/syncmanager.cpp
> diff --git a/services/backupsync/service/syncmanager.h \
> b/services/storage/backupsync/service/syncmanager.h similarity index 100%
> rename from services/backupsync/service/syncmanager.h
> rename to services/storage/backupsync/service/syncmanager.h
> diff --git a/services/backupsync/service/tools.cpp \
> b/services/storage/backupsync/service/tools.cpp similarity index 100%
> rename from services/backupsync/service/tools.cpp
> rename to services/storage/backupsync/service/tools.cpp
> diff --git a/services/backupsync/service/tools.h \
> b/services/storage/backupsync/service/tools.h similarity index 100%
> rename from services/backupsync/service/tools.h
> rename to services/storage/backupsync/service/tools.h
> diff --git a/services/storage/datamanagementmodel.cpp \
> b/services/storage/datamanagementmodel.cpp index a6a66a3..931af15 100644
> --- a/services/storage/datamanagementmodel.cpp
> +++ b/services/storage/datamanagementmodel.cpp
> @@ -27,7 +27,7 @@
> #include "simpleresourcegraph.h"
> #include "simpleresource.h"
> #include "resourcewatchermanager.h"
> -#include "../backupsync/lib/syncresource.h"
> +#include "backupsync/lib/syncresource.h"
> #include "nepomuktools.h"
>
> #include <Soprano/Vocabulary/NRL>
> diff --git a/services/storage/resourceidentifier.cpp \
> b/services/storage/resourceidentifier.cpp index f5d81a9..19e059f 100644
> --- a/services/storage/resourceidentifier.cpp
> +++ b/services/storage/resourceidentifier.cpp
> @@ -19,7 +19,7 @@
>
>
> #include "resourceidentifier.h"
> -#include "../backupsync/lib/syncresource.h"
> +#include "backupsync/lib/syncresource.h"
> #include "classandpropertytree.h"
>
> #include <QtCore/QDateTime>
> diff --git a/services/storage/resourceidentifier.h \
> b/services/storage/resourceidentifier.h index 14d073c..42f0a3b 100644
> --- a/services/storage/resourceidentifier.h
> +++ b/services/storage/resourceidentifier.h
> @@ -21,7 +21,7 @@
> #ifndef RESOURCEIDENTIFIER_H
> #define RESOURCEIDENTIFIER_H
>
> -#include "../backupsync/lib/resourceidentifier.h"
> +#include "backupsync/lib/resourceidentifier.h"
> #include "datamanagement.h"
>
> #include <KUrl>
>
>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic