From 48acaec66ff3610cff0b082d499c782ad32c5f37 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 12 Nov 2018 18:39:50 +0100 Subject: [PATCH 1/5] libsync: search'n'replace "Q_DECL_OVERRIDE" with "override" --- src/libsync/accessmanager.h | 2 +- src/libsync/cookiejar.h | 4 +-- src/libsync/creds/dummycredentials.h | 20 +++++++------- src/libsync/creds/httpcredentials.cpp | 2 +- src/libsync/creds/httpcredentials.h | 20 +++++++------- src/libsync/creds/tokencredentials.h | 20 +++++++------- src/libsync/networkjobs.h | 40 +++++++++++++-------------- src/libsync/nextcloudtheme.h | 8 +++--- src/libsync/owncloudpropagator.h | 20 +++++++------- src/libsync/propagatedownload.h | 14 +++++----- src/libsync/propagateremotedelete.h | 10 +++---- src/libsync/propagateremotemkdir.h | 6 ++-- src/libsync/propagateremotemove.h | 10 +++---- src/libsync/propagateupload.h | 34 +++++++++++------------ src/libsync/propagatorjobs.h | 8 +++--- 15 files changed, 109 insertions(+), 109 deletions(-) diff --git a/src/libsync/accessmanager.h b/src/libsync/accessmanager.h index d38a13487..42c4ba983 100644 --- a/src/libsync/accessmanager.h +++ b/src/libsync/accessmanager.h @@ -37,7 +37,7 @@ public: void setRawCookie(const QByteArray &rawCookie, const QUrl &url); protected: - QNetworkReply *createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0) Q_DECL_OVERRIDE; + QNetworkReply *createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0) override; }; } // namespace OCC diff --git a/src/libsync/cookiejar.h b/src/libsync/cookiejar.h index 83d9e3c50..e5aeb139a 100644 --- a/src/libsync/cookiejar.h +++ b/src/libsync/cookiejar.h @@ -31,8 +31,8 @@ class OWNCLOUDSYNC_EXPORT CookieJar : public QNetworkCookieJar public: explicit CookieJar(QObject *parent = 0); ~CookieJar(); - bool setCookiesFromUrl(const QList &cookieList, const QUrl &url) Q_DECL_OVERRIDE; - QList cookiesForUrl(const QUrl &url) const Q_DECL_OVERRIDE; + bool setCookiesFromUrl(const QList &cookieList, const QUrl &url) override; + QList cookiesForUrl(const QUrl &url) const override; void clearSessionCookies(); diff --git a/src/libsync/creds/dummycredentials.h b/src/libsync/creds/dummycredentials.h index 6729b2e5a..f9fc11dc5 100644 --- a/src/libsync/creds/dummycredentials.h +++ b/src/libsync/creds/dummycredentials.h @@ -26,16 +26,16 @@ class OWNCLOUDSYNC_EXPORT DummyCredentials : public AbstractCredentials public: QString _user; QString _password; - QString authType() const Q_DECL_OVERRIDE; - QString user() const Q_DECL_OVERRIDE; - QNetworkAccessManager *createQNAM() const Q_DECL_OVERRIDE; - bool ready() const Q_DECL_OVERRIDE; - bool stillValid(QNetworkReply *reply) Q_DECL_OVERRIDE; - void fetchFromKeychain() Q_DECL_OVERRIDE; - void askFromUser() Q_DECL_OVERRIDE; - void persist() Q_DECL_OVERRIDE; - void invalidateToken() Q_DECL_OVERRIDE {} - void forgetSensitiveData() Q_DECL_OVERRIDE{}; + QString authType() const override; + QString user() const override; + QNetworkAccessManager *createQNAM() const override; + bool ready() const override; + bool stillValid(QNetworkReply *reply) override; + void fetchFromKeychain() override; + void askFromUser() override; + void persist() override; + void invalidateToken() override {} + void forgetSensitiveData() override{}; }; } // namespace OCC diff --git a/src/libsync/creds/httpcredentials.cpp b/src/libsync/creds/httpcredentials.cpp index 4805092e7..b8b79b66d 100644 --- a/src/libsync/creds/httpcredentials.cpp +++ b/src/libsync/creds/httpcredentials.cpp @@ -57,7 +57,7 @@ public: } protected: - QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) Q_DECL_OVERRIDE + QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) override { QNetworkRequest req(request); if (!req.attribute(HttpCredentials::DontAddCredentialsAttribute).toBool()) { diff --git a/src/libsync/creds/httpcredentials.h b/src/libsync/creds/httpcredentials.h index b71edf6ca..0687f4e5a 100644 --- a/src/libsync/creds/httpcredentials.h +++ b/src/libsync/creds/httpcredentials.h @@ -82,17 +82,17 @@ public: explicit HttpCredentials(); HttpCredentials(const QString &user, const QString &password, const QSslCertificate &certificate = QSslCertificate(), const QSslKey &key = QSslKey()); - QString authType() const Q_DECL_OVERRIDE; - QNetworkAccessManager *createQNAM() const Q_DECL_OVERRIDE; - bool ready() const Q_DECL_OVERRIDE; - void fetchFromKeychain() Q_DECL_OVERRIDE; - bool stillValid(QNetworkReply *reply) Q_DECL_OVERRIDE; - void persist() Q_DECL_OVERRIDE; - QString user() const Q_DECL_OVERRIDE; + QString authType() const override; + QNetworkAccessManager *createQNAM() const override; + bool ready() const override; + void fetchFromKeychain() override; + bool stillValid(QNetworkReply *reply) override; + void persist() override; + QString user() const override; // the password or token QString password() const; - void invalidateToken() Q_DECL_OVERRIDE; - void forgetSensitiveData() Q_DECL_OVERRIDE; + void invalidateToken() override; + void forgetSensitiveData() override; QString fetchUser(); virtual bool sslIsTrusted() { return false; } @@ -102,7 +102,7 @@ public: bool refreshAccessToken(); // To fetch the user name as early as possible - void setAccount(Account *account) Q_DECL_OVERRIDE; + void setAccount(Account *account) override; // Whether we are using OAuth bool isUsingOAuth() const { return !_refreshToken.isNull(); } diff --git a/src/libsync/creds/tokencredentials.h b/src/libsync/creds/tokencredentials.h index 996b0618b..2cc851777 100644 --- a/src/libsync/creds/tokencredentials.h +++ b/src/libsync/creds/tokencredentials.h @@ -39,16 +39,16 @@ public: TokenCredentials(); TokenCredentials(const QString &user, const QString &password, const QString &token); - QString authType() const Q_DECL_OVERRIDE; - QNetworkAccessManager *createQNAM() const Q_DECL_OVERRIDE; - bool ready() const Q_DECL_OVERRIDE; - void askFromUser() Q_DECL_OVERRIDE; - void fetchFromKeychain() Q_DECL_OVERRIDE; - bool stillValid(QNetworkReply *reply) Q_DECL_OVERRIDE; - void persist() Q_DECL_OVERRIDE; - QString user() const Q_DECL_OVERRIDE; - void invalidateToken() Q_DECL_OVERRIDE; - void forgetSensitiveData() Q_DECL_OVERRIDE; + QString authType() const override; + QNetworkAccessManager *createQNAM() const override; + bool ready() const override; + void askFromUser() override; + void fetchFromKeychain() override; + bool stillValid(QNetworkReply *reply) override; + void persist() override; + QString user() const override; + void invalidateToken() override; + void forgetSensitiveData() override; QString password() const; private Q_SLOTS: diff --git a/src/libsync/networkjobs.h b/src/libsync/networkjobs.h index 071a34fe8..062435d1d 100644 --- a/src/libsync/networkjobs.h +++ b/src/libsync/networkjobs.h @@ -36,13 +36,13 @@ class OWNCLOUDSYNC_EXPORT EntityExistsJob : public AbstractNetworkJob Q_OBJECT public: explicit EntityExistsJob(AccountPtr account, const QString &path, QObject *parent = 0); - void start() Q_DECL_OVERRIDE; + void start() override; signals: void exists(QNetworkReply *); private slots: - virtual bool finished() Q_DECL_OVERRIDE; + virtual bool finished() override; }; /** @@ -98,7 +98,7 @@ class OWNCLOUDSYNC_EXPORT LsColJob : public AbstractNetworkJob public: explicit LsColJob(AccountPtr account, const QString &path, QObject *parent = 0); explicit LsColJob(AccountPtr account, const QUrl &url, QObject *parent = 0); - void start() Q_DECL_OVERRIDE; + void start() override; QHash _folderInfos; /** @@ -119,7 +119,7 @@ signals: void finishedWithoutError(); private slots: - virtual bool finished() Q_DECL_OVERRIDE; + virtual bool finished() override; private: QList _properties; @@ -141,7 +141,7 @@ class OWNCLOUDSYNC_EXPORT PropfindJob : public AbstractNetworkJob Q_OBJECT public: explicit PropfindJob(AccountPtr account, const QString &path, QObject *parent = 0); - void start() Q_DECL_OVERRIDE; + void start() override; /** * Used to specify which properties shall be retrieved. @@ -159,7 +159,7 @@ signals: void finishedWithError(QNetworkReply *reply = 0); private slots: - virtual bool finished() Q_DECL_OVERRIDE; + virtual bool finished() override; private: QList _properties; @@ -183,7 +183,7 @@ public: */ explicit AvatarJob(AccountPtr account, const QString &userId, int size, QObject *parent = 0); - void start() Q_DECL_OVERRIDE; + void start() override; /** The retrieved avatar images don't have the circle shape by default */ static QImage makeCircularAvatar(const QImage &baseAvatar); @@ -196,7 +196,7 @@ signals: void avatarPixmap(const QImage &); private slots: - virtual bool finished() Q_DECL_OVERRIDE; + virtual bool finished() override; private: QUrl _avatarUrl; @@ -217,7 +217,7 @@ class OWNCLOUDSYNC_EXPORT ProppatchJob : public AbstractNetworkJob Q_OBJECT public: explicit ProppatchJob(AccountPtr account, const QString &path, QObject *parent = 0); - void start() Q_DECL_OVERRIDE; + void start() override; /** * Used to specify which properties shall be set. @@ -235,7 +235,7 @@ signals: void finishedWithError(); private slots: - virtual bool finished() Q_DECL_OVERRIDE; + virtual bool finished() override; private: QMap _properties; @@ -255,13 +255,13 @@ public: explicit MkColJob(AccountPtr account, const QString &path, QObject *parent = 0); explicit MkColJob(AccountPtr account, const QUrl &url, const QMap &extraHeaders, QObject *parent = 0); - void start() Q_DECL_OVERRIDE; + void start() override; signals: void finished(QNetworkReply::NetworkError); private slots: - virtual bool finished() Q_DECL_OVERRIDE; + virtual bool finished() override; }; /** @@ -273,7 +273,7 @@ class OWNCLOUDSYNC_EXPORT CheckServerJob : public AbstractNetworkJob Q_OBJECT public: explicit CheckServerJob(AccountPtr account, QObject *parent = 0); - void start() Q_DECL_OVERRIDE; + void start() override; static QString version(const QJsonObject &info); static QString versionString(const QJsonObject &info); @@ -300,8 +300,8 @@ signals: void timeout(const QUrl &url); private: - bool finished() Q_DECL_OVERRIDE; - void onTimedOut() Q_DECL_OVERRIDE; + bool finished() override; + void onTimedOut() override; private slots: virtual void metaDataChangedSlot(); virtual void encryptedSlot(); @@ -330,13 +330,13 @@ class OWNCLOUDSYNC_EXPORT RequestEtagJob : public AbstractNetworkJob Q_OBJECT public: explicit RequestEtagJob(AccountPtr account, const QString &path, QObject *parent = 0); - void start() Q_DECL_OVERRIDE; + void start() override; signals: void etagRetreived(const QString &etag); private slots: - virtual bool finished() Q_DECL_OVERRIDE; + virtual bool finished() override; }; /** @@ -374,10 +374,10 @@ public: void addRawHeader(const QByteArray &headerName, const QByteArray &value); public slots: - void start() Q_DECL_OVERRIDE; + void start() override; protected: - bool finished() Q_DECL_OVERRIDE; + bool finished() override; signals: /** @@ -449,7 +449,7 @@ public: signals: void finishedSignal(QNetworkReply *reply); private slots: - bool finished() Q_DECL_OVERRIDE; + bool finished() override; }; /** diff --git a/src/libsync/nextcloudtheme.h b/src/libsync/nextcloudtheme.h index 78ff75f95..adf940bbc 100644 --- a/src/libsync/nextcloudtheme.h +++ b/src/libsync/nextcloudtheme.h @@ -30,11 +30,11 @@ public: NextcloudTheme(); #ifndef TOKEN_AUTH_ONLY - QVariant customMedia(CustomMediaType type) Q_DECL_OVERRIDE; + QVariant customMedia(CustomMediaType type) override; - QColor wizardHeaderBackgroundColor() const Q_DECL_OVERRIDE; - QColor wizardHeaderTitleColor() const Q_DECL_OVERRIDE; - QPixmap wizardHeaderLogo() const Q_DECL_OVERRIDE; + QColor wizardHeaderBackgroundColor() const override; + QColor wizardHeaderTitleColor() const override; + QPixmap wizardHeaderLogo() const override; #endif private: diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h index 9506dc0e2..f5a30ea03 100644 --- a/src/libsync/owncloudpropagator.h +++ b/src/libsync/owncloudpropagator.h @@ -186,7 +186,7 @@ public: } ~PropagateItemJob(); - bool scheduleSelfOrChild() Q_DECL_OVERRIDE + bool scheduleSelfOrChild() override { if (_state != NotYetStarted) { return false; @@ -238,15 +238,15 @@ public: _tasksToDo.append(item); } - virtual bool scheduleSelfOrChild() Q_DECL_OVERRIDE; - virtual JobParallelism parallelism() Q_DECL_OVERRIDE; + virtual bool scheduleSelfOrChild() override; + virtual JobParallelism parallelism() override; /* * Abort synchronously or asynchronously - some jobs * require to be finished without immediete abort (abort on job might * cause conflicts/duplicated files - owncloud/client/issues/5949) */ - virtual void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE + virtual void abort(PropagatorJob::AbortType abortType) override { if (!_runningJobs.empty()) { _abortsCount = _runningJobs.size(); @@ -262,7 +262,7 @@ public: } } - qint64 committedDiskSpace() const Q_DECL_OVERRIDE; + qint64 committedDiskSpace() const override; private slots: void slotSubJobAbortFinished(); @@ -304,9 +304,9 @@ public: _subJobs.appendTask(item); } - virtual bool scheduleSelfOrChild() Q_DECL_OVERRIDE; - virtual JobParallelism parallelism() Q_DECL_OVERRIDE; - virtual void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE + virtual bool scheduleSelfOrChild() override; + virtual JobParallelism parallelism() override; + virtual void abort(PropagatorJob::AbortType abortType) override { if (_firstJob) // Force first job to abort synchronously @@ -325,7 +325,7 @@ public: } - qint64 committedDiskSpace() const Q_DECL_OVERRIDE + qint64 committedDiskSpace() const override { return _subJobs.committedDiskSpace(); } @@ -350,7 +350,7 @@ public: : PropagateItemJob(propagator, item) { } - void start() Q_DECL_OVERRIDE + void start() override { SyncFileItem::Status status = _item->_status; done(status == SyncFileItem::NoStatus ? SyncFileItem::FileIgnored : status, _item->_errorString); diff --git a/src/libsync/propagatedownload.h b/src/libsync/propagatedownload.h index 80b4c0475..d40432694 100644 --- a/src/libsync/propagatedownload.h +++ b/src/libsync/propagatedownload.h @@ -64,8 +64,8 @@ public: } } - virtual void start() Q_DECL_OVERRIDE; - virtual bool finished() Q_DECL_OVERRIDE + virtual void start() override; + virtual bool finished() override { if (reply()->bytesAvailable()) { return false; @@ -95,7 +95,7 @@ public: SyncFileItem::Status errorStatus() { return _errorStatus; } void setErrorStatus(const SyncFileItem::Status &s) { _errorStatus = s; } - void onTimedOut() Q_DECL_OVERRIDE; + void onTimedOut() override; QByteArray &etag() { return _etag; } quint64 resumeStart() { return _resumeStart; } @@ -159,11 +159,11 @@ public: , _deleteExisting(false) { } - void start() Q_DECL_OVERRIDE; - qint64 committedDiskSpace() const Q_DECL_OVERRIDE; + void start() override; + qint64 committedDiskSpace() const override; // We think it might finish quickly because it is a small file. - bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return _item->_size < propagator()->smallFileSize(); } + bool isLikelyFinishedQuickly() override { return _item->_size < propagator()->smallFileSize(); } /** * Whether an existing folder with the same name may be deleted before @@ -192,7 +192,7 @@ private slots: /// Called when it's time to update the db metadata void updateMetadata(bool isConflict); - void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE; + void abort(PropagatorJob::AbortType abortType) override; void slotDownloadProgress(qint64, qint64); void slotChecksumFail(const QString &errMsg); diff --git a/src/libsync/propagateremotedelete.h b/src/libsync/propagateremotedelete.h index 559d64743..e119d38e5 100644 --- a/src/libsync/propagateremotedelete.h +++ b/src/libsync/propagateremotedelete.h @@ -30,8 +30,8 @@ public: explicit DeleteJob(AccountPtr account, const QString &path, QObject *parent = 0); explicit DeleteJob(AccountPtr account, const QUrl &url, QObject *parent = 0); - void start() Q_DECL_OVERRIDE; - bool finished() Q_DECL_OVERRIDE; + void start() override; + bool finished() override; signals: void finishedSignal(); @@ -51,11 +51,11 @@ public: : PropagateItemJob(propagator, item) { } - void start() Q_DECL_OVERRIDE; + void start() override; void createDeleteJob(const QString &filename); - void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE; + void abort(PropagatorJob::AbortType abortType) override; - bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return !_item->isDirectory(); } + bool isLikelyFinishedQuickly() override { return !_item->isDirectory(); } private slots: void slotDeleteJobFinished(); diff --git a/src/libsync/propagateremotemkdir.h b/src/libsync/propagateremotemkdir.h index 8a08efabd..b850e6f2a 100644 --- a/src/libsync/propagateremotemkdir.h +++ b/src/libsync/propagateremotemkdir.h @@ -34,11 +34,11 @@ public: , _deleteExisting(false) { } - void start() Q_DECL_OVERRIDE; - void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE; + void start() override; + void abort(PropagatorJob::AbortType abortType) override; // Creating a directory should be fast. - bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return true; } + bool isLikelyFinishedQuickly() override { return true; } /** * Whether an existing entity with the same name may be deleted before diff --git a/src/libsync/propagateremotemove.h b/src/libsync/propagateremotemove.h index 1a1b8ce92..bd94e8045 100644 --- a/src/libsync/propagateremotemove.h +++ b/src/libsync/propagateremotemove.h @@ -34,8 +34,8 @@ public: explicit MoveJob(AccountPtr account, const QUrl &url, const QString &destination, QMap _extraHeaders, QObject *parent = 0); - void start() Q_DECL_OVERRIDE; - bool finished() Q_DECL_OVERRIDE; + void start() override; + bool finished() override; signals: void finishedSignal(); @@ -55,9 +55,9 @@ public: : PropagateItemJob(propagator, item) { } - void start() Q_DECL_OVERRIDE; - void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE; - JobParallelism parallelism() Q_DECL_OVERRIDE { return _item->isDirectory() ? WaitForFinished : FullParallelism; } + void start() override; + void abort(PropagatorJob::AbortType abortType) override; + JobParallelism parallelism() override { return _item->isDirectory() ? WaitForFinished : FullParallelism; } /** * Rename the directory in the selective sync list diff --git a/src/libsync/propagateupload.h b/src/libsync/propagateupload.h index 89aefb277..4aa537801 100644 --- a/src/libsync/propagateupload.h +++ b/src/libsync/propagateupload.h @@ -42,13 +42,13 @@ public: /** Reads the data from the file and opens the device */ bool prepareAndOpen(const QString &fileName, qint64 start, qint64 size); - qint64 writeData(const char *, qint64) Q_DECL_OVERRIDE; - qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; - qint64 bytesAvailable() const Q_DECL_OVERRIDE; - bool isSequential() const Q_DECL_OVERRIDE; - bool seek(qint64 pos) Q_DECL_OVERRIDE; + qint64 writeData(const char *, qint64) override; + qint64 readData(char *data, qint64 maxlen) override; + bool atEnd() const override; + qint64 size() const override; + qint64 bytesAvailable() const override; + bool isSequential() const override; + bool seek(qint64 pos) override; void setBandwidthLimited(bool); bool isBandwidthLimited() { return _bandwidthLimited; } @@ -115,9 +115,9 @@ public: int _chunk; - virtual void start() Q_DECL_OVERRIDE; + virtual void start() override; - virtual bool finished() Q_DECL_OVERRIDE + virtual bool finished() override { qCInfo(lcPutJob) << "PUT of" << reply()->request().url().toString() << "FINISHED WITH STATUS" << replyStatusString() @@ -174,8 +174,8 @@ public: { } - void start() Q_DECL_OVERRIDE; - bool finished() Q_DECL_OVERRIDE; + void start() override; + bool finished() override; signals: void finishedSignal(); @@ -246,12 +246,12 @@ public: void setDeleteExisting(bool enabled); /* start should setup the file, path and size that will be send to the server */ - void start() Q_DECL_OVERRIDE; + void start() override; void setupEncryptedFile(const QString& path, const QString& filename, quint64 size); void setupUnencryptedFile(); void startUploadFile(); void callUnlockFolder(); - bool isLikelyFinishedQuickly() Q_DECL_OVERRIDE { return _item->_size < propagator()->smallFileSize(); } + bool isLikelyFinishedQuickly() override { return _item->_size < propagator()->smallFileSize(); } private slots: void slotComputeContentChecksum(); @@ -352,9 +352,9 @@ public: { } - void doStartUpload() Q_DECL_OVERRIDE; + void doStartUpload() override; public slots: - void abort(PropagatorJob::AbortType abortType) Q_DECL_OVERRIDE; + void abort(PropagatorJob::AbortType abortType) override; private slots: void startNextChunk(); void slotPutFinished(); @@ -398,13 +398,13 @@ public: { } - void doStartUpload() Q_DECL_OVERRIDE; + void doStartUpload() override; private: void startNewUpload(); void startNextChunk(); public slots: - void abort(AbortType abortType) Q_DECL_OVERRIDE; + void abort(AbortType abortType) override; private slots: void slotPropfindFinished(); void slotPropfindFinishedWithError(); diff --git a/src/libsync/propagatorjobs.h b/src/libsync/propagatorjobs.h index 832b4cb05..b4c37cd94 100644 --- a/src/libsync/propagatorjobs.h +++ b/src/libsync/propagatorjobs.h @@ -39,7 +39,7 @@ public: : PropagateItemJob(propagator, item) { } - void start() Q_DECL_OVERRIDE; + void start() override; private: bool removeRecursively(const QString &path); @@ -60,7 +60,7 @@ public: , _deleteExistingFile(false) { } - void start() Q_DECL_OVERRIDE; + void start() override; /** * Whether an existing file with the same name may be deleted before @@ -86,7 +86,7 @@ public: : PropagateItemJob(propagator, item) { } - void start() Q_DECL_OVERRIDE; - JobParallelism parallelism() Q_DECL_OVERRIDE { return _item->isDirectory() ? WaitForFinished : FullParallelism; } + void start() override; + JobParallelism parallelism() override { return _item->isDirectory() ? WaitForFinished : FullParallelism; } }; } From 0d1c15a76861d500e5753e4cd5e64dea3871a030 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 12 Nov 2018 18:43:58 +0100 Subject: [PATCH 2/5] libsync: run clang-tidy modernize-use-override --- src/libsync/networkjobs.h | 16 ++++++++-------- src/libsync/owncloudpropagator.h | 12 ++++++------ src/libsync/propagatedownload.h | 4 ++-- src/libsync/propagateupload.h | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/libsync/networkjobs.h b/src/libsync/networkjobs.h index 062435d1d..1cc75383f 100644 --- a/src/libsync/networkjobs.h +++ b/src/libsync/networkjobs.h @@ -42,7 +42,7 @@ signals: void exists(QNetworkReply *); private slots: - virtual bool finished() override; + bool finished() override; }; /** @@ -63,7 +63,7 @@ signals: void result(int httpCode); private slots: - virtual bool finished() override; + bool finished() override; }; struct ExtraFolderInfo { @@ -119,7 +119,7 @@ signals: void finishedWithoutError(); private slots: - virtual bool finished() override; + bool finished() override; private: QList _properties; @@ -159,7 +159,7 @@ signals: void finishedWithError(QNetworkReply *reply = 0); private slots: - virtual bool finished() override; + bool finished() override; private: QList _properties; @@ -196,7 +196,7 @@ signals: void avatarPixmap(const QImage &); private slots: - virtual bool finished() override; + bool finished() override; private: QUrl _avatarUrl; @@ -235,7 +235,7 @@ signals: void finishedWithError(); private slots: - virtual bool finished() override; + bool finished() override; private: QMap _properties; @@ -261,7 +261,7 @@ signals: void finished(QNetworkReply::NetworkError); private slots: - virtual bool finished() override; + bool finished() override; }; /** @@ -336,7 +336,7 @@ signals: void etagRetreived(const QString &etag); private slots: - virtual bool finished() override; + bool finished() override; }; /** diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h index f5a30ea03..9233fbf74 100644 --- a/src/libsync/owncloudpropagator.h +++ b/src/libsync/owncloudpropagator.h @@ -238,15 +238,15 @@ public: _tasksToDo.append(item); } - virtual bool scheduleSelfOrChild() override; - virtual JobParallelism parallelism() override; + bool scheduleSelfOrChild() override; + JobParallelism parallelism() override; /* * Abort synchronously or asynchronously - some jobs * require to be finished without immediete abort (abort on job might * cause conflicts/duplicated files - owncloud/client/issues/5949) */ - virtual void abort(PropagatorJob::AbortType abortType) override + void abort(PropagatorJob::AbortType abortType) override { if (!_runningJobs.empty()) { _abortsCount = _runningJobs.size(); @@ -304,9 +304,9 @@ public: _subJobs.appendTask(item); } - virtual bool scheduleSelfOrChild() override; - virtual JobParallelism parallelism() override; - virtual void abort(PropagatorJob::AbortType abortType) override + bool scheduleSelfOrChild() override; + JobParallelism parallelism() override; + void abort(PropagatorJob::AbortType abortType) override { if (_firstJob) // Force first job to abort synchronously diff --git a/src/libsync/propagatedownload.h b/src/libsync/propagatedownload.h index d40432694..5e70892da 100644 --- a/src/libsync/propagatedownload.h +++ b/src/libsync/propagatedownload.h @@ -64,8 +64,8 @@ public: } } - virtual void start() override; - virtual bool finished() override + void start() override; + bool finished() override { if (reply()->bytesAvailable()) { return false; diff --git a/src/libsync/propagateupload.h b/src/libsync/propagateupload.h index 4aa537801..7b0273a45 100644 --- a/src/libsync/propagateupload.h +++ b/src/libsync/propagateupload.h @@ -115,9 +115,9 @@ public: int _chunk; - virtual void start() override; + void start() override; - virtual bool finished() override + bool finished() override { qCInfo(lcPutJob) << "PUT of" << reply()->request().url().toString() << "FINISHED WITH STATUS" << replyStatusString() From 1af9bf8abcdf2e4845d94137b7d85556e216e2c7 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 12 Nov 2018 18:46:39 +0100 Subject: [PATCH 3/5] libsync: run clang-tidy modernize-use-nullptr --- src/libsync/abstractnetworkjob.cpp | 4 +- src/libsync/abstractnetworkjob.h | 8 ++-- src/libsync/accessmanager.h | 4 +- src/libsync/account.cpp | 4 +- src/libsync/account.h | 6 +-- src/libsync/bandwidthmanager.cpp | 16 +++---- src/libsync/clientsideencryption.cpp | 52 +++++++++++------------ src/libsync/clientsideencryptionjobs.h | 20 ++++----- src/libsync/configfile.h | 2 +- src/libsync/cookiejar.h | 2 +- src/libsync/creds/abstractcredentials.cpp | 2 +- src/libsync/creds/httpcredentials.cpp | 2 +- src/libsync/discoveryphase.cpp | 26 ++++++------ src/libsync/discoveryphase.h | 8 ++-- src/libsync/logger.cpp | 2 +- src/libsync/logger.h | 2 +- src/libsync/networkjobs.h | 32 +++++++------- src/libsync/owncloudpropagator.cpp | 6 +-- src/libsync/owncloudpropagator.h | 2 +- src/libsync/owncloudpropagator_p.h | 2 +- src/libsync/progressdispatcher.cpp | 2 +- src/libsync/progressdispatcher.h | 2 +- src/libsync/propagatedownload.cpp | 4 +- src/libsync/propagatedownload.h | 4 +- src/libsync/propagateremotedelete.h | 4 +- src/libsync/propagateremotemove.h | 4 +- src/libsync/propagateupload.cpp | 2 +- src/libsync/propagateupload.h | 6 +-- src/libsync/theme.cpp | 4 +- src/libsync/theme.h | 2 +- 30 files changed, 118 insertions(+), 118 deletions(-) diff --git a/src/libsync/abstractnetworkjob.cpp b/src/libsync/abstractnetworkjob.cpp index 7b2868b35..bea082bfc 100644 --- a/src/libsync/abstractnetworkjob.cpp +++ b/src/libsync/abstractnetworkjob.cpp @@ -50,7 +50,7 @@ AbstractNetworkJob::AbstractNetworkJob(AccountPtr account, const QString &path, , _followRedirects(true) , _account(account) , _ignoreCredentialFailure(false) - , _reply(0) + , _reply(nullptr) , _path(path) , _redirectCount(0) { @@ -279,7 +279,7 @@ QString AbstractNetworkJob::errorStringParsingBody(QByteArray *body) AbstractNetworkJob::~AbstractNetworkJob() { - setReply(0); + setReply(nullptr); } void AbstractNetworkJob::start() diff --git a/src/libsync/abstractnetworkjob.h b/src/libsync/abstractnetworkjob.h index bbbc58e2f..7ba74ea2b 100644 --- a/src/libsync/abstractnetworkjob.h +++ b/src/libsync/abstractnetworkjob.h @@ -39,7 +39,7 @@ class OWNCLOUDSYNC_EXPORT AbstractNetworkJob : public QObject { Q_OBJECT public: - explicit AbstractNetworkJob(AccountPtr account, const QString &path, QObject *parent = 0); + explicit AbstractNetworkJob(AccountPtr account, const QString &path, QObject *parent = nullptr); virtual ~AbstractNetworkJob(); virtual void start(); @@ -86,7 +86,7 @@ public: * * Warning: Needs to call reply()->readAll(). */ - QString errorStringParsingBody(QByteArray *body = 0); + QString errorStringParsingBody(QByteArray *body = nullptr); /** static variable the HTTP timeout (in seconds). If set to 0, the default will be used */ @@ -120,14 +120,14 @@ protected: */ QNetworkReply *sendRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req = QNetworkRequest(), - QIODevice *requestBody = 0); + QIODevice *requestBody = nullptr); // sendRequest does not take a relative path instead of an url, // but the old API allowed that. We have this undefined overload // to help catch usage errors QNetworkReply *sendRequest(const QByteArray &verb, const QString &relativePath, QNetworkRequest req = QNetworkRequest(), - QIODevice *requestBody = 0); + QIODevice *requestBody = nullptr); /** Makes this job drive a pre-made QNetworkReply * diff --git a/src/libsync/accessmanager.h b/src/libsync/accessmanager.h index 42c4ba983..b86e497f9 100644 --- a/src/libsync/accessmanager.h +++ b/src/libsync/accessmanager.h @@ -32,12 +32,12 @@ class OWNCLOUDSYNC_EXPORT AccessManager : public QNetworkAccessManager Q_OBJECT public: - AccessManager(QObject *parent = 0); + AccessManager(QObject *parent = nullptr); void setRawCookie(const QByteArray &rawCookie, const QUrl &url); protected: - QNetworkReply *createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0) override; + QNetworkReply *createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData = nullptr) override; }; } // namespace OCC diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp index 18c375c1b..e5cb9a397 100644 --- a/src/libsync/account.cpp +++ b/src/libsync/account.cpp @@ -152,10 +152,10 @@ AbstractCredentials *Account::credentials() const void Account::setCredentials(AbstractCredentials *cred) { // set active credential manager - QNetworkCookieJar *jar = 0; + QNetworkCookieJar *jar = nullptr; if (_am) { jar = _am->cookieJar(); - jar->setParent(0); + jar->setParent(nullptr); _am = QSharedPointer(); } diff --git a/src/libsync/account.h b/src/libsync/account.h index 768e8f36a..c49be3f58 100644 --- a/src/libsync/account.h +++ b/src/libsync/account.h @@ -140,7 +140,7 @@ public: QNetworkReply *sendRawRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req = QNetworkRequest(), - QIODevice *data = 0); + QIODevice *data = nullptr); /** Create and start network job for a simple one-off request. * @@ -149,7 +149,7 @@ public: SimpleNetworkJob *sendRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req = QNetworkRequest(), - QIODevice *data = 0); + QIODevice *data = nullptr); /** The ssl configuration during the first connection */ QSslConfiguration getOrCreateSslConfig(); @@ -267,7 +267,7 @@ protected Q_SLOTS: void slotCredentialsAsked(); private: - Account(QObject *parent = 0); + Account(QObject *parent = nullptr); void setSharedThis(AccountPtr sharedThis); QWeakPointer _sharedThis; diff --git a/src/libsync/bandwidthmanager.cpp b/src/libsync/bandwidthmanager.cpp index 00f833868..c7191105c 100644 --- a/src/libsync/bandwidthmanager.cpp +++ b/src/libsync/bandwidthmanager.cpp @@ -47,10 +47,10 @@ static qint64 relativeLimitMeasuringTimerIntervalMsec = 1000 * 2; BandwidthManager::BandwidthManager(OwncloudPropagator *p) : QObject() , _propagator(p) - , _relativeLimitCurrentMeasuredDevice(0) + , _relativeLimitCurrentMeasuredDevice(nullptr) , _relativeUploadLimitProgressAtMeasuringRestart(0) , _currentUploadLimit(0) - , _relativeLimitCurrentMeasuredJob(0) + , _relativeLimitCurrentMeasuredJob(nullptr) , _currentDownloadLimit(0) { _currentUploadLimit = _propagator->_uploadLimit.fetchAndAddAcquire(0); @@ -115,7 +115,7 @@ void BandwidthManager::unregisterUploadDevice(QObject *o) _absoluteUploadDeviceList.removeAll(p); _relativeUploadDeviceList.removeAll(p); if (p == _relativeLimitCurrentMeasuredDevice) { - _relativeLimitCurrentMeasuredDevice = 0; + _relativeLimitCurrentMeasuredDevice = nullptr; _relativeUploadLimitProgressAtMeasuringRestart = 0; } } @@ -142,7 +142,7 @@ void BandwidthManager::unregisterDownloadJob(QObject *o) GETFileJob *j = reinterpret_cast(o); // note, we might already be in the ~QObject _downloadJobList.removeAll(j); if (_relativeLimitCurrentMeasuredJob == j) { - _relativeLimitCurrentMeasuredJob = 0; + _relativeLimitCurrentMeasuredJob = nullptr; _relativeDownloadLimitProgressAtMeasuringRestart = 0; } } @@ -155,7 +155,7 @@ void BandwidthManager::relativeUploadMeasuringTimerExpired() _relativeUploadDelayTimer.start(); return; } - if (_relativeLimitCurrentMeasuredDevice == 0) { + if (_relativeLimitCurrentMeasuredDevice == nullptr) { qCDebug(lcBandwidthManager) << "No device set, just waiting 1 sec"; _relativeUploadDelayTimer.setInterval(1000); _relativeUploadDelayTimer.start(); @@ -201,7 +201,7 @@ void BandwidthManager::relativeUploadMeasuringTimerExpired() ud->giveBandwidthQuota(quotaPerDevice); qCDebug(lcBandwidthManager) << "Gave" << quotaPerDevice / 1024.0 << "kB to" << ud; } - _relativeLimitCurrentMeasuredDevice = 0; + _relativeLimitCurrentMeasuredDevice = nullptr; } void BandwidthManager::relativeUploadDelayTimerExpired() @@ -249,7 +249,7 @@ void BandwidthManager::relativeDownloadMeasuringTimerExpired() _relativeDownloadDelayTimer.start(); return; } - if (_relativeLimitCurrentMeasuredJob == 0) { + if (_relativeLimitCurrentMeasuredJob == nullptr) { qCDebug(lcBandwidthManager) << "No job set, just waiting 1 sec"; _relativeDownloadDelayTimer.setInterval(1000); _relativeDownloadDelayTimer.start(); @@ -295,7 +295,7 @@ void BandwidthManager::relativeDownloadMeasuringTimerExpired() gfj->giveBandwidthQuota(quotaPerJob); qCDebug(lcBandwidthManager) << "Gave" << quotaPerJob / 1024.0 << "kB to" << gfj; } - _relativeLimitCurrentMeasuredDevice = 0; + _relativeLimitCurrentMeasuredDevice = nullptr; } void BandwidthManager::relativeDownloadDelayTimerExpired() diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp index a2dabea84..f0d3bc9dc 100644 --- a/src/libsync/clientsideencryption.cpp +++ b/src/libsync/clientsideencryption.cpp @@ -150,7 +150,7 @@ QByteArray encryptPrivateKey( } /* Initialise the decryption operation. */ - if(!EVP_EncryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, NULL, NULL)) { + if(!EVP_EncryptInit_ex(ctx, EVP_aes_256_gcm(), nullptr, nullptr, nullptr)) { qCInfo(lcCse()) << "Error initializing context with aes_256"; handleErrors(); } @@ -159,13 +159,13 @@ QByteArray encryptPrivateKey( EVP_CIPHER_CTX_set_padding(ctx, 0); /* Set IV length. */ - if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), NULL)) { + if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr)) { qCInfo(lcCse()) << "Error setting iv length"; handleErrors(); } /* Initialise key and IV */ - if(!EVP_EncryptInit_ex(ctx, NULL, NULL, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) { + if(!EVP_EncryptInit_ex(ctx, nullptr, nullptr, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) { qCInfo(lcCse()) << "Error initialising key and iv"; handleErrors(); } @@ -242,21 +242,21 @@ QByteArray decryptPrivateKey(const QByteArray& key, const QByteArray& data) { } /* Initialise the decryption operation. */ - if(!EVP_DecryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, NULL, NULL)) { + if(!EVP_DecryptInit_ex(ctx, EVP_aes_256_gcm(), nullptr, nullptr, nullptr)) { qCInfo(lcCse()) << "Error initialising context with aes 256"; EVP_CIPHER_CTX_free(ctx); return QByteArray(); } /* Set IV length. Not necessary if this is 12 bytes (96 bits) */ - if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), NULL)) { + if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr)) { qCInfo(lcCse()) << "Error setting IV size"; EVP_CIPHER_CTX_free(ctx); return QByteArray(); } /* Initialise key and IV */ - if(!EVP_DecryptInit_ex(ctx, NULL, NULL, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) { + if(!EVP_DecryptInit_ex(ctx, nullptr, nullptr, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) { qCInfo(lcCse()) << "Error initialising key and iv"; EVP_CIPHER_CTX_free(ctx); return QByteArray(); @@ -331,21 +331,21 @@ QByteArray decryptStringSymmetric(const QByteArray& key, const QByteArray& data) } /* Initialise the decryption operation. */ - if(!EVP_DecryptInit_ex(ctx, EVP_aes_128_gcm(), NULL, NULL, NULL)) { + if(!EVP_DecryptInit_ex(ctx, EVP_aes_128_gcm(), nullptr, nullptr, nullptr)) { qCInfo(lcCse()) << "Error initialising context with aes 128"; EVP_CIPHER_CTX_free(ctx); return QByteArray(); } /* Set IV length. Not necessary if this is 12 bytes (96 bits) */ - if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), NULL)) { + if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr)) { qCInfo(lcCse()) << "Error setting IV size"; EVP_CIPHER_CTX_free(ctx); return QByteArray(); } /* Initialise key and IV */ - if(!EVP_DecryptInit_ex(ctx, NULL, NULL, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) { + if(!EVP_DecryptInit_ex(ctx, nullptr, nullptr, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) { qCInfo(lcCse()) << "Error initialising key and iv"; EVP_CIPHER_CTX_free(ctx); return QByteArray(); @@ -394,10 +394,10 @@ QByteArray decryptStringSymmetric(const QByteArray& key, const QByteArray& data) QByteArray privateKeyToPem(const QByteArray key) { BIO *privateKeyBio = BIO_new(BIO_s_mem()); BIO_write(privateKeyBio, key.constData(), key.size()); - EVP_PKEY *pkey = PEM_read_bio_PrivateKey(privateKeyBio, NULL, NULL, NULL); + EVP_PKEY *pkey = PEM_read_bio_PrivateKey(privateKeyBio, nullptr, nullptr, nullptr); BIO *pemBio = BIO_new(BIO_s_mem()); - PEM_write_bio_PKCS8PrivateKey(pemBio, pkey, NULL, NULL, 0, NULL, NULL); + PEM_write_bio_PKCS8PrivateKey(pemBio, pkey, nullptr, nullptr, 0, nullptr, nullptr); QByteArray pem = BIO2ByteArray(pemBio); BIO_free_all(privateKeyBio); @@ -419,7 +419,7 @@ QByteArray encryptStringSymmetric(const QByteArray& key, const QByteArray& data) } /* Initialise the decryption operation. */ - if(!EVP_EncryptInit_ex(ctx, EVP_aes_128_gcm(), NULL, NULL, NULL)) { + if(!EVP_EncryptInit_ex(ctx, EVP_aes_128_gcm(), nullptr, nullptr, nullptr)) { qCInfo(lcCse()) << "Error initializing context with aes_128"; handleErrors(); return {}; @@ -429,14 +429,14 @@ QByteArray encryptStringSymmetric(const QByteArray& key, const QByteArray& data) EVP_CIPHER_CTX_set_padding(ctx, 0); /* Set IV length. */ - if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), NULL)) { + if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr)) { qCInfo(lcCse()) << "Error setting iv length"; handleErrors(); return {}; } /* Initialise key and IV */ - if(!EVP_EncryptInit_ex(ctx, NULL, NULL, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) { + if(!EVP_EncryptInit_ex(ctx, nullptr, nullptr, (unsigned char *)key.constData(), (unsigned char *)iv.constData())) { qCInfo(lcCse()) << "Error initialising key and iv"; handleErrors(); return {}; @@ -523,7 +523,7 @@ QByteArray decryptStringAsymmetric(EVP_PKEY *privateKey, const QByteArray& data) } size_t outlen = 0; - err = EVP_PKEY_decrypt(ctx, NULL, &outlen, (unsigned char *)data.constData(), data.size()); + err = EVP_PKEY_decrypt(ctx, nullptr, &outlen, (unsigned char *)data.constData(), data.size()); if (err <= 0) { qCInfo(lcCseDecryption()) << "Could not determine the buffer length"; handleErrors(); @@ -584,7 +584,7 @@ QByteArray encryptStringAsymmetric(EVP_PKEY *publicKey, const QByteArray& data) } size_t outLen = 0; - if (EVP_PKEY_encrypt(ctx, NULL, &outLen, (unsigned char *)data.constData(), data.size()) != 1) { + if (EVP_PKEY_encrypt(ctx, nullptr, &outLen, (unsigned char *)data.constData(), data.size()) != 1) { qCInfo(lcCse()) << "Error retrieving the size of the encrypted data"; exit(1); } else { @@ -834,7 +834,7 @@ void ClientSideEncryption::generateKeyPair() EVP_PKEY *localKeyPair = nullptr; // Init RSA - EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, NULL); + EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, nullptr); if(EVP_PKEY_keygen_init(ctx) <= 0) { qCInfo(lcCse()) << "Couldn't initialize the key generator"; @@ -855,7 +855,7 @@ void ClientSideEncryption::generateKeyPair() qCInfo(lcCse()) << "Storing keys locally"; BIO *privKey = BIO_new(BIO_s_mem()); - if (PEM_write_bio_PrivateKey(privKey, localKeyPair, NULL, NULL, 0, NULL, NULL) <= 0) { + if (PEM_write_bio_PrivateKey(privKey, localKeyPair, nullptr, nullptr, 0, nullptr, nullptr) <= 0) { qCInfo(lcCse()) << "Could not read private key from bio."; return; } @@ -1218,7 +1218,7 @@ QByteArray FolderMetadata::encryptMetadataKey(const QByteArray& data) const { BIO *publicKeyBio = BIO_new(BIO_s_mem()); QByteArray publicKeyPem = _account->e2e()->_publicKey.toPem(); BIO_write(publicKeyBio, publicKeyPem.constData(), publicKeyPem.size()); - EVP_PKEY *publicKey = PEM_read_bio_PUBKEY(publicKeyBio, NULL, NULL, NULL); + EVP_PKEY *publicKey = PEM_read_bio_PUBKEY(publicKeyBio, nullptr, nullptr, nullptr); // The metadata key is binary so base64 encode it first auto ret = EncryptionHelper::encryptStringAsymmetric(publicKey, data.toBase64()); @@ -1231,7 +1231,7 @@ QByteArray FolderMetadata::decryptMetadataKey(const QByteArray& encryptedMetadat BIO *privateKeyBio = BIO_new(BIO_s_mem()); QByteArray privateKeyPem = _account->e2e()->_privateKey; BIO_write(privateKeyBio, privateKeyPem.constData(), privateKeyPem.size()); - EVP_PKEY *key = PEM_read_bio_PrivateKey(privateKeyBio, NULL, NULL, NULL); + EVP_PKEY *key = PEM_read_bio_PrivateKey(privateKeyBio, nullptr, nullptr, nullptr); // Also base64 decode the result QByteArray decryptResult = EncryptionHelper::decryptStringAsymmetric( @@ -1382,7 +1382,7 @@ bool EncryptionHelper::fileEncryption(const QByteArray &key, const QByteArray &i } /* Initialise the decryption operation. */ - if(!EVP_EncryptInit_ex(ctx, EVP_aes_128_gcm(), NULL, NULL, NULL)) { + if(!EVP_EncryptInit_ex(ctx, EVP_aes_128_gcm(), nullptr, nullptr, nullptr)) { qCInfo(lcCse()) << "Could not init cipher"; return false; } @@ -1390,13 +1390,13 @@ bool EncryptionHelper::fileEncryption(const QByteArray &key, const QByteArray &i EVP_CIPHER_CTX_set_padding(ctx, 0); /* Set IV length. */ - if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), NULL)) { + if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr)) { qCInfo(lcCse()) << "Could not set iv length"; return false; } /* Initialise key and IV */ - if(!EVP_EncryptInit_ex(ctx, NULL, NULL, (const unsigned char *)key.constData(), (const unsigned char *)iv.constData())) { + if(!EVP_EncryptInit_ex(ctx, nullptr, nullptr, (const unsigned char *)key.constData(), (const unsigned char *)iv.constData())) { qCInfo(lcCse()) << "Could not set key and iv"; return false; } @@ -1467,7 +1467,7 @@ bool EncryptionHelper::fileDecryption(const QByteArray &key, const QByteArray& i } /* Initialise the decryption operation. */ - if(!EVP_DecryptInit_ex(ctx, EVP_aes_128_gcm(), NULL, NULL, NULL)) { + if(!EVP_DecryptInit_ex(ctx, EVP_aes_128_gcm(), nullptr, nullptr, nullptr)) { qCInfo(lcCse()) << "Could not init cipher"; return false; } @@ -1475,13 +1475,13 @@ bool EncryptionHelper::fileDecryption(const QByteArray &key, const QByteArray& i EVP_CIPHER_CTX_set_padding(ctx, 0); /* Set IV length. */ - if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), NULL)) { + if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, iv.size(), nullptr)) { qCInfo(lcCse()) << "Could not set iv length"; return false; } /* Initialise key and IV */ - if(!EVP_DecryptInit_ex(ctx, NULL, NULL, (const unsigned char *) key.constData(), (const unsigned char *) iv.constData())) { + if(!EVP_DecryptInit_ex(ctx, nullptr, nullptr, (const unsigned char *) key.constData(), (const unsigned char *) iv.constData())) { qCInfo(lcCse()) << "Could not set key and iv"; return false; } diff --git a/src/libsync/clientsideencryptionjobs.h b/src/libsync/clientsideencryptionjobs.h index ae363b87b..8831f7483 100644 --- a/src/libsync/clientsideencryptionjobs.h +++ b/src/libsync/clientsideencryptionjobs.h @@ -28,7 +28,7 @@ class OWNCLOUDSYNC_EXPORT SignPublicKeyApiJob : public AbstractNetworkJob { Q_OBJECT public: - explicit SignPublicKeyApiJob(const AccountPtr &account, const QString &path, QObject *parent = 0); + explicit SignPublicKeyApiJob(const AccountPtr &account, const QString &path, QObject *parent = nullptr); /** * @brief setCsr - the CSR with the public key. @@ -71,7 +71,7 @@ class OWNCLOUDSYNC_EXPORT StorePrivateKeyApiJob : public AbstractNetworkJob { Q_OBJECT public: - explicit StorePrivateKeyApiJob(const AccountPtr &account, const QString &path, QObject *parent = 0); + explicit StorePrivateKeyApiJob(const AccountPtr &account, const QString &path, QObject *parent = nullptr); /** * @brief setCsr - the CSR with the public key. @@ -114,7 +114,7 @@ class OWNCLOUDSYNC_EXPORT SetEncryptionFlagApiJob : public AbstractNetworkJob { Q_OBJECT public: - explicit SetEncryptionFlagApiJob(const AccountPtr &account, const QByteArray& fileId, QObject *parent = 0); + explicit SetEncryptionFlagApiJob(const AccountPtr &account, const QByteArray& fileId, QObject *parent = nullptr); public slots: void start() override; @@ -134,7 +134,7 @@ class OWNCLOUDSYNC_EXPORT LockEncryptFolderApiJob : public AbstractNetworkJob { Q_OBJECT public: - explicit LockEncryptFolderApiJob(const AccountPtr &account, const QByteArray& fileId, QObject *parent = 0); + explicit LockEncryptFolderApiJob(const AccountPtr &account, const QByteArray& fileId, QObject *parent = nullptr); public slots: void start() override; @@ -159,7 +159,7 @@ public: const AccountPtr &account, const QByteArray& fileId, const QByteArray& token, - QObject *parent = 0); + QObject *parent = nullptr); public slots: void start() override; @@ -186,7 +186,7 @@ public: const AccountPtr &account, const QByteArray& fileId, const QByteArray& b64Metadata, - QObject *parent = 0); + QObject *parent = nullptr); public slots: void start() override; @@ -212,7 +212,7 @@ public: const QByteArray& fileId, const QByteArray& b64Metadata, const QByteArray& lockedToken, - QObject *parent = 0); + QObject *parent = nullptr); public slots: void start() override; @@ -238,7 +238,7 @@ public: explicit GetMetadataApiJob ( const AccountPtr &account, const QByteArray& fileId, - QObject *parent = 0); + QObject *parent = nullptr); public slots: void start() override; @@ -261,7 +261,7 @@ public: explicit DeleteMetadataApiJob ( const AccountPtr &account, const QByteArray& fileId, - QObject *parent = 0); + QObject *parent = nullptr); public slots: void start() override; @@ -284,7 +284,7 @@ class OWNCLOUDSYNC_EXPORT GetFolderEncryptStatusJob : public AbstractNetworkJob { Q_OBJECT public: - explicit GetFolderEncryptStatusJob (const AccountPtr &account, const QString& folder, QObject *parent = 0); + explicit GetFolderEncryptStatusJob (const AccountPtr &account, const QString& folder, QObject *parent = nullptr); public slots: void start() override; diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h index ebf30290f..e84e8b2f3 100644 --- a/src/libsync/configfile.h +++ b/src/libsync/configfile.h @@ -159,7 +159,7 @@ public: /** Returns a new settings pre-set in a specific group. The Settings will be created with the given parent. If no parent is specified, the caller must destroy the settings */ - static std::unique_ptr settingsWithGroup(const QString &group, QObject *parent = 0); + static std::unique_ptr settingsWithGroup(const QString &group, QObject *parent = nullptr); /// Add the system and user exclude file path to the ExcludedFiles instance. static void setupDefaultExcludeFilePaths(ExcludedFiles &excludedFiles); diff --git a/src/libsync/cookiejar.h b/src/libsync/cookiejar.h index e5aeb139a..245b546b9 100644 --- a/src/libsync/cookiejar.h +++ b/src/libsync/cookiejar.h @@ -29,7 +29,7 @@ class OWNCLOUDSYNC_EXPORT CookieJar : public QNetworkCookieJar { Q_OBJECT public: - explicit CookieJar(QObject *parent = 0); + explicit CookieJar(QObject *parent = nullptr); ~CookieJar(); bool setCookiesFromUrl(const QList &cookieList, const QUrl &url) override; QList cookiesForUrl(const QUrl &url) const override; diff --git a/src/libsync/creds/abstractcredentials.cpp b/src/libsync/creds/abstractcredentials.cpp index 4febff813..677891f84 100644 --- a/src/libsync/creds/abstractcredentials.cpp +++ b/src/libsync/creds/abstractcredentials.cpp @@ -24,7 +24,7 @@ namespace OCC { Q_LOGGING_CATEGORY(lcCredentials, "nextcloud.sync.credentials", QtInfoMsg) AbstractCredentials::AbstractCredentials() - : _account(0) + : _account(nullptr) , _wasFetched(false) { } diff --git a/src/libsync/creds/httpcredentials.cpp b/src/libsync/creds/httpcredentials.cpp index b8b79b66d..3090bdb30 100644 --- a/src/libsync/creds/httpcredentials.cpp +++ b/src/libsync/creds/httpcredentials.cpp @@ -50,7 +50,7 @@ namespace { class HttpCredentialsAccessManager : public AccessManager { public: - HttpCredentialsAccessManager(const HttpCredentials *cred, QObject *parent = 0) + HttpCredentialsAccessManager(const HttpCredentials *cred, QObject *parent = nullptr) : AccessManager(parent) , _cred(cred) { diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp index 84f8264d2..a4432ad93 100644 --- a/src/libsync/discoveryphase.cpp +++ b/src/libsync/discoveryphase.cpp @@ -528,7 +528,7 @@ void DiscoveryMainThread::singleDirectoryJobResultSlot() qCDebug(lcDiscovery) << "Have" << _currentDiscoveryDirectoryResult->list.size() << "results for " << _currentDiscoveryDirectoryResult->path; - _currentDiscoveryDirectoryResult = 0; // the sync thread owns it now + _currentDiscoveryDirectoryResult = nullptr; // the sync thread owns it now if (!_firstFolderProcessed) { _firstFolderProcessed = true; @@ -549,7 +549,7 @@ void DiscoveryMainThread::singleDirectoryJobFinishedWithErrorSlot(int csyncErrno _currentDiscoveryDirectoryResult->code = csyncErrnoCode; _currentDiscoveryDirectoryResult->msg = msg; - _currentDiscoveryDirectoryResult = 0; // the sync thread owns it now + _currentDiscoveryDirectoryResult = nullptr; // the sync thread owns it now _discoveryJob->_vioMutex.lock(); _discoveryJob->_vioWaitCondition.wakeAll(); @@ -598,7 +598,7 @@ void DiscoveryMainThread::slotGetSizeFinishedWithError() qCWarning(lcDiscovery) << "Error getting the size of the directory"; // just let let the discovery job continue then - _currentGetSizeResult = 0; + _currentGetSizeResult = nullptr; QMutexLocker locker(&_discoveryJob->_vioMutex); _discoveryJob->_vioWaitCondition.wakeAll(); } @@ -611,7 +611,7 @@ void DiscoveryMainThread::slotGetSizeResult(const QVariantMap &map) *_currentGetSizeResult = map.value(QLatin1String("size")).toLongLong(); qCDebug(lcDiscovery) << "Size of folder:" << *_currentGetSizeResult; - _currentGetSizeResult = 0; + _currentGetSizeResult = nullptr; QMutexLocker locker(&_discoveryJob->_vioMutex); _discoveryJob->_vioWaitCondition.wakeAll(); } @@ -630,13 +630,13 @@ void DiscoveryMainThread::abort() if (_discoveryJob->_vioMutex.tryLock()) { _currentDiscoveryDirectoryResult->msg = tr("Aborted by the user"); // Actually also created somewhere else by sync engine _currentDiscoveryDirectoryResult->code = EIO; - _currentDiscoveryDirectoryResult = 0; + _currentDiscoveryDirectoryResult = nullptr; _discoveryJob->_vioWaitCondition.wakeAll(); _discoveryJob->_vioMutex.unlock(); } } if (_currentGetSizeResult) { - _currentGetSizeResult = 0; + _currentGetSizeResult = nullptr; QMutexLocker locker(&_discoveryJob->_vioMutex); _discoveryJob->_vioWaitCondition.wakeAll(); } @@ -666,12 +666,12 @@ csync_vio_handle_t *DiscoveryJob::remote_vio_opendir_hook(const char *url, errno = directoryResult->code; // save the error string to the context discoveryJob->_csync_ctx->error_string = qstrdup(directoryResult->msg.toUtf8().constData()); - return NULL; + return nullptr; } return directoryResult.take(); } - return NULL; + return nullptr; } @@ -687,7 +687,7 @@ std::unique_ptr DiscoveryJob::remote_vio_readdir_hook(csync_v return file_stat; } } - return NULL; + return nullptr; } void DiscoveryJob::remote_vio_closedir_hook(csync_vio_handle_t *dhandle, void *userdata) @@ -719,10 +719,10 @@ void DiscoveryJob::start() _lastUpdateProgressCallbackCall.invalidate(); int ret = csync_update(_csync_ctx); - _csync_ctx->callbacks.checkSelectiveSyncNewFolderHook = 0; - _csync_ctx->callbacks.checkSelectiveSyncBlackListHook = 0; - _csync_ctx->callbacks.update_callback = 0; - _csync_ctx->callbacks.update_callback_userdata = 0; + _csync_ctx->callbacks.checkSelectiveSyncNewFolderHook = nullptr; + _csync_ctx->callbacks.checkSelectiveSyncBlackListHook = nullptr; + _csync_ctx->callbacks.update_callback = nullptr; + _csync_ctx->callbacks.update_callback_userdata = nullptr; emit finished(ret); deleteLater(); diff --git a/src/libsync/discoveryphase.h b/src/libsync/discoveryphase.h index 238f1e822..04b2ae097 100644 --- a/src/libsync/discoveryphase.h +++ b/src/libsync/discoveryphase.h @@ -59,7 +59,7 @@ class DiscoverySingleDirectoryJob : public QObject { Q_OBJECT public: - explicit DiscoverySingleDirectoryJob(const AccountPtr &account, const QString &path, QObject *parent = 0); + explicit DiscoverySingleDirectoryJob(const AccountPtr &account, const QString &path, QObject *parent = nullptr); // Specify thgat this is the root and we need to check the data-fingerprint void setIsRootPath() { _isRootPath = true; } void start(); @@ -117,8 +117,8 @@ public: DiscoveryMainThread(AccountPtr account) : QObject() , _account(account) - , _currentDiscoveryDirectoryResult(0) - , _currentGetSizeResult(0) + , _currentDiscoveryDirectoryResult(nullptr) + , _currentGetSizeResult(nullptr) , _firstFolderProcessed(false) { } @@ -187,7 +187,7 @@ class DiscoveryJob : public QObject public: - explicit DiscoveryJob(CSYNC *ctx, QObject *parent = 0) + explicit DiscoveryJob(CSYNC *ctx, QObject *parent = nullptr) : QObject(parent) , _csync_ctx(ctx) { diff --git a/src/libsync/logger.cpp b/src/libsync/logger.cpp index a9bd94648..ef486266f 100644 --- a/src/libsync/logger.cpp +++ b/src/libsync/logger.cpp @@ -141,7 +141,7 @@ void Logger::setLogFile(const QString &name) { QMutexLocker locker(&_mutex); if (_logstream) { - _logstream.reset(0); + _logstream.reset(nullptr); _logFile.close(); } diff --git a/src/libsync/logger.h b/src/libsync/logger.h index 7ae278e49..91dbb3202 100644 --- a/src/libsync/logger.h +++ b/src/libsync/logger.h @@ -94,7 +94,7 @@ public slots: void enterNextLogFile(); private: - Logger(QObject *parent = 0); + Logger(QObject *parent = nullptr); ~Logger(); QList _logs; bool _showTime; diff --git a/src/libsync/networkjobs.h b/src/libsync/networkjobs.h index 1cc75383f..c2fefd611 100644 --- a/src/libsync/networkjobs.h +++ b/src/libsync/networkjobs.h @@ -35,7 +35,7 @@ class OWNCLOUDSYNC_EXPORT EntityExistsJob : public AbstractNetworkJob { Q_OBJECT public: - explicit EntityExistsJob(AccountPtr account, const QString &path, QObject *parent = 0); + explicit EntityExistsJob(AccountPtr account, const QString &path, QObject *parent = nullptr); void start() override; signals: @@ -56,7 +56,7 @@ class OWNCLOUDSYNC_EXPORT DeleteApiJob : public AbstractNetworkJob { Q_OBJECT public: - explicit DeleteApiJob(AccountPtr account, const QString &path, QObject *parent = 0); + explicit DeleteApiJob(AccountPtr account, const QString &path, QObject *parent = nullptr); void start() override; signals: @@ -96,8 +96,8 @@ class OWNCLOUDSYNC_EXPORT LsColJob : public AbstractNetworkJob { Q_OBJECT public: - explicit LsColJob(AccountPtr account, const QString &path, QObject *parent = 0); - explicit LsColJob(AccountPtr account, const QUrl &url, QObject *parent = 0); + explicit LsColJob(AccountPtr account, const QString &path, QObject *parent = nullptr); + explicit LsColJob(AccountPtr account, const QUrl &url, QObject *parent = nullptr); void start() override; QHash _folderInfos; @@ -140,7 +140,7 @@ class OWNCLOUDSYNC_EXPORT PropfindJob : public AbstractNetworkJob { Q_OBJECT public: - explicit PropfindJob(AccountPtr account, const QString &path, QObject *parent = 0); + explicit PropfindJob(AccountPtr account, const QString &path, QObject *parent = nullptr); void start() override; /** @@ -156,7 +156,7 @@ public: signals: void result(const QVariantMap &values); - void finishedWithError(QNetworkReply *reply = 0); + void finishedWithError(QNetworkReply *reply = nullptr); private slots: bool finished() override; @@ -181,7 +181,7 @@ public: * @param userId The user for which to obtain the avatar * @param size The size of the avatar (square so size*size) */ - explicit AvatarJob(AccountPtr account, const QString &userId, int size, QObject *parent = 0); + explicit AvatarJob(AccountPtr account, const QString &userId, int size, QObject *parent = nullptr); void start() override; @@ -216,7 +216,7 @@ class OWNCLOUDSYNC_EXPORT ProppatchJob : public AbstractNetworkJob { Q_OBJECT public: - explicit ProppatchJob(AccountPtr account, const QString &path, QObject *parent = 0); + explicit ProppatchJob(AccountPtr account, const QString &path, QObject *parent = nullptr); void start() override; /** @@ -252,9 +252,9 @@ class OWNCLOUDSYNC_EXPORT MkColJob : public AbstractNetworkJob QMap _extraHeaders; public: - explicit MkColJob(AccountPtr account, const QString &path, QObject *parent = 0); + explicit MkColJob(AccountPtr account, const QString &path, QObject *parent = nullptr); explicit MkColJob(AccountPtr account, const QUrl &url, - const QMap &extraHeaders, QObject *parent = 0); + const QMap &extraHeaders, QObject *parent = nullptr); void start() override; signals: @@ -272,7 +272,7 @@ class OWNCLOUDSYNC_EXPORT CheckServerJob : public AbstractNetworkJob { Q_OBJECT public: - explicit CheckServerJob(AccountPtr account, QObject *parent = 0); + explicit CheckServerJob(AccountPtr account, QObject *parent = nullptr); void start() override; static QString version(const QJsonObject &info); @@ -329,7 +329,7 @@ class OWNCLOUDSYNC_EXPORT RequestEtagJob : public AbstractNetworkJob { Q_OBJECT public: - explicit RequestEtagJob(AccountPtr account, const QString &path, QObject *parent = 0); + explicit RequestEtagJob(AccountPtr account, const QString &path, QObject *parent = nullptr); void start() override; signals: @@ -358,7 +358,7 @@ class OWNCLOUDSYNC_EXPORT JsonApiJob : public AbstractNetworkJob { Q_OBJECT public: - explicit JsonApiJob(const AccountPtr &account, const QString &path, QObject *parent = 0); + explicit JsonApiJob(const AccountPtr &account, const QString &path, QObject *parent = nullptr); /** * @brief addQueryParams - add more parameters to the ocs call @@ -415,7 +415,7 @@ public: WebViewFlow }; - explicit DetermineAuthTypeJob(AccountPtr account, QObject *parent = 0); + explicit DetermineAuthTypeJob(AccountPtr account, QObject *parent = nullptr); void start(); signals: void authType(AuthType); @@ -440,11 +440,11 @@ class OWNCLOUDSYNC_EXPORT SimpleNetworkJob : public AbstractNetworkJob { Q_OBJECT public: - explicit SimpleNetworkJob(AccountPtr account, QObject *parent = 0); + explicit SimpleNetworkJob(AccountPtr account, QObject *parent = nullptr); QNetworkReply *startRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req = QNetworkRequest(), - QIODevice *requestBody = 0); + QIODevice *requestBody = nullptr); signals: void finishedSignal(QNetworkReply *reply); diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp index ae98423bd..bf358153e 100644 --- a/src/libsync/owncloudpropagator.cpp +++ b/src/libsync/owncloudpropagator.cpp @@ -334,7 +334,7 @@ PropagateItemJob *OwncloudPropagator::createJob(const SyncFileItemPtr &item) job->setDeleteExistingFolder(deleteExisting); return job; } else { - PropagateUploadFileCommon *job = 0; + PropagateUploadFileCommon *job = nullptr; if (item->_size > syncOptions()._initialChunkSize && account()->capabilities().chunkingNg()) { // Item is above _initialChunkSize, thus will be classified as to be chunked job = new PropagateUploadFileNG(this, item); @@ -354,9 +354,9 @@ PropagateItemJob *OwncloudPropagator::createJob(const SyncFileItemPtr &item) case CSYNC_INSTRUCTION_ERROR: return new PropagateIgnoreJob(this, item); default: - return 0; + return nullptr; } - return 0; + return nullptr; } quint64 OwncloudPropagator::smallFileSize() diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h index 9233fbf74..b4ccd3fb2 100644 --- a/src/libsync/owncloudpropagator.h +++ b/src/libsync/owncloudpropagator.h @@ -565,7 +565,7 @@ class CleanupPollsJob : public QObject public: explicit CleanupPollsJob(const QVector &pollInfos, AccountPtr account, - SyncJournalDb *journal, const QString &localPath, QObject *parent = 0) + SyncJournalDb *journal, const QString &localPath, QObject *parent = nullptr) : QObject(parent) , _pollInfos(pollInfos) , _account(account) diff --git a/src/libsync/owncloudpropagator_p.h b/src/libsync/owncloudpropagator_p.h index 4983e570a..cb266a80d 100644 --- a/src/libsync/owncloudpropagator_p.h +++ b/src/libsync/owncloudpropagator_p.h @@ -60,7 +60,7 @@ inline QByteArray getEtagFromReply(QNetworkReply *reply) */ inline SyncFileItem::Status classifyError(QNetworkReply::NetworkError nerror, int httpCode, - bool *anotherSyncNeeded = NULL) + bool *anotherSyncNeeded = nullptr) { Q_ASSERT(nerror != QNetworkReply::NoError); // we should only be called when there is an error diff --git a/src/libsync/progressdispatcher.cpp b/src/libsync/progressdispatcher.cpp index e85b55e67..e17279a53 100644 --- a/src/libsync/progressdispatcher.cpp +++ b/src/libsync/progressdispatcher.cpp @@ -20,7 +20,7 @@ namespace OCC { -ProgressDispatcher *ProgressDispatcher::_instance = 0; +ProgressDispatcher *ProgressDispatcher::_instance = nullptr; QString Progress::asResultString(const SyncFileItem &item) { diff --git a/src/libsync/progressdispatcher.h b/src/libsync/progressdispatcher.h index e011b5b60..66b7ba7cd 100644 --- a/src/libsync/progressdispatcher.h +++ b/src/libsync/progressdispatcher.h @@ -305,7 +305,7 @@ protected: void setProgressInfo(const QString &folder, const ProgressInfo &progress); private: - ProgressDispatcher(QObject *parent = 0); + ProgressDispatcher(QObject *parent = nullptr); QElapsedTimer _timer; static ProgressDispatcher *_instance; diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp index 5c0fb5645..fd181f96e 100644 --- a/src/libsync/propagatedownload.cpp +++ b/src/libsync/propagatedownload.cpp @@ -80,7 +80,7 @@ GETFileJob::GETFileJob(AccountPtr account, const QString &path, QFile *device, , _bandwidthLimited(false) , _bandwidthChoked(false) , _bandwidthQuota(0) - , _bandwidthManager(0) + , _bandwidthManager(nullptr) , _hasEmittedFinishedSignal(false) , _lastModified() { @@ -100,7 +100,7 @@ GETFileJob::GETFileJob(AccountPtr account, const QUrl &url, QFile *device, , _bandwidthLimited(false) , _bandwidthChoked(false) , _bandwidthQuota(0) - , _bandwidthManager(0) + , _bandwidthManager(nullptr) , _hasEmittedFinishedSignal(false) , _lastModified() { diff --git a/src/libsync/propagatedownload.h b/src/libsync/propagatedownload.h index 5e70892da..86635d087 100644 --- a/src/libsync/propagatedownload.h +++ b/src/libsync/propagatedownload.h @@ -52,11 +52,11 @@ public: // DOES NOT take ownership of the device. explicit GETFileJob(AccountPtr account, const QString &path, QFile *device, const QMap &headers, const QByteArray &expectedEtagForResume, - quint64 resumeStart, QObject *parent = 0); + quint64 resumeStart, QObject *parent = nullptr); // For directDownloadUrl: explicit GETFileJob(AccountPtr account, const QUrl &url, QFile *device, const QMap &headers, const QByteArray &expectedEtagForResume, - quint64 resumeStart, QObject *parent = 0); + quint64 resumeStart, QObject *parent = nullptr); virtual ~GETFileJob() { if (_bandwidthManager) { diff --git a/src/libsync/propagateremotedelete.h b/src/libsync/propagateremotedelete.h index e119d38e5..bf0dcffea 100644 --- a/src/libsync/propagateremotedelete.h +++ b/src/libsync/propagateremotedelete.h @@ -27,8 +27,8 @@ class DeleteJob : public AbstractNetworkJob Q_OBJECT QUrl _url; // Only used if the constructor taking a url is taken. public: - explicit DeleteJob(AccountPtr account, const QString &path, QObject *parent = 0); - explicit DeleteJob(AccountPtr account, const QUrl &url, QObject *parent = 0); + explicit DeleteJob(AccountPtr account, const QString &path, QObject *parent = nullptr); + explicit DeleteJob(AccountPtr account, const QUrl &url, QObject *parent = nullptr); void start() override; bool finished() override; diff --git a/src/libsync/propagateremotemove.h b/src/libsync/propagateremotemove.h index bd94e8045..567896dd8 100644 --- a/src/libsync/propagateremotemove.h +++ b/src/libsync/propagateremotemove.h @@ -30,9 +30,9 @@ class MoveJob : public AbstractNetworkJob QMap _extraHeaders; public: - explicit MoveJob(AccountPtr account, const QString &path, const QString &destination, QObject *parent = 0); + explicit MoveJob(AccountPtr account, const QString &path, const QString &destination, QObject *parent = nullptr); explicit MoveJob(AccountPtr account, const QUrl &url, const QString &destination, - QMap _extraHeaders, QObject *parent = 0); + QMap _extraHeaders, QObject *parent = nullptr); void start() override; bool finished() override; diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp index d7511e55d..ad364b929 100644 --- a/src/libsync/propagateupload.cpp +++ b/src/libsync/propagateupload.cpp @@ -69,7 +69,7 @@ static bool fileIsStillChanging(const SyncFileItem &item) PUTFileJob::~PUTFileJob() { // Make sure that we destroy the QNetworkReply before our _device of which it keeps an internal pointer. - setReply(0); + setReply(nullptr); } void PUTFileJob::start() diff --git a/src/libsync/propagateupload.h b/src/libsync/propagateupload.h index 7b0273a45..8dfd98d6f 100644 --- a/src/libsync/propagateupload.h +++ b/src/libsync/propagateupload.h @@ -93,7 +93,7 @@ private: public: // Takes ownership of the device explicit PUTFileJob(AccountPtr account, const QString &path, QIODevice *device, - const QMap &headers, int chunk, QObject *parent = 0) + const QMap &headers, int chunk, QObject *parent = nullptr) : AbstractNetworkJob(account, path, parent) , _device(device) , _headers(headers) @@ -102,7 +102,7 @@ public: _device->setParent(this); } explicit PUTFileJob(AccountPtr account, const QUrl &url, QIODevice *device, - const QMap &headers, int chunk, QObject *parent = 0) + const QMap &headers, int chunk, QObject *parent = nullptr) : AbstractNetworkJob(account, QString(), parent) , _device(device) , _headers(headers) @@ -232,7 +232,7 @@ public: : PropagateItemJob(propagator, item) , _finished(false) , _deleteExisting(false) - , _uploadEncryptedHelper(0) + , _uploadEncryptedHelper(nullptr) , _uploadingEncrypted(false) { } diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index e86ea760c..3e968bdba 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -37,7 +37,7 @@ namespace OCC { -Theme *Theme::_instance = 0; +Theme *Theme::_instance = nullptr; Theme *Theme::instance() { @@ -201,7 +201,7 @@ QString Theme::hidpiFileName(const QString &fileName, QPaintDevice *dev) #endif Theme::Theme() - : QObject(0) + : QObject(nullptr) , _mono(false) { } diff --git a/src/libsync/theme.h b/src/libsync/theme.h index 77ec90b2f..f703fd8b5 100644 --- a/src/libsync/theme.h +++ b/src/libsync/theme.h @@ -87,7 +87,7 @@ public: virtual QString configFileName() const; #ifndef TOKEN_AUTH_ONLY - static QString hidpiFileName(const QString &fileName, QPaintDevice *dev = 0); + static QString hidpiFileName(const QString &fileName, QPaintDevice *dev = nullptr); /** * get an sync state icon From b0959a6292e29ffacfea3ad3a470cea3216527b7 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 12 Nov 2018 18:53:47 +0100 Subject: [PATCH 4/5] SettingsDialog: fix a little glitch in the account tool button size SettingsDialog::accountAdded() uses the height of the toolbar to calculate the desired default size for toolbuttons. Make sure to have the "General" and "Network" tool buttons in place before calling accountAdded() to avoid cramped first button. --- src/gui/settingsdialog.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index 515b39880..21d5f9bfe 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -93,10 +93,6 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) _actionGroup->setExclusive(true); connect(_actionGroup, &QActionGroup::triggered, this, &SettingsDialog::slotSwitchPage); - foreach(auto ai, AccountManager::instance()->accounts()) { - accountAdded(ai.data()); - } - _actionBefore = new QAction(this); _toolBar->addAction(_actionBefore); @@ -121,6 +117,10 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) _actionGroupWidgets.insert(generalAction, generalSettings); _actionGroupWidgets.insert(networkAction, networkSettings); + foreach(auto ai, AccountManager::instance()->accounts()) { + accountAdded(ai.data()); + } + QTimer::singleShot(1, this, &SettingsDialog::showFirstPage); QAction *showLogWindow = new QAction(this); From 0f9e32d49c351dfe2d3f6c322e9c1f188b4ea4db Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Tue, 13 Nov 2018 01:52:41 +0000 Subject: [PATCH 5/5] [tx-robot] updated from transifex --- .tx/nextcloud.client-desktop/de_translation | 8 +- translations/client_cs.ts | 245 ++++++++++---------- translations/client_is.ts | 139 +++++------ translations/client_ja.ts | 2 +- translations/client_ru.ts | 97 ++++---- translations/client_sk.ts | 154 ++++++------ 6 files changed, 333 insertions(+), 312 deletions(-) diff --git a/.tx/nextcloud.client-desktop/de_translation b/.tx/nextcloud.client-desktop/de_translation index 4273bd606..418dc1843 100644 --- a/.tx/nextcloud.client-desktop/de_translation +++ b/.tx/nextcloud.client-desktop/de_translation @@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3 # Translations -Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation -Icon[de_DE]=@APPLICATION_ICON_NAME@ -Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation -GenericName[de_DE]=Synchronisationsordner +Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation +Icon[de]=@APPLICATION_ICON_NAME@ +Name[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation +GenericName[de]=Synchronisationsordner diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 5c8baa7c6..96b8c11cb 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -4,42 +4,42 @@ %1 (%2, %3) - + %1 (%2, %3) Checking for changes in '%1' - + Zjišťování případných změn v „%1“ Syncing %1 of %2 (%3 left) - + Synchronizuje se %1 z %2 (%3 zbývá) Syncing %1 of %2 - + Synchronizuje se %1 z %2 Syncing %1 (%2 left) - + Synchronizuje se %1 (zbývá %2) Syncing %1 - + Synchronizuje se %1 Sync paused - + Synchronizace pozastavena Syncing - + Synchronizuje se @@ -47,12 +47,12 @@ Dialog - + Dialog Label - + Štítek @@ -60,18 +60,18 @@ Could not make directories in trash - + V Koši není možné vytvářet složky Could not move '%1' to '%2' - + „%1“ se nedaří přesunout do „%2“ Moving to the trash is not implemented on this platform - + Přesun do koše není na této platformě implementováno @@ -148,12 +148,12 @@ End to end encryption mnemonic - + Mnemonická šifrování mezi koncovými body To protect your Cryptocraphic Identity, we encrypt it with a mnemonic of 12 dictionary words.Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop). - + Pro ochranu vaší kryptografické identity ji šifrujeme pomocí mnemonické 12 slovy ze slovníku. Poznamenejte si je někam bezpečně. Budou potřebné pro přidání dalších zařízení k vašemu účtu (jako je mobilní telefon či notebook). @@ -233,12 +233,12 @@ Show E2E mnemonic - + Zobrazit E2E mnemotechnickou Encrypt - + Šífrovat @@ -476,27 +476,27 @@ %1 - + %1 More information - + Více informací Accept - + Přijmout Join - + Připojit se Open Browser - + Otevřít prohlížeč @@ -514,17 +514,17 @@ Accept - + Přijmout Synced - + Synchronizováno Retry all uploads - + Zkusit znovu všechna nahrání @@ -624,12 +624,12 @@ Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br> - + Zadejte heslovou frázi pro šifrování mezi koncovými body: <br><br>Uživatel: %2<br>Účet: %3<br> Enter E2E passphrase - + Zadejte E2E heslovou frázi @@ -678,7 +678,7 @@ The server file discovery reply is missing data. - + Odpověď ze serveru na objevování souboru postrádá data. @@ -803,12 +803,12 @@ The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized. - + Složka %1 byla vytvořena ale byla dříve vynechána ze synchronizace. Nebude synchronizována. The file %1 was created but was excluded from synchronization previously. It will not be synchronized. - + Soubor %1 byl vytvořen ale byl dříve byl vynechán ze synchronizace. Nebude synchronizován. @@ -817,7 +817,11 @@ This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default). %1 - + Změny v synchronizovaných složkách se nedaří spolehlivě sledovat. + +To znamená, že synchronizační klient nemusí místní změny okamžitě nahrát a namísto toho bude pouze skenovat pro lokální změny a nahrávat je příležitostně (výchozí je každé dvě hodiny). + +%1 @@ -825,22 +829,25 @@ This means that the synchronization client might not upload local changes immedi These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to keep the files, they will be re-synced with the server if you have rights to do so. If you decide to delete the files, they will be unavailable to you, unless you are the owner. - + Všechny soubory v synchronizační složce „%1“ byly smazány na serveru. +Tato smazání budou synchronizována do místní synchronizační složky, takže tyto soubory nebudou dostupné, pokud nemáte oprávnění na obnovu. +Pokud se rozhodnete soubory ponechat, budou znovu synchronizovány se serverem pokud na to máte oprávnění. +Pokud se soubory rozhodnete smazat, nebudou vám dostupné, pokud nejste vlastník. Download new files? - + Stáhnout nové soubory? Download new files - + Stáhnout nové soubory Keep local files - + Ponechat místní soubory @@ -921,7 +928,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st Sync was successful, unresolved conflicts. - + Synchronizace byla úspěšná, nevyřešené konflikty. @@ -931,7 +938,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st The local folder %1 contains a symbolic link. The link target contains an already synced folder. Please pick another one! - + Místní složka %1 obsahuje symbolický odkaz. Cíl odkazu obsahuje složku, která už byla synchronizována. Zvolte jinou! @@ -999,7 +1006,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st Synchronized with local folder - + Synchronizováno s místní složkou @@ -1090,22 +1097,22 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st Checking for changes in remote '%1' - + Zjišťují se změny ve vzdáleném „%1“ Checking for changes in local '%1' - + Zjišťují se změny v místním „%1“ ↓ %1/s - + ↓ %1/s ↑ %1/s - + ↑ %1/s @@ -1157,7 +1164,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st This problem usually happens when the inotify watches are exhausted. Check the FAQ for details. - + Tento problém obvykle nastává když jsou překročeny kapacity sledování změn na souborovém systému (inotify). Podrobnosti naleznete v často kladených dotazech (FAQ). @@ -1285,7 +1292,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st Legal notice - + Právní upozornění @@ -1300,7 +1307,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st Show Server &Notifications - + Zobrazovat &upozornění serveru @@ -1341,7 +1348,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st Show sync folders in &Explorer's Navigation Pane - + Zobrazit synchronizované složky v panelu navigac&e Průzkumníka @@ -1367,7 +1374,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st Server notifications that require attention. - + Oznámení serveru která vyžadují pozornost. @@ -1375,14 +1382,16 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st Sharing error - + Chyba sdílení Could not retrieve or create the public link share. Error: %1 - + Nedaří se získat nebo vytvořit sdílení veřejným odkazem. Chyba: + +%1 @@ -1438,7 +1447,7 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st Remove all - + Odebrat vše @@ -1495,32 +1504,32 @@ Položky u kterých je povoleno smazání budou vymazány, pokud by bránily ods Dialog - + Dialog Legal notice - + Právní upozornění TextLabel - + TextovýŠtítek Close - + Zavřít <p>Copyright 2017-2018 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p> - + <p>Copyright 2017-2018 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p> <p>Licensed under the GNU General Public License (GPL) Version 2.0 or any later version.</p> - + <p>Licencováno pod GNU General Public License (GPL) verze 2.0 nebo jakékoli novější.</p> @@ -1548,14 +1557,16 @@ Položky u kterých je povoleno smazání budou vymazány, pokud by bránily ods Permanently save logs - + Ukládat záznamy událostí trvale When this option is enabled and no other logging is configured, logs will be written to a temporary folder and expire after a few hours. This setting persists across client restarts. Logs will be written to %1 - + Když je tato volba zapnutá a není nastavené žádné další zaznamenávání událostí, záznam událostí bude zapisován do dočasné složky a po několika hodinách jeho platnost skončí. Toto nastavení přetrvá přes restarty klienta. + +Záznamy událostí budou zapisovány do %1 @@ -1958,22 +1969,22 @@ můžete být požádáni o dodatečná oprávnění. Keep your data secure and under your control - + Mějte svá data zabezpečená a pod svou kontrolou Secure collaboration & file exchange - + Zabezpečená spolupráce a výměna souborů Easy-to-use web mail, calendaring & contacts - + Snadno použitelný webový e-mailový klient, kalendáře a kontakty Screensharing, online meetings & web conferences - + Sdílení obrazovky, online schůzky a webové konference @@ -1995,7 +2006,7 @@ Nedoporučuje se jí používat. Could not load certificate. Maybe wrong password? - + Certifikát není možné načíst. Nejspíš je chybné heslo? @@ -2200,7 +2211,7 @@ Nedoporučuje se jí používat. File %1 can not be downloaded because encryption information is missing. - + Soubor %1 není možné stáhnout z důvodu chybějících informací o šifrování @@ -2377,7 +2388,7 @@ Nedoporučuje se jí používat. File Removed (start upload) %1 - + Soubor odebrán (zahájit nahrávání) %1 @@ -2596,7 +2607,7 @@ Nedoporučuje se jí používat. Icon - + Ikona @@ -2629,22 +2640,22 @@ Nedoporučuje se jí používat. &Share link - + Odkaz pro &sdílení Enable - + Zapnout Password: - + Heslo: Expiration date: - + Datum skončení platnosti: @@ -2659,42 +2670,42 @@ Nedoporučuje se jí používat. Allow Editing - + Umožnit upravování Read only - + Pouze pro čtení Allow Upload && Editing - + Umožnit nahrávání a upravování File Drop (Upload Only) - + Přetažení souboru (pouze nahrání) Copy link - + Zkopírovat odkaz Password Protect - + Chránit heslem Expiration Date - + Datum skončení platnosti Unshare - + Přestat sdílet @@ -2732,7 +2743,7 @@ Nedoporučuje se jí používat. Copy link - + Zkopírovat odkaz @@ -2755,7 +2766,7 @@ Nedoporučuje se jí používat. User name - + Uživatelské jméno @@ -2765,22 +2776,22 @@ Nedoporučuje se jí používat. Can reshare - + Může sdílet dál Can create - + Může vytvářet Can change - + Může měnit Can delete - + Může mazat @@ -2830,7 +2841,7 @@ Nedoporučuje se jí používat. Context menu share - + Sdílení kontextové nabídky @@ -2857,18 +2868,18 @@ Nedoporučuje se jí používat. Resharing this file is not allowed - + Sdílet tento soubor dál není dovoleno Copy public link to clipboard - + Zkopírovat veřejný odkaz do schránky Open in browser - + Otevřít v prohlížeči @@ -3162,32 +3173,32 @@ Nedoporučuje se jí používat. Failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder. - + Nepodařilo načíst nebo vytvořit soubor žurnálu. Ověřte, že máte oprávnění pro čtení a zápis do místní synchronizační složky. Discovery step failed. - + Krok objevování se nezdařil. Permission denied. - + Oprávnění zamítnuto. File or directory not found: - + Soubor nebo adresář nenalezen: Tried to create a folder that already exists. - + Pokus o vytvoření složky, která už existuje. No space on %1 server available. - + Na %1 serveru není k dispozici volné místo. @@ -3358,7 +3369,7 @@ Nedoporučuje se jí používat. <p>This release was supplied by the Nextcloud GmbH</p> - + <p>Toto vydání bylo poskytnuto společností Nextcloud GmbH</p> @@ -3366,12 +3377,12 @@ Nedoporučuje se jí používat. You have been logged out of %1 as user %2. Please login again - + Byli jste odhlášeni z %1 jako uživatel %2. Znovu se přihlaste Please login with the user: %1 - + Přihlaste se pomocí uživatele: %1 @@ -3505,7 +3516,7 @@ Nedoporučuje se jí používat. Unresolved conflicts - + Nevyřešené konflikty @@ -3561,7 +3572,7 @@ Nedoporučuje se jí používat. Apps - + Aplikace @@ -3571,12 +3582,12 @@ Nedoporučuje se jí používat. Checking for changes in remote '%1' - + Zjišťují se změny ve vzdáleném „%1“ Checking for changes in local '%1' - + Zjišťují se změny v místním „%1“ @@ -3722,7 +3733,7 @@ Nedoporučuje se jí používat. An error occurred while connecting. Please try again. - + Při připojování došlo k chybě. Zkuste to znovu. @@ -3746,22 +3757,22 @@ Nedoporučuje se jí používat. <a href="https://docs.nextcloud.com/server/13/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a> - + <a href="https://docs.nextcloud.com/server/13/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Hostujte svůj vlastní server</span></a> Register with a provider - + Zaregistrovat se u poskytovatele Log in - + Přihlásit SlideshowLabel - + ŠtítekPrezentace @@ -3813,22 +3824,22 @@ Nedoporučuje se jí používat. %n day ago - + před %n dnempřed %n dnypřed %n dnypřed %n dny %n days ago - + Před %n dnemPřed %n dnyPřed %n dnyPřed %n dny %n hour ago - + před %n hodinoupřed %n hodinamipřed %n hodinamipřed %n hodinami %n hours ago - + před %n hodinoupřed %n hodinamipřed %n hodinamipřed %n hodinami @@ -3843,12 +3854,12 @@ Nedoporučuje se jí používat. %n minute ago - + před %n minutoupřed %n minutamipřed %n minutamipřed %n minutami %n minutes ago - + před %n minutoupřed %n minutamipřed %n minutamipřed %n minutami @@ -3925,17 +3936,17 @@ Nedoporučuje se jí používat. The checksum header is malformed. - + Hlavička kontrolního součtu je poškozena. The checksum header contained an unknown checksum type '%1' - + Hlavička kontrolního součtu obsahovala neznámý typ součtu „%1“ The downloaded file does not match the checksum, it will be resumed. - + Stažený soubor neodpovídá kontrolnímu součtu, bude znovu stažen. @@ -3943,7 +3954,7 @@ Nedoporučuje se jí používat. Form - + Formulář @@ -3964,7 +3975,7 @@ Nedoporučuje se jí používat. <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> - + <p><small>Sestaveno z Git revize <a href="%1">%2</a> na %3, %4 s použitím Qt %5, %6</small></p> diff --git a/translations/client_is.ts b/translations/client_is.ts index 2934408d6..a5828eb49 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -39,7 +39,7 @@ Syncing - + Samstilli @@ -47,12 +47,12 @@ Dialog - + Samskiptagluggi Label - + Skýring @@ -66,7 +66,7 @@ Could not move '%1' to '%2' - + Gat ekki fært '%1' yfir í '%2' @@ -239,7 +239,7 @@ Encrypt - + Dulrita @@ -482,27 +482,27 @@ skráakerfið eða sameignarmöppur, gætu verið með önnur takmörk. %1 - + %1 More information - + Nánari upplýsingar Accept - + Samþykkja Join - + Taka þátt Open Browser - + Opna vafra @@ -520,17 +520,17 @@ skráakerfið eða sameignarmöppur, gætu verið með önnur takmörk. Accept - + Samþykkja Synced - + Samstillt Retry all uploads - + Prófa aftur allar innsendingar @@ -839,17 +839,17 @@ If you decide to delete the files, they will be unavailable to you, unless you a Download new files? - + Sækja nýjar skrár? Download new files - + Sækja nýjar skrár Keep local files - + Halda skrám á tölvu @@ -1005,7 +1005,7 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana. Synchronized with local folder - + Samstillt við möppu á tölvunni @@ -1096,22 +1096,22 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana. Checking for changes in remote '%1' - + Athuga með breytingar í fjartengdri '%1' Checking for changes in local '%1' - + Athuga með breytingar í staðværri '%1' ↓ %1/s - + ↓ %1/s ↑ %1/s - + ↑ %1/s @@ -1291,7 +1291,7 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana. Legal notice - + Lagaleg atriði @@ -1444,7 +1444,7 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana. Remove all - + Fjarlægja allt @@ -1499,12 +1499,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from Dialog - + Samskiptagluggi Legal notice - + Lagaleg atriði @@ -1514,17 +1514,17 @@ Items where deletion is allowed will be deleted if they prevent a directory from Close - + Loka <p>Copyright 2017-2018 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p> - + <p>Höfundarréttur 2017-2018 Nextcloud GmbH<br />Höfundarréttur 2012-2018 ownCloud GmbH</p> <p>Licensed under the GNU General Public License (GPL) Version 2.0 or any later version.</p> - + <p>Gefið út með almenna GNU General Public License (GPL) útgáfu 2.0 eða nýrri.</p> @@ -1963,22 +1963,22 @@ aðgerð til að leysa málið!</small></p> Keep your data secure and under your control - + Haltu gögnum þínum öruggum og undir þinni stjórn Secure collaboration & file exchange - + Örugg samvinna og skráaskipti Easy-to-use web mail, calendaring & contacts - + Einfaldur og auðveldur vefpóstur, dagatal og tengiliðir Screensharing, online meetings & web conferences - + Skjádeiling, netfundir og vefráðstefnur @@ -2603,7 +2603,7 @@ Ekki er mælt með því að hún sé notuð. Icon - + Táknmynd @@ -2636,22 +2636,22 @@ Ekki er mælt með því að hún sé notuð. &Share link - + &Deilitengill Enable - + Virkja Password: - + Lykilorð: Expiration date: - + Gildistími: @@ -2666,42 +2666,42 @@ Ekki er mælt með því að hún sé notuð. Allow Editing - + Leyfa breytingar Read only - + Skrifvarið Allow Upload && Editing - + Leyfa innsendingu og breytingar File Drop (Upload Only) - + Slepping skráa (einungis innsending) Copy link - + Afrita tengil Password Protect - + Verja með lykilorði Expiration Date - + Gildir til Unshare - + Hætta deilingu @@ -2740,7 +2740,7 @@ Ekki er mælt með því að hún sé notuð. Copy link - + Afrita tengil @@ -2763,7 +2763,7 @@ Ekki er mælt með því að hún sé notuð. User name - + Notandanafn @@ -2773,22 +2773,22 @@ Ekki er mælt með því að hún sé notuð. Can reshare - + Getur endurdeilt Can create - + Getur búið til Can change - + Getur breytt Can delete - + Getur eytt @@ -2866,18 +2866,18 @@ Ekki er mælt með því að hún sé notuð. Resharing this file is not allowed - + Endurdeiling þessarar skráar er ekki leyfð Copy public link to clipboard - + Afrita opinberan tengil á klippispjald Open in browser - + Opna í vafra @@ -3181,12 +3181,12 @@ Ekki er mælt með því að hún sé notuð. Permission denied. - + Heimild fæst ekki. File or directory not found: - + Skrá eða mappa fannst ekki: @@ -3570,7 +3570,7 @@ Ekki er mælt með því að hún sé notuð. Apps - + Forrit @@ -3580,12 +3580,12 @@ Ekki er mælt með því að hún sé notuð. Checking for changes in remote '%1' - + Athuga með breytingar í fjartengdri '%1' Checking for changes in local '%1' - + Athuga með breytingar í staðværri '%1' @@ -3755,17 +3755,17 @@ Ekki er mælt með því að hún sé notuð. <a href="https://docs.nextcloud.com/server/13/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a> - + <a href="https://docs.nextcloud.com/server/13/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Hýstu þinn eigin þjón</span></a> Register with a provider - + Skráðu þig hjá þjónustu Log in - + Skrá inn @@ -3822,22 +3822,22 @@ Ekki er mælt með því að hún sé notuð. %n day ago - + fyrir %n degi síðanfyrir %n dögum síðan %n days ago - + fyrir %n degi síðanfyrir %n dögum síðan %n hour ago - + fyrir %n klukkustund síðanfyrir %n klukkustundum síðan %n hours ago - + fyrir %n klukkustund síðanfyrir %n klukkustundum síðan @@ -3852,12 +3852,12 @@ Ekki er mælt með því að hún sé notuð. %n minute ago - + fyrir %n mínútu síðanfyrir %n mínútum síðan %n minutes ago - + fyrir %n mínútu síðanfyrir %n mínútum síðan @@ -3976,7 +3976,8 @@ borð við 'trayer' og reyna síðan aftur. <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> - + <p><small>Byggt með Git revision <a href="%1">%2</a> á %3, %4 með Qt %5, +%6</small></p> diff --git a/translations/client_ja.ts b/translations/client_ja.ts index 63f89b792..4483a1e2e 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -481,7 +481,7 @@ More information - + 詳細情報 diff --git a/translations/client_ru.ts b/translations/client_ru.ts index d5484c760..330d03176 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -153,7 +153,7 @@ To protect your Cryptocraphic Identity, we encrypt it with a mnemonic of 12 dictionary words.Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop). - + Для защиты личного идентификатора сквозного шифрования используется мнемофраза, состоящая из двенадцати слов. Мнемофразу следует записать и сохранить запись в надёжном месте, она потребуется для подключения к учётной записи ваших дополнительных устройств. @@ -524,7 +524,7 @@ Retry all uploads - + Повторить передачу файлов на сервер @@ -678,7 +678,7 @@ The server file discovery reply is missing data. - + Сервер вернул ответ, не содержащих данных о файле. @@ -804,12 +804,12 @@ The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized. - Папка «%1» создана, но она ранее была исключена из синхронизации. Данные внутри этой папки не будут синхронизированы. + Создана папка «%1» создана, но ранее она была исключена из синхронизации. Данные внутри этой папки не будут синхронизированы. The file %1 was created but was excluded from synchronization previously. It will not be synchronized. - Файл «%1» создан, но она ранее был исключён из синхронизации. Этот файл не будет синхронизирован. + Создан файл «%1», но ранее он был исключён из синхронизации. Этот файл не будет синхронизирован. @@ -818,7 +818,10 @@ This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default). %1 - + Невозможно надёжным способом отслеживать изменения в синхронизируемых папках. + +Это означает, что приложение для синхронизации не может выполнять синхронизацию локальных изменений с сервером немедленно. Вместо этого будет выполняться периодическое (по умолчанию каждые два часа) сканирование локальных папок и синхронизация обнаруженных изменений с сервером. +%1 @@ -1508,7 +1511,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from TextLabel - + TextLabel @@ -1518,12 +1521,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from <p>Copyright 2017-2018 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p> - <p>Copyright 2017-2018 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p> + <p>© Nextcloud GmbH, 2017-2018 <br />© ownCloud GmbH, 2012-2018</p> <p>Licensed under the GNU General Public License (GPL) Version 2.0 or any later version.</p> - + <p>Лицензируется в соответствии со Стандартной Общественной Лицензией GNU (GPL) версии 2.0 или любой более поздней версией.</p> @@ -1795,7 +1798,7 @@ for additional privileges during the process. Downloading version %1. Please wait... - Загрузка версии %1. Пожалуйста, подождите... + Дождитесь окончания загрузки версии %1… @@ -1868,7 +1871,7 @@ for additional privileges during the process. <p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p> - <p><small><strong>Внимание:</strong> Локальная папка не пуста. Выберите действие!</small></p> + <p><small><strong>Предупреждение:</strong> Локальная папка не пуста, требуется выбор действия:</small></p> @@ -1902,7 +1905,7 @@ for additional privileges during the process. Retry unencrypted over HTTP (insecure) - Попробовать без шифрования через HTTP (не безопасно) + Попробовать без шифрования по протоколу HTTP (небезопасно) @@ -1943,7 +1946,7 @@ for additional privileges during the process. Login in your browser - Вход в ваш браузер + Выполнить вход в браузере @@ -1976,7 +1979,7 @@ for additional privileges during the process. Screensharing, online meetings & web conferences - Публикация экрана, онлайн общение и веб-конференции + Доступ к изображению на экране, онлайн общение и веб-конференции @@ -2161,7 +2164,7 @@ It is not advisable to use it. Skip folders configuration - Пропустить настройку каталогов + Пропустить настройку папок @@ -2187,7 +2190,7 @@ It is not advisable to use it. Invalid JSON reply from the poll URL - Не правильный JSON ответ на сформированный URL + С опрашиваемого адреса получен неверный ответ в формате JSON @@ -2274,7 +2277,7 @@ It is not advisable to use it. Attention, possible case sensitivity clash with %1 - Внимание, возможен конфликт чувствительности к регистру с %1 + Внимание, возможен конфликт чувствительности к регистру имён с «%1» @@ -2324,7 +2327,7 @@ It is not advisable to use it. Wrong HTTP code returned by server. Expected 204, but received "%1 %2". - Сервер ответил не правильным HTTP кодом. Ожидался 204, но получен "%1 %2". + Сервер ответил неправильным кодом HTTP. Ожидался 204, но получен «%1 %2». @@ -2332,7 +2335,7 @@ It is not advisable to use it. Wrong HTTP code returned by server. Expected 201, but received "%1 %2". - Сервер ответил не правильным HTTP кодом. Ожидался 201, но получен "%1 %2". + Сервер ответил неправильным кодом HTTP . Ожидался 201, но получен «%1 %2». @@ -2345,7 +2348,7 @@ It is not advisable to use it. Wrong HTTP code returned by server. Expected 201, but received "%1 %2". - Сервер ответил не правильным HTTP кодом. Ожидался 201, но получен "%1 %2". + Сервер ответил неправильным кодом HTTP. Ожидался 201, но получен «%1 %2». @@ -2359,7 +2362,7 @@ It is not advisable to use it. File %1 cannot be uploaded because another file with the same name, differing only in case, exists - Невозможно загрузить файл «%1», так как уже существует файл с тем же именем, но отличающимся только регистром символов + Невозможно загрузить файл «%1», так как уже существует файл с тем же именем, но отличающимся регистром символов @@ -2369,13 +2372,13 @@ It is not advisable to use it. Local file changed during sync. - Локальный файл изменился в процессе синхронизации. + Локальный файл был изменён во время синхронизации. Upload of %1 exceeds the quota for the folder - Закачка %1 превышает квоту для каталога + Передача «%1» на сервер превысит заданную для папки квоту @@ -2490,7 +2493,7 @@ It is not advisable to use it. Deselect remote folders you do not wish to synchronize. - Снимите выбор с удалённых папок, котрые вы не хотите синхронизировать. + Снимите отметки с папок, которые не нужно синхронизировать. @@ -2506,12 +2509,12 @@ It is not advisable to use it. No subfolders currently on the server. - Нет подкаталогов на сервере на данный момент. + Сейчас на сервере нет вложенных папок. An error occurred while loading the list of sub folders. - Произошла ошибка во время загрузки списка подпапок. + Ошибка получения списка вложенных папок. @@ -2519,7 +2522,7 @@ It is not advisable to use it. Dismiss - Убрать + Отклонить @@ -2527,7 +2530,7 @@ It is not advisable to use it. Settings - Настройки + Параметры @@ -2547,7 +2550,7 @@ It is not advisable to use it. Account - Уч.запись + Учётная запись @@ -2576,7 +2579,7 @@ It is not advisable to use it. Account - Уч.запись + Учётная запись @@ -2594,7 +2597,7 @@ It is not advisable to use it. ownCloud Path: - Путь к OwnCloud: + Путь ownCloud: @@ -2604,7 +2607,7 @@ It is not advisable to use it. %1 Sharing - Вы поделились %1 + Предоставление общего доступа к «%1» @@ -2614,12 +2617,12 @@ It is not advisable to use it. Folder: %2 - Папка: %2 + Папка: «%2» The file can not be shared because it was shared without sharing permission. - Невозможно предоставить общий доступ к файлу: нет разрешения на предоставление общего доступа. + Невозможно предоставить общий доступ: отсутствуют разрешения на предоставление общего доступа. @@ -2632,12 +2635,12 @@ It is not advisable to use it. &Share link - + П&редоставить доступ по ссылке Enable - Включить + Использовать @@ -2647,7 +2650,7 @@ It is not advisable to use it. Expiration date: - Дата истечения: + Срок действия: @@ -2833,7 +2836,7 @@ It is not advisable to use it. Context menu share - + Контекстное меню предоставления общего доступа @@ -2939,7 +2942,7 @@ It is not advisable to use it. <h3>Fingerprints</h3> - <h3>Отпечаток</ h3> + <h3>Отпечатки</h3> @@ -3170,7 +3173,7 @@ It is not advisable to use it. Discovery step failed. - + Ошибка на этапе поиска. @@ -3361,7 +3364,7 @@ It is not advisable to use it. <p>This release was supplied by the Nextcloud GmbH</p> - + <p>Этот выпуск подготовлен Nextcloud GmbH</p> @@ -3369,7 +3372,7 @@ It is not advisable to use it. You have been logged out of %1 as user %2. Please login again - + Выполнен выход пользователя %2 из системы %1. Войдите заново @@ -3382,7 +3385,7 @@ It is not advisable to use it. Please sign in - Пожалуйста войдите в систему + Войдите в систему @@ -3392,7 +3395,7 @@ It is not advisable to use it. There are no sync folders configured. - Нет настроенных каталогов для синхронизации + Синхронизация папок не настроена. @@ -3508,7 +3511,7 @@ It is not advisable to use it. Unresolved conflicts - + Неразрешённые конфликты @@ -3749,7 +3752,7 @@ It is not advisable to use it. <a href="https://docs.nextcloud.com/server/13/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Host your own server</span></a> - + <a href="https://docs.nextcloud.com/server/13/admin_manual/installation/index.html#installation"><span style=" text-decoration: underline; color:#0000ff;">Развернуть собственный сервер</span></a> @@ -3764,7 +3767,7 @@ It is not advisable to use it. SlideshowLabel - + SlideshowLabel diff --git a/translations/client_sk.ts b/translations/client_sk.ts index 7eef42b1b..fa4a57f80 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -34,12 +34,12 @@ Sync paused - + Synchronizácia je pozastavená Syncing - + Synchronizuje sa @@ -52,7 +52,7 @@ Label - + Štítok @@ -60,18 +60,18 @@ Could not make directories in trash - + Nie je možné vytvárať adresáre v koši Could not move '%1' to '%2' - + Nie je možne presunúť '%1' do '%2' Moving to the trash is not implemented on this platform - + Presuúvanie do koša nie je na tejto platforme k dispozícii @@ -148,7 +148,7 @@ End to end encryption mnemonic - + End-to-end kódovanie mnemotechnické @@ -238,7 +238,7 @@ Encrypt - + Zašifrovať @@ -476,27 +476,27 @@ %1 - + %1 More information - + Viac informácií Accept - + Prijať Join - + Pripojiť Open Browser - + Otvoriť prehliadač @@ -514,17 +514,17 @@ Accept - + Prijať Synced - + Zosynchronizované Retry all uploads - + Zopakovať všetky nahrávania @@ -629,7 +629,7 @@ Enter E2E passphrase - + Zadajte E2E prístupovú frázu @@ -831,24 +831,26 @@ If you decide to delete the files, they will be unavailable to you, unless you a Download new files? - + Stiahnuť nové súbory? Download new files - + Stiahnuť nové súbory Keep local files - + Ponechať lokálne súbory All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server. - + Všetky súbory vo vašej lokálnej synchronizovanom priečinku '%1' boli vymazané. Tieto súbory budú vymazané aj na serveri a teda už viac nebudú dostupné až kým ich neobnovíte. +Ste si istí, že chcete tieto akcie synchronizovať so serverom? +Ak to bol omyl a chcete si tieto súbory ponechať, budú opäť synchronizované zo servera. @@ -918,7 +920,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an Sync was successful, unresolved conflicts. - + Synchronizácia bola úspešná s nevyriešenými konfliktmi. @@ -928,7 +930,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an The local folder %1 contains a symbolic link. The link target contains an already synced folder. Please pick another one! - + Lokálny priečinok %1 obsahuje symbolický odkaz. Tento odkazuje na už zosynchronizovaný priečinok. Vyberte prosím niektorý iný. @@ -1282,7 +1284,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an Legal notice - + Právne upozornenie @@ -1292,12 +1294,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an For System Tray - + Pre oznamovaciu oblasť systémového panela Show Server &Notifications - + Zobraziť &hlásenia zo servera @@ -1307,7 +1309,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an Ask for confirmation before synchronizing folders larger than - + Požiadať o potvrdenie pred synchronizáciou zložiek väčších než @@ -1318,7 +1320,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an Ask for confirmation before synchronizing external storages - + Požiadajte o potvrdenie pred synchronizáciou externých úložísk @@ -1343,7 +1345,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an S&how crash reporter - + Z&obraziť hlásenia o pádoch @@ -1364,7 +1366,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an Server notifications that require attention. - + Zobrazovať hlásenie, ktoré vyžadujú pozornosť. @@ -1372,14 +1374,16 @@ Continuing the sync as normal will cause all your files to be overwritten by an Sharing error - + Chyba sprístupnenia Could not retrieve or create the public link share. Error: %1 - + Nie je možné získať alebo vytvoriť verejný odkaz pre sprístupnenie. Chyba: + +%1 @@ -1387,12 +1391,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an Please enter %1 password:<br><br>User: %2<br>Account: %3<br> - + Zadajte prosím heslo %1:<br><br>Používateľ: %2<br>Účet: %3<br> Reading from keychain failed with error: '%1' - + Čítanie z kľúčenky sa nepodarilo s chybou: '%1' @@ -1402,7 +1406,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an <a href="%1">Click here</a> to request an app password from the web interface. - + <a href="%1">Kliknite sem</a> pre vyžiadanie hesla aplikácie z webového rozhrania. @@ -1415,7 +1419,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an Global Ignore Settings - + Globálne nastavenia pre ignorovanie @@ -1425,7 +1429,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an Files Ignored by Patterns - + Ignorovať súbory podľa masky @@ -1435,7 +1439,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an Remove all - + Odstrániť všetko @@ -1457,7 +1461,9 @@ Continuing the sync as normal will cause all your files to be overwritten by an Files or folders matching a pattern will not be synchronized. Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data. - + Súbory alebo priečinky vyhovujúce maske nebudu synchronizované. + +Položky u ktorých je povolené mazanie sa vymažú ak by bránili odstráneniu priečinka. Toto je užitočne napr. pre matadáta. @@ -1490,12 +1496,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from Dialog - + Dialóg Legal notice - + Právne upozornenie @@ -1505,7 +1511,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from Close - + Zatvoriť @@ -1742,7 +1748,7 @@ Logs will be written to %1 Error returned from the server: <em>%1</em> - + Chyba vrátená zo servera: <em>%1</em> @@ -1935,7 +1941,7 @@ môžu byť vyžadované dodatočné oprávnenia. Login in your browser - + Prihlásenie sa v prehliadači @@ -1953,22 +1959,22 @@ môžu byť vyžadované dodatočné oprávnenia. Keep your data secure and under your control - + Majte svoje dáta pod vlastnou kontrolou a zabezpečené Secure collaboration & file exchange - + Bezpečná spolupráca a výmena súborov Easy-to-use web mail, calendaring & contacts - + Ľahko použiteľné webové rozhranie pre poštu, kalendár a kontakty Screensharing, online meetings & web conferences - + Zdieľanie obrazovky, on-line schôdze a webové konferencie @@ -1990,7 +1996,7 @@ Nie je vhodné ju používať. Could not load certificate. Maybe wrong password? - + Nie je možné načítať certifikát. Možno zlé heslo? @@ -2634,12 +2640,12 @@ Nie je vhodné ju používať. Password: - + Heslo: Expiration date: - + Dátum vypršania: @@ -2654,47 +2660,47 @@ Nie je vhodné ju používať. Allow Editing - + Umožniť úpravy Read only - + Len na čítanie Allow Upload && Editing - + Umožniť nahrávanie a úpravy File Drop (Upload Only) - + Odovzdávanie súborov (len nahrávanie) Copy link - + Kopírovať odkaz Password Protect - + Chániť heslom Expiration Date - + Dátum vypršania: Unshare - + Zneprístupniť Confirm Link Share Deletion - + Potvrdzovať rušenie sprístupnenia @@ -2727,7 +2733,7 @@ Nie je vhodné ju používať. Copy link - + Kopírovať odkaz @@ -2737,7 +2743,7 @@ Nie je vhodné ju používať. I shared something with you - + Niečo som vám sprístupnil @@ -2750,7 +2756,7 @@ Nie je vhodné ju používať. User name - + Meno používateľa @@ -2760,22 +2766,22 @@ Nie je vhodné ju používať. Can reshare - + Môže sprístupniť aj iným Can create - + Môže vytvárať Can change - + Môže meniť Can delete - + Môže odstraňovať @@ -2852,18 +2858,18 @@ Nie je vhodné ju používať. Resharing this file is not allowed - + Opätovné sprístupňovanie tohto súboru je zakázané Copy public link to clipboard - + Skopírovať verejný odkaz do schránky Open in browser - + Otvoriť v prehliadači @@ -3081,7 +3087,7 @@ Nie je vhodné ju používať. The mounted folder is temporarily not available on the server - + Pripojený priečinok je na serveri dočasne nedostupný @@ -3101,7 +3107,7 @@ Nie je vhodné ju používať. File/Folder is ignored because it's hidden. - + Súbor/priečinok je ignorovaný, pretože je skrytý @@ -3111,13 +3117,13 @@ Nie je vhodné ju používať. Conflict: Server version downloaded, local copy renamed and not uploaded. - + Konflikt: Prevzatá verzia zo servera, lokálna kópia premenovaná a neodovzdaná. Only %1 are available, need at least %2 to start Placeholders are postfixed with file sizes using Utility::octetsToString() - + Je dostupných len %1, pre spustenie je potrebných aspoň %2