modernize-user-override,
modernize-use-transparent-functors,
modernize-use-uncaught-exceptions,
+ modernize-use-using,
'
WarningsAsErrors: '*'
HeaderFilterRegex: '.*'
Q_PLUGIN_METADATA(IID "com.owncloud.ovarlayiconplugin" FILE "ownclouddolphinoverlayplugin.json")
Q_OBJECT
- typedef QHash<QByteArray, QByteArray> StatusMap;
+ using StatusMap = QHash<QByteArray, QByteArray>;
StatusMap m_status;
public:
template <class T, class const_iterator>
struct QTokenizerPrivate {
- typedef typename T::value_type char_type;
+ using char_type = typename T::value_type;
struct State {
bool inQuote = false;
template <class T, class const_iterator>
class QTokenizer {
public:
- typedef typename T::value_type char_type;
+ using char_type = typename T::value_type;
/*!
\class QTokenizer
}
};
-typedef QTokenizer<QByteArray, QByteArray::const_iterator> QByteArrayTokenizer;
-typedef QTokenizer<std::string, std::string::const_iterator> StringTokenizer;
-typedef QTokenizer<std::wstring, std::wstring::const_iterator> WStringTokenizer;
+using QByteArrayTokenizer = QTokenizer<QByteArray, QByteArray::const_iterator>;
+using StringTokenizer = QTokenizer<std::string, std::string::const_iterator>;
+using WStringTokenizer = QTokenizer<std::wstring, std::wstring::const_iterator>;
QT_END_NAMESPACE
#if defined(Q_OS_WIN)
#include <QLibrary>
#include <qt_windows.h>
-typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*);
+using PProcessIdToSessionId = BOOL (WINAPI*)(DWORD, DWORD*);
static PProcessIdToSessionId pProcessIdToSessionId = 0;
#endif
class NetrcParser
{
public:
- typedef QPair<QString, QString> LoginPair;
+ using LoginPair = QPair<QString, QString>;
NetrcParser(const QString &file = QString());
bool parse();
CSYNC_STATUS_INDIVIDUAL_CANNOT_ENCODE
};
-typedef enum csync_status_codes_e CSYNC_STATUS;
+using CSYNC_STATUS = enum csync_status_codes_e;
#ifndef likely
# define likely(x) (x)
// currently specified at https://github.com/owncloud/core/issues/8322 are 9 to 10
#define REMOTE_PERM_BUF_SIZE 15
-typedef struct csync_file_stat_s csync_file_stat_t;
+using csync_file_stat_t = struct csync_file_stat_s;
struct OCSYNC_EXPORT csync_file_stat_s {
time_t modtime = 0;
/**
* csync handle
*/
-typedef struct csync_s CSYNC;
+using CSYNC = struct csync_s;
-typedef int (*csync_auth_callback) (const char *prompt, char *buf, size_t len,
- int echo, int verify, void *userdata);
+using csync_auth_callback = int (*)(const char *prompt, char *buf, size_t len, int echo, int verify, void *userdata);
-typedef void (*csync_update_callback) (bool local,
- const char *dirUrl,
- void *userdata);
+using csync_update_callback = void (*)(bool local, const char *dirUrl, void *userdata);
-typedef void csync_vio_handle_t;
-typedef csync_vio_handle_t* (*csync_vio_opendir_hook) (const char *url,
- void *userdata);
-typedef std::unique_ptr<csync_file_stat_t> (*csync_vio_readdir_hook) (csync_vio_handle_t *dhhandle,
- void *userdata);
-typedef void (*csync_vio_closedir_hook) (csync_vio_handle_t *dhhandle,
- void *userdata);
+using csync_vio_handle_t = void;
+using csync_vio_opendir_hook = csync_vio_handle_t *(*)(const char *url, void *userdata);
+using csync_vio_readdir_hook = std::unique_ptr<csync_file_stat_t> (*)(csync_vio_handle_t *dhandle, void *userdata);
+using csync_vio_closedir_hook = void (*)(csync_vio_handle_t *dhandle, void *userdata);
/* Compute the checksum of the given \a checksumTypeId for \a path. */
-typedef QByteArray (*csync_checksum_hook)(
- const QByteArray &path, const QByteArray &otherChecksumHeader, void *userdata);
+using csync_checksum_hook = QByteArray (*)(const QByteArray &path, const QByteArray &otherChecksumHeader, void *userdata);
/**
* @brief Update detection
CSYNC_FILE_EXCLUDE_CONFLICT,
CSYNC_FILE_EXCLUDE_CANNOT_ENCODE
};
-typedef enum csync_exclude_type_e CSYNC_EXCLUDE_TYPE;
+using CSYNC_EXCLUDE_TYPE = enum csync_exclude_type_e;
class ExcludedFilesTest;
* @{
*/
-typedef int (*csync_walker_fn) (CSYNC *ctx, std::unique_ptr<csync_file_stat_t> fs);
+using csync_walker_fn = int (*)(CSYNC *ctx, std::unique_ptr<csync_file_stat_t> fs);
/**
* @brief The walker function to use in the file tree walker.
Q_LOGGING_CATEGORY(lcCSyncUtils, "nextcloud.sync.csync.utils", QtInfoMsg)
-typedef struct {
+using _instr_code_struct = struct {
const char *instr_str;
enum csync_instructions_e instr_code;
-} _instr_code_struct;
+};
static const _instr_code_struct _instr[] =
{
#ifdef _WIN32
-typedef struct stat64 csync_stat_t;
+typedef struct stat64 csync_stat_t; // NOLINT this is sometimes compiled in C mode
#define _FILE_OFFSET_BITS 64
#else
-typedef struct stat csync_stat_t;
+typedef struct stat csync_stat_t; // NOLINT this is sometimes compiled in C mode
#endif
#ifndef O_NOATIME
#endif
#if defined _WIN32 && defined _UNICODE
-typedef wchar_t mbchar_t;
+typedef wchar_t mbchar_t; // NOLINT this is sometimes compiled in C mode
#define _topen _wopen
#define _tdirent _wdirent
#define _topendir _wopendir
#define _tchdir _wchdir
#define _tgetcwd _wgetcwd
#else
-typedef char mbchar_t;
+typedef char mbchar_t; // NOLINT this is sometimes compiled in C mode
#define _tdirent dirent
#define _topen open
#define _topendir opendir
#include "csync.h"
#include "csync_private.h"
-typedef struct fhandle_s {
+using fhandle_t = struct fhandle_s {
+
int fd;
-} fhandle_t;
+
+};
csync_vio_handle_t *csync_vio_opendir(CSYNC *ctx, const char *name);
int csync_vio_closedir(CSYNC *ctx, csync_vio_handle_t *dhandle);
* directory functions
*/
-typedef struct dhandle_s {
+using dhandle_t = struct dhandle_s {
DIR *dh;
char *path;
-} dhandle_t;
+};
static int _csync_vio_local_stat_mb(const mbchar_t *wuri, csync_file_stat_t *buf);
* directory functions
*/
-typedef struct dhandle_s {
+using dhandle_t = struct dhandle_s {
WIN32_FIND_DATA ffd;
HANDLE hFind;
int firstFind;
mbchar_t *path; // Always ends with '\'
-} dhandle_t;
+};
static int _csync_vio_local_stat_mb(const mbchar_t *uri, csync_file_stat_t *buf);
class AccountApp;
class RemoteWipe;
-typedef QExplicitlySharedDataPointer<AccountState> AccountStatePtr;
-typedef QList<AccountApp*> AccountAppList;
+using AccountStatePtr = QExplicitlySharedDataPointer<AccountState>;
+using AccountAppList = QList<AccountApp *>;
/**
* @brief Extra info about an ownCloud server account.
};
/// The actual current connectivity status.
- typedef ConnectionValidator::Status ConnectionStatus;
+ using ConnectionStatus = ConnectionValidator::Status;
/// Use the account as parent
explicit AccountState(AccountPtr account);
/* Forward declaration required since gio header files interfere with QObject headers */
struct _CloudProvidersProviderExporter;
-typedef _CloudProvidersProviderExporter CloudProvidersProviderExporter;
+using CloudProvidersProviderExporter = _CloudProvidersProviderExporter;
struct _CloudProvidersAccountExporter;
-typedef _CloudProvidersAccountExporter CloudProvidersAccountExporter;
+using CloudProvidersAccountExporter = _CloudProvidersAccountExporter;
struct _GMenuModel;
-typedef _GMenuModel GMenuModel;
+using GMenuModel = _GMenuModel;
struct _GMenu;
-typedef _GMenu GMenu;
+using GMenu = _GMenu;
struct _GActionGroup;
-typedef _GActionGroup GActionGroup;
-typedef char gchar;
-typedef void* gpointer;
+using GActionGroup = _GActionGroup;
+using gchar = char;
+using gpointer = void*;
using namespace OCC;
~Folder();
- typedef QMap<QString, Folder *> Map;
- typedef QMapIterator<QString, Folder *> MapIterator;
+ using Map = QMap<QString, Folder *>;
+ using MapIterator = QMapIterator<QString, Folder *>;
/**
* The account the folder is configured on.
public:
explicit ShareeModel(const AccountPtr &account, const QString &type, QObject *parent = nullptr);
- typedef QVector<QSharedPointer<Sharee>> ShareeSet; // FIXME: make it a QSet<Sharee> when Sharee can be compared
+ using ShareeSet = QVector<QSharedPointer<Sharee>>; // FIXME: make it a QSet<Sharee> when Sharee can be compared
void fetch(const QString &search, const ShareeSet &blacklist);
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role) const override;
TypeCircle = Sharee::Circle
};
- typedef SharePermissions Permissions;
+ using Permissions = SharePermissions;
/*
* Constructor for shares
#include "socketapisocket_mac.h"
#else
#include <QLocalServer>
-typedef QLocalServer SocketApiServer;
+using SocketApiServer = QLocalServer;
#endif
class QUrl;
class Activity
{
public:
- typedef QPair<qlonglong, QString> Identifier;
+ using Identifier = QPair<qlonglong, QString>;
enum Type {
ActivityType,
*
* A QList based list of Activities
*/
-
-typedef QList<Activity> ActivityList;
+using ActivityList = QList<Activity>;
}
Q_DECLARE_METATYPE(OCC::Activity::Type)
class AbstractCredentials;
class Account;
-typedef QSharedPointer<Account> AccountPtr;
+using AccountPtr = QSharedPointer<Account>;
class AccessManager;
class SimpleNetworkJob;
namespace OCC {
class Account;
-typedef QSharedPointer<Account> AccountPtr;
+using AccountPtr = QSharedPointer<Account>;
class AccountState;
-typedef QExplicitlySharedDataPointer<AccountState> AccountStatePtr;
+using AccountStatePtr = QExplicitlySharedDataPointer<AccountState>;
} // namespace OCC
QString keychainProxyPasswordKey() const;
private:
- typedef QSharedPointer<AbstractCredentials> SharedCreds;
+ using SharedCreds = QSharedPointer<AbstractCredentials>;
static bool _askedUser;
static QString _oCVersion;
class SyncFileItem;
class SyncJournalFileRecord;
-typedef QSharedPointer<SyncFileItem> SyncFileItemPtr;
+using SyncFileItemPtr = QSharedPointer<SyncFileItem>;
/**
* @brief The SyncFileItem class
return *item1 < *item2;
}
-typedef QVector<SyncFileItemPtr> SyncFileItemVector;
+using SyncFileItemVector = QVector<SyncFileItemPtr>;
}
Q_DECLARE_METATYPE(OCC::SyncFileItem)
struct PathComparator {
bool operator()( const QString& lhs, const QString& rhs ) const;
};
- typedef std::map<QString, SyncFileStatus::SyncFileStatusTag, PathComparator> ProblemsMap;
+ using ProblemsMap = std::map<QString, SyncFileStatus::SyncFileStatusTag, PathComparator>;
SyncFileStatus::SyncFileStatusTag lookupProblem(const QString &pathToMatch, const ProblemsMap &problemMap);
enum SharedFlag { UnknownShared,
int torture_run_tests(void)
{
- typedef ExcludedFilesTest T;
+ using T = ExcludedFilesTest;
const struct CMUnitTest tests[] = {
cmocka_unit_test_setup_teardown(T::check_csync_exclude_add, T::setup, T::teardown),
static mbchar_t wd_buffer[WD_BUFFER_SIZE];
-typedef struct {
+using statevar = struct {
CSYNC *csync;
char *result;
char *ignored_dir;
-} statevar;
+};
/* remove the complete test dir */
static int wipe_testdir()
using namespace OCC;
-typedef QList< QPair<QString,QString> > QueryItems;
+using QueryItems = QList<QPair<QString, QString>>;
Q_DECLARE_METATYPE(QueryItems)
void testParseEtag()
{
- typedef QPair<const char*, const char*> Test;
+ using Test = QPair<const char*, const char*>;
QList<Test> tests;
tests.append(Test("\"abcd\"", "abcd"));
tests.append(Test("\"\"", ""));
void testDownloadInfo()
{
- typedef SyncJournalDb::DownloadInfo Info;
+ using Info = SyncJournalDb::DownloadInfo;
Info record = _db.getDownloadInfo("nonexistant");
QVERIFY(!record._valid);
projects / nextcloud-desktop.git / commitdiff