← Back to branch summary

~ubuntu-branches/ubuntu/wily/oxygen/wily

« back to all changes in this revision

Viewing changes to kdecoration/oxygensettingsprovider.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell, Scarlett Clark, Jonathan Riddell
  • Date: 2015-08-10 23:18:51 UTC
  • mfrom: (1.1.9)
  • Revision ID: package-import@ubuntu.com-20150810231851-wtw33zvkigya4f7t
Tags: 4:5.3.95-0ubuntu1
[ Scarlett Clark ]
* Vivid backport. 

[ Jonathan Riddell ]
* new upstream beta release

Show diffs side-by-side

added added

removed removed

Lines of Context:
kdecoration/oxygensettingsprovider.cpp
20
20
 */
21
21
 
22
22
#include "oxygensettingsprovider.h"
23
 
#include "oxygensettingsprovider.moc"
 
23
 
 
24
#include "oxygendecohelper.h"
 
25
#include "oxygenshadowcache.h"
24
26
 
25
27
#include "oxygenexceptionlist.h"
26
28
 
35
37
 
36
38
    //__________________________________________________________________
37
39
    SettingsProvider::SettingsProvider():
38
 
        m_config( KSharedConfig::openConfig( QStringLiteral("oxygenrc") ) )
 
40
        m_config( KSharedConfig::openConfig( QStringLiteral("oxygenrc") ) ),
 
41
        m_decoHelper( new DecoHelper() ),
 
42
        m_shadowCache( new ShadowCache( *m_decoHelper ) )
39
43
    { reconfigure(); }
40
44
 
41
45
    //__________________________________________________________________
42
46
    SettingsProvider::~SettingsProvider()
43
 
    { s_self = nullptr; }
 
47
    {
 
48
        s_self = nullptr;
 
49
        delete m_shadowCache;
 
50
        delete m_decoHelper;
 
51
    }
44
52
 
45
53
    //__________________________________________________________________
46
54
    SettingsProvider *SettingsProvider::self()
61
69
            m_defaultSettings->setCurrentGroup( QStringLiteral("Windeco") );
62
70
        }
63
71
 
 
72
        m_decoHelper->invalidateCaches();
 
73
        m_decoHelper->loadConfig();
 
74
 
 
75
        m_shadowCache->readConfig();
64
76
        m_defaultSettings->load();
65
77
 
66
78
        ExceptionList exceptions;