Changeset View
Changeset View
Standalone View
Standalone View
src/core/slavebase.h
Show First 20 Lines • Show All 253 Lines • ▼ Show 20 Line(s) | 63 | public: | |||
---|---|---|---|---|---|
254 | * Call to signal a message, to be displayed if the application wants to, | 254 | * Call to signal a message, to be displayed if the application wants to, | ||
255 | * for instance in a status bar. Usual examples are "connecting to host xyz", etc. | 255 | * for instance in a status bar. Usual examples are "connecting to host xyz", etc. | ||
256 | */ | 256 | */ | ||
257 | void infoMessage(const QString &msg); | 257 | void infoMessage(const QString &msg); | ||
258 | 258 | | |||
259 | /** | 259 | /** | ||
260 | * Type of message box. Should be kept in sync with KMessageBox::ButtonCode. | 260 | * Type of message box. Should be kept in sync with KMessageBox::ButtonCode. | ||
261 | */ | 261 | */ | ||
262 | enum MessageBoxType { QuestionYesNo = 1, WarningYesNo = 2, WarningContinueCancel = 3, WarningYesNoCancel = 4, Information = 5, SSLMessageBox = 6 }; | 262 | enum MessageBoxType { QuestionYesNo = 1, WarningYesNo = 2, WarningContinueCancel = 3, WarningYesNoCancel = 4, Information = 5, SSLMessageBox = 6 }; | ||
dfaure: Does this break API docs generation? Suddenly the /** ... */ comment is separated from the enum. | |||||
The comment didn't affect the doc generation. But the placement was awkward so I changed it. chinmoyr: The comment didn't affect the doc generation. But the placement was awkward so I changed it. | |||||
263 | 263 | | |||
264 | /** | 264 | /** | ||
265 | * Button codes. Should be kept in sync with KMessageBox::ButtonCode | 265 | * Button codes. Should be kept in sync with KMessageBox::ButtonCode | ||
266 | */ | 266 | */ | ||
267 | enum ButtonCode { | 267 | enum ButtonCode { | ||
268 | Ok = 1, | 268 | Ok = 1, | ||
269 | Cancel = 2, | 269 | Cancel = 2, | ||
270 | Yes = 3, | 270 | Yes = 3, | ||
▲ Show 20 Lines • Show All 663 Lines • ▼ Show 20 Line(s) | 933 | /** Internally used | |||
934 | * @internal | 934 | * @internal | ||
935 | */ | 935 | */ | ||
936 | int waitForHostInfo(QHostInfo &info); | 936 | int waitForHostInfo(QHostInfo &info); | ||
937 | 937 | | |||
938 | /** | 938 | /** | ||
939 | * Checks with job if privilege operation is allowed. | 939 | * Checks with job if privilege operation is allowed. | ||
940 | * @return privilege operation status. | 940 | * @return privilege operation status. | ||
941 | * @see PrivilegeOperationStatus | 941 | * @see PrivilegeOperationStatus | ||
942 | * @since 5.43 | 942 | * @since 5.43 | ||
I was too slow, it's 5.66 now. Please change it everywhere. Well by waiting we didn't break the message freeze with all these new i18n calls. dfaure: I was too slow, it's 5.66 now. Please change it everywhere.
Well by waiting we didn't break… | |||||
943 | */ | 943 | */ | ||
944 | PrivilegeOperationStatus requestPrivilegeOperation(); | 944 | PrivilegeOperationStatus requestPrivilegeOperation(); | ||
945 | 945 | | |||
946 | /** | 946 | /** | ||
947 | * Adds @p action to the list of PolicyKit actions which the | 947 | * Adds @p action to the list of PolicyKit actions which the | ||
948 | * slave is authorized to perform. | 948 | * slave is authorized to perform. | ||
949 | * | 949 | * | ||
950 | * @param action the PolicyKit action | 950 | * @param action the PolicyKit action | ||
951 | * @since 5.45 | 951 | * @since 5.45 | ||
952 | */ | 952 | */ | ||
953 | void addTemporaryAuthorization(const QString &action); | 953 | void addTemporaryAuthorization(const QString &action); | ||
954 | 954 | | |||
955 | protected: | 955 | protected: | ||
956 | /** | 956 | /** | ||
dfaure: `, use requestPrivilegeOperation(QString)` | |||||
957 | * Name of the protocol supported by this slave | 957 | * Name of the protocol supported by this slave | ||
958 | */ | 958 | */ | ||
959 | QByteArray mProtocol; | 959 | QByteArray mProtocol; | ||
dfaure: The modern way is `#if KIOCORE_ENABLE_DEPRECATED_SINCE(5, 65)` | |||||
960 | //Often used by TcpSlaveBase and unlikely to change | 960 | //Often used by TcpSlaveBase and unlikely to change | ||
KIOCORE_DEPRECATED_VERSION(5, 65, "Pass QString action to requestPrivilegeOperation") dfaure: `KIOCORE_DEPRECATED_VERSION(5, 65, "Pass QString action to requestPrivilegeOperation")` | |||||
961 | MetaData mOutgoingMetaData; | 961 | MetaData mOutgoingMetaData; | ||
962 | MetaData mIncomingMetaData; | 962 | MetaData mIncomingMetaData; | ||
963 | 963 | | |||
964 | QString privilegeOperationDetails; | ||||
Missing "m" prefix like the other members, but wait.... isn't this BIC? Adding a new member to an exported class certainly is. This needs to go into the SlaveBasePrivate class instead. dfaure: Missing "m" prefix like the other members, but wait.... isn't this BIC? Adding a new member to… | |||||
Since we need details from the ioslave somehow, I deprecated requestPrivilegeOperation() in favor of an overload that accepts details as argument. chinmoyr: Since we need details from the ioslave somehow, I deprecated requestPrivilegeOperation() in… | |||||
965 | | ||||
964 | enum VirtualFunctionId { | 966 | enum VirtualFunctionId { | ||
965 | AppConnectionMade = 0, | 967 | AppConnectionMade = 0, | ||
966 | GetFileSystemFreeSpace = 1 // KF6 TODO: Turn into a virtual method | 968 | GetFileSystemFreeSpace = 1 // KF6 TODO: Turn into a virtual method | ||
967 | }; | 969 | }; | ||
968 | virtual void virtual_hook(int id, void *data); | 970 | virtual void virtual_hook(int id, void *data); | ||
969 | 971 | | |||
970 | private: | 972 | private: | ||
971 | // This helps catching missing tr()/i18n() calls in error(). | 973 | // This helps catching missing tr()/i18n() calls in error(). | ||
Show All 17 Lines |
Does this break API docs generation? Suddenly the /** ... */ comment is separated from the enum.