Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
luyikei
VLMC
Commits
bb701f5d
Commit
bb701f5d
authored
Nov 26, 2009
by
Clement CHAVANCE
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Forgot to comit a file ....
parent
09c2e5af
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
4 deletions
+39
-4
src/Configuration/SettingsManager.cpp
src/Configuration/SettingsManager.cpp
+39
-4
No files found.
src/Configuration/SettingsManager.cpp
View file @
bb701f5d
...
...
@@ -46,10 +46,10 @@ SettingsManager::~SettingsManager()
void
SettingsManager
::
setValues
(
const
QString
&
part
,
QHash
<
QString
,
QVariant
>
values
)
{
if
(
!
m_
d
ata
.
contains
(
part
)
)
if
(
!
m_
tempD
ata
.
contains
(
part
)
)
addNewSettingsPart
(
part
);
m_globalLock
.
lockForRead
();
SettingsPart
*
sett
=
m_
d
ata
[
part
];
SettingsPart
*
sett
=
m_
tempD
ata
[
part
];
m_globalLock
.
unlock
();
QHash
<
QString
,
QVariant
>::
iterator
it
=
values
.
begin
();
QHash
<
QString
,
QVariant
>::
iterator
end
=
values
.
end
();
...
...
@@ -63,13 +63,13 @@ void SettingsManager::setValues( const QString& part, QHash<QString, QVariant>
void
SettingsManager
::
setValue
(
const
QString
&
part
,
const
QString
&
key
,
QVariant
&
value
)
{
m_globalLock
.
lockForRead
();
if
(
!
m_
d
ata
.
contains
(
part
)
)
if
(
!
m_
tempD
ata
.
contains
(
part
)
)
{
addNewSettingsPart
(
part
);
}
m_globalLock
.
unlock
();
QWriteLocker
lock
(
&
m_globalLock
);
SettingsPart
*
tmp
=
m_
d
ata
[
part
];
SettingsPart
*
tmp
=
m_
tempD
ata
[
part
];
tmp
->
m_data
.
insert
(
key
,
value
);
return
;
}
...
...
@@ -154,6 +154,41 @@ void SettingsManager::addNewSettingsPart( const QString& name )
rLock
.
unlock
();
QWriteLocker
lock
(
&
m_globalLock
);
m_data
.
insert
(
name
,
new
SettingsPart
);
m_tempData
.
insert
(
name
,
new
SettingsPart
);
}
}
void
SettingsManager
::
commit
()
{
QWriteLocker
lock
(
&
m_globalLock
);
QHash
<
QString
,
SettingsPart
*>::
iterator
it
=
m_tempData
.
begin
();
QHash
<
QString
,
SettingsPart
*>::
iterator
ed
=
m_tempData
.
end
();
for
(
;
it
!=
ed
;
++
it
)
{
SettingsPart
*
sett
=
it
.
value
();
QReadLocker
rLock
(
&
sett
->
m_lock
);
QHash
<
QString
,
QVariant
>::
iterator
iter
=
sett
->
m_data
.
begin
();
QHash
<
QString
,
QVariant
>::
iterator
ed
=
sett
->
m_data
.
end
();
QWriteLocker
wLock
(
&
m_data
[
it
.
key
()]
->
m_lock
);
for
(
;
iter
!=
ed
;
++
iter
)
m_data
[
it
.
key
()]
->
m_data
.
insert
(
iter
.
key
(),
iter
.
value
()
);
}
}
void
SettingsManager
::
flush
()
{
QWriteLocker
lock
(
&
m_globalLock
);
QHash
<
QString
,
SettingsPart
*>::
iterator
it
=
m_tempData
.
begin
();
QHash
<
QString
,
SettingsPart
*>::
iterator
ed
=
m_tempData
.
end
();
for
(
;
it
!=
ed
;
++
it
)
{
QWriteLocker
wLock
(
&
it
.
value
()
->
m_lock
);
it
.
value
()
->
m_data
.
clear
();
}
}
...
...
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