[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ksecrets] src/api/ksecrets: Moving dbus-related files to the fd.o directory
From:       Valentin Rusu <kde () rusu ! info>
Date:       2015-08-06 15:30:07
Message-ID: E1ZNN7P-0001Aw-IM () scm ! kde ! org
[Download RAW message or body]

Git commit 11ea44f178854f71c568c6e69d605257cccf8873 by Valentin Rusu.
Committed on 06/08/2015 at 15:29.
Pushed by vrusu into branch 'master'.

Moving dbus-related files to the fd.o directory

R  +0    -0    src/api/ksecrets/fd.o/ksecretsservicecodec.cpp [from: \
src/api/ksecrets/ksecretsservicecodec.cpp - 100% similarity] R  +0    -0    \
src/api/ksecrets/fd.o/ksecretsservicecodec.h [from: src/api/ksecrets/ksecretsservicecodec.h - \
100% similarity] R  +0    -0    src/api/ksecrets/fd.o/ksecretsservicecollectionjobs.cpp [from: \
src/api/ksecrets/ksecretsservicecollectionjobs.cpp - 100% similarity] R  +0    -0    \
src/api/ksecrets/fd.o/ksecretsservicecollectionjobs.h [from: \
src/api/ksecrets/ksecretsservicecollectionjobs.h - 100% similarity] R  +0    -0    \
src/api/ksecrets/fd.o/ksecretsservicecollectionjobs_p.h [from: \
src/api/ksecrets/ksecretsservicecollectionjobs_p.h - 100% similarity] R  +0    -0    \
src/api/ksecrets/fd.o/ksecretsservicedbustypes.h [from: \
src/api/ksecrets/ksecretsservicedbustypes.h - 100% similarity] R  +0    -0    \
src/api/ksecrets/fd.o/ksecretsserviceitemjobs.cpp [from: \
src/api/ksecrets/ksecretsserviceitemjobs.cpp - 100% similarity] R  +0    -0    \
src/api/ksecrets/fd.o/ksecretsserviceitemjobs.h [from: \
src/api/ksecrets/ksecretsserviceitemjobs.h - 100% similarity] R  +0    -0    \
src/api/ksecrets/fd.o/ksecretsserviceitemjobs_p.h [from: \
src/api/ksecrets/ksecretsserviceitemjobs_p.h - 100% similarity] M  +0    -1    \
src/api/ksecrets/ksecretsitem.cpp M  +0    -6    src/api/ksecrets/ksecretsvalue.cpp
M  +0    -18   src/api/ksecrets/ksecretsvalue_p.h

http://commits.kde.org/ksecrets/11ea44f178854f71c568c6e69d605257cccf8873

diff --git a/src/api/ksecrets/ksecretsservicecodec.cpp \
b/src/api/ksecrets/fd.o/ksecretsservicecodec.cpp similarity index 100%
rename from src/api/ksecrets/ksecretsservicecodec.cpp
rename to src/api/ksecrets/fd.o/ksecretsservicecodec.cpp
diff --git a/src/api/ksecrets/ksecretsservicecodec.h \
b/src/api/ksecrets/fd.o/ksecretsservicecodec.h similarity index 100%
rename from src/api/ksecrets/ksecretsservicecodec.h
rename to src/api/ksecrets/fd.o/ksecretsservicecodec.h
diff --git a/src/api/ksecrets/ksecretsservicecollectionjobs.cpp \
b/src/api/ksecrets/fd.o/ksecretsservicecollectionjobs.cpp similarity index 100%
rename from src/api/ksecrets/ksecretsservicecollectionjobs.cpp
rename to src/api/ksecrets/fd.o/ksecretsservicecollectionjobs.cpp
diff --git a/src/api/ksecrets/ksecretsservicecollectionjobs.h \
b/src/api/ksecrets/fd.o/ksecretsservicecollectionjobs.h similarity index 100%
rename from src/api/ksecrets/ksecretsservicecollectionjobs.h
rename to src/api/ksecrets/fd.o/ksecretsservicecollectionjobs.h
diff --git a/src/api/ksecrets/ksecretsservicecollectionjobs_p.h \
b/src/api/ksecrets/fd.o/ksecretsservicecollectionjobs_p.h similarity index 100%
rename from src/api/ksecrets/ksecretsservicecollectionjobs_p.h
rename to src/api/ksecrets/fd.o/ksecretsservicecollectionjobs_p.h
diff --git a/src/api/ksecrets/ksecretsservicedbustypes.h \
b/src/api/ksecrets/fd.o/ksecretsservicedbustypes.h similarity index 100%
rename from src/api/ksecrets/ksecretsservicedbustypes.h
rename to src/api/ksecrets/fd.o/ksecretsservicedbustypes.h
diff --git a/src/api/ksecrets/ksecretsserviceitemjobs.cpp \
b/src/api/ksecrets/fd.o/ksecretsserviceitemjobs.cpp similarity index 100%
rename from src/api/ksecrets/ksecretsserviceitemjobs.cpp
rename to src/api/ksecrets/fd.o/ksecretsserviceitemjobs.cpp
diff --git a/src/api/ksecrets/ksecretsserviceitemjobs.h \
b/src/api/ksecrets/fd.o/ksecretsserviceitemjobs.h similarity index 100%
rename from src/api/ksecrets/ksecretsserviceitemjobs.h
rename to src/api/ksecrets/fd.o/ksecretsserviceitemjobs.h
diff --git a/src/api/ksecrets/ksecretsserviceitemjobs_p.h \
b/src/api/ksecrets/fd.o/ksecretsserviceitemjobs_p.h similarity index 100%
rename from src/api/ksecrets/ksecretsserviceitemjobs_p.h
rename to src/api/ksecrets/fd.o/ksecretsserviceitemjobs_p.h
diff --git a/src/api/ksecrets/ksecretsitem.cpp b/src/api/ksecrets/ksecretsitem.cpp
index d41dd1a..d13d774 100644
--- a/src/api/ksecrets/ksecretsitem.cpp
+++ b/src/api/ksecrets/ksecretsitem.cpp
@@ -20,7 +20,6 @@
 
 #include "ksecretsitem.h"
 #include "ksecretsitem_p.h"
-#include "ksecretsserviceitemjobs.h"
 
 #include <QDateTime>
 #include <QtConcurrent>
diff --git a/src/api/ksecrets/ksecretsvalue.cpp b/src/api/ksecrets/ksecretsvalue.cpp
index 9e34a5d..10c5ea3 100644
--- a/src/api/ksecrets/ksecretsvalue.cpp
+++ b/src/api/ksecrets/ksecretsvalue.cpp
@@ -89,12 +89,6 @@ SecretPrivate::SecretPrivate( const SecretPrivate &that ) :
     value = that.value;
 }
 
-SecretPrivate::SecretPrivate( const DBusSecretStruct &that )
-{
-    value = that.m_value;
-    contentType = that.m_contentType;
-}
-
 SecretPrivate::~SecretPrivate()
 {
 }
diff --git a/src/api/ksecrets/ksecretsvalue_p.h b/src/api/ksecrets/ksecretsvalue_p.h
index 9d2c85b..a83747f 100644
--- a/src/api/ksecrets/ksecretsvalue_p.h
+++ b/src/api/ksecrets/ksecretsvalue_p.h
@@ -22,7 +22,6 @@
 #define KSECRETSSECRET_P_H
 
 #include "ksecretsvalue.h"
-#include "ksecretsservicedbustypes.h"
 
 #include <QtDBus/QDBusObjectPath>
 #include <QSharedData>
@@ -33,26 +32,9 @@ class SecretPrivate : public QSharedData {
 public:
     SecretPrivate();
     SecretPrivate( const SecretPrivate& that );
-    SecretPrivate( const DBusSecretStruct& secretStruct );
     ~SecretPrivate();
 
 
-    /**
-     * This will obtain a properly encrypted SecretStruct ready to be transmitted over the \
                dbus
-     * to the daemon
-     *
-     * @return true if the secretStruct was correctly initialized
-     */
-    bool toSecretStruct( DBusSecretStruct &secretStruct ) const;
-
-    /**
-     * This method attempts to decrypt the secretStruct given and to allocate and initialize
-     * SecretPrivate instance with it.
-     *
-     * @return true if the secret struct was successfully decrypted into the SecretPrivate \
                object
-     */
-    static bool fromSecretStruct( const DBusSecretStruct &secretStruct, SecretPrivate*& );
-
     bool operator == ( const SecretPrivate &that ) const;
 
     QString contentType;


[prev in list] [next in list] [prev in thread] [next in thread]