mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-23 12:55:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

legacy propagator: Remove more code

Browse source
This commit is contained in:
Markus Goetz 2015-10-28 10:59:02 +01:00
parent 6a0633083d
commit 9337927722
16 changed files with 0 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cmd/cmd.cpp
View file

@ -369,7 +369,6 @@ restart_sync:
csync_set_log_level(options.silent ? 1 : 11);
opts = &options;
cred->syncContextPreInit(_csync_ctx);
if( csync_init( _csync_ctx ) < 0 ) {
qFatal("Could not initialize csync!");
@ -441,8 +440,6 @@ restart_sync:
return EXIT_FAILURE;
}
cred->syncContextPreStart(_csync_ctx);
Cmd cmd;
SyncJournalDb db(options.source_dir);
if (!selectiveSyncList.empty()) {

23
src/gui/creds/shibbolethcredentials.cpp
View file

@ -73,29 +73,6 @@ void ShibbolethCredentials::setAccount(Account* account)
}
}
void ShibbolethCredentials::syncContextPreInit(CSYNC* ctx)
{
Q_UNUSED(ctx);
}
QByteArray ShibbolethCredentials::prepareCookieData() const
{
QString cookiesAsString;
QList<QNetworkCookie> cookies = accountCookies(_account);
foreach(const QNetworkCookie &cookie, cookies) {
cookiesAsString += cookie.toRawForm(QNetworkCookie::NameAndValueOnly) + QLatin1String("; ");
}
return cookiesAsString.toLatin1();
}
void ShibbolethCredentials::syncContextPreStart (CSYNC* ctx)
{
Q_UNUSED(ctx);
}
bool ShibbolethCredentials::changed(AbstractCredentials* credentials) const
{
ShibbolethCredentials* other(qobject_cast< ShibbolethCredentials* >(credentials));

2
src/gui/creds/shibbolethcredentials.h
View file

@ -48,8 +48,6 @@ public:
ShibbolethCredentials(const QNetworkCookie &cookie);
void setAccount(Account* account) Q_DECL_OVERRIDE;
void syncContextPreInit(CSYNC* ctx) Q_DECL_OVERRIDE;
void syncContextPreStart(CSYNC* ctx) Q_DECL_OVERRIDE;
bool changed(AbstractCredentials* credentials) const Q_DECL_OVERRIDE;
QString authType() const Q_DECL_OVERRIDE;
QString user() const Q_DECL_OVERRIDE;

1
src/gui/folder.cpp
View file

@ -111,7 +111,6 @@ bool Folder::init()
csync_set_log_level( 11 );
Q_ASSERT( _accountState );
_accountState->account()->credentials()->syncContextPreInit(_csync_ctx);
if( csync_init( _csync_ctx ) < 0 ) {
qDebug() << "Could not initialize csync!" << csync_get_status(_csync_ctx) << csync_get_status_string(_csync_ctx);

2
src/libsync/creds/abstractcredentials.h
View file

@ -41,8 +41,6 @@ public:
*/
virtual void setAccount(Account* account);
virtual void syncContextPreInit(CSYNC* ctx) = 0;
virtual void syncContextPreStart(CSYNC* ctx) = 0;
virtual bool changed(AbstractCredentials* credentials) const = 0;
virtual QString authType() const = 0;
virtual QString user() const = 0;

6
src/libsync/creds/dummycredentials.cpp
View file

@ -17,12 +17,6 @@
namespace OCC
{
void DummyCredentials::syncContextPreInit(CSYNC*)
{}
void DummyCredentials::syncContextPreStart(CSYNC*)
{}
bool DummyCredentials::changed(AbstractCredentials* credentials) const
{
DummyCredentials* dummy(dynamic_cast< DummyCredentials* >(credentials));

2
src/libsync/creds/dummycredentials.h
View file

@ -27,8 +27,6 @@ public:
QString _user;
QString _password;
void syncContextPreInit(CSYNC* ctx) Q_DECL_OVERRIDE;
void syncContextPreStart(CSYNC* ctx) Q_DECL_OVERRIDE;
bool changed(AbstractCredentials* credentials) const Q_DECL_OVERRIDE;
QString authType() const Q_DECL_OVERRIDE;
QString user() const Q_DECL_OVERRIDE;

10
src/libsync/creds/httpcredentials.cpp
View file

@ -57,16 +57,6 @@ HttpCredentials::HttpCredentials(const QString& user, const QString& password, c
{
}
void HttpCredentials::syncContextPreInit (CSYNC* ctx)
{
Q_UNUSED(ctx);
}
void HttpCredentials::syncContextPreStart (CSYNC* ctx)
{
Q_UNUSED(ctx);
}
bool HttpCredentials::changed(AbstractCredentials* credentials) const
{
HttpCredentials* other(qobject_cast< HttpCredentials* >(credentials));

2
src/libsync/creds/httpcredentials.h
View file

@ -38,8 +38,6 @@ public:
explicit HttpCredentials();
HttpCredentials(const QString& user, const QString& password, const QString& certificatePath, const QString& certificatePasswd);
void syncContextPreInit(CSYNC* ctx) Q_DECL_OVERRIDE;
void syncContextPreStart(CSYNC* ctx) Q_DECL_OVERRIDE;
bool changed(AbstractCredentials* credentials) const Q_DECL_OVERRIDE;
QString authType() const Q_DECL_OVERRIDE;
QNetworkAccessManager* getQNAM() const Q_DECL_OVERRIDE;

10
src/libsync/creds/tokencredentials.cpp
View file

@ -80,16 +80,6 @@ TokenCredentials::TokenCredentials(const QString& user, const QString& password,
{
}
void TokenCredentials::syncContextPreInit (CSYNC* ctx)
{
Q_UNUSED(ctx);
}
void TokenCredentials::syncContextPreStart (CSYNC* ctx)
{
Q_UNUSED(ctx);
}
bool TokenCredentials::changed(AbstractCredentials* credentials) const
{
TokenCredentials* other(dynamic_cast< TokenCredentials* >(credentials));

2
src/libsync/creds/tokencredentials.h
View file

@ -40,8 +40,6 @@ public:
TokenCredentials();
TokenCredentials(const QString& user, const QString& password, const QString &token);
void syncContextPreInit(CSYNC* ctx) Q_DECL_OVERRIDE;
void syncContextPreStart(CSYNC* ctx) Q_DECL_OVERRIDE;
bool changed(AbstractCredentials* credentials) const Q_DECL_OVERRIDE;
QString authType() const Q_DECL_OVERRIDE;
QNetworkAccessManager* getQNAM() const Q_DECL_OVERRIDE;

5
src/libsync/owncloudpropagator.h
View file

@ -354,11 +354,6 @@ signals:
void itemCompleted(const SyncFileItem &, const PropagatorJob &);
void progress(const SyncFileItem&, quint64 bytes);
void finished();
/**
* Called when we detect that the total number of bytes changes (because a download or upload
* turns out to be bigger or smaller than what was initially computed in the update phase
*/
void adjustTotalTransmissionSize( qint64 adjust );
private:

5
src/libsync/progressdispatcher.cpp
View file

@ -149,11 +149,6 @@ void ProgressInfo::adjustTotalsForFile(const SyncFileItem &item)
}
}
void ProgressInfo::adjustTotalSize(qint64 change)
{
_sizeProgress._total += change;
}
quint64 ProgressInfo::totalFiles() const
{
return _fileProgress._total;

7
src/libsync/progressdispatcher.h
View file

@ -64,13 +64,6 @@ public:
*/
void adjustTotalsForFile(const SyncFileItem & item);
/**
* Adjust the total size by some value.
*
* Deprecated. Used only in the legacy propagator.
*/
void adjustTotalSize(qint64 change);
quint64 totalFiles() const;
quint64 completedFiles() const;

7
src/libsync/syncengine.cpp
View file

@ -659,7 +659,6 @@ void SyncEngine::startSync()
qDebug() << (usingSelectiveSync ? "====Using Selective Sync" : "====NOT Using Selective Sync");
csync_set_userdata(_csync_ctx, this);
_account->credentials()->syncContextPreStart(_csync_ctx);
_stopWatch.start();
@ -812,7 +811,6 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
this, SLOT(slotItemCompleted(const SyncFileItem &, const PropagatorJob &)));
connect(_propagator.data(), SIGNAL(progress(const SyncFileItem &,quint64)),
this, SLOT(slotProgress(const SyncFileItem &,quint64)));
connect(_propagator.data(), SIGNAL(adjustTotalTransmissionSize(qint64)), this, SLOT(slotAdjustTotalTransmissionSize(qint64)));
connect(_propagator.data(), SIGNAL(finished()), this, SLOT(slotFinished()), Qt::QueuedConnection);
// apply the network limits to the propagator
@ -917,11 +915,6 @@ void SyncEngine::slotProgress(const SyncFileItem& item, quint64 current)
}
void SyncEngine::slotAdjustTotalTransmissionSize(qint64 change)
{
_progressInfo->adjustTotalSize(change);
}
/* Given a path on the remote, give the path as it is when the rename is done */
QString SyncEngine::adjustRenamedPath(const QString& original)
{

1
src/libsync/syncengine.h
View file

@ -125,7 +125,6 @@ private slots:
void slotItemCompleted(const SyncFileItem& item, const PropagatorJob & job);
void slotFinished();
void slotProgress(const SyncFileItem& item, quint64 curent);
void slotAdjustTotalTransmissionSize(qint64 change);
void slotDiscoveryJobFinished(int updateResult);
void slotCleanPollsJobAborted(const QString &error);