Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kio: remove KIO::SlaveBase compat bits

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-03 07:30:00 +03:00
parent 4cbd252f74
commit c560428d0d
3 changed files with 2 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kio/kio/slavebase.cpp
View file

@ -359,7 +359,6 @@ void SlaveBase::sendMetaData()
{
if (!d->m_outgoingMetaData.isEmpty()) {
KIO_DATA << d->m_outgoingMetaData;
send(SI_META_DATA, data);
}
d->m_outgoingMetaData.clear();
@ -421,7 +420,6 @@ void SlaveBase::error(int errid, const QString &text)
d->rebuildConfig();
d->m_outgoingMetaData.clear();
KIO_DATA << (qint32)errid << text;
send(SI_ERROR, data);
}
@ -674,12 +672,6 @@ bool SlaveBase::openPasswordDialog(AuthInfo& info, const QString &errorMsg)
}
int SlaveBase::messageBox(MessageBoxType type, const QString &text, const QString &caption,
const QString &buttonYes, const QString &buttonNo)
{
return messageBox(text, type, caption, buttonYes, buttonNo, QString());
}
int SlaveBase::messageBox(const QString &text, MessageBoxType type, const QString &caption,
const QString &buttonYes, const QString &buttonNo,
const QString &dontAskAgainName)
{

20
kio/kio/slavebase.h
View file

@ -197,29 +197,11 @@ public:
* The default is i18n("&No").
* Note: for ContinueCancel, buttonYes is the continue button and buttonNo is unused.
* and for Information, none is used.
* @return a button code, as defined in KMessageBox, or 0 on communication error.
*/
int messageBox(MessageBoxType type, const QString &text,
const QString &caption = QString(),
const QString &buttonYes = i18n("&Yes"),
const QString &buttonNo = i18n("&No"));
/**
* Call this to show a message box from the slave
* @param text Message string. May contain newlines.
* @param type type of message box: QuestionYesNo, WarningYesNo, WarningContinueCancel...
* @param caption Message box title.
* @param buttonYes The text for the first button.
* The default is i18n("&Yes").
* @param buttonNo The text for the second button.
* The default is i18n("&No").
* Note: for ContinueCancel, buttonYes is the continue button and buttonNo is unused.
* and for Information, none is used.
* @param dontAskAgain A checkbox is added with which further confirmation can be turned off.
* If the checkbox was ticked @p*dontAskAgain will be set to true, otherwise false.
* @return a button code, as defined in KMessageBox, or 0 on communication error.
*/
int messageBox(const QString &text, MessageBoxType type,
int messageBox(MessageBoxType type, const QString &text,
const QString &caption = QString(),
const QString &buttonYes = i18n("&Yes"),
const QString &buttonNo = i18n("&No"),

2
kioslave/curl/kio_curl.cpp
View file

@ -335,7 +335,7 @@ int curlKeyCallback(CURL *curl,
);
const QString kiocaption = i18n("Key mismatch");
const int messageresult = curlprotocol->messageBox(
kiomessage, KIO::SlaveBase::WarningContinueCancel, kiocaption,
KIO::SlaveBase::WarningContinueCancel, kiomessage, kiocaption,
i18n("&Yes"), i18n("&No"), kiodontaskagain
);
kWarning(7103) << "Key mismatch for" << curlprotocol->p_url << messageresult;