alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

detach on file/directory definition add

Browse Source
This commit is contained in:
Aaron Seigo 2014-08-08 07:22:45 +02:00
parent bc571d98e2
commit b4f4515d2a
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/plasma/package.cpp
View File

@ -585,7 +585,16 @@ void Package::addDirectoryDefinition(const char *key, const QString &path, const
if (d->contents.contains(key)) { if (d->contents.contains(key)) {
s = d->contents[key]; s = d->contents[key];
if (s.paths.contains(path) && s.directory == true
#ifndef PLASMA_NO_PACKAGE_EXTRADATA
&& s.name == name
#endif
) {
return;
} }
}
d.detach();
#ifndef PLASMA_NO_PACKAGE_EXTRADATA #ifndef PLASMA_NO_PACKAGE_EXTRADATA
if (!name.isEmpty()) { if (!name.isEmpty()) {
@ -607,8 +616,16 @@ void Package::addFileDefinition(const char *key, const QString &path, const QStr
if (d->contents.contains(key)) { if (d->contents.contains(key)) {
s = d->contents[key]; s = d->contents[key];
if (s.paths.contains(path) && s.directory == false
#ifndef PLASMA_NO_PACKAGE_EXTRADATA
&& s.name == name
#endif
) {
return;
}
} }
d.detach();
#ifndef PLASMA_NO_PACKAGE_EXTRADATA #ifndef PLASMA_NO_PACKAGE_EXTRADATA
if (!name.isEmpty()) { if (!name.isEmpty()) {
s.name = name; s.name = name;
@ -625,7 +642,10 @@ void Package::addFileDefinition(const char *key, const QString &path, const QStr
void Package::removeDefinition(const char *key) void Package::removeDefinition(const char *key)
{ {
if (d->contents.contains(key)) {
d.detach();
d->contents.remove(key); d->contents.remove(key);
}
} }
void Package::setRequired(const char *key, bool required) void Package::setRequired(const char *key, bool required)