diff --git a/src/mirall/csyncthread.h b/src/mirall/csyncthread.h index d81d2c9ae2..31c75922f9 100644 --- a/src/mirall/csyncthread.h +++ b/src/mirall/csyncthread.h @@ -29,42 +29,6 @@ class QProcess; namespace Mirall { -enum walkErrorTypes { - WALK_ERROR_NONE = 0, - WALK_ERROR_WALK, - WALK_ERROR_INSTRUCTIONS, - WALK_ERROR_DIR_PERMS -}; - -struct walkStats_s { - walkStats_s(); - - int errorType; - - ulong eval; - ulong removed; - ulong renamed; - ulong newFiles; - ulong conflicts; - ulong ignores; - ulong sync; - ulong error; - - ulong dirPermErrors; - - ulong seenFiles; -}; - -typedef walkStats_s WalkStats; - -struct syncFileItem_s { - QString file; - csync_instructions_e instruction; -}; -typedef syncFileItem_s SyncFileItem; - -typedef QVector SyncFileItemVector; - class CSyncThread : public QObject { Q_OBJECT @@ -87,8 +51,6 @@ signals: void started(); private: - void emitStateDb( CSYNC *csync ); - static int getauth(const char *prompt, char *buf, size_t len, diff --git a/src/mirall/owncloudfolder.cpp b/src/mirall/owncloudfolder.cpp index 71e25467e0..b2e373d0c7 100644 --- a/src/mirall/owncloudfolder.cpp +++ b/src/mirall/owncloudfolder.cpp @@ -133,8 +133,6 @@ void ownCloudFolder::startSync(const QStringList &pathList) connect(_csync, SIGNAL(finished()), SLOT(slotCSyncFinished()), Qt::QueuedConnection); connect(_csync, SIGNAL(csyncError(const QString)), SLOT(slotCSyncError(const QString)), Qt::QueuedConnection); - qRegisterMetaType("SyncFileItemVector"); - qRegisterMetaType("WalkStats"); _thread->start(); QMetaObject::invokeMethod(_csync, "startSync", Qt::QueuedConnection); @@ -252,56 +250,5 @@ void ownCloudFolder::wipe() _wipeDb = false; } -// TOOD: not called anywhere -SyncFileStatus ownCloudFolder::fileStatus( const QString& file ) -{ - if( file.isEmpty() ) return STATUS_NONE; - QFileInfo fi( path(), file ); - - foreach( const SyncFileItem item, _items ) { - qDebug() << "FileStatus compare: " << item.file << " <> " << fi.absoluteFilePath(); - - if( item.file == fi.absoluteFilePath() ) { - switch( item.instruction ) { - case CSYNC_INSTRUCTION_NONE: - return STATUS_NONE; - break; - case CSYNC_INSTRUCTION_EVAL: - return STATUS_EVAL; - break; - case CSYNC_INSTRUCTION_RENAME: - return STATUS_RENAME; - break; - case CSYNC_INSTRUCTION_NEW: - return STATUS_NEW; - break; - case CSYNC_INSTRUCTION_CONFLICT: - return STATUS_CONFLICT; - break; - case CSYNC_INSTRUCTION_IGNORE: - return STATUS_IGNORE; - break; - case CSYNC_INSTRUCTION_SYNC: - case CSYNC_INSTRUCTION_UPDATED: - return STATUS_SYNC; - break; - case CSYNC_INSTRUCTION_STAT_ERROR: - return STATUS_STAT_ERROR; - break; - case CSYNC_INSTRUCTION_ERROR: - return STATUS_ERROR; - break; - case CSYNC_INSTRUCTION_DELETED: - case CSYNC_INSTRUCTION_REMOVE: - return STATUS_REMOVE; - break; - default: - break; - } - } - } - return STATUS_NEW; -} - } // ns diff --git a/src/mirall/owncloudfolder.h b/src/mirall/owncloudfolder.h index d5c0e28155..a30bf581c8 100644 --- a/src/mirall/owncloudfolder.h +++ b/src/mirall/owncloudfolder.h @@ -77,7 +77,6 @@ private: QStringList _errors; bool _csyncError; bool _wipeDb; - QVector _items; }; }