Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Unmaintained
KDE Pim
Commits
68c4b895
Commit
68c4b895
authored
Nov 24, 2014
by
David Jarvie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Spelling
parent
813f7118
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
11 deletions
+11
-11
pimsettingexporter/abstractimportexportjob.cpp
pimsettingexporter/abstractimportexportjob.cpp
+5
-5
pimsettingexporter/addressbook/exportaddressbookjob.cpp
pimsettingexporter/addressbook/exportaddressbookjob.cpp
+1
-1
pimsettingexporter/alarm/exportalarmjob.cpp
pimsettingexporter/alarm/exportalarmjob.cpp
+1
-1
pimsettingexporter/calendar/exportcalendarjob.cpp
pimsettingexporter/calendar/exportcalendarjob.cpp
+1
-1
pimsettingexporter/jot/exportjotjob.cpp
pimsettingexporter/jot/exportjotjob.cpp
+1
-1
pimsettingexporter/mail/exportmailjob.cpp
pimsettingexporter/mail/exportmailjob.cpp
+1
-1
pimsettingexporter/notes/exportnotesjob.cpp
pimsettingexporter/notes/exportnotesjob.cpp
+1
-1
No files found.
pimsettingexporter/abstractimportexportjob.cpp
View file @
68c4b895
...
@@ -269,7 +269,7 @@ void AbstractImportExportJob::backupResourceDirectory(const Akonadi::AgentInstan
...
@@ -269,7 +269,7 @@ void AbstractImportExportJob::backupResourceDirectory(const Akonadi::AgentInstan
const
QString
errorStr
=
Utils
::
storeResources
(
archive
(),
identifier
,
archivePath
);
const
QString
errorStr
=
Utils
::
storeResources
(
archive
(),
identifier
,
archivePath
);
if
(
!
errorStr
.
isEmpty
())
if
(
!
errorStr
.
isEmpty
())
Q_EMIT
error
(
errorStr
);
Q_EMIT
error
(
errorStr
);
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was back
up
ed."
,
filename
));
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was backed
up
."
,
filename
));
url
=
Utils
::
akonadiAgentConfigPath
(
identifier
);
url
=
Utils
::
akonadiAgentConfigPath
(
identifier
);
if
(
!
url
.
isEmpty
())
{
if
(
!
url
.
isEmpty
())
{
...
@@ -278,7 +278,7 @@ void AbstractImportExportJob::backupResourceDirectory(const Akonadi::AgentInstan
...
@@ -278,7 +278,7 @@ void AbstractImportExportJob::backupResourceDirectory(const Akonadi::AgentInstan
if
(
QDir
(
url
.
path
()).
exists
())
{
if
(
QDir
(
url
.
path
()).
exists
())
{
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
if
(
fileAdded
)
if
(
fileAdded
)
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was back
up
ed."
,
filename
));
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was backed
up
."
,
filename
));
else
else
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
}
}
...
@@ -306,14 +306,14 @@ void AbstractImportExportJob::backupResourceFile(const Akonadi::AgentInstance &a
...
@@ -306,14 +306,14 @@ void AbstractImportExportJob::backupResourceFile(const Akonadi::AgentInstance &a
const
QString
errorStr
=
Utils
::
storeResources
(
archive
(),
identifier
,
archivePath
);
const
QString
errorStr
=
Utils
::
storeResources
(
archive
(),
identifier
,
archivePath
);
if
(
!
errorStr
.
isEmpty
())
if
(
!
errorStr
.
isEmpty
())
Q_EMIT
error
(
errorStr
);
Q_EMIT
error
(
errorStr
);
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was back
up
ed."
,
filename
));
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was backed
up
."
,
filename
));
url
=
Utils
::
akonadiAgentConfigPath
(
identifier
);
url
=
Utils
::
akonadiAgentConfigPath
(
identifier
);
if
(
!
url
.
isEmpty
())
{
if
(
!
url
.
isEmpty
())
{
filename
=
url
.
fileName
();
filename
=
url
.
fileName
();
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
if
(
fileAdded
)
if
(
fileAdded
)
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was back
up
ed."
,
filename
));
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was backed
up
."
,
filename
));
else
else
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
}
}
...
@@ -449,7 +449,7 @@ bool AbstractImportExportJob::backupFullDirectory(const KUrl &url, const QString
...
@@ -449,7 +449,7 @@ bool AbstractImportExportJob::backupFullDirectory(const KUrl &url, const QString
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
tmp
.
fileName
(),
archivePath
+
archivename
);
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
tmp
.
fileName
(),
archivePath
+
archivename
);
if
(
fileAdded
)
if
(
fileAdded
)
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was back
up
ed."
,
filename
));
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was backed
up
."
,
filename
));
else
else
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
...
...
pimsettingexporter/addressbook/exportaddressbookjob.cpp
View file @
68c4b895
...
@@ -88,7 +88,7 @@ void ExportAddressbookJob::backupResources()
...
@@ -88,7 +88,7 @@ void ExportAddressbookJob::backupResources()
const
QString
filename
=
url
.
fileName
();
const
QString
filename
=
url
.
fileName
();
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
if
(
fileAdded
)
if
(
fileAdded
)
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was back
up
ed."
,
filename
));
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was backed
up
."
,
filename
));
else
else
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
}
}
...
...
pimsettingexporter/alarm/exportalarmjob.cpp
View file @
68c4b895
...
@@ -91,7 +91,7 @@ void ExportAlarmJob::backupResources()
...
@@ -91,7 +91,7 @@ void ExportAlarmJob::backupResources()
const
QString
filename
=
url
.
fileName
();
const
QString
filename
=
url
.
fileName
();
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
if
(
fileAdded
)
if
(
fileAdded
)
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was back
up
ed."
,
filename
));
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was backed
up
."
,
filename
));
else
else
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
}
}
...
...
pimsettingexporter/calendar/exportcalendarjob.cpp
View file @
68c4b895
...
@@ -94,7 +94,7 @@ void ExportCalendarJob::backupResources()
...
@@ -94,7 +94,7 @@ void ExportCalendarJob::backupResources()
const
QString
filename
=
url
.
fileName
();
const
QString
filename
=
url
.
fileName
();
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
if
(
fileAdded
)
if
(
fileAdded
)
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was back
up
ed."
,
filename
));
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was backed
up
."
,
filename
));
else
else
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
}
}
...
...
pimsettingexporter/jot/exportjotjob.cpp
View file @
68c4b895
...
@@ -87,7 +87,7 @@ void ExportJotJob::backupResources()
...
@@ -87,7 +87,7 @@ void ExportJotJob::backupResources()
const
QString
filename
=
url
.
fileName
();
const
QString
filename
=
url
.
fileName
();
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
if
(
fileAdded
)
if
(
fileAdded
)
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was back
up
ed."
,
filename
));
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was backed
up
."
,
filename
));
else
else
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
}
}
...
...
pimsettingexporter/mail/exportmailjob.cpp
View file @
68c4b895
...
@@ -486,7 +486,7 @@ void ExportMailJob::backupMails()
...
@@ -486,7 +486,7 @@ void ExportMailJob::backupMails()
const
QString
filename
=
url
.
fileName
();
const
QString
filename
=
url
.
fileName
();
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
if
(
fileAdded
)
if
(
fileAdded
)
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was back
up
ed."
,
filename
));
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was backed
up
."
,
filename
));
else
else
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
}
}
...
...
pimsettingexporter/notes/exportnotesjob.cpp
View file @
68c4b895
...
@@ -138,7 +138,7 @@ void ExportNotesJob::backupData()
...
@@ -138,7 +138,7 @@ void ExportNotesJob::backupData()
const
QString
filename
=
url
.
fileName
();
const
QString
filename
=
url
.
fileName
();
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
const
bool
fileAdded
=
archive
()
->
addLocalFile
(
url
.
path
(),
archivePath
+
filename
);
if
(
fileAdded
)
if
(
fileAdded
)
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was back
up
ed."
,
filename
));
Q_EMIT
info
(
i18n
(
"
\"
%1
\"
was backed
up
."
,
filename
));
else
else
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
Q_EMIT
error
(
i18n
(
"
\"
%1
\"
file cannot be added to backup file."
,
filename
));
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment