summaryrefslogtreecommitdiff
authorsandman <sandman>2002-11-24 18:31:38 (UTC)
committer sandman <sandman>2002-11-24 18:31:38 (UTC)
commit75cf5d2277d66f533167bcb2e3b6f0eee2424d96 (patch) (side-by-side diff)
tree32f6fb81494954ac93e6f451f701d0b83f9852b7
parent1b2c3ce0d94f033e8ffe1aa8575b210cdfb3c1ec (diff)
downloadopie-75cf5d2277d66f533167bcb2e3b6f0eee2424d96.zip
opie-75cf5d2277d66f533167bcb2e3b6f0eee2424d96.tar.gz
opie-75cf5d2277d66f533167bcb2e3b6f0eee2424d96.tar.bz2
Valgrind complaint
had to changed the initialization sequence
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/theme/othemebase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/styles/theme/othemebase.cpp b/noncore/styles/theme/othemebase.cpp
index 58005b5..acac847 100644
--- a/noncore/styles/theme/othemebase.cpp
+++ b/noncore/styles/theme/othemebase.cpp
@@ -268,43 +268,43 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ )
if ( configFileName.isEmpty() ) {
Config cfg ( "qpe" );
cfg. setGroup ( "Appearance" );
configFileName = cfg. readEntry ( "Theme", "default" );
}
MyConfig config( configFilePath + "/themes/" + configFileName + ".themerc" , Config::File );
// printf ( "Opened config file: %s\n", ( configFilePath + "/themes/" + configFileName + ".themerc" ). ascii());
// Are we initalized?
+ applyMiscResourceGroup( &config );
for ( i = 0; i < INHERIT_ITEMS; ++i ) {
applyResourceGroup( &config, i, copyfrom, pixnames, brdnames );
// printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() );
}
for ( ; i < INHERIT_ITEMS*2; ++i ) {
if ( config.hasGroup( QString( widgetEntries[ i ] ) ) ) {
applyResourceGroup( &config, i, copyfrom, pixnames, brdnames );
// printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() );
}
else {
copyfrom [ i ] = widgetEntries[ i - INHERIT_ITEMS ];
// printf ( "%d [%s]: copy=%s\n", i, widgetEntries [i], copyfrom [i].latin1());
}
}
for ( ; i < WIDGETS; ++i ) {
applyResourceGroup( &config, i, copyfrom, pixnames, brdnames );
// printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() );
}
- applyMiscResourceGroup( &config );
// initalize defaults that may not be read
for ( i = 0; i < WIDGETS; ++i )
loaded[ i ] = false;
btnXShift = btnYShift = focus3DOffset = 0;
aTabLine = iTabLine = true;
roundedButton = roundedCombo = roundedSlider = focus3D = false;
splitterWidth = 10;
for ( i = 0; i < WIDGETS; ++i ) {
readResourceGroup( i, copyfrom, pixnames, brdnames, loaded );
// printf ( "%d [%s]: copy=%s, pix=%s, brd=%s, colors=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1(), (colors[i]?colors[i]->background().name().latin1():"<none)" ));