Branch 'kolab/integration/4.13.0' - 14 commits - agents/notesagent akonadiconsole/monitoritem.cpp akonadiconsole/querydebugger.cpp CMakeLists.txt incidenceeditor-ng/CMakeLists.txt kleopatra/kleopatraapplication.cpp kontact/src libksieve/kmanagesieve noteshared/noteshared_export.h pimcommon/autocorrection pimcommon/storageservice
Christian Mollekopf
mollekopf at kolabsys.com
Mon Dec 1 12:30:41 CET 2014
CMakeLists.txt | 2
agents/notesagent/notesagent.cpp | 2
akonadiconsole/monitoritem.cpp | 6
akonadiconsole/querydebugger.cpp | 2
incidenceeditor-ng/CMakeLists.txt | 4
kleopatra/kleopatraapplication.cpp | 2
kontact/src/mainwindow.cpp | 10
libksieve/kmanagesieve/sasl-common.h | 2
noteshared/noteshared_export.h | 2
pimcommon/autocorrection/tests/CMakeLists.txt | 1
pimcommon/storageservice/box/boxjob.cpp | 106 +++++-----
pimcommon/storageservice/box/boxstorageservice.cpp | 30 +-
pimcommon/storageservice/dropbox/dropboxjob.cpp | 102 ++++-----
pimcommon/storageservice/dropbox/dropboxstorageservice.cpp | 30 +-
pimcommon/storageservice/gdrive/gdrivejob.cpp | 34 +--
pimcommon/storageservice/gdrive/gdrivestorageservice.cpp | 30 +-
pimcommon/storageservice/hubic/hubicjob.cpp | 104 ++++-----
pimcommon/storageservice/hubic/hubicstorageservice.cpp | 30 +-
pimcommon/storageservice/job/storageserviceabstractjob.cpp | 34 +--
pimcommon/storageservice/storageserviceabstract.cpp | 34 +--
pimcommon/storageservice/storageserviceabstract.h | 34 +--
pimcommon/storageservice/webdav/webdavjob.cpp | 66 +++---
pimcommon/storageservice/webdav/webdavstorageservice.cpp | 30 +-
pimcommon/storageservice/yousendit/yousenditjob.cpp | 100 ++++-----
pimcommon/storageservice/yousendit/yousenditstorageservice.cpp | 30 +-
25 files changed, 416 insertions(+), 411 deletions(-)
New commits:
commit 8390e5be78615222ba49cbfca061b60594109c6f
Merge: 6b6056c 5d4259f
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Mon Dec 1 12:30:30 2014 +0100
Merge remote-tracking branch 'kolab/kolab/integration/4.13.0' into kolab/integration/4.13.0
commit 6b6056c1d87ccbf637aabf93597e7fd700510b3f
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Mon Dec 1 12:29:27 2014 +0100
Fixed Wid reinterpret_cast.
at least on unix Wid is a unsigned long and reinterpret cast with loss of precision
is not possible. Of course it's still possible to fail by not storing an
unsigned long in the first place.
diff --git a/kleopatra/kleopatraapplication.cpp b/kleopatra/kleopatraapplication.cpp
index 8ee50cc..ff01bb4 100644
--- a/kleopatra/kleopatraapplication.cpp
+++ b/kleopatra/kleopatraapplication.cpp
@@ -292,7 +292,7 @@ int KleopatraApplication::newInstance() {
// Check for Parent Window id
WId parentId = 0;
if ( args->isSet( "parent-windowid" ) ) {
- parentId = reinterpret_cast<WId>(args->getOption( "parent-windowid" ).toUInt());
+ parentId = reinterpret_cast<WId>(args->getOption( "parent-windowid" ).toULong());
}
// Search for local keys
commit 54a788195e38e8e9218521e6c0288bdbf2326c0e
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Mon Dec 1 12:27:33 2014 +0100
some forgotten fixes for clashes with the MS API
diff --git a/pimcommon/storageservice/gdrive/gdrivejob.cpp b/pimcommon/storageservice/gdrive/gdrivejob.cpp
index 1b62671..fbb49fc 100644
--- a/pimcommon/storageservice/gdrive/gdrivejob.cpp
+++ b/pimcommon/storageservice/gdrive/gdrivejob.cpp
@@ -97,7 +97,7 @@ QString GDriveJob::lastPathComponent( const QUrl &url ) const
void GDriveJob::listFolder(const QString &folder)
{
- mActionType = PimCommon::StorageServiceAbstract::ListFolder;
+ mActionType = PimCommon::StorageServiceAbstract::ListFolderAction;
mError = false;
const QString folderId = folder.isEmpty() ? QLatin1String("root") : folder;
KGAPI2::Drive::ChildReferenceFetchJob *fetchJob = new KGAPI2::Drive::ChildReferenceFetchJob( folderId, mAccount );
@@ -147,7 +147,7 @@ void GDriveJob::slotFileFetchFinished(KGAPI2::Job* job)
void GDriveJob::requestTokenAccess()
{
mError = false;
- mActionType = PimCommon::StorageServiceAbstract::RequestToken;
+ mActionType = PimCommon::StorageServiceAbstract::RequestTokenAction;
KGAPI2::AuthJob *authJob = new KGAPI2::AuthJob(
mAccount,
@@ -184,7 +184,7 @@ void GDriveJob::initializeToken(KGAPI2::AccountPtr account)
void GDriveJob::accountInfo()
{
- mActionType = PimCommon::StorageServiceAbstract::AccountInfo;
+ mActionType = PimCommon::StorageServiceAbstract::AccountInfoAction;
mError = false;
KGAPI2::Drive::AboutFetchJob *aboutFetchJob = new KGAPI2::Drive::AboutFetchJob(mAccount, this);
connect(aboutFetchJob, SIGNAL(finished(KGAPI2::Job*)), this, SLOT(slotAboutFetchJobFinished(KGAPI2::Job*)));
@@ -211,7 +211,7 @@ void GDriveJob::slotAboutFetchJobFinished(KGAPI2::Job *job)
QNetworkReply *GDriveJob::uploadFile(const QString &filename, const QString &uploadAsName, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::UploadFile;
+ mActionType = PimCommon::StorageServiceAbstract::UploadFileAction;
mError = false;
KGAPI2::Drive::FilePtr file( new KGAPI2::Drive::File() );
file->setTitle( uploadAsName );
@@ -245,7 +245,7 @@ void GDriveJob::slotUploadJobFinished(KGAPI2::Job* job)
void GDriveJob::deleteFile(const QString &filename)
{
- mActionType = PimCommon::StorageServiceAbstract::DeleteFile;
+ mActionType = PimCommon::StorageServiceAbstract::DeleteFileAction;
mError = false;
const QString folderId = filename;
KGAPI2::Drive::FileDeleteJob *fileDeleteJob = new KGAPI2::Drive::FileDeleteJob(folderId, mAccount, this);
@@ -254,7 +254,7 @@ void GDriveJob::deleteFile(const QString &filename)
void GDriveJob::deleteFolder(const QString &foldername)
{
- mActionType = PimCommon::StorageServiceAbstract::DeleteFolder;
+ mActionType = PimCommon::StorageServiceAbstract::DeleteFolderAction;
mError = false;
const QString folderId = foldername;
KGAPI2::Drive::FileDeleteJob *fileDeleteJob = new KGAPI2::Drive::FileDeleteJob(folderId, mAccount, this);
@@ -286,7 +286,7 @@ void GDriveJob::slotDeleteFileFinished(KGAPI2::Job*job)
QNetworkReply * GDriveJob::downloadFile(const QString &name, const QString &fileId, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::DownLoadFile;
+ mActionType = PimCommon::StorageServiceAbstract::DownLoadFileAction;
mError = false;
const QString defaultDestination = (destination.isEmpty() ? PimCommon::StorageServiceJobConfig::self()->defaultUploadFolder() : destination);
@@ -305,7 +305,7 @@ QNetworkReply * GDriveJob::downloadFile(const QString &name, const QString &file
void GDriveJob::refreshToken()
{
- mActionType = PimCommon::StorageServiceAbstract::AccessToken;
+ mActionType = PimCommon::StorageServiceAbstract::AccessTokenAction;
KGAPI2::AuthJob *authJob = new KGAPI2::AuthJob(
mAccount,
mClientId,
@@ -315,7 +315,7 @@ void GDriveJob::refreshToken()
void GDriveJob::createFolder(const QString &foldername, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::CreateFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CreateFolderAction;
mError = false;
KGAPI2::Drive::FilePtr file( new KGAPI2::Drive::File() );
@@ -342,7 +342,7 @@ void GDriveJob::slotCreateJobFinished(KGAPI2::Job *job)
void GDriveJob::createServiceFolder()
{
- mActionType = PimCommon::StorageServiceAbstract::CreateServiceFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CreateServiceFolderAction;
mError = false;
const QString folderName = lastPathComponent( QString() );
@@ -361,7 +361,7 @@ void GDriveJob::copyFile(const QString &source, const QString &destination)
{
qDebug()<<"source "<<source<<" destination"<<destination;
- mActionType = PimCommon::StorageServiceAbstract::CopyFile;
+ mActionType = PimCommon::StorageServiceAbstract::CopyFileAction;
mError = false;
KGAPI2::Drive::FilePtr file( new KGAPI2::Drive::File() );
file->setTitle( QLatin1String("copy") );
@@ -387,7 +387,7 @@ void GDriveJob::slotCopyJobFinished(KGAPI2::Job *job)
void GDriveJob::copyFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::CopyFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CopyFolderAction;
mError = false;
KGAPI2::Drive::FilePtr file( new KGAPI2::Drive::File() );
file->setTitle( QLatin1String("copy") );
@@ -413,7 +413,7 @@ void GDriveJob::slotCopyFolderJobFinished(KGAPI2::Job *job)
void GDriveJob::renameFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::RenameFolder;
+ mActionType = PimCommon::StorageServiceAbstract::RenameFolderAction;
qDebug()<<" source "<<source<<" destination "<<destination;
mError = false;
qDebug()<<" not implemented";
@@ -424,7 +424,7 @@ void GDriveJob::renameFolder(const QString &source, const QString &destination)
void GDriveJob::renameFile(const QString &oldName, const QString &newName)
{
- mActionType = PimCommon::StorageServiceAbstract::RenameFile;
+ mActionType = PimCommon::StorageServiceAbstract::RenameFileAction;
qDebug()<<" oldName "<<oldName<<" newName "<<newName;
mError = false;
qDebug()<<" not implemented";
@@ -441,7 +441,7 @@ void GDriveJob::renameFile(const QString &oldName, const QString &newName)
void GDriveJob::moveFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::MoveFolder;
+ mActionType = PimCommon::StorageServiceAbstract::MoveFolderAction;
mError = false;
qDebug()<<" not implemented";
Q_EMIT actionFailed(QLatin1String("Not Implemented"));
@@ -451,7 +451,7 @@ void GDriveJob::moveFolder(const QString &source, const QString &destination)
void GDriveJob::moveFile(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::MoveFile;
+ mActionType = PimCommon::StorageServiceAbstract::MoveFileAction;
mError = false;
qDebug()<<" not implemented";
Q_EMIT actionFailed(QLatin1String("Not Implemented"));
@@ -461,7 +461,7 @@ void GDriveJob::moveFile(const QString &source, const QString &destination)
void GDriveJob::shareLink(const QString &root, const QString &path)
{
- mActionType = PimCommon::StorageServiceAbstract::ShareLink;
+ mActionType = PimCommon::StorageServiceAbstract::ShareLinkAction;
mError = false;
QUrl url;
QString fileId; //TODO
diff --git a/pimcommon/storageservice/gdrive/gdrivestorageservice.cpp b/pimcommon/storageservice/gdrive/gdrivestorageservice.cpp
index a698a73..cb605c7 100644
--- a/pimcommon/storageservice/gdrive/gdrivestorageservice.cpp
+++ b/pimcommon/storageservice/gdrive/gdrivestorageservice.cpp
@@ -175,7 +175,7 @@ void GDriveStorageService::storageServiceShareLink(const QString &root, const QS
if (mNeedToReadConfigFirst)
readConfig();
if (mAccount->accessToken().isEmpty() || needToRefreshToken()) {
- mNextAction->setNextActionType(ShareLink);
+ mNextAction->setNextActionType(ShareLinkAction);
mNextAction->setPath(path);
mNextAction->setRootPath(root);
if (mAccount->accessToken().isEmpty()) {
@@ -198,7 +198,7 @@ void GDriveStorageService::storageServicedownloadFile(const QString &name, const
readConfig();
if (mAccount->accessToken().isEmpty() || needToRefreshToken()) {
- mNextAction->setNextActionType(DownLoadFile);
+ mNextAction->setNextActionType(DownLoadFileAction);
mNextAction->setNextActionName(name);
mNextAction->setDownloadDestination(destination);
mNextAction->setFileId(fileId);
@@ -224,7 +224,7 @@ void GDriveStorageService::storageServicedeleteFile(const QString &filename)
readConfig();
if (mAccount->accessToken().isEmpty() || needToRefreshToken()) {
- mNextAction->setNextActionType(DeleteFile);
+ mNextAction->setNextActionType(DeleteFileAction);
mNextAction->setNextActionName(filename);
if (mAccount->accessToken().isEmpty()) {
storageServiceauthentication();
@@ -246,7 +246,7 @@ void GDriveStorageService::storageServicedeleteFolder(const QString &foldername)
readConfig();
if (mAccount->accessToken().isEmpty() || needToRefreshToken()) {
- mNextAction->setNextActionType(DeleteFolder);
+ mNextAction->setNextActionType(DeleteFolderAction);
mNextAction->setNextActionFolder(foldername);
if (mAccount->accessToken().isEmpty()) {
storageServiceauthentication();
@@ -268,7 +268,7 @@ void GDriveStorageService::storageServiceRenameFolder(const QString &source, con
readConfig();
if (mAccount->accessToken().isEmpty() || needToRefreshToken()) {
- mNextAction->setNextActionType(RenameFolder);
+ mNextAction->setNextActionType(RenameFolderAction);
mNextAction->setRenameFolder(source, destination);
if (mAccount->accessToken().isEmpty()) {
storageServiceauthentication();
@@ -290,7 +290,7 @@ void GDriveStorageService::storageServiceRenameFile(const QString &source, const
readConfig();
if (mAccount->accessToken().isEmpty() || needToRefreshToken()) {
- mNextAction->setNextActionType(RenameFile);
+ mNextAction->setNextActionType(RenameFileAction);
mNextAction->setRenameFolder(source, destination);
if (mAccount->accessToken().isEmpty()) {
storageServiceauthentication();
@@ -312,7 +312,7 @@ void GDriveStorageService::storageServiceMoveFolder(const QString &source, const
readConfig();
if (mAccount->accessToken().isEmpty() || needToRefreshToken()) {
- mNextAction->setNextActionType(MoveFolder);
+ mNextAction->setNextActionType(MoveFolderAction);
mNextAction->setRenameFolder(source, destination);
if (mAccount->accessToken().isEmpty()) {
storageServiceauthentication();
@@ -334,7 +334,7 @@ void GDriveStorageService::storageServiceMoveFile(const QString &source, const Q
readConfig();
if (mAccount->accessToken().isEmpty() || needToRefreshToken()) {
- mNextAction->setNextActionType(MoveFile);
+ mNextAction->setNextActionType(MoveFileAction);
mNextAction->setRenameFolder(source, destination);
if (mAccount->accessToken().isEmpty()) {
storageServiceauthentication();
@@ -356,7 +356,7 @@ void GDriveStorageService::storageServiceCopyFile(const QString &source, const Q
readConfig();
if (mAccount->accessToken().isEmpty() || needToRefreshToken()) {
- mNextAction->setNextActionType(CopyFile);
+ mNextAction->setNextActionType(CopyFileAction);
mNextAction->setRenameFolder(source, destination);
if (mAccount->accessToken().isEmpty()) {
storageServiceauthentication();
@@ -378,7 +378,7 @@ void GDriveStorageService::storageServiceCopyFolder(const QString &source, const
readConfig();
if (mAccount->accessToken().isEmpty() || needToRefreshToken()) {
- mNextAction->setNextActionType(CopyFolder);
+ mNextAction->setNextActionType(CopyFolderAction);
mNextAction->setRenameFolder(source, destination);
if (mAccount->accessToken().isEmpty()) {
storageServiceauthentication();
@@ -420,7 +420,7 @@ void GDriveStorageService::storageServicelistFolder(const QString &folder)
readConfig();
if (mAccount->accessToken().isEmpty() || needToRefreshToken()) {
- mNextAction->setNextActionType(ListFolder);
+ mNextAction->setNextActionType(ListFolderAction);
mNextAction->setNextActionFolder(folder);
if (mAccount->accessToken().isEmpty()) {
storageServiceauthentication();
@@ -442,7 +442,7 @@ void GDriveStorageService::storageServicecreateFolder(const QString &name, const
readConfig();
if (mAccount->accessToken().isEmpty() || needToRefreshToken()) {
- mNextAction->setNextActionType(CreateFolder);
+ mNextAction->setNextActionType(CreateFolderAction);
mNextAction->setNextActionName(name);
mNextAction->setNextActionFolder(destination);
if (mAccount->accessToken().isEmpty()) {
@@ -465,7 +465,7 @@ void GDriveStorageService::storageServiceaccountInfo()
readConfig();
if (mAccount->accessToken().isEmpty() || needToRefreshToken()) {
- mNextAction->setNextActionType(AccountInfo);
+ mNextAction->setNextActionType(AccountInfoAction);
if (mAccount->accessToken().isEmpty()) {
storageServiceauthentication();
} else {
@@ -491,7 +491,7 @@ void GDriveStorageService::storageServiceuploadFile(const QString &filename, con
readConfig();
if (mAccount->accessToken().isEmpty() || needToRefreshToken()) {
- mNextAction->setNextActionType(UploadFile);
+ mNextAction->setNextActionType(UploadFileAction);
mNextAction->setNextActionName(filename);
mNextAction->setNextActionFolder(destination);
mNextAction->setUploadAsName(uploadAsName);
@@ -585,7 +585,7 @@ void GDriveStorageService::storageServicecreateServiceFolder()
readConfig();
if (mAccount->accessToken().isEmpty() || needToRefreshToken()) {
- mNextAction->setNextActionType(CreateServiceFolder);
+ mNextAction->setNextActionType(CreateServiceFolderAction);
if (mAccount->accessToken().isEmpty()) {
storageServiceauthentication();
} else {
commit ae8a64893c4ab59fa7d7215b08757b1b9669f3ec
Merge: c75ba0a 595491a
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Fri Nov 28 17:25:10 2014 +0100
Merge branch 'tilladam-kolab/integration/4.13.0' into kolab/integration/4.13.0
commit 595491a1502b41609976ce2cd9ecb1f5d30dec51
Author: Till Adam <till.adam at kdab.com>
Date: Sat Nov 22 21:50:06 2014 +0100
Fix duplicate type scopes, does not compile with Visual Studio.
diff --git a/akonadiconsole/monitoritem.cpp b/akonadiconsole/monitoritem.cpp
index 9c7af0b..ff99443 100644
--- a/akonadiconsole/monitoritem.cpp
+++ b/akonadiconsole/monitoritem.cpp
@@ -117,7 +117,7 @@ void MonitorItem::monitoredMimeTypesChanged()
{
const QStringList mimeTypes = mInterface->monitoredMimeTypes();
monitoredMimeTypes = mimeTypes.join( QLatin1String( ", " ) );
- Q_EMIT changed( MonitorsModel::MonitorsModel::MonitoredMimeTypesColumn );
+ Q_EMIT changed( MonitorsModel::MonitoredMimeTypesColumn );
}
void MonitorItem::monitoredResourcesChanged()
@@ -129,7 +129,7 @@ void MonitorItem::monitoredResourcesChanged()
monitoredResources += list[i];
}
- Q_EMIT changed( MonitorsModel::MonitorsModel::MonitoredResourcesColumn );
+ Q_EMIT changed( MonitorsModel::MonitoredResourcesColumn );
}
void MonitorItem::ignoredSessionsChanged()
@@ -141,6 +141,6 @@ void MonitorItem::ignoredSessionsChanged()
ignoredSessions += list[i];
}
- Q_EMIT changed( MonitorsModel::MonitorsModel::MonitorsModel::IgnoredSessionsColumn );
+ Q_EMIT changed( MonitorsModel::IgnoredSessionsColumn );
}
diff --git a/akonadiconsole/querydebugger.cpp b/akonadiconsole/querydebugger.cpp
index ac1d118..27ef435 100644
--- a/akonadiconsole/querydebugger.cpp
+++ b/akonadiconsole/querydebugger.cpp
@@ -148,7 +148,7 @@ QString QueryDebugger::variantToString( const QVariant &val )
{
if ( val.canConvert( QVariant::String ) ) {
return val.toString();
- } else if ( val.canConvert( QVariant::QVariant::DateTime ) ) {
+ } else if ( val.canConvert( QVariant::DateTime ) ) {
return val.toDateTime().toString( Qt::ISODate );
}
commit 163fa299ec52ad322315814bbb24bd1a8ef541da
Author: Till Adam <till.adam at kdab.com>
Date: Sat Nov 22 21:37:53 2014 +0100
Don't build the mobile parts of the incidenceeditor_ng when not building mobile UI.
diff --git a/incidenceeditor-ng/CMakeLists.txt b/incidenceeditor-ng/CMakeLists.txt
index 0659bf0..7a304e1 100644
--- a/incidenceeditor-ng/CMakeLists.txt
+++ b/incidenceeditor-ng/CMakeLists.txt
@@ -126,7 +126,7 @@ install(TARGETS incidenceeditorsng ${INSTALL_TARGETS_DEFAULT_ARGS})
### Build the mobile version if needed
-#if(KDEPIM_MOBILE_UI)
+if(KDEPIM_MOBILE_UI)
set(incidenceeditors_ng_mobile_LIB_SRCS
${incidenceeditors_ng_shared_LIB_SRCS}
)
@@ -170,7 +170,7 @@ install(TARGETS incidenceeditorsng ${INSTALL_TARGETS_DEFAULT_ARGS})
)
install(TARGETS incidenceeditorsngmobile ${INSTALL_TARGETS_DEFAULT_ARGS})
-#endif(KDEPIM_MOBILE_UI)
+endif(KDEPIM_MOBILE_UI)
### Build the test app TODO: Make optional
commit 38ab637aad60c8c36469daef3dff48ed8d39c70c
Author: Till Adam <till.adam at kdab.com>
Date: Sat Nov 22 16:51:02 2014 +0100
Add missing library to the link line.
diff --git a/pimcommon/autocorrection/tests/CMakeLists.txt b/pimcommon/autocorrection/tests/CMakeLists.txt
index cc0dddf..d6457c1 100644
--- a/pimcommon/autocorrection/tests/CMakeLists.txt
+++ b/pimcommon/autocorrection/tests/CMakeLists.txt
@@ -14,6 +14,7 @@ target_link_libraries(autocorrection_gui
${KDE4_KDEUI_LIBS}
${QT_QTWEBKIT_LIBRARY}
${KDE4_KIO_LIBS}
+ kdepim
pimcommon
)
commit 2140953dac4c3c911c320a440b951f2d2208d5e4
Author: Patrick Spendrin <ps_ml at gmx.de>
Date: Wed May 7 02:17:53 2014 +0200
fix clashes with MS API
diff --git a/pimcommon/storageservice/box/boxjob.cpp b/pimcommon/storageservice/box/boxjob.cpp
index b946c5b..01db181 100644
--- a/pimcommon/storageservice/box/boxjob.cpp
+++ b/pimcommon/storageservice/box/boxjob.cpp
@@ -63,7 +63,7 @@ void BoxJob::initializeToken(const QString &refreshToken, const QString &token)
void BoxJob::createServiceFolder()
{
- mActionType = PimCommon::StorageServiceAbstract::CreateServiceFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CreateServiceFolderAction;
mError = false;
createFolderJob(PimCommon::StorageServiceJobConfig::self()->defaultUploadFolder(), QLatin1String("0"));
}
@@ -71,7 +71,7 @@ void BoxJob::createServiceFolder()
void BoxJob::requestTokenAccess()
{
mError = false;
- mActionType = PimCommon::StorageServiceAbstract::RequestToken;
+ mActionType = PimCommon::StorageServiceAbstract::RequestTokenAction;
QUrl url(mServiceUrl + mAuthorizePath );
url.addQueryItem(QLatin1String("response_type"), QLatin1String("code"));
url.addQueryItem(QLatin1String("client_id"), mClientId);
@@ -132,7 +132,7 @@ void BoxJob::parseRedirectUrl(const QUrl &url)
void BoxJob::getTokenAccess(const QString &authorizeCode)
{
- mActionType = PimCommon::StorageServiceAbstract::AccessToken;
+ mActionType = PimCommon::StorageServiceAbstract::AccessTokenAction;
mError = false;
QNetworkRequest request(QUrl(mServiceUrl + mPathToken));
request.setHeader(QNetworkRequest::ContentTypeHeader, QLatin1String("application/x-www-form-urlencoded"));
@@ -168,37 +168,37 @@ void BoxJob::slotSendDataFinished(QNetworkReply *reply)
case PimCommon::StorageServiceAbstract::NoneAction:
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::RequestToken:
+ case PimCommon::StorageServiceAbstract::RequestTokenAction:
Q_EMIT authorizationFailed(errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::AccessToken:
+ case PimCommon::StorageServiceAbstract::AccessTokenAction:
Q_EMIT authorizationFailed(errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::UploadFile:
+ case PimCommon::StorageServiceAbstract::UploadFileAction:
Q_EMIT uploadFileFailed(errorStr);
errorMessage(mActionType, errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::DownLoadFile:
+ case PimCommon::StorageServiceAbstract::DownLoadFileAction:
Q_EMIT downLoadFileFailed(errorStr);
errorMessage(mActionType, errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::DeleteFile:
- case PimCommon::StorageServiceAbstract::CreateFolder:
- case PimCommon::StorageServiceAbstract::AccountInfo:
- case PimCommon::StorageServiceAbstract::ListFolder:
- case PimCommon::StorageServiceAbstract::CreateServiceFolder:
- case PimCommon::StorageServiceAbstract::DeleteFolder:
- case PimCommon::StorageServiceAbstract::RenameFolder:
- case PimCommon::StorageServiceAbstract::RenameFile:
- case PimCommon::StorageServiceAbstract::MoveFolder:
- case PimCommon::StorageServiceAbstract::MoveFile:
- case PimCommon::StorageServiceAbstract::CopyFile:
- case PimCommon::StorageServiceAbstract::CopyFolder:
- case PimCommon::StorageServiceAbstract::ShareLink:
+ case PimCommon::StorageServiceAbstract::DeleteFileAction:
+ case PimCommon::StorageServiceAbstract::CreateFolderAction:
+ case PimCommon::StorageServiceAbstract::AccountInfoAction:
+ case PimCommon::StorageServiceAbstract::ListFolderAction:
+ case PimCommon::StorageServiceAbstract::CreateServiceFolderAction:
+ case PimCommon::StorageServiceAbstract::DeleteFolderAction:
+ case PimCommon::StorageServiceAbstract::RenameFolderAction:
+ case PimCommon::StorageServiceAbstract::RenameFileAction:
+ case PimCommon::StorageServiceAbstract::MoveFolderAction:
+ case PimCommon::StorageServiceAbstract::MoveFileAction:
+ case PimCommon::StorageServiceAbstract::CopyFileAction:
+ case PimCommon::StorageServiceAbstract::CopyFolderAction:
+ case PimCommon::StorageServiceAbstract::ShareLinkAction:
errorMessage(mActionType, errorStr);
deleteLater();
break;
@@ -218,55 +218,55 @@ void BoxJob::slotSendDataFinished(QNetworkReply *reply)
case PimCommon::StorageServiceAbstract::NoneAction:
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::RequestToken:
+ case PimCommon::StorageServiceAbstract::RequestTokenAction:
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::AccessToken:
+ case PimCommon::StorageServiceAbstract::AccessTokenAction:
parseAccessToken(data);
break;
- case PimCommon::StorageServiceAbstract::UploadFile:
+ case PimCommon::StorageServiceAbstract::UploadFileAction:
parseUploadFile(data);
break;
- case PimCommon::StorageServiceAbstract::CreateFolder:
+ case PimCommon::StorageServiceAbstract::CreateFolderAction:
parseCreateFolder(data);
break;
- case PimCommon::StorageServiceAbstract::AccountInfo:
+ case PimCommon::StorageServiceAbstract::AccountInfoAction:
parseAccountInfo(data);
break;
- case PimCommon::StorageServiceAbstract::ListFolder:
+ case PimCommon::StorageServiceAbstract::ListFolderAction:
parseListFolder(data);
break;
- case PimCommon::StorageServiceAbstract::CreateServiceFolder:
+ case PimCommon::StorageServiceAbstract::CreateServiceFolderAction:
parseCreateServiceFolder(data);
break;
- case PimCommon::StorageServiceAbstract::DeleteFile:
+ case PimCommon::StorageServiceAbstract::DeleteFileAction:
parseDeleteFile(data);
break;
- case PimCommon::StorageServiceAbstract::DeleteFolder:
+ case PimCommon::StorageServiceAbstract::DeleteFolderAction:
parseDeleteFolder(data);
break;
- case PimCommon::StorageServiceAbstract::CopyFile:
+ case PimCommon::StorageServiceAbstract::CopyFileAction:
parseCopyFile(data);
break;
- case PimCommon::StorageServiceAbstract::CopyFolder:
+ case PimCommon::StorageServiceAbstract::CopyFolderAction:
parseCopyFolder(data);
break;
- case PimCommon::StorageServiceAbstract::RenameFile:
+ case PimCommon::StorageServiceAbstract::RenameFileAction:
parseRenameFile(data);
break;
- case PimCommon::StorageServiceAbstract::RenameFolder:
+ case PimCommon::StorageServiceAbstract::RenameFolderAction:
parseRenameFolder(data);
break;
- case PimCommon::StorageServiceAbstract::MoveFolder:
+ case PimCommon::StorageServiceAbstract::MoveFolderAction:
parseMoveFolder(data);
break;
- case PimCommon::StorageServiceAbstract::MoveFile:
+ case PimCommon::StorageServiceAbstract::MoveFileAction:
parseMoveFile(data);
break;
- case PimCommon::StorageServiceAbstract::ShareLink:
+ case PimCommon::StorageServiceAbstract::ShareLinkAction:
parseShareLink(data);
break;
- case PimCommon::StorageServiceAbstract::DownLoadFile:
+ case PimCommon::StorageServiceAbstract::DownLoadFileAction:
parseDownloadFile(data);
break;
}
@@ -293,7 +293,7 @@ void BoxJob::parseAccountInfo(const QString &data)
void BoxJob::refreshToken()
{
- mActionType = PimCommon::StorageServiceAbstract::AccessToken;
+ mActionType = PimCommon::StorageServiceAbstract::AccessTokenAction;
QNetworkRequest request(QUrl(QLatin1String("https://www.box.com/api/oauth2/token")));
request.setHeader(QNetworkRequest::ContentTypeHeader, QLatin1String("application/x-www-form-urlencoded"));
QUrl postData;
@@ -310,7 +310,7 @@ void BoxJob::refreshToken()
void BoxJob::deleteFile(const QString &filename)
{
- mActionType = PimCommon::StorageServiceAbstract::DeleteFile;
+ mActionType = PimCommon::StorageServiceAbstract::DeleteFileAction;
mError = false;
QUrl url;
url.setUrl(mApiUrl + mFileInfoPath + filename);
@@ -323,7 +323,7 @@ void BoxJob::deleteFile(const QString &filename)
void BoxJob::deleteFolder(const QString &foldername)
{
- mActionType = PimCommon::StorageServiceAbstract::DeleteFolder;
+ mActionType = PimCommon::StorageServiceAbstract::DeleteFolderAction;
mError = false;
QUrl url;
url.setUrl(mApiUrl + mFolderInfoPath + foldername);
@@ -337,7 +337,7 @@ void BoxJob::deleteFolder(const QString &foldername)
void BoxJob::renameFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::RenameFolder;
+ mActionType = PimCommon::StorageServiceAbstract::RenameFolderAction;
mError = false;
QUrl url;
url.setUrl(mApiUrl + mFolderInfoPath + source);
@@ -352,7 +352,7 @@ void BoxJob::renameFolder(const QString &source, const QString &destination)
void BoxJob::renameFile(const QString &oldName, const QString &newName)
{
- mActionType = PimCommon::StorageServiceAbstract::RenameFile;
+ mActionType = PimCommon::StorageServiceAbstract::RenameFileAction;
mError = false;
QUrl url;
@@ -368,7 +368,7 @@ void BoxJob::renameFile(const QString &oldName, const QString &newName)
void BoxJob::moveFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::MoveFolder;
+ mActionType = PimCommon::StorageServiceAbstract::MoveFolderAction;
mError = false;
QUrl url;
url.setUrl(mApiUrl + mFolderInfoPath + source);
@@ -383,7 +383,7 @@ void BoxJob::moveFolder(const QString &source, const QString &destination)
void BoxJob::moveFile(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::MoveFile;
+ mActionType = PimCommon::StorageServiceAbstract::MoveFileAction;
mError = false;
QUrl url;
url.setUrl(mApiUrl + mFileInfoPath + source);
@@ -399,7 +399,7 @@ void BoxJob::moveFile(const QString &source, const QString &destination)
void BoxJob::copyFile(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::CopyFile;
+ mActionType = PimCommon::StorageServiceAbstract::CopyFileAction;
mError = false;
QUrl url;
url.setUrl(mApiUrl + mFileInfoPath + QString::fromLatin1("%1/copy").arg(source));
@@ -414,7 +414,7 @@ void BoxJob::copyFile(const QString &source, const QString &destination)
void BoxJob::copyFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::CopyFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CopyFolderAction;
mError = false;
QUrl url;
url.setUrl(mApiUrl + mFolderInfoPath + QString::fromLatin1("%1/copy").arg(source));
@@ -431,7 +431,7 @@ QNetworkReply *BoxJob::uploadFile(const QString &filename, const QString &upload
{
QFile *file = new QFile(filename);
if (file->exists()) {
- mActionType = PimCommon::StorageServiceAbstract::UploadFile;
+ mActionType = PimCommon::StorageServiceAbstract::UploadFileAction;
mError = false;
if (file->open(QIODevice::ReadOnly)) {
QUrl url;
@@ -455,7 +455,7 @@ QNetworkReply *BoxJob::uploadFile(const QString &filename, const QString &upload
void BoxJob::listFolder(const QString &folder)
{
- mActionType = PimCommon::StorageServiceAbstract::ListFolder;
+ mActionType = PimCommon::StorageServiceAbstract::ListFolderAction;
mError = false;
QUrl url;
url.setUrl(mApiUrl + mFolderInfoPath + (folder.isEmpty() ? QLatin1String("0") : folder) + QLatin1String("/items?fields=name,created_at,size,modified_at,id"));
@@ -468,7 +468,7 @@ void BoxJob::listFolder(const QString &folder)
void BoxJob::accountInfo()
{
- mActionType = PimCommon::StorageServiceAbstract::AccountInfo;
+ mActionType = PimCommon::StorageServiceAbstract::AccountInfoAction;
mError = false;
QUrl url;
url.setUrl(mApiUrl + mCurrentAccountInfoPath);
@@ -493,7 +493,7 @@ void BoxJob::createFolderJob(const QString &foldername, const QString &destinati
void BoxJob::createFolder(const QString &foldername, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::CreateFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CreateFolderAction;
mError = false;
createFolderJob(foldername, destination);
}
@@ -502,7 +502,7 @@ void BoxJob::createFolder(const QString &foldername, const QString &destination)
void BoxJob::shareLink(const QString &root, const QString &fileId)
{
Q_UNUSED(root);
- mActionType = PimCommon::StorageServiceAbstract::ShareLink;
+ mActionType = PimCommon::StorageServiceAbstract::ShareLinkAction;
mError = false;
QUrl url;
url.setUrl(mApiUrl + mFileInfoPath + fileId);
@@ -654,10 +654,10 @@ void BoxJob::parseDownloadFile(const QString &data)
QNetworkReply * BoxJob::downloadFile(const QString &name, const QString &fileId, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::DownLoadFile;
+ mActionType = PimCommon::StorageServiceAbstract::DownLoadFileAction;
mError = false;
- mActionType = PimCommon::StorageServiceAbstract::DownLoadFile;
+ mActionType = PimCommon::StorageServiceAbstract::DownLoadFileAction;
mError = false;
const QString defaultDestination = (destination.isEmpty() ? PimCommon::StorageServiceJobConfig::self()->defaultUploadFolder() : destination);
delete mDownloadFile;
diff --git a/pimcommon/storageservice/box/boxstorageservice.cpp b/pimcommon/storageservice/box/boxstorageservice.cpp
index 0a7cd6c..2360659 100644
--- a/pimcommon/storageservice/box/boxstorageservice.cpp
+++ b/pimcommon/storageservice/box/boxstorageservice.cpp
@@ -156,7 +156,7 @@ void BoxStorageService::storageServiceShareLink(const QString &root, const QStri
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(ShareLink);
+ mNextAction->setNextActionType(ShareLinkAction);
mNextAction->setPath(path);
mNextAction->setRootPath(root);
if (mToken.isEmpty()) {
@@ -177,7 +177,7 @@ void BoxStorageService::storageServicedownloadFile(const QString &name, const QS
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(DownLoadFile);
+ mNextAction->setNextActionType(DownLoadFileAction);
mNextAction->setNextActionName(name);
mNextAction->setDownloadDestination(destination);
mNextAction->setFileId(fileId);
@@ -201,7 +201,7 @@ void BoxStorageService::storageServicedeleteFile(const QString &filename)
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(DeleteFile);
+ mNextAction->setNextActionType(DeleteFileAction);
mNextAction->setNextActionName(filename);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -221,7 +221,7 @@ void BoxStorageService::storageServicedeleteFolder(const QString &foldername)
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(DeleteFolder);
+ mNextAction->setNextActionType(DeleteFolderAction);
mNextAction->setNextActionFolder(foldername);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -241,7 +241,7 @@ void BoxStorageService::storageServiceRenameFolder(const QString &source, const
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(RenameFolder);
+ mNextAction->setNextActionType(RenameFolderAction);
mNextAction->setRenameFolder(source, destination);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -261,7 +261,7 @@ void BoxStorageService::storageServiceRenameFile(const QString &source, const QS
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(RenameFile);
+ mNextAction->setNextActionType(RenameFileAction);
mNextAction->setRenameFolder(source, destination);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -281,7 +281,7 @@ void BoxStorageService::storageServiceMoveFolder(const QString &source, const QS
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(MoveFolder);
+ mNextAction->setNextActionType(MoveFolderAction);
mNextAction->setRenameFolder(source, destination);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -301,7 +301,7 @@ void BoxStorageService::storageServiceMoveFile(const QString &source, const QStr
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(MoveFile);
+ mNextAction->setNextActionType(MoveFileAction);
mNextAction->setRenameFolder(source, destination);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -321,7 +321,7 @@ void BoxStorageService::storageServiceCopyFile(const QString &source, const QStr
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(CopyFile);
+ mNextAction->setNextActionType(CopyFileAction);
mNextAction->setRenameFolder(source, destination);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -341,7 +341,7 @@ void BoxStorageService::storageServiceCopyFolder(const QString &source, const QS
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(CopyFolder);
+ mNextAction->setNextActionType(CopyFolderAction);
mNextAction->setRenameFolder(source, destination);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -361,7 +361,7 @@ void BoxStorageService::storageServicelistFolder(const QString &folder)
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(ListFolder);
+ mNextAction->setNextActionType(ListFolderAction);
mNextAction->setNextActionFolder(folder);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -381,7 +381,7 @@ void BoxStorageService::storageServicecreateFolder(const QString &name, const QS
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(CreateFolder);
+ mNextAction->setNextActionType(CreateFolderAction);
mNextAction->setNextActionName(name);
mNextAction->setNextActionFolder(destination);
if (mToken.isEmpty()) {
@@ -402,7 +402,7 @@ void BoxStorageService::storageServiceaccountInfo()
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(AccountInfo);
+ mNextAction->setNextActionType(AccountInfoAction);
if (mToken.isEmpty()) {
storageServiceauthentication();
} else {
@@ -426,7 +426,7 @@ void BoxStorageService::storageServiceuploadFile(const QString &filename, const
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(UploadFile);
+ mNextAction->setNextActionType(UploadFileAction);
mNextAction->setNextActionName(filename);
mNextAction->setNextActionFolder(destination);
mNextAction->setUploadAsName(uploadAsName);
@@ -506,7 +506,7 @@ void BoxStorageService::storageServicecreateServiceFolder()
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(CreateServiceFolder);
+ mNextAction->setNextActionType(CreateServiceFolderAction);
if (mToken.isEmpty()) {
storageServiceauthentication();
} else {
diff --git a/pimcommon/storageservice/dropbox/dropboxjob.cpp b/pimcommon/storageservice/dropbox/dropboxjob.cpp
index 61ef726..38d9c84 100644
--- a/pimcommon/storageservice/dropbox/dropboxjob.cpp
+++ b/pimcommon/storageservice/dropbox/dropboxjob.cpp
@@ -66,7 +66,7 @@ void DropBoxJob::initializeToken(const QString &accessToken, const QString &acce
void DropBoxJob::requestTokenAccess()
{
- mActionType = PimCommon::StorageServiceAbstract::RequestToken;
+ mActionType = PimCommon::StorageServiceAbstract::RequestTokenAction;
mError = false;
QNetworkRequest request(QUrl(mApiPath + QLatin1String("oauth/request_token")));
request.setHeader(QNetworkRequest::ContentTypeHeader, QLatin1String("application/x-www-form-urlencoded"));
@@ -86,7 +86,7 @@ void DropBoxJob::requestTokenAccess()
void DropBoxJob::getTokenAccess()
{
- mActionType = PimCommon::StorageServiceAbstract::AccessToken;
+ mActionType = PimCommon::StorageServiceAbstract::AccessTokenAction;
mError = false;
QNetworkRequest request(QUrl(mApiPath + QLatin1String("oauth/access_token")));
request.setHeader(QNetworkRequest::ContentTypeHeader, QLatin1String("application/x-www-form-urlencoded"));
@@ -119,37 +119,37 @@ void DropBoxJob::slotSendDataFinished(QNetworkReply *reply)
case PimCommon::StorageServiceAbstract::NoneAction:
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::RequestToken:
+ case PimCommon::StorageServiceAbstract::RequestTokenAction:
Q_EMIT authorizationFailed(errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::AccessToken:
+ case PimCommon::StorageServiceAbstract::AccessTokenAction:
Q_EMIT authorizationFailed(errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::UploadFile:
+ case PimCommon::StorageServiceAbstract::UploadFileAction:
Q_EMIT uploadFileFailed(errorStr);
errorMessage(mActionType, errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::DownLoadFile:
+ case PimCommon::StorageServiceAbstract::DownLoadFileAction:
Q_EMIT downLoadFileFailed(errorStr);
errorMessage(mActionType, errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::CreateFolder:
- case PimCommon::StorageServiceAbstract::AccountInfo:
- case PimCommon::StorageServiceAbstract::ListFolder:
- case PimCommon::StorageServiceAbstract::ShareLink:
- case PimCommon::StorageServiceAbstract::CreateServiceFolder:
- case PimCommon::StorageServiceAbstract::DeleteFile:
- case PimCommon::StorageServiceAbstract::DeleteFolder:
- case PimCommon::StorageServiceAbstract::RenameFolder:
- case PimCommon::StorageServiceAbstract::RenameFile:
- case PimCommon::StorageServiceAbstract::MoveFolder:
- case PimCommon::StorageServiceAbstract::MoveFile:
- case PimCommon::StorageServiceAbstract::CopyFile:
- case PimCommon::StorageServiceAbstract::CopyFolder:
+ case PimCommon::StorageServiceAbstract::CreateFolderAction:
+ case PimCommon::StorageServiceAbstract::AccountInfoAction:
+ case PimCommon::StorageServiceAbstract::ListFolderAction:
+ case PimCommon::StorageServiceAbstract::ShareLinkAction:
+ case PimCommon::StorageServiceAbstract::CreateServiceFolderAction:
+ case PimCommon::StorageServiceAbstract::DeleteFileAction:
+ case PimCommon::StorageServiceAbstract::DeleteFolderAction:
+ case PimCommon::StorageServiceAbstract::RenameFolderAction:
+ case PimCommon::StorageServiceAbstract::RenameFileAction:
+ case PimCommon::StorageServiceAbstract::MoveFolderAction:
+ case PimCommon::StorageServiceAbstract::MoveFileAction:
+ case PimCommon::StorageServiceAbstract::CopyFileAction:
+ case PimCommon::StorageServiceAbstract::CopyFolderAction:
errorMessage(mActionType, errorStr);
deleteLater();
break;
@@ -163,55 +163,55 @@ void DropBoxJob::slotSendDataFinished(QNetworkReply *reply)
switch(mActionType) {
case PimCommon::StorageServiceAbstract::NoneAction:
break;
- case PimCommon::StorageServiceAbstract::RequestToken:
+ case PimCommon::StorageServiceAbstract::RequestTokenAction:
parseRequestToken(data);
break;
- case PimCommon::StorageServiceAbstract::AccessToken:
+ case PimCommon::StorageServiceAbstract::AccessTokenAction:
parseResponseAccessToken(data);
break;
- case PimCommon::StorageServiceAbstract::UploadFile:
+ case PimCommon::StorageServiceAbstract::UploadFileAction:
parseUploadFile(data);
break;
- case PimCommon::StorageServiceAbstract::CreateFolder:
+ case PimCommon::StorageServiceAbstract::CreateFolderAction:
parseCreateFolder(data);
break;
- case PimCommon::StorageServiceAbstract::AccountInfo:
+ case PimCommon::StorageServiceAbstract::AccountInfoAction:
parseAccountInfo(data);
break;
- case PimCommon::StorageServiceAbstract::ListFolder:
+ case PimCommon::StorageServiceAbstract::ListFolderAction:
parseListFolder(data);
break;
- case PimCommon::StorageServiceAbstract::ShareLink:
+ case PimCommon::StorageServiceAbstract::ShareLinkAction:
parseShareLink(data);
break;
- case PimCommon::StorageServiceAbstract::CreateServiceFolder:
+ case PimCommon::StorageServiceAbstract::CreateServiceFolderAction:
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::DeleteFile:
+ case PimCommon::StorageServiceAbstract::DeleteFileAction:
parseDeleteFile(data);
break;
- case PimCommon::StorageServiceAbstract::DeleteFolder:
+ case PimCommon::StorageServiceAbstract::DeleteFolderAction:
parseDeleteFolder(data);
break;
- case PimCommon::StorageServiceAbstract::DownLoadFile:
+ case PimCommon::StorageServiceAbstract::DownLoadFileAction:
parseDownLoadFile(data);
break;
- case PimCommon::StorageServiceAbstract::RenameFolder:
+ case PimCommon::StorageServiceAbstract::RenameFolderAction:
parseRenameFolder(data);
break;
- case PimCommon::StorageServiceAbstract::RenameFile:
+ case PimCommon::StorageServiceAbstract::RenameFileAction:
parseRenameFile(data);
break;
- case PimCommon::StorageServiceAbstract::MoveFolder:
+ case PimCommon::StorageServiceAbstract::MoveFolderAction:
parseMoveFolder(data);
break;
- case PimCommon::StorageServiceAbstract::MoveFile:
+ case PimCommon::StorageServiceAbstract::MoveFileAction:
parseMoveFile(data);
break;
- case PimCommon::StorageServiceAbstract::CopyFile:
+ case PimCommon::StorageServiceAbstract::CopyFileAction:
parseCopyFile(data);
break;
- case PimCommon::StorageServiceAbstract::CopyFolder:
+ case PimCommon::StorageServiceAbstract::CopyFolderAction:
parseCopyFolder(data);
break;
}
@@ -386,7 +386,7 @@ void DropBoxJob::createFolderJob(const QString &foldername, const QString &desti
void DropBoxJob::createFolder(const QString &foldername, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::CreateFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CreateFolderAction;
mError = false;
createFolderJob(foldername, destination);
}
@@ -395,7 +395,7 @@ QNetworkReply *DropBoxJob::uploadFile(const QString &filename, const QString &up
{
QFile *file = new QFile(filename);
if (file->exists()) {
- mActionType = PimCommon::StorageServiceAbstract::UploadFile;
+ mActionType = PimCommon::StorageServiceAbstract::UploadFileAction;
mError = false;
if (file->open(QIODevice::ReadOnly)) {
const QString defaultDestination = (destination.isEmpty() ? PimCommon::StorageServiceJobConfig::self()->defaultUploadFolder() : destination);
@@ -417,7 +417,7 @@ QNetworkReply *DropBoxJob::uploadFile(const QString &filename, const QString &up
void DropBoxJob::accountInfo()
{
- mActionType = PimCommon::StorageServiceAbstract::AccountInfo;
+ mActionType = PimCommon::StorageServiceAbstract::AccountInfoAction;
mError = false;
QUrl url(mApiPath + QLatin1String("account/info"));
addDefaultUrlItem(url);
@@ -430,7 +430,7 @@ void DropBoxJob::accountInfo()
void DropBoxJob::listFolder(const QString &folder)
{
- mActionType = PimCommon::StorageServiceAbstract::ListFolder;
+ mActionType = PimCommon::StorageServiceAbstract::ListFolderAction;
mError = false;
QUrl url(mApiPath + QLatin1String("metadata/dropbox/") + folder);
addDefaultUrlItem(url);
@@ -465,7 +465,7 @@ void DropBoxJob::parseUploadFile(const QString &data)
void DropBoxJob::shareLink(const QString &root, const QString &path)
{
- mActionType = PimCommon::StorageServiceAbstract::ShareLink;
+ mActionType = PimCommon::StorageServiceAbstract::ShareLinkAction;
mError = false;
QUrl url = QUrl(mApiPath + QString::fromLatin1("shares/%1/%2").arg(root).arg(path));
@@ -479,7 +479,7 @@ void DropBoxJob::shareLink(const QString &root, const QString &path)
void DropBoxJob::createServiceFolder()
{
- mActionType = PimCommon::StorageServiceAbstract::CreateServiceFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CreateServiceFolderAction;
mError = false;
createFolderJob(PimCommon::StorageServiceJobConfig::self()->defaultUploadFolder(), QString());
}
@@ -487,7 +487,7 @@ void DropBoxJob::createServiceFolder()
QNetworkReply *DropBoxJob::downloadFile(const QString &name, const QString &fileId, const QString &destination)
{
Q_UNUSED(fileId);
- mActionType = PimCommon::StorageServiceAbstract::DownLoadFile;
+ mActionType = PimCommon::StorageServiceAbstract::DownLoadFileAction;
mError = false;
const QString defaultDestination = (destination.isEmpty() ? PimCommon::StorageServiceJobConfig::self()->defaultUploadFolder() : destination);
delete mDownloadFile;
@@ -512,7 +512,7 @@ QNetworkReply *DropBoxJob::downloadFile(const QString &name, const QString &file
void DropBoxJob::deleteFile(const QString &filename)
{
- mActionType = PimCommon::StorageServiceAbstract::DeleteFile;
+ mActionType = PimCommon::StorageServiceAbstract::DeleteFileAction;
mError = false;
QUrl url = QUrl(mApiPath + QLatin1String("fileops/delete"));
url.addQueryItem(QLatin1String("root"), mRootPath);
@@ -525,7 +525,7 @@ void DropBoxJob::deleteFile(const QString &filename)
void DropBoxJob::deleteFolder(const QString &foldername)
{
- mActionType = PimCommon::StorageServiceAbstract::DeleteFolder;
+ mActionType = PimCommon::StorageServiceAbstract::DeleteFolderAction;
mError = false;
QUrl url = QUrl(mApiPath + QLatin1String("fileops/delete"));
url.addQueryItem(QLatin1String("root"), mRootPath);
@@ -538,7 +538,7 @@ void DropBoxJob::deleteFolder(const QString &foldername)
void DropBoxJob::renameFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::RenameFolder;
+ mActionType = PimCommon::StorageServiceAbstract::RenameFolderAction;
mError = false;
QUrl url = QUrl(mApiPath + QLatin1String("fileops/move"));
url.addQueryItem(QLatin1String("root"), mRootPath);
@@ -568,7 +568,7 @@ void DropBoxJob::renameFolder(const QString &source, const QString &destination)
void DropBoxJob::renameFile(const QString &oldName, const QString &newName)
{
- mActionType = PimCommon::StorageServiceAbstract::RenameFile;
+ mActionType = PimCommon::StorageServiceAbstract::RenameFileAction;
mError = false;
QUrl url = QUrl(mApiPath + QLatin1String("fileops/move"));
url.addQueryItem(QLatin1String("root"), mRootPath);
@@ -600,7 +600,7 @@ void DropBoxJob::renameFile(const QString &oldName, const QString &newName)
void DropBoxJob::moveFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::MoveFolder;
+ mActionType = PimCommon::StorageServiceAbstract::MoveFolderAction;
mError = false;
QUrl url = QUrl(mApiPath + QLatin1String("fileops/move"));
url.addQueryItem(QLatin1String("root"), mRootPath);
@@ -615,7 +615,7 @@ void DropBoxJob::moveFolder(const QString &source, const QString &destination)
void DropBoxJob::moveFile(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::MoveFile;
+ mActionType = PimCommon::StorageServiceAbstract::MoveFileAction;
mError = false;
QUrl url = QUrl(mApiPath + QLatin1String("fileops/move"));
url.addQueryItem(QLatin1String("root"), mRootPath);
@@ -630,7 +630,7 @@ void DropBoxJob::moveFile(const QString &source, const QString &destination)
void DropBoxJob::copyFile(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::CopyFile;
+ mActionType = PimCommon::StorageServiceAbstract::CopyFileAction;
mError = false;
QUrl url = QUrl(mApiPath + QLatin1String("fileops/copy"));
url.addQueryItem(QLatin1String("root"), mRootPath);
@@ -645,7 +645,7 @@ void DropBoxJob::copyFile(const QString &source, const QString &destination)
void DropBoxJob::copyFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::CopyFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CopyFolderAction;
mError = false;
QUrl url = QUrl(mApiPath + QLatin1String("fileops/copy"));
url.addQueryItem(QLatin1String("root"), mRootPath);
diff --git a/pimcommon/storageservice/dropbox/dropboxstorageservice.cpp b/pimcommon/storageservice/dropbox/dropboxstorageservice.cpp
index 8c5b4fd..6901f86 100644
--- a/pimcommon/storageservice/dropbox/dropboxstorageservice.cpp
+++ b/pimcommon/storageservice/dropbox/dropboxstorageservice.cpp
@@ -115,7 +115,7 @@ bool DropBoxStorageService::checkNeedAuthenticate()
void DropBoxStorageService::storageServiceShareLink(const QString &root, const QString &path)
{
if (checkNeedAuthenticate()) {
- mNextAction->setNextActionType(ShareLink);
+ mNextAction->setNextActionType(ShareLinkAction);
mNextAction->setRootPath(root);
mNextAction->setPath(path);
storageServiceauthentication();
@@ -131,7 +131,7 @@ void DropBoxStorageService::storageServiceShareLink(const QString &root, const Q
void DropBoxStorageService::storageServicecreateServiceFolder()
{
if (checkNeedAuthenticate()) {
- mNextAction->setNextActionType(CreateServiceFolder);
+ mNextAction->setNextActionType(CreateServiceFolderAction);
storageServiceauthentication();
} else {
DropBoxJob *job = new DropBoxJob(this);
@@ -166,7 +166,7 @@ void DropBoxStorageService::slotAuthorizationDone(const QString &accessToken, co
void DropBoxStorageService::storageServicelistFolder(const QString &folder)
{
if (checkNeedAuthenticate()) {
- mNextAction->setNextActionType(ListFolder);
+ mNextAction->setNextActionType(ListFolderAction);
mNextAction->setNextActionFolder(folder);
storageServiceauthentication();
} else {
@@ -181,7 +181,7 @@ void DropBoxStorageService::storageServicelistFolder(const QString &folder)
void DropBoxStorageService::storageServiceaccountInfo()
{
if (checkNeedAuthenticate()) {
- mNextAction->setNextActionType(AccountInfo);
+ mNextAction->setNextActionType(AccountInfoAction);
storageServiceauthentication();
} else {
DropBoxJob *job = new DropBoxJob(this);
@@ -195,7 +195,7 @@ void DropBoxStorageService::storageServiceaccountInfo()
void DropBoxStorageService::storageServicecreateFolder(const QString &name, const QString &destination)
{
if (checkNeedAuthenticate()) {
- mNextAction->setNextActionType(CreateFolder);
+ mNextAction->setNextActionType(CreateFolderAction);
mNextAction->setNextActionName(name);
mNextAction->setNextActionFolder(destination);
storageServiceauthentication();
@@ -211,7 +211,7 @@ void DropBoxStorageService::storageServicecreateFolder(const QString &name, cons
void DropBoxStorageService::storageServiceuploadFile(const QString &filename, const QString &uploadAsName, const QString &destination)
{
if (checkNeedAuthenticate()) {
- mNextAction->setNextActionType(UploadFile);
+ mNextAction->setNextActionType(UploadFileAction);
mNextAction->setNextActionName(filename);
mNextAction->setNextActionFolder(destination);
mNextAction->setUploadAsName(uploadAsName);
@@ -291,7 +291,7 @@ QString DropBoxStorageService::storageServiceName() const
void DropBoxStorageService::storageServicedownloadFile(const QString &name, const QString &fileId, const QString &destination)
{
if (checkNeedAuthenticate()) {
- mNextAction->setNextActionType(DownLoadFile);
+ mNextAction->setNextActionType(DownLoadFileAction);
mNextAction->setNextActionName(name);
mNextAction->setDownloadDestination(destination);
mNextAction->setFileId(fileId);
@@ -310,7 +310,7 @@ void DropBoxStorageService::storageServicedownloadFile(const QString &name, cons
void DropBoxStorageService::storageServicedeleteFile(const QString &filename)
{
if (checkNeedAuthenticate()) {
- mNextAction->setNextActionType(DeleteFile);
+ mNextAction->setNextActionType(DeleteFileAction);
mNextAction->setNextActionName(filename);
storageServiceauthentication();
} else {
@@ -325,7 +325,7 @@ void DropBoxStorageService::storageServicedeleteFile(const QString &filename)
void DropBoxStorageService::storageServicedeleteFolder(const QString &foldername)
{
if (checkNeedAuthenticate()) {
- mNextAction->setNextActionType(DeleteFolder);
+ mNextAction->setNextActionType(DeleteFolderAction);
mNextAction->setNextActionFolder(foldername);
storageServiceauthentication();
} else {
@@ -340,7 +340,7 @@ void DropBoxStorageService::storageServicedeleteFolder(const QString &foldername
void DropBoxStorageService::storageServiceRenameFolder(const QString &source, const QString &destination)
{
if (checkNeedAuthenticate()) {
- mNextAction->setNextActionType(RenameFolder);
+ mNextAction->setNextActionType(RenameFolderAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -355,7 +355,7 @@ void DropBoxStorageService::storageServiceRenameFolder(const QString &source, co
void DropBoxStorageService::storageServiceRenameFile(const QString &source, const QString &destination)
{
if (checkNeedAuthenticate()) {
- mNextAction->setNextActionType(RenameFile);
+ mNextAction->setNextActionType(RenameFileAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -370,7 +370,7 @@ void DropBoxStorageService::storageServiceRenameFile(const QString &source, cons
void DropBoxStorageService::storageServiceMoveFolder(const QString &source, const QString &destination)
{
if (checkNeedAuthenticate()) {
- mNextAction->setNextActionType(MoveFolder);
+ mNextAction->setNextActionType(MoveFolderAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -385,7 +385,7 @@ void DropBoxStorageService::storageServiceMoveFolder(const QString &source, cons
void DropBoxStorageService::storageServiceMoveFile(const QString &source, const QString &destination)
{
if (checkNeedAuthenticate()) {
- mNextAction->setNextActionType(RenameFolder);
+ mNextAction->setNextActionType(RenameFolderAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -400,7 +400,7 @@ void DropBoxStorageService::storageServiceMoveFile(const QString &source, const
void DropBoxStorageService::storageServiceCopyFile(const QString &source, const QString &destination)
{
if (checkNeedAuthenticate()) {
- mNextAction->setNextActionType(CopyFile);
+ mNextAction->setNextActionType(CopyFileAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -415,7 +415,7 @@ void DropBoxStorageService::storageServiceCopyFile(const QString &source, const
void DropBoxStorageService::storageServiceCopyFolder(const QString &source, const QString &destination)
{
if (checkNeedAuthenticate()) {
- mNextAction->setNextActionType(CopyFolder);
+ mNextAction->setNextActionType(CopyFolderAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
diff --git a/pimcommon/storageservice/hubic/hubicjob.cpp b/pimcommon/storageservice/hubic/hubicjob.cpp
index c64c9e9..3cbf181 100644
--- a/pimcommon/storageservice/hubic/hubicjob.cpp
+++ b/pimcommon/storageservice/hubic/hubicjob.cpp
@@ -59,7 +59,7 @@ void HubicJob::initializeToken(const QString &refreshToken, const QString &token
void HubicJob::createServiceFolder()
{
- mActionType = PimCommon::StorageServiceAbstract::CreateServiceFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CreateServiceFolderAction;
mError = false;
//TODO
Q_EMIT actionFailed(QLatin1String("Not Implemented"));
@@ -70,7 +70,7 @@ void HubicJob::createServiceFolder()
void HubicJob::requestTokenAccess()
{
mError = false;
- mActionType = PimCommon::StorageServiceAbstract::RequestToken;
+ mActionType = PimCommon::StorageServiceAbstract::RequestTokenAction;
QUrl url(mServiceUrl + mAuthorizePath );
url.addQueryItem(QLatin1String("response_type"), QLatin1String("code"));
url.addQueryItem(QLatin1String("client_id"), mClientId);
@@ -130,7 +130,7 @@ void HubicJob::parseRedirectUrl(const QUrl &url)
void HubicJob::getTokenAccess(const QString &authorizeCode)
{
- mActionType = PimCommon::StorageServiceAbstract::AccessToken;
+ mActionType = PimCommon::StorageServiceAbstract::AccessTokenAction;
mError = false;
QNetworkRequest request(QUrl(mServiceUrl + mPathToken));
request.setHeader(QNetworkRequest::ContentTypeHeader, QLatin1String("application/x-www-form-urlencoded"));
@@ -162,37 +162,37 @@ void HubicJob::slotSendDataFinished(QNetworkReply *reply)
case PimCommon::StorageServiceAbstract::NoneAction:
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::RequestToken:
+ case PimCommon::StorageServiceAbstract::RequestTokenAction:
Q_EMIT authorizationFailed(errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::AccessToken:
+ case PimCommon::StorageServiceAbstract::AccessTokenAction:
Q_EMIT authorizationFailed(errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::UploadFile:
+ case PimCommon::StorageServiceAbstract::UploadFileAction:
Q_EMIT uploadFileFailed(errorStr);
errorMessage(mActionType, errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::DownLoadFile:
+ case PimCommon::StorageServiceAbstract::DownLoadFileAction:
Q_EMIT downLoadFileFailed(errorStr);
errorMessage(mActionType, errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::DeleteFile:
- case PimCommon::StorageServiceAbstract::CreateFolder:
- case PimCommon::StorageServiceAbstract::AccountInfo:
- case PimCommon::StorageServiceAbstract::ListFolder:
- case PimCommon::StorageServiceAbstract::CreateServiceFolder:
- case PimCommon::StorageServiceAbstract::DeleteFolder:
- case PimCommon::StorageServiceAbstract::RenameFolder:
- case PimCommon::StorageServiceAbstract::RenameFile:
- case PimCommon::StorageServiceAbstract::MoveFolder:
- case PimCommon::StorageServiceAbstract::MoveFile:
- case PimCommon::StorageServiceAbstract::CopyFile:
- case PimCommon::StorageServiceAbstract::CopyFolder:
- case PimCommon::StorageServiceAbstract::ShareLink:
+ case PimCommon::StorageServiceAbstract::DeleteFileAction:
+ case PimCommon::StorageServiceAbstract::CreateFolderAction:
+ case PimCommon::StorageServiceAbstract::AccountInfoAction:
+ case PimCommon::StorageServiceAbstract::ListFolderAction:
+ case PimCommon::StorageServiceAbstract::CreateServiceFolderAction:
+ case PimCommon::StorageServiceAbstract::DeleteFolderAction:
+ case PimCommon::StorageServiceAbstract::RenameFolderAction:
+ case PimCommon::StorageServiceAbstract::RenameFileAction:
+ case PimCommon::StorageServiceAbstract::MoveFolderAction:
+ case PimCommon::StorageServiceAbstract::MoveFileAction:
+ case PimCommon::StorageServiceAbstract::CopyFileAction:
+ case PimCommon::StorageServiceAbstract::CopyFolderAction:
+ case PimCommon::StorageServiceAbstract::ShareLinkAction:
errorMessage(mActionType, errorStr);
deleteLater();
break;
@@ -212,55 +212,55 @@ void HubicJob::slotSendDataFinished(QNetworkReply *reply)
case PimCommon::StorageServiceAbstract::NoneAction:
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::RequestToken:
+ case PimCommon::StorageServiceAbstract::RequestTokenAction:
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::AccessToken:
+ case PimCommon::StorageServiceAbstract::AccessTokenAction:
parseAccessToken(data);
break;
- case PimCommon::StorageServiceAbstract::UploadFile:
+ case PimCommon::StorageServiceAbstract::UploadFileAction:
parseUploadFile(data);
break;
- case PimCommon::StorageServiceAbstract::CreateFolder:
+ case PimCommon::StorageServiceAbstract::CreateFolderAction:
parseCreateFolder(data);
break;
- case PimCommon::StorageServiceAbstract::AccountInfo:
+ case PimCommon::StorageServiceAbstract::AccountInfoAction:
parseAccountInfo(data);
break;
- case PimCommon::StorageServiceAbstract::ListFolder:
+ case PimCommon::StorageServiceAbstract::ListFolderAction:
parseListFolder(data);
break;
- case PimCommon::StorageServiceAbstract::CreateServiceFolder:
+ case PimCommon::StorageServiceAbstract::CreateServiceFolderAction:
parseCreateServiceFolder(data);
break;
- case PimCommon::StorageServiceAbstract::DeleteFile:
+ case PimCommon::StorageServiceAbstract::DeleteFileAction:
parseDeleteFile(data);
break;
- case PimCommon::StorageServiceAbstract::DeleteFolder:
+ case PimCommon::StorageServiceAbstract::DeleteFolderAction:
parseDeleteFolder(data);
break;
- case PimCommon::StorageServiceAbstract::CopyFile:
+ case PimCommon::StorageServiceAbstract::CopyFileAction:
parseCopyFile(data);
break;
- case PimCommon::StorageServiceAbstract::CopyFolder:
+ case PimCommon::StorageServiceAbstract::CopyFolderAction:
parseCopyFolder(data);
break;
- case PimCommon::StorageServiceAbstract::RenameFile:
+ case PimCommon::StorageServiceAbstract::RenameFileAction:
parseRenameFile(data);
break;
- case PimCommon::StorageServiceAbstract::RenameFolder:
+ case PimCommon::StorageServiceAbstract::RenameFolderAction:
parseRenameFolder(data);
break;
- case PimCommon::StorageServiceAbstract::MoveFolder:
+ case PimCommon::StorageServiceAbstract::MoveFolderAction:
parseMoveFolder(data);
break;
- case PimCommon::StorageServiceAbstract::MoveFile:
+ case PimCommon::StorageServiceAbstract::MoveFileAction:
parseMoveFile(data);
break;
- case PimCommon::StorageServiceAbstract::ShareLink:
+ case PimCommon::StorageServiceAbstract::ShareLinkAction:
parseShareLink(data);
break;
- case PimCommon::StorageServiceAbstract::DownLoadFile:
+ case PimCommon::StorageServiceAbstract::DownLoadFileAction:
parseDownloadFile(data);
break;
}
@@ -287,7 +287,7 @@ void HubicJob::parseAccountInfo(const QString &data)
void HubicJob::refreshToken()
{
- mActionType = PimCommon::StorageServiceAbstract::AccessToken;
+ mActionType = PimCommon::StorageServiceAbstract::AccessTokenAction;
QNetworkRequest request(QUrl(QLatin1String("https://api.hubic.com/oauth/token/")));
request.setHeader(QNetworkRequest::ContentTypeHeader, QLatin1String("application/x-www-form-urlencoded"));
QUrl postData;
@@ -304,49 +304,49 @@ void HubicJob::refreshToken()
void HubicJob::deleteFile(const QString &filename)
{
- mActionType = PimCommon::StorageServiceAbstract::DeleteFile;
+ mActionType = PimCommon::StorageServiceAbstract::DeleteFileAction;
mError = false;
}
void HubicJob::deleteFolder(const QString &foldername)
{
- mActionType = PimCommon::StorageServiceAbstract::DeleteFolder;
+ mActionType = PimCommon::StorageServiceAbstract::DeleteFolderAction;
mError = false;
}
void HubicJob::renameFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::RenameFolder;
+ mActionType = PimCommon::StorageServiceAbstract::RenameFolderAction;
mError = false;
}
void HubicJob::renameFile(const QString &oldName, const QString &newName)
{
- mActionType = PimCommon::StorageServiceAbstract::RenameFile;
+ mActionType = PimCommon::StorageServiceAbstract::RenameFileAction;
mError = false;
}
void HubicJob::moveFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::MoveFolder;
+ mActionType = PimCommon::StorageServiceAbstract::MoveFolderAction;
mError = false;
}
void HubicJob::moveFile(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::MoveFile;
+ mActionType = PimCommon::StorageServiceAbstract::MoveFileAction;
mError = false;
}
void HubicJob::copyFile(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::CopyFile;
+ mActionType = PimCommon::StorageServiceAbstract::CopyFileAction;
mError = false;
}
void HubicJob::copyFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::CopyFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CopyFolderAction;
mError = false;
}
@@ -354,7 +354,7 @@ QNetworkReply *HubicJob::uploadFile(const QString &filename, const QString &uplo
{
QFile *file = new QFile(filename);
if (file->exists()) {
- mActionType = PimCommon::StorageServiceAbstract::UploadFile;
+ mActionType = PimCommon::StorageServiceAbstract::UploadFileAction;
mError = false;
if (file->open(QIODevice::ReadOnly)) {
#if 0
@@ -381,7 +381,7 @@ QNetworkReply *HubicJob::uploadFile(const QString &filename, const QString &uplo
void HubicJob::listFolder(const QString &folder)
{
- mActionType = PimCommon::StorageServiceAbstract::ListFolder;
+ mActionType = PimCommon::StorageServiceAbstract::ListFolderAction;
mError = false;
QUrl url;
url.setUrl(mApiUrl + mSwiftTokenPath);
@@ -405,7 +405,7 @@ void HubicJob::listFolder(const QString &folder)
void HubicJob::accountInfo()
{
- mActionType = PimCommon::StorageServiceAbstract::AccountInfo;
+ mActionType = PimCommon::StorageServiceAbstract::AccountInfoAction;
mError = false;
QUrl url;
url.setUrl(mApiUrl + mCurrentAccountInfoPath);
@@ -418,7 +418,7 @@ void HubicJob::accountInfo()
void HubicJob::createFolder(const QString &foldername, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::CreateFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CreateFolderAction;
mError = false;
}
@@ -426,7 +426,7 @@ void HubicJob::createFolder(const QString &foldername, const QString &destinatio
void HubicJob::shareLink(const QString &root, const QString &fileId)
{
Q_UNUSED(root);
- mActionType = PimCommon::StorageServiceAbstract::ShareLink;
+ mActionType = PimCommon::StorageServiceAbstract::ShareLinkAction;
mError = false;
}
@@ -569,7 +569,7 @@ void HubicJob::parseDownloadFile(const QString &data)
QNetworkReply * HubicJob::downloadFile(const QString &name, const QString &fileId, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::DownLoadFile;
+ mActionType = PimCommon::StorageServiceAbstract::DownLoadFileAction;
mError = false;
#if 0
mActionType = PimCommon::StorageServiceAbstract::DownLoadFile;
diff --git a/pimcommon/storageservice/hubic/hubicstorageservice.cpp b/pimcommon/storageservice/hubic/hubicstorageservice.cpp
index d0314af..73da78b 100644
--- a/pimcommon/storageservice/hubic/hubicstorageservice.cpp
+++ b/pimcommon/storageservice/hubic/hubicstorageservice.cpp
@@ -152,7 +152,7 @@ void HubicStorageService::storageServicelistFolder(const QString &folder)
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(ListFolder);
+ mNextAction->setNextActionType(ListFolderAction);
mNextAction->setNextActionFolder(folder);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -172,7 +172,7 @@ void HubicStorageService::storageServicecreateFolder(const QString &name, const
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(CreateFolder);
+ mNextAction->setNextActionType(CreateFolderAction);
mNextAction->setNextActionName(name);
mNextAction->setNextActionFolder(destination);
if (mToken.isEmpty()) {
@@ -193,7 +193,7 @@ void HubicStorageService::storageServiceaccountInfo()
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(AccountInfo);
+ mNextAction->setNextActionType(AccountInfoAction);
if (mToken.isEmpty()) {
storageServiceauthentication();
} else {
@@ -217,7 +217,7 @@ void HubicStorageService::storageServiceuploadFile(const QString &filename, cons
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(UploadFile);
+ mNextAction->setNextActionType(UploadFileAction);
mNextAction->setNextActionName(filename);
mNextAction->setUploadAsName(uploadAsName);
mNextAction->setNextActionFolder(destination);
@@ -285,7 +285,7 @@ void HubicStorageService::storageServiceShareLink(const QString &root, const QSt
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(ShareLink);
+ mNextAction->setNextActionType(ShareLinkAction);
mNextAction->setRootPath(root);
mNextAction->setPath(path);
if (mToken.isEmpty()) {
@@ -311,7 +311,7 @@ void HubicStorageService::storageServicedownloadFile(const QString &name, const
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(DownLoadFile);
+ mNextAction->setNextActionType(DownLoadFileAction);
mNextAction->setNextActionName(name);
mNextAction->setDownloadDestination(destination);
mNextAction->setFileId(fileId);
@@ -335,7 +335,7 @@ void HubicStorageService::storageServicecreateServiceFolder()
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(CreateServiceFolder);
+ mNextAction->setNextActionType(CreateServiceFolderAction);
if (mToken.isEmpty()) {
storageServiceauthentication();
} else {
@@ -354,7 +354,7 @@ void HubicStorageService::storageServicedeleteFile(const QString &filename)
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(DeleteFile);
+ mNextAction->setNextActionType(DeleteFileAction);
mNextAction->setNextActionName(filename);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -374,7 +374,7 @@ void HubicStorageService::storageServicedeleteFolder(const QString &foldername)
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(DeleteFolder);
+ mNextAction->setNextActionType(DeleteFolderAction);
mNextAction->setNextActionFolder(foldername);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -394,7 +394,7 @@ void HubicStorageService::storageServiceRenameFolder(const QString &source, cons
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(RenameFolder);
+ mNextAction->setNextActionType(RenameFolderAction);
mNextAction->setRenameFolder(source, destination);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -414,7 +414,7 @@ void HubicStorageService::storageServiceRenameFile(const QString &source, const
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(RenameFile);
+ mNextAction->setNextActionType(RenameFileAction);
mNextAction->setRenameFolder(source, destination);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -434,7 +434,7 @@ void HubicStorageService::storageServiceMoveFolder(const QString &source, const
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(MoveFolder);
+ mNextAction->setNextActionType(MoveFolderAction);
mNextAction->setRenameFolder(source, destination);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -454,7 +454,7 @@ void HubicStorageService::storageServiceMoveFile(const QString &source, const QS
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(MoveFile);
+ mNextAction->setNextActionType(MoveFileAction);
mNextAction->setRenameFolder(source, destination);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -474,7 +474,7 @@ void HubicStorageService::storageServiceCopyFile(const QString &source, const QS
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(CopyFile);
+ mNextAction->setNextActionType(CopyFileAction);
mNextAction->setRenameFolder(source, destination);
if (mToken.isEmpty()) {
storageServiceauthentication();
@@ -494,7 +494,7 @@ void HubicStorageService::storageServiceCopyFolder(const QString &source, const
{
const bool needRefresh = needToRefreshToken();
if (mToken.isEmpty() || needRefresh) {
- mNextAction->setNextActionType(CopyFolder);
+ mNextAction->setNextActionType(CopyFolderAction);
mNextAction->setRenameFolder(source, destination);
if (mToken.isEmpty()) {
storageServiceauthentication();
diff --git a/pimcommon/storageservice/job/storageserviceabstractjob.cpp b/pimcommon/storageservice/job/storageserviceabstractjob.cpp
index 98f037e..aaeb637 100644
--- a/pimcommon/storageservice/job/storageserviceabstractjob.cpp
+++ b/pimcommon/storageservice/job/storageserviceabstractjob.cpp
@@ -60,55 +60,55 @@ void StorageServiceAbstractJob::errorMessage(PimCommon::StorageServiceAbstract::
switch(type) {
case PimCommon::StorageServiceAbstract::NoneAction:
break;
- case PimCommon::StorageServiceAbstract::RequestToken:
+ case PimCommon::StorageServiceAbstract::RequestTokenAction:
error = i18n("Request Token returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::AccessToken:
+ case PimCommon::StorageServiceAbstract::AccessTokenAction:
error = i18n("Access Token returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::UploadFile:
+ case PimCommon::StorageServiceAbstract::UploadFileAction:
error = i18n("Upload File returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::CreateFolder:
+ case PimCommon::StorageServiceAbstract::CreateFolderAction:
error = i18n("Create Folder returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::AccountInfo:
+ case PimCommon::StorageServiceAbstract::AccountInfoAction:
error = i18n("Get account info returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::ListFolder:
+ case PimCommon::StorageServiceAbstract::ListFolderAction:
error = i18n("List folder returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::ShareLink:
+ case PimCommon::StorageServiceAbstract::ShareLinkAction:
error = i18n("Share Link returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::CreateServiceFolder:
+ case PimCommon::StorageServiceAbstract::CreateServiceFolderAction:
error = i18n("Create Service Folder returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::DownLoadFile:
+ case PimCommon::StorageServiceAbstract::DownLoadFileAction:
error = i18n("Download file returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::DeleteFile:
+ case PimCommon::StorageServiceAbstract::DeleteFileAction:
error = i18n("Delete File returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::DeleteFolder:
+ case PimCommon::StorageServiceAbstract::DeleteFolderAction:
error = i18n("Delete Folder returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::RenameFolder:
+ case PimCommon::StorageServiceAbstract::RenameFolderAction:
error = i18n("Rename Folder returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::RenameFile:
+ case PimCommon::StorageServiceAbstract::RenameFileAction:
error = i18n("Rename File returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::MoveFile:
+ case PimCommon::StorageServiceAbstract::MoveFileAction:
error = i18n("Move File returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::MoveFolder:
+ case PimCommon::StorageServiceAbstract::MoveFolderAction:
error = i18n("Move Folder returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::CopyFile:
+ case PimCommon::StorageServiceAbstract::CopyFileAction:
error = i18n("Copy File returns an error: %1",errorStr);
break;
- case PimCommon::StorageServiceAbstract::CopyFolder:
+ case PimCommon::StorageServiceAbstract::CopyFolderAction:
error = i18n("Copy Folder returns an error: %1",errorStr);
break;
}
diff --git a/pimcommon/storageservice/storageserviceabstract.cpp b/pimcommon/storageservice/storageserviceabstract.cpp
index 23e474a..e823fd5 100644
--- a/pimcommon/storageservice/storageserviceabstract.cpp
+++ b/pimcommon/storageservice/storageserviceabstract.cpp
@@ -271,54 +271,54 @@ void StorageServiceAbstract::executeNextAction()
switch(mNextAction->nextActionType()) {
case NoneAction:
break;
- case RequestToken:
+ case RequestTokenAction:
storageServiceauthentication();
break;
- case AccessToken:
+ case AccessTokenAction:
break;
- case UploadFile:
+ case UploadFileAction:
storageServiceuploadFile(mNextAction->nextActionName(), mNextAction->uploadAsName(), mNextAction->nextActionFolder());
break;
- case CreateFolder:
+ case CreateFolderAction:
storageServicecreateFolder(mNextAction->nextActionName(), mNextAction->nextActionFolder());
break;
- case ListFolder:
+ case ListFolderAction:
storageServicelistFolder(mNextAction->nextActionFolder());
break;
- case AccountInfo:
+ case AccountInfoAction:
storageServiceaccountInfo();
break;
- case ShareLink:
+ case ShareLinkAction:
storageServiceShareLink(mNextAction->rootPath(), mNextAction->path());
break;
- case CreateServiceFolder:
+ case CreateServiceFolderAction:
storageServicecreateServiceFolder();
break;
- case DownLoadFile:
+ case DownLoadFileAction:
storageServicedownloadFile(mNextAction->nextActionName(), mNextAction->fileId(), mNextAction->downloadDestination());
break;
- case DeleteFile:
+ case DeleteFileAction:
storageServicedeleteFile(mNextAction->nextActionName());
break;
- case DeleteFolder:
+ case DeleteFolderAction:
storageServicedeleteFolder(mNextAction->nextActionFolder());
break;
- case RenameFolder:
+ case RenameFolderAction:
storageServiceRenameFolder(mNextAction->renameSource(), mNextAction->renameDestination());
break;
- case RenameFile:
+ case RenameFileAction:
storageServiceRenameFile(mNextAction->renameSource(), mNextAction->renameDestination());
break;
- case MoveFile:
+ case MoveFileAction:
storageServiceMoveFile(mNextAction->renameSource(), mNextAction->renameDestination());
break;
- case MoveFolder:
+ case MoveFolderAction:
storageServiceMoveFolder(mNextAction->renameSource(), mNextAction->renameDestination());
break;
- case CopyFile:
+ case CopyFileAction:
storageServiceCopyFile(mNextAction->renameSource(), mNextAction->renameDestination());
break;
- case CopyFolder:
+ case CopyFolderAction:
storageServiceCopyFolder(mNextAction->renameSource(), mNextAction->renameDestination());
break;
}
diff --git a/pimcommon/storageservice/storageserviceabstract.h b/pimcommon/storageservice/storageserviceabstract.h
index f2b5668..3c9d819 100644
--- a/pimcommon/storageservice/storageserviceabstract.h
+++ b/pimcommon/storageservice/storageserviceabstract.h
@@ -83,25 +83,25 @@ public:
enum ActionType {
NoneAction = 0,
//Account
- RequestToken,
- AccessToken,
- AccountInfo,
+ RequestTokenAction,
+ AccessTokenAction,
+ AccountInfoAction,
//File
- UploadFile,
- DownLoadFile,
- ShareLink,
- DeleteFile,
- RenameFile,
- MoveFile,
- CopyFile,
+ UploadFileAction,
+ DownLoadFileAction,
+ ShareLinkAction,
+ DeleteFileAction,
+ RenameFileAction,
+ MoveFileAction,
+ CopyFileAction,
//Folder
- CreateFolder,
- ListFolder,
- CreateServiceFolder,
- DeleteFolder,
- RenameFolder,
- MoveFolder,
- CopyFolder
+ CreateFolderAction,
+ ListFolderAction,
+ CreateServiceFolderAction,
+ DeleteFolderAction,
+ RenameFolderAction,
+ MoveFolderAction,
+ CopyFolderAction
};
bool isInProgress() const;
diff --git a/pimcommon/storageservice/webdav/webdavjob.cpp b/pimcommon/storageservice/webdav/webdavjob.cpp
index 9482e20..175aa0d 100644
--- a/pimcommon/storageservice/webdav/webdavjob.cpp
+++ b/pimcommon/storageservice/webdav/webdavjob.cpp
@@ -90,7 +90,7 @@ void WebDavJob::slotAuthenticationRequired(QNetworkReply *,QAuthenticator *auth)
void WebDavJob::requestTokenAccess()
{
mError = false;
- mActionType = PimCommon::StorageServiceAbstract::AccessToken;
+ mActionType = PimCommon::StorageServiceAbstract::AccessTokenAction;
QPointer<WebDavSettingsDialog> dlg = new WebDavSettingsDialog;
if (dlg->exec()) {
mServiceLocation = dlg->serviceLocation();
@@ -109,7 +109,7 @@ void WebDavJob::requestTokenAccess()
void WebDavJob::copyFile(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::CopyFile;
+ mActionType = PimCommon::StorageServiceAbstract::CopyFileAction;
mError = false;
QString filename;
if (!source.isEmpty()) {
@@ -128,7 +128,7 @@ void WebDavJob::copyFile(const QString &source, const QString &destination)
void WebDavJob::copyFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::CopyFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CopyFolderAction;
mError = false;
QString filename;
if (!source.isEmpty()) {
@@ -146,7 +146,7 @@ void WebDavJob::copyFolder(const QString &source, const QString &destination)
void WebDavJob::deleteFile(const QString &filename)
{
- mActionType = PimCommon::StorageServiceAbstract::DeleteFile;
+ mActionType = PimCommon::StorageServiceAbstract::DeleteFileAction;
mError = false;
QUrl url(mServiceLocation);
url.setPath(filename);
@@ -155,7 +155,7 @@ void WebDavJob::deleteFile(const QString &filename)
void WebDavJob::deleteFolder(const QString &foldername)
{
- mActionType = PimCommon::StorageServiceAbstract::DeleteFolder;
+ mActionType = PimCommon::StorageServiceAbstract::DeleteFolderAction;
mError = false;
QUrl url(mServiceLocation);
url.setPath(foldername);
@@ -164,7 +164,7 @@ void WebDavJob::deleteFolder(const QString &foldername)
void WebDavJob::renameFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::RenameFolder;
+ mActionType = PimCommon::StorageServiceAbstract::RenameFolderAction;
mError = false;
QString destinationFolder;
@@ -197,7 +197,7 @@ void WebDavJob::renameFolder(const QString &source, const QString &destination)
void WebDavJob::renameFile(const QString &oldName, const QString &newName)
{
- mActionType = PimCommon::StorageServiceAbstract::RenameFile;
+ mActionType = PimCommon::StorageServiceAbstract::RenameFileAction;
mError = false;
QString destination;
@@ -228,7 +228,7 @@ QNetworkReply *WebDavJob::uploadFile(const QString &filename, const QString &upl
{
QFile *file = new QFile(filename);
if (file->exists()) {
- mActionType = PimCommon::StorageServiceAbstract::UploadFile;
+ mActionType = PimCommon::StorageServiceAbstract::UploadFileAction;
mError = false;
if (file->open(QIODevice::ReadOnly)) {
QUrl destinationFile(mServiceLocation);
@@ -255,7 +255,7 @@ QNetworkReply *WebDavJob::uploadFile(const QString &filename, const QString &upl
void WebDavJob::listFolder(const QString &folder)
{
- mActionType = PimCommon::StorageServiceAbstract::ListFolder;
+ mActionType = PimCommon::StorageServiceAbstract::ListFolderAction;
mError = false;
QUrl url(mServiceLocation);
if (!folder.isEmpty())
@@ -265,7 +265,7 @@ void WebDavJob::listFolder(const QString &folder)
void WebDavJob::moveFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::MoveFolder;
+ mActionType = PimCommon::StorageServiceAbstract::MoveFolderAction;
mError = false;
QString destinationPath;
if (!source.isEmpty()) {
@@ -291,7 +291,7 @@ void WebDavJob::moveFolder(const QString &source, const QString &destination)
void WebDavJob::moveFile(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::MoveFile;
+ mActionType = PimCommon::StorageServiceAbstract::MoveFileAction;
mError = false;
QString destinationPath;
if (!source.isEmpty()) {
@@ -326,7 +326,7 @@ void WebDavJob::createFolderJob(const QString &foldername, const QString &destin
void WebDavJob::createFolder(const QString &foldername, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::CreateFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CreateFolderAction;
mError = false;
createFolderJob(foldername, destination);
}
@@ -339,7 +339,7 @@ void WebDavJob::slotListInfo(const QString &data)
void WebDavJob::accountInfo()
{
- mActionType = PimCommon::StorageServiceAbstract::AccountInfo;
+ mActionType = PimCommon::StorageServiceAbstract::AccountInfoAction;
mError = false;
QUrl url(mServiceLocation);
accountInfo(url.toString());
@@ -359,55 +359,55 @@ void WebDavJob::slotSendDataFinished(QNetworkReply *reply)
case PimCommon::StorageServiceAbstract::NoneAction:
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::RequestToken:
+ case PimCommon::StorageServiceAbstract::RequestTokenAction:
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::AccessToken:
+ case PimCommon::StorageServiceAbstract::AccessTokenAction:
parseAccessToken(data);
break;
- case PimCommon::StorageServiceAbstract::UploadFile:
+ case PimCommon::StorageServiceAbstract::UploadFileAction:
parseUploadFile(data);
break;
- case PimCommon::StorageServiceAbstract::CreateFolder:
+ case PimCommon::StorageServiceAbstract::CreateFolderAction:
parseCreateFolder(data);
break;
- case PimCommon::StorageServiceAbstract::AccountInfo:
+ case PimCommon::StorageServiceAbstract::AccountInfoAction:
parseAccountInfo(data);
break;
- case PimCommon::StorageServiceAbstract::ListFolder:
+ case PimCommon::StorageServiceAbstract::ListFolderAction:
parseListFolder(data);
break;
- case PimCommon::StorageServiceAbstract::DeleteFile:
+ case PimCommon::StorageServiceAbstract::DeleteFileAction:
parseDeleteFile(data);
break;
- case PimCommon::StorageServiceAbstract::DeleteFolder:
+ case PimCommon::StorageServiceAbstract::DeleteFolderAction:
parseDeleteFolder(data);
break;
- case PimCommon::StorageServiceAbstract::RenameFolder:
+ case PimCommon::StorageServiceAbstract::RenameFolderAction:
parseRenameFolder(data);
break;
- case PimCommon::StorageServiceAbstract::RenameFile:
+ case PimCommon::StorageServiceAbstract::RenameFileAction:
parseRenameFile(data);
break;
- case PimCommon::StorageServiceAbstract::MoveFolder:
+ case PimCommon::StorageServiceAbstract::MoveFolderAction:
parseMoveFolder(data);
break;
- case PimCommon::StorageServiceAbstract::MoveFile:
+ case PimCommon::StorageServiceAbstract::MoveFileAction:
parseMoveFile(data);
break;
- case PimCommon::StorageServiceAbstract::CopyFile:
+ case PimCommon::StorageServiceAbstract::CopyFileAction:
parseCopyFile(data);
break;
- case PimCommon::StorageServiceAbstract::CopyFolder:
+ case PimCommon::StorageServiceAbstract::CopyFolderAction:
parseCopyFolder(data);
break;
- case PimCommon::StorageServiceAbstract::DownLoadFile:
+ case PimCommon::StorageServiceAbstract::DownLoadFileAction:
parseDownloadFile(data);
break;
- case PimCommon::StorageServiceAbstract::ShareLink:
+ case PimCommon::StorageServiceAbstract::ShareLinkAction:
parseShareLink(data);
break;
- case PimCommon::StorageServiceAbstract::CreateServiceFolder:
+ case PimCommon::StorageServiceAbstract::CreateServiceFolderAction:
parseCreateServiceFolder(data);
break;
}
@@ -570,7 +570,7 @@ void WebDavJob::parseListFolder(const QString &data)
void WebDavJob::shareLink(const QString &/*root*/, const QString &path)
{
- mActionType = PimCommon::StorageServiceAbstract::ShareLink;
+ mActionType = PimCommon::StorageServiceAbstract::ShareLinkAction;
mError = false;
QString filePath(path);
if (!path.startsWith(mServiceLocation)) {
@@ -592,14 +592,14 @@ void WebDavJob::shareLink(const QString &/*root*/, const QString &path)
void WebDavJob::createServiceFolder()
{
- mActionType = PimCommon::StorageServiceAbstract::CreateServiceFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CreateServiceFolderAction;
mError = false;
createFolderJob(PimCommon::StorageServiceJobConfig::self()->defaultUploadFolder(), QString());
}
QNetworkReply *WebDavJob::downloadFile(const QString &name, const QString &fileId, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::DownLoadFile;
+ mActionType = PimCommon::StorageServiceAbstract::DownLoadFileAction;
mError = false;
const QString defaultDestination = (destination.isEmpty() ? PimCommon::StorageServiceJobConfig::self()->defaultUploadFolder() : destination);
delete mDownloadFile;
diff --git a/pimcommon/storageservice/webdav/webdavstorageservice.cpp b/pimcommon/storageservice/webdav/webdavstorageservice.cpp
index a200faf..eeded21 100644
--- a/pimcommon/storageservice/webdav/webdavstorageservice.cpp
+++ b/pimcommon/storageservice/webdav/webdavstorageservice.cpp
@@ -145,7 +145,7 @@ void WebDavStorageService::storageServiceShareLink(const QString &root, const QS
if (needInitialized()) {
mNextAction->setRootPath(root);
mNextAction->setPath(path);
- mNextAction->setNextActionType(ShareLink);
+ mNextAction->setNextActionType(ShareLinkAction);
storageServiceauthentication();
} else {
WebDavJob *job = new WebDavJob(this);
@@ -159,7 +159,7 @@ void WebDavStorageService::storageServiceShareLink(const QString &root, const QS
void WebDavStorageService::storageServicedownloadFile(const QString &name, const QString &fileId, const QString &destination)
{
if (needInitialized()) {
- mNextAction->setNextActionType(DownLoadFile);
+ mNextAction->setNextActionType(DownLoadFileAction);
mNextAction->setNextActionName(name);
mNextAction->setDownloadDestination(destination);
mNextAction->setFileId(fileId);
@@ -178,7 +178,7 @@ void WebDavStorageService::storageServicedownloadFile(const QString &name, const
void WebDavStorageService::storageServicecreateServiceFolder()
{
if (needInitialized()) {
- mNextAction->setNextActionType(CreateServiceFolder);
+ mNextAction->setNextActionType(CreateServiceFolderAction);
storageServiceauthentication();
} else {
WebDavJob *job = new WebDavJob(this);
@@ -192,7 +192,7 @@ void WebDavStorageService::storageServicecreateServiceFolder()
void WebDavStorageService::storageServicedeleteFile(const QString &filename)
{
if (needInitialized()) {
- mNextAction->setNextActionType(DeleteFile);
+ mNextAction->setNextActionType(DeleteFileAction);
mNextAction->setNextActionName(filename);
storageServiceauthentication();
} else {
@@ -207,7 +207,7 @@ void WebDavStorageService::storageServicedeleteFile(const QString &filename)
void WebDavStorageService::storageServicedeleteFolder(const QString &foldername)
{
if (needInitialized()) {
- mNextAction->setNextActionType(DeleteFolder);
+ mNextAction->setNextActionType(DeleteFolderAction);
mNextAction->setNextActionName(foldername);
storageServiceauthentication();
} else {
@@ -222,7 +222,7 @@ void WebDavStorageService::storageServicedeleteFolder(const QString &foldername)
void WebDavStorageService::storageServiceRenameFolder(const QString &source, const QString &destination)
{
if (needInitialized()) {
- mNextAction->setNextActionType(RenameFolder);
+ mNextAction->setNextActionType(RenameFolderAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -237,7 +237,7 @@ void WebDavStorageService::storageServiceRenameFolder(const QString &source, con
void WebDavStorageService::storageServiceRenameFile(const QString &source, const QString &destination)
{
if (needInitialized()) {
- mNextAction->setNextActionType(RenameFile);
+ mNextAction->setNextActionType(RenameFileAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -252,7 +252,7 @@ void WebDavStorageService::storageServiceRenameFile(const QString &source, const
void WebDavStorageService::storageServiceMoveFolder(const QString &source, const QString &destination)
{
if (needInitialized()) {
- mNextAction->setNextActionType(MoveFolder);
+ mNextAction->setNextActionType(MoveFolderAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -267,7 +267,7 @@ void WebDavStorageService::storageServiceMoveFolder(const QString &source, const
void WebDavStorageService::storageServiceMoveFile(const QString &source, const QString &destination)
{
if (needInitialized()) {
- mNextAction->setNextActionType(MoveFile);
+ mNextAction->setNextActionType(MoveFileAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -282,7 +282,7 @@ void WebDavStorageService::storageServiceMoveFile(const QString &source, const Q
void WebDavStorageService::storageServiceCopyFile(const QString &source, const QString &destination)
{
if (needInitialized()) {
- mNextAction->setNextActionType(CopyFile);
+ mNextAction->setNextActionType(CopyFileAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -297,7 +297,7 @@ void WebDavStorageService::storageServiceCopyFile(const QString &source, const Q
void WebDavStorageService::storageServiceCopyFolder(const QString &source, const QString &destination)
{
if (needInitialized()) {
- mNextAction->setNextActionType(CopyFolder);
+ mNextAction->setNextActionType(CopyFolderAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -411,7 +411,7 @@ QString WebDavStorageService::fileShareRoot(const QVariantMap &variantMap)
void WebDavStorageService::storageServicelistFolder(const QString &folder)
{
if (needInitialized()) {
- mNextAction->setNextActionType(ListFolder);
+ mNextAction->setNextActionType(ListFolderAction);
mNextAction->setNextActionFolder(folder);
storageServiceauthentication();
} else {
@@ -426,7 +426,7 @@ void WebDavStorageService::storageServicelistFolder(const QString &folder)
void WebDavStorageService::storageServicecreateFolder(const QString &name, const QString &destination)
{
if (needInitialized()) {
- mNextAction->setNextActionType(CreateFolder);
+ mNextAction->setNextActionType(CreateFolderAction);
mNextAction->setNextActionName(name);
mNextAction->setNextActionFolder(destination);
storageServiceauthentication();
@@ -442,7 +442,7 @@ void WebDavStorageService::storageServicecreateFolder(const QString &name, const
void WebDavStorageService::storageServiceaccountInfo()
{
if (needInitialized()) {
- mNextAction->setNextActionType(AccountInfo);
+ mNextAction->setNextActionType(AccountInfoAction);
storageServiceauthentication();
} else {
WebDavJob *job = new WebDavJob(this);
@@ -461,7 +461,7 @@ QString WebDavStorageService::name()
void WebDavStorageService::storageServiceuploadFile(const QString &filename, const QString &uploadAsName, const QString &destination)
{
if (needInitialized()) {
- mNextAction->setNextActionType(UploadFile);
+ mNextAction->setNextActionType(UploadFileAction);
mNextAction->setNextActionName(filename);
mNextAction->setNextActionFolder(destination);
mNextAction->setUploadAsName(uploadAsName);
diff --git a/pimcommon/storageservice/yousendit/yousenditjob.cpp b/pimcommon/storageservice/yousendit/yousenditjob.cpp
index b8d16ed..581cd01 100644
--- a/pimcommon/storageservice/yousendit/yousenditjob.cpp
+++ b/pimcommon/storageservice/yousendit/yousenditjob.cpp
@@ -55,7 +55,7 @@ void YouSendItJob::initializeToken(const QString &password, const QString &userN
void YouSendItJob::copyFile(const QString &/*source*/, const QString &/*destination*/)
{
- mActionType = PimCommon::StorageServiceAbstract::CopyFile;
+ mActionType = PimCommon::StorageServiceAbstract::CopyFileAction;
mError = false;
qDebug()<<" not implemented";
Q_EMIT actionFailed(QLatin1String("Not Implemented"));
@@ -64,7 +64,7 @@ void YouSendItJob::copyFile(const QString &/*source*/, const QString &/*destinat
void YouSendItJob::copyFolder(const QString &/*source*/, const QString &/*destination*/)
{
- mActionType = PimCommon::StorageServiceAbstract::CopyFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CopyFolderAction;
mError = false;
qDebug()<<" not implemented";
Q_EMIT actionFailed(QLatin1String("Not Implemented"));
@@ -73,7 +73,7 @@ void YouSendItJob::copyFolder(const QString &/*source*/, const QString &/*destin
void YouSendItJob::createServiceFolder()
{
- mActionType = PimCommon::StorageServiceAbstract::CreateServiceFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CreateServiceFolderAction;
mError = false;
createFolderJob(PimCommon::StorageServiceJobConfig::self()->defaultUploadFolder(), QString());
}
@@ -97,7 +97,7 @@ QNetworkRequest YouSendItJob::setDefaultHeader(const QUrl &url)
void YouSendItJob::deleteFile(const QString &filename)
{
- mActionType = PimCommon::StorageServiceAbstract::DeleteFile;
+ mActionType = PimCommon::StorageServiceAbstract::DeleteFileAction;
mError = false;
QUrl url(mDefaultUrl + QString::fromLatin1("/dpi/v1/folder/file/%1").arg(filename));
qDebug()<<" url"<<url;
@@ -108,7 +108,7 @@ void YouSendItJob::deleteFile(const QString &filename)
void YouSendItJob::deleteFolder(const QString &foldername)
{
- mActionType = PimCommon::StorageServiceAbstract::DeleteFolder;
+ mActionType = PimCommon::StorageServiceAbstract::DeleteFolderAction;
mError = false;
QUrl url(mDefaultUrl + QString::fromLatin1("/dpi/v1/folder/%1").arg(foldername));
QNetworkRequest request = setDefaultHeader(url);
@@ -118,7 +118,7 @@ void YouSendItJob::deleteFolder(const QString &foldername)
void YouSendItJob::renameFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::RenameFolder;
+ mActionType = PimCommon::StorageServiceAbstract::RenameFolderAction;
mError = false;
QUrl url(mDefaultUrl + QString::fromLatin1("/dpi/v1/folder/%1/rename?name=%2").arg(source).arg(destination));
QNetworkRequest request = setDefaultHeader(url);
@@ -132,7 +132,7 @@ void YouSendItJob::renameFolder(const QString &source, const QString &destinatio
void YouSendItJob::renameFile(const QString &oldName, const QString &newName)
{
- mActionType = PimCommon::StorageServiceAbstract::RenameFile;
+ mActionType = PimCommon::StorageServiceAbstract::RenameFileAction;
mError = false;
QUrl url(mDefaultUrl + QString::fromLatin1("/dpi/v1/folder/file/%1/rename?name=%2").arg(oldName).arg(newName));
QNetworkRequest request = setDefaultHeader(url);
@@ -147,7 +147,7 @@ void YouSendItJob::renameFile(const QString &oldName, const QString &newName)
void YouSendItJob::moveFolder(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::MoveFolder;
+ mActionType = PimCommon::StorageServiceAbstract::MoveFolderAction;
mError = false;
QUrl url(mDefaultUrl + QString::fromLatin1("/dpi/v1/folder/%1/move?parentId=%2").arg(source).arg(destination));
QNetworkRequest request = setDefaultHeader(url);
@@ -161,7 +161,7 @@ void YouSendItJob::moveFolder(const QString &source, const QString &destination)
void YouSendItJob::moveFile(const QString &source, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::MoveFile;
+ mActionType = PimCommon::StorageServiceAbstract::MoveFileAction;
mError = false;
QUrl url(mDefaultUrl + QString::fromLatin1("/dpi/v1/folder/file/%1/move?parentId=%2").arg(source).arg(destination));
QNetworkRequest request = setDefaultHeader(url);
@@ -189,7 +189,7 @@ void YouSendItJob::requestTokenAccess()
}
delete dlg;
- mActionType = PimCommon::StorageServiceAbstract::RequestToken;
+ mActionType = PimCommon::StorageServiceAbstract::RequestTokenAction;
mError = false;
QUrl url(mDefaultUrl + QLatin1String("/dpi/v1/auth"));
QNetworkRequest request(url);
@@ -209,7 +209,7 @@ void YouSendItJob::requestTokenAccess()
QNetworkReply *YouSendItJob::uploadFile(const QString &filename, const QString &uploadAsName, const QString &destination)
{
//FIXME filename
- mActionType = PimCommon::StorageServiceAbstract::UploadFile;
+ mActionType = PimCommon::StorageServiceAbstract::UploadFileAction;
mError = false;
QUrl url(mDefaultUrl + QLatin1String("/dpi/v1/folder/file/initUpload"));
QNetworkRequest request = setDefaultHeader(url);
@@ -223,7 +223,7 @@ QNetworkReply *YouSendItJob::uploadFile(const QString &filename, const QString &
void YouSendItJob::listFolder(const QString &folder)
{
- mActionType = PimCommon::StorageServiceAbstract::ListFolder;
+ mActionType = PimCommon::StorageServiceAbstract::ListFolderAction;
mError = false;
//Show root folder => 0
QUrl url;
@@ -242,7 +242,7 @@ void YouSendItJob::listFolder(const QString &folder)
void YouSendItJob::accountInfo()
{
- mActionType = PimCommon::StorageServiceAbstract::AccountInfo;
+ mActionType = PimCommon::StorageServiceAbstract::AccountInfoAction;
mError = false;
QUrl url(mDefaultUrl + QLatin1String("/dpi/v2/user"));
url.addQueryItem(QLatin1String("email"),mUsername);
@@ -255,7 +255,7 @@ void YouSendItJob::accountInfo()
void YouSendItJob::createFolder(const QString &foldername, const QString &destination)
{
- mActionType = PimCommon::StorageServiceAbstract::CreateFolder;
+ mActionType = PimCommon::StorageServiceAbstract::CreateFolderAction;
mError = false;
createFolderJob(foldername, destination);
}
@@ -295,37 +295,37 @@ void YouSendItJob::slotSendDataFinished(QNetworkReply *reply)
case PimCommon::StorageServiceAbstract::NoneAction:
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::RequestToken:
+ case PimCommon::StorageServiceAbstract::RequestTokenAction:
Q_EMIT authorizationFailed(errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::AccessToken:
+ case PimCommon::StorageServiceAbstract::AccessTokenAction:
Q_EMIT authorizationFailed(errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::UploadFile:
+ case PimCommon::StorageServiceAbstract::UploadFileAction:
Q_EMIT uploadFileFailed(errorStr);
errorMessage(mActionType, errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::DownLoadFile:
+ case PimCommon::StorageServiceAbstract::DownLoadFileAction:
Q_EMIT downLoadFileFailed(errorStr);
errorMessage(mActionType, errorStr);
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::DeleteFile:
- case PimCommon::StorageServiceAbstract::DeleteFolder:
- case PimCommon::StorageServiceAbstract::CreateFolder:
- case PimCommon::StorageServiceAbstract::AccountInfo:
- case PimCommon::StorageServiceAbstract::ListFolder:
- case PimCommon::StorageServiceAbstract::CreateServiceFolder:
- case PimCommon::StorageServiceAbstract::RenameFolder:
- case PimCommon::StorageServiceAbstract::RenameFile:
- case PimCommon::StorageServiceAbstract::MoveFolder:
- case PimCommon::StorageServiceAbstract::MoveFile:
- case PimCommon::StorageServiceAbstract::CopyFile:
- case PimCommon::StorageServiceAbstract::CopyFolder:
- case PimCommon::StorageServiceAbstract::ShareLink:
+ case PimCommon::StorageServiceAbstract::DeleteFileAction:
+ case PimCommon::StorageServiceAbstract::DeleteFolderAction:
+ case PimCommon::StorageServiceAbstract::CreateFolderAction:
+ case PimCommon::StorageServiceAbstract::AccountInfoAction:
+ case PimCommon::StorageServiceAbstract::ListFolderAction:
+ case PimCommon::StorageServiceAbstract::CreateServiceFolderAction:
+ case PimCommon::StorageServiceAbstract::RenameFolderAction:
+ case PimCommon::StorageServiceAbstract::RenameFileAction:
+ case PimCommon::StorageServiceAbstract::MoveFolderAction:
+ case PimCommon::StorageServiceAbstract::MoveFileAction:
+ case PimCommon::StorageServiceAbstract::CopyFileAction:
+ case PimCommon::StorageServiceAbstract::CopyFolderAction:
+ case PimCommon::StorageServiceAbstract::ShareLinkAction:
errorMessage(mActionType, errorStr);
deleteLater();
break;
@@ -336,55 +336,55 @@ void YouSendItJob::slotSendDataFinished(QNetworkReply *reply)
case PimCommon::StorageServiceAbstract::NoneAction:
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::RequestToken:
+ case PimCommon::StorageServiceAbstract::RequestTokenAction:
parseRequestToken(data);
break;
- case PimCommon::StorageServiceAbstract::AccessToken:
+ case PimCommon::StorageServiceAbstract::AccessTokenAction:
deleteLater();
break;
- case PimCommon::StorageServiceAbstract::UploadFile:
+ case PimCommon::StorageServiceAbstract::UploadFileAction:
parseUploadFile(data);
break;
- case PimCommon::StorageServiceAbstract::CreateFolder:
+ case PimCommon::StorageServiceAbstract::CreateFolderAction:
parseCreateFolder(data);
break;
- case PimCommon::StorageServiceAbstract::AccountInfo:
+ case PimCommon::StorageServiceAbstract::AccountInfoAction:
parseAccountInfo(data);
break;
- case PimCommon::StorageServiceAbstract::ListFolder:
+ case PimCommon::StorageServiceAbstract::ListFolderAction:
parseListFolder(data);
break;
- case PimCommon::StorageServiceAbstract::CreateServiceFolder:
+ case PimCommon::StorageServiceAbstract::CreateServiceFolderAction:
parseCreateServiceFolder(data);
break;
- case PimCommon::StorageServiceAbstract::DeleteFolder:
+ case PimCommon::StorageServiceAbstract::DeleteFolderAction:
parseDeleteFolder(data);
break;
- case PimCommon::StorageServiceAbstract::DeleteFile:
+ case PimCommon::StorageServiceAbstract::DeleteFileAction:
parseDeleteFile(data);
break;
- case PimCommon::StorageServiceAbstract::DownLoadFile:
+ case PimCommon::StorageServiceAbstract::DownLoadFileAction:
parseDownloadFile(data);
break;
- case PimCommon::StorageServiceAbstract::RenameFolder:
+ case PimCommon::StorageServiceAbstract::RenameFolderAction:
parseRenameFolder(data);
break;
- case PimCommon::StorageServiceAbstract::RenameFile:
+ case PimCommon::StorageServiceAbstract::RenameFileAction:
parseRenameFile(data);
break;
- case PimCommon::StorageServiceAbstract::MoveFolder:
+ case PimCommon::StorageServiceAbstract::MoveFolderAction:
parseMoveFolder(data);
break;
- case PimCommon::StorageServiceAbstract::MoveFile:
+ case PimCommon::StorageServiceAbstract::MoveFileAction:
parseMoveFile(data);
break;
- case PimCommon::StorageServiceAbstract::CopyFile:
+ case PimCommon::StorageServiceAbstract::CopyFileAction:
parseCopyFile(data);
break;
- case PimCommon::StorageServiceAbstract::CopyFolder:
+ case PimCommon::StorageServiceAbstract::CopyFolderAction:
parseCopyFolder(data);
break;
- case PimCommon::StorageServiceAbstract::ShareLink:
+ case PimCommon::StorageServiceAbstract::ShareLinkAction:
parseShareLink(data);
break;
}
@@ -593,7 +593,7 @@ void YouSendItJob::parseUploadFile(const QString &data)
void YouSendItJob::startUploadFile(const QString &fileId)
{
- mActionType = PimCommon::StorageServiceAbstract::UploadFile;
+ mActionType = PimCommon::StorageServiceAbstract::UploadFileAction;
mError = false;
QUrl url(mDefaultUrl + QLatin1String("/dpi/v1/folder/file/initUpload"));
QNetworkRequest request(url);
@@ -615,7 +615,7 @@ void YouSendItJob::startUploadFile(const QString &fileId)
void YouSendItJob::shareLink(const QString &root, const QString &path)
{
mError = false;
- mActionType = PimCommon::StorageServiceAbstract::ShareLink;
+ mActionType = PimCommon::StorageServiceAbstract::ShareLinkAction;
Q_EMIT actionFailed(QLatin1String("Not Implemented"));
qDebug()<<" not implemented";
deleteLater();
diff --git a/pimcommon/storageservice/yousendit/yousenditstorageservice.cpp b/pimcommon/storageservice/yousendit/yousenditstorageservice.cpp
index 07f8940..de2c913 100644
--- a/pimcommon/storageservice/yousendit/yousenditstorageservice.cpp
+++ b/pimcommon/storageservice/yousendit/yousenditstorageservice.cpp
@@ -139,7 +139,7 @@ void YouSendItStorageService::slotAuthorizationDone(const QString &password, con
void YouSendItStorageService::storageServicelistFolder(const QString &folder)
{
if (needAuthenticate()) {
- mNextAction->setNextActionType(ListFolder);
+ mNextAction->setNextActionType(ListFolderAction);
mNextAction->setNextActionFolder(folder);
storageServiceauthentication();
} else {
@@ -156,7 +156,7 @@ void YouSendItStorageService::storageServicecreateFolder(const QString &name, co
if (needAuthenticate()) {
mNextAction->setNextActionName(name);
mNextAction->setNextActionFolder(destination);
- mNextAction->setNextActionType(CreateFolder);
+ mNextAction->setNextActionType(CreateFolderAction);
storageServiceauthentication();
} else {
YouSendItJob *job = new YouSendItJob(this);
@@ -170,7 +170,7 @@ void YouSendItStorageService::storageServicecreateFolder(const QString &name, co
void YouSendItStorageService::storageServiceaccountInfo()
{
if (needAuthenticate()) {
- mNextAction->setNextActionType(AccountInfo);
+ mNextAction->setNextActionType(AccountInfoAction);
storageServiceauthentication();
} else {
YouSendItJob *job = new YouSendItJob(this);
@@ -192,7 +192,7 @@ void YouSendItStorageService::storageServiceuploadFile(const QString &filename,
mNextAction->setNextActionName(filename);
mNextAction->setNextActionFolder(destination);
mNextAction->setUploadAsName(uploadAsName);
- mNextAction->setNextActionType(UploadFile);
+ mNextAction->setNextActionType(UploadFileAction);
storageServiceauthentication();
} else {
YouSendItJob *job = new YouSendItJob(this);
@@ -255,7 +255,7 @@ void YouSendItStorageService::storageServiceShareLink(const QString &root, const
if (needAuthenticate()) {
mNextAction->setRootPath(root);
mNextAction->setPath(path);
- mNextAction->setNextActionType(ShareLink);
+ mNextAction->setNextActionType(ShareLinkAction);
storageServiceauthentication();
} else {
YouSendItJob *job = new YouSendItJob(this);
@@ -270,7 +270,7 @@ void YouSendItStorageService::storageServicedownloadFile(const QString &name, co
{
if (needAuthenticate()) {
mNextAction->setNextActionName(name);
- mNextAction->setNextActionType(DownLoadFile);
+ mNextAction->setNextActionType(DownLoadFileAction);
mNextAction->setDownloadDestination(destination);
mNextAction->setFileId(fileId);
storageServiceauthentication();
@@ -288,7 +288,7 @@ void YouSendItStorageService::storageServicedownloadFile(const QString &name, co
void YouSendItStorageService::storageServicecreateServiceFolder()
{
if (needAuthenticate()) {
- mNextAction->setNextActionType(CreateServiceFolder);
+ mNextAction->setNextActionType(CreateServiceFolderAction);
storageServiceauthentication();
} else {
YouSendItJob *job = new YouSendItJob(this);
@@ -303,7 +303,7 @@ void YouSendItStorageService::storageServicedeleteFile(const QString &filename)
{
if (needAuthenticate()) {
mNextAction->setNextActionName(filename);
- mNextAction->setNextActionType(DeleteFile);
+ mNextAction->setNextActionType(DeleteFileAction);
storageServiceauthentication();
} else {
YouSendItJob *job = new YouSendItJob(this);
@@ -318,7 +318,7 @@ void YouSendItStorageService::storageServicedeleteFolder(const QString &folderna
{
if (needAuthenticate()) {
mNextAction->setNextActionName(foldername);
- mNextAction->setNextActionType(DeleteFolder);
+ mNextAction->setNextActionType(DeleteFolderAction);
storageServiceauthentication();
} else {
YouSendItJob *job = new YouSendItJob(this);
@@ -332,7 +332,7 @@ void YouSendItStorageService::storageServicedeleteFolder(const QString &folderna
void YouSendItStorageService::storageServiceRenameFolder(const QString &source, const QString &destination)
{
if (needAuthenticate()) {
- mNextAction->setNextActionType(RenameFolder);
+ mNextAction->setNextActionType(RenameFolderAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -347,7 +347,7 @@ void YouSendItStorageService::storageServiceRenameFolder(const QString &source,
void YouSendItStorageService::storageServiceRenameFile(const QString &source, const QString &destination)
{
if (needAuthenticate()) {
- mNextAction->setNextActionType(RenameFile);
+ mNextAction->setNextActionType(RenameFileAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -362,7 +362,7 @@ void YouSendItStorageService::storageServiceRenameFile(const QString &source, co
void YouSendItStorageService::storageServiceMoveFolder(const QString &source, const QString &destination)
{
if (needAuthenticate()) {
- mNextAction->setNextActionType(MoveFolder);
+ mNextAction->setNextActionType(MoveFolderAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -377,7 +377,7 @@ void YouSendItStorageService::storageServiceMoveFolder(const QString &source, co
void YouSendItStorageService::storageServiceMoveFile(const QString &source, const QString &destination)
{
if (needAuthenticate()) {
- mNextAction->setNextActionType(MoveFile);
+ mNextAction->setNextActionType(MoveFileAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -392,7 +392,7 @@ void YouSendItStorageService::storageServiceMoveFile(const QString &source, cons
void YouSendItStorageService::storageServiceCopyFile(const QString &source, const QString &destination)
{
if (needAuthenticate()) {
- mNextAction->setNextActionType(CopyFile);
+ mNextAction->setNextActionType(CopyFileAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
@@ -407,7 +407,7 @@ void YouSendItStorageService::storageServiceCopyFile(const QString &source, cons
void YouSendItStorageService::storageServiceCopyFolder(const QString &source, const QString &destination)
{
if (needAuthenticate()) {
- mNextAction->setNextActionType(CopyFolder);
+ mNextAction->setNextActionType(CopyFolderAction);
mNextAction->setRenameFolder(source, destination);
storageServiceauthentication();
} else {
commit 6f25436d943a1b2dd4cc042e4f74748fccea77fa
Author: Till Adam <till.adam at kdab.com>
Date: Sat Nov 22 13:49:37 2014 +0100
Don't build knotes on Windows, for the time being.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68c7741..53a83e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -296,7 +296,9 @@ else()
macro_optional_add_subdirectory(kaddressbook)
macro_optional_add_subdirectory(kmailcvt)
macro_optional_add_subdirectory(mboximporter)
+if (NOT WIN32)
macro_optional_add_subdirectory(knotes)
+endif()
macro_optional_add_subdirectory(ksendemail)
macro_optional_add_subdirectory(ktnef)
macro_optional_add_subdirectory(mailimporter)
commit e0c05b1ccbecbe043010db84a4667a32e27edc0f
Author: Patrick Spendrin <ps_ml at gmx.de>
Date: Wed May 7 02:18:55 2014 +0200
adapt to library name
diff --git a/noteshared/noteshared_export.h b/noteshared/noteshared_export.h
index 74e4a26..32cd406 100644
--- a/noteshared/noteshared_export.h
+++ b/noteshared/noteshared_export.h
@@ -27,7 +27,7 @@
# if defined(KDEPIM_STATIC_LIBS)
/* No export/import for static libraries */
# define NOTESHARED_EXPORT
-# elif defined(MAKE_PIMCOMMON_LIB)
+# elif defined(MAKE_NOTESHARED_LIB)
/* We are building this library */
# define NOTESHARED_EXPORT KDE_EXPORT
# else
commit 7875f6f0cea80fc729e37fc619c8439b6c8d0d6e
Author: Till Adam <till.adam at kdab.com>
Date: Sat Nov 22 13:03:00 2014 +0100
The WId can be a HWD on Windows, so explicitly cast to make that work. urgh
diff --git a/agents/notesagent/notesagent.cpp b/agents/notesagent/notesagent.cpp
index 17648ed..a8a81a6 100644
--- a/agents/notesagent/notesagent.cpp
+++ b/agents/notesagent/notesagent.cpp
@@ -93,7 +93,7 @@ bool NotesAgent::enabledAgent() const
void NotesAgent::configure( WId windowId )
{
- showConfigureDialog(windowId);
+ showConfigureDialog((qlonglong)windowId);
}
void NotesAgent::showConfigureDialog(qlonglong windowId)
commit ce2a344fa2ccfe5fe2a2ceefb098a8a141090b12
Author: Till Adam <till.adam at kdab.com>
Date: Sat Nov 22 12:33:15 2014 +0100
Add missing include of kstandarddirs.
diff --git a/libksieve/kmanagesieve/sasl-common.h b/libksieve/kmanagesieve/sasl-common.h
index 96bcc2f..54056c9 100644
--- a/libksieve/kmanagesieve/sasl-common.h
+++ b/libksieve/kmanagesieve/sasl-common.h
@@ -26,6 +26,8 @@
#include <QFile>
#include <QDir>
+#include <KStandardDirs>
+
extern "C" {
#include <sasl/sasl.h>
}
commit a1038291d9e1af53074cd2792060deabfeb81f7a
Author: Till Adam <till.adam at kdab.com>
Date: Fri Nov 21 11:41:28 2014 +0100
Fix infinite loops when trying to resolve file: URLs. Fixed by David upstream in kdelibs, meanwhile.
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index eaac7c0..cb581d3 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -386,12 +386,12 @@ void MainWindow::paintAboutScreen( const QString &msg )
{
QString location = KStandardDirs::locate( "data", QLatin1String("kontact/about/main.html") );
QString content = QLatin1String(KPIMUtils::kFileToByteArray( location ));
- content = content.arg( QLatin1String("file:") + KStandardDirs::locate(
+ content = content.arg( QLatin1String("file:/") + KStandardDirs::locate(
"data", QLatin1String("kdeui/about/kde_infopage.css") ) );
if ( QApplication::isRightToLeft() ) {
content =
content.arg( QLatin1String("@import \"%1\";") ).
- arg( QLatin1String("file:") + KStandardDirs::locate(
+ arg( QLatin1String("file:/") + KStandardDirs::locate(
"data", QLatin1String("kdeui/about/kde_infopage_rtl.css") ) );
} else {
content = content.arg( QString() );
@@ -1253,21 +1253,21 @@ QString MainWindow::introductionString()
subs( QLatin1String("exec:/help?kontact") ).
subs( iconSize ).
subs( iconSize ).
- subs( QLatin1String("file:") + handbook_icon_path ).
+ subs( QLatin1String("file:/") + handbook_icon_path ).
subs( QLatin1String("exec:/help?kontact") ).
subs( i18nc( "@item:intext", "Read Manual" ) ).
subs( i18nc( "@item:intext", "Learn more about Kontact and its components" ) ).
subs( QLatin1String("http://kontact.org") ).
subs( iconSize ).
subs( iconSize ).
- subs( QLatin1String("file:") + html_icon_path ).
+ subs( QLatin1String("file:/") + html_icon_path ).
subs( QLatin1String("http://kontact.org") ).
subs( i18nc( "@item:intext", "Visit Kontact Website" ) ).
subs( i18nc( "@item:intext", "Access online resources and tutorials" ) ).
subs( QLatin1String("exec:/accountwizard") ).
subs( iconSize ).
subs( iconSize ).
- subs( QLatin1String("file:") + wizard_icon_path ).
+ subs( QLatin1String("file:/") + wizard_icon_path ).
subs( QLatin1String("exec:/accountwizard") ).
subs( i18nc( "@item:intext", "Setup your Accounts" ) ).
subs( i18nc( "@item:intext", "Prepare Kontact for use" ) ).
commit b99a19664c59e3fbdbcfa3758cd2d1a7cd75c41a
Author: Till Adam <till.adam at kdab.com>
Date: Fri Nov 21 11:39:36 2014 +0100
Hack that is required on Windows.
diff --git a/kleopatra/kleopatraapplication.cpp b/kleopatra/kleopatraapplication.cpp
index 08e1bdb..8ee50cc 100644
--- a/kleopatra/kleopatraapplication.cpp
+++ b/kleopatra/kleopatraapplication.cpp
@@ -292,7 +292,7 @@ int KleopatraApplication::newInstance() {
// Check for Parent Window id
WId parentId = 0;
if ( args->isSet( "parent-windowid" ) ) {
- parentId = args->getOption( "parent-windowid" ).toUInt();
+ parentId = reinterpret_cast<WId>(args->getOption( "parent-windowid" ).toUInt());
}
// Search for local keys
More information about the commits
mailing list