Differential D25010 Diff 68975 src/ioslaves/file/file.h

Changeset View

Standalone View

View Options

src/ioslaves/file/file.h

Show All 34 Lines
35#include <config-kioslave-file.h> 35​#include <config-kioslave-file.h>
36 36​
37#if HAVE_POSIX_ACL 37​#if HAVE_POSIX_ACL
38#include <sys/acl.h> 38​#include <sys/acl.h>
39#include <acl/libacl.h> 39​#include <acl/libacl.h>
40#endif 40​#endif
41 41​
42#include "file_p.h" 42​#include "file_p.h"
43​#include "statjob.h"
43 44​
44#include <QLoggingCategory> 45​#include <QLoggingCategory>
45Q_DECLARE_LOGGING_CATEGORY(KIO_FILE) 46​Q_DECLARE_LOGGING_CATEGORY(KIO_FILE)
46 47​
47class FileProtocol : public QObject, public KIO::SlaveBase 48​class FileProtocol : public QObject, public KIO::SlaveBase
48{ 49​{
49 Q_OBJECT 50​ Q_OBJECT
50public: 51​public:
Show All 38 Lines89#if HAVE_POSIX_ACL
89 static bool isExtendedACL(acl_t acl); 90​ static bool isExtendedACL(acl_t acl);
90#endif 91​#endif
91 92​
92protected: 93​protected:
93 void virtual_hook(int id, void *data) override; 94​ void virtual_hook(int id, void *data) override;
94 95​
95private: 96​private:
96 bool createUDSEntry(const QString &filename, const QByteArray &path, KIO::UDSEntry &entry, 97​ bool createUDSEntry(const QString &filename, const QByteArray &path, KIO::UDSEntry &entry,
97 short int details); 98​ KIO::StatJob::StatDetails details);
98 int setACL(const char *path, mode_t perm, bool _directoryDefault); 99​ int setACL(const char *path, mode_t perm, bool _directoryDefault);
99 QString getUserName(KUserId uid) const; 100​ QString getUserName(KUserId uid) const;
100 QString getGroupName(KGroupId gid) const; 101​ QString getGroupName(KGroupId gid) const;
101 bool deleteRecursive(const QString &path); 102​ bool deleteRecursive(const QString &path);
102 103​
103 void fileSystemFreeSpace(const QUrl &url); // KF6 TODO: Turn into virtual method in SlaveBase 104​ void fileSystemFreeSpace(const QUrl &url); // KF6 TODO: Turn into virtual method in SlaveBase
104 105​
105 bool privilegeOperationUnitTestMode(); 106​ bool privilegeOperationUnitTestMode();
Show All 9 Lines
115 116​
116 // Close without calling finish(). Use this to close after error. 117​ // Close without calling finish(). Use this to close after error.
117 void closeWithoutFinish(); 118​ void closeWithoutFinish();
118 119​
119private: 120​private:
120 mutable QHash<KUserId, QString> mUsercache; 121​ mutable QHash<KUserId, QString> mUsercache;
121 mutable QHash<KGroupId, QString> mGroupcache; 122​ mutable QHash<KGroupId, QString> mGroupcache;
122 QFile *mFile; 123​ QFile *mFile;
123}; 124​};
dfaureUnsubmitted
Done

Please move it up with the other private methods. This last section is member variables only.

Also, it could be marked as const.

dfaure: Please move it up with the other private methods. This last section is member variables only.
124 125​
125#endif 126​#endif