Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
PIM Data Exporter
Commits
7c75e2b1
Commit
7c75e2b1
authored
Sep 30, 2014
by
Laurent Montel
😁
Browse files
astyle-kdelibs
parent
7891ffb4
Changes
6
Hide whitespace changes
Inline
Side-by-side
abstractimportexportjob.cpp
View file @
7c75e2b1
...
...
@@ -365,7 +365,7 @@ QStringList AbstractImportExportJob::restoreResourceFile(const QString &resource
const
KArchiveEntry
*
dataResouceEntry
=
mArchiveDirectory
->
entry
(
dataFile
);
if
(
dataResouceEntry
->
isFile
())
{
const
KArchiveFile
*
file
=
static_cast
<
const
KArchiveFile
*>
(
dataResouceEntry
);
file
->
copyTo
(
newUrl
.
adjusted
(
QUrl
::
RemoveFilename
|
QUrl
::
StripTrailingSlash
).
path
());
file
->
copyTo
(
newUrl
.
adjusted
(
QUrl
::
RemoveFilename
|
QUrl
::
StripTrailingSlash
).
path
());
}
settings
.
insert
(
QLatin1String
(
"Path"
),
newUrl
.
path
());
...
...
dialog/showarchivestructuredialog.cpp
View file @
7c75e2b1
...
...
@@ -172,4 +172,3 @@ void ShowArchiveStructureDialog::readConfig()
}
}
mail/importmailjob.cpp
View file @
7c75e2b1
...
...
@@ -809,7 +809,7 @@ void ImportMailJob::restoreConfig()
copyToFile
(
entry
,
QString
(
QStandardPaths
::
writableLocation
(
QStandardPaths
::
GenericDataLocation
)
+
QLatin1String
(
"/"
)
+
QLatin1String
(
"kmail2/adblockrules_local"
)),
QLatin1String
(
"adblockrules_local"
),
Utils
::
dataPath
()
+
QLatin1String
(
"kmail2/"
));
}
}
else
{
copyToFile
(
entry
,
QStandardPaths
::
writableLocation
(
QStandardPaths
::
GenericDataLocation
)
+
QLatin1Char
(
'/'
)
+
QLatin1String
(
"kmail2/adblockrules_local"
),
QLatin1String
(
"adblockrules_local"
),
Utils
::
dataPath
()
+
QLatin1String
(
"kmail2/"
)
);
copyToFile
(
entry
,
QStandardPaths
::
writableLocation
(
QStandardPaths
::
GenericDataLocation
)
+
QLatin1Char
(
'/'
)
+
QLatin1String
(
"kmail2/adblockrules_local"
),
QLatin1String
(
"adblockrules_local"
),
Utils
::
dataPath
()
+
QLatin1String
(
"kmail2/"
));
}
}
...
...
main.cpp
View file @
7c75e2b1
...
...
@@ -17,7 +17,6 @@
#include
"pimsettingexporterwindow.h"
#include
<kaboutdata.h>
#include
<KLocalizedString>
#include
<KDBusService>
...
...
@@ -38,8 +37,8 @@ int main(int argc, char *argv[])
migrate
.
migrate
();
KAboutData
aboutData
(
QLatin1String
(
"pimsettingexporter"
),
i18n
(
"PIM Setting Exporter"
),
QLatin1String
(
KDEPIM_VERSION
),
i18n
(
"PIM Setting Exporter"
),
KAboutLicense
::
GPL_V2
,
i18n
(
"Copyright © 2012-2014 pimsettingexporter authors"
));
QLatin1String
(
KDEPIM_VERSION
),
i18n
(
"PIM Setting Exporter"
),
KAboutLicense
::
GPL_V2
,
i18n
(
"Copyright © 2012-2014 pimsettingexporter authors"
));
aboutData
.
addAuthor
(
i18n
(
"Laurent Montel"
),
i18n
(
"Maintainer"
),
QStringLiteral
(
"montel@kde.org"
));
QApplication
::
setWindowIcon
(
QIcon
::
fromTheme
(
QLatin1String
(
"kontact"
)));
QApplication
app
(
argc
,
argv
);
...
...
synchronizeresourcejob.cpp
View file @
7c75e2b1
...
...
@@ -79,4 +79,3 @@ void SynchronizeResourceJob::setListResources(const QStringList &resources)
mListResources
=
resources
;
}
utils.cpp
View file @
7c75e2b1
...
...
@@ -123,9 +123,9 @@ QUrl Utils::adaptResourcePath(KSharedConfigPtr resourceConfig, const QString &st
if
(
QFile
(
newUrl
.
path
()).
exists
())
{
QString
newFileName
=
newUrl
.
path
();
for
(
int
i
=
0
;;
++
i
)
{
newFileName
=
newUrl
.
adjusted
(
QUrl
::
RemoveFilename
|
QUrl
::
StripTrailingSlash
).
path
()
+
QLatin1Char
(
'/'
)
+
QString
::
number
(
i
)
+
QLatin1Char
(
'/'
)
+
newUrl
.
fileName
();
newFileName
=
newUrl
.
adjusted
(
QUrl
::
RemoveFilename
|
QUrl
::
StripTrailingSlash
).
path
()
+
QLatin1Char
(
'/'
)
+
QString
::
number
(
i
)
+
QLatin1Char
(
'/'
)
+
newUrl
.
fileName
();
if
(
!
QFile
(
newFileName
).
exists
())
{
QDir
dir
(
newUrl
.
adjusted
(
QUrl
::
RemoveFilename
|
QUrl
::
StripTrailingSlash
).
path
());
QDir
dir
(
newUrl
.
adjusted
(
QUrl
::
RemoveFilename
|
QUrl
::
StripTrailingSlash
).
path
());
dir
.
mkdir
(
QString
::
number
(
i
));
break
;
}
...
...
Write
Preview
Supports
Markdown
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