Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Network
KIO GDrive
Commits
2c19742b
Commit
2c19742b
authored
Aug 07, 2022
by
Nicolas Fella
Browse files
Port away from deprecated ERR_SLAVE_DEFINED
parent
fdd38804
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
2c19742b
...
...
@@ -8,7 +8,7 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
project
(
kio-gdrive VERSION
${
RELEASE_SERVICE_VERSION
}
)
set
(
QT_MIN_VERSION 5.15.0
)
set
(
KF5_MIN_VERSION 5.9
0
.0
)
set
(
KF5_MIN_VERSION 5.9
6
.0
)
set
(
KGAPI_MIN_VERSION 5.11.41
)
set
(
KACCOUNTS_MIN_VERSION 20.03.80
)
set
(
QTKEYCHAIN_MIN_VERSION 0.6.0
)
...
...
src/kio_gdrive.cpp
View file @
2c19742b
...
...
@@ -123,7 +123,7 @@ KIOGDrive::Action KIOGDrive::handleError(const KGAPI2::Job &job, const QUrl &url
error
(
KIO
::
ERR_DISK_FULL
,
url
.
toDisplayString
());
return
Fail
;
default:
error
(
KIO
::
ERR_
SLAVE
_DEFINED
,
job
.
errorString
());
error
(
KIO
::
ERR_
WORKER
_DEFINED
,
job
.
errorString
());
return
Fail
;
}
...
...
@@ -310,7 +310,7 @@ void KIOGDrive::createAccount()
}
if
(
m_accountManager
->
accounts
().
isEmpty
())
{
error
(
KIO
::
ERR_
SLAVE
_DEFINED
,
i18n
(
"There are no Google Drive accounts enabled. Please add at least one."
));
error
(
KIO
::
ERR_
WORKER
_DEFINED
,
i18n
(
"There are no Google Drive accounts enabled. Please add at least one."
));
return
;
}
...
...
@@ -700,7 +700,7 @@ void KIOGDrive::listDir(const QUrl &url)
const
auto
account
=
getAccount
(
accountId
);
if
(
account
->
accountName
().
isEmpty
())
{
qCDebug
(
GDRIVE
)
<<
"Unknown account"
<<
accountId
<<
"for"
<<
url
;
error
(
KIO
::
ERR_
SLAVE
_DEFINED
,
i18n
(
"%1 isn't a known GDrive account"
,
accountId
));
error
(
KIO
::
ERR_
WORKER
_DEFINED
,
i18n
(
"%1 isn't a known GDrive account"
,
accountId
));
return
;
}
...
...
@@ -840,7 +840,7 @@ void KIOGDrive::stat(const QUrl &url)
const
auto
account
=
getAccount
(
accountId
);
if
(
account
->
accountName
().
isEmpty
())
{
qCDebug
(
GDRIVE
)
<<
"Unknown account"
<<
accountId
<<
"for"
<<
url
;
error
(
KIO
::
ERR_
SLAVE
_DEFINED
,
i18n
(
"%1 isn't a known GDrive account"
,
accountId
));
error
(
KIO
::
ERR_
WORKER
_DEFINED
,
i18n
(
"%1 isn't a known GDrive account"
,
accountId
));
return
;
}
...
...
@@ -1260,7 +1260,7 @@ void KIOGDrive::del(const QUrl &url, bool isfile)
// Trying to delete the Team Drive root is pointless
if
(
gdriveUrl
.
isSharedDrivesRoot
())
{
qCDebug
(
GDRIVE
)
<<
"Tried deleting Shared Drives root."
;
error
(
KIO
::
ERR_
SLAVE
_DEFINED
,
i18n
(
"Can't delete Shared Drives root."
));
error
(
KIO
::
ERR_
WORKER
_DEFINED
,
i18n
(
"Can't delete Shared Drives root."
));
return
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment