← Back to branch summary

~ubuntu-branches/ubuntu/raring/kadu/raring

« back to all changes in this revision

Viewing changes to plugins/spellchecker/configuration/spellchecker-configuration.cpp

  • Committer: Package Import Robot
  • Author(s): Patryk Cisek
  • Date: 2012-09-15 13:02:48 UTC
  • mfrom: (0.95.1) (0.94.1) (0.91.2) (2.3.37 sid)
  • Revision ID: package-import@ubuntu.com-20120915130248-hu211iq9ow3s3oas
Tags: 0.12.3-1
* New upstream release
* Removed debian/patches/05-hotfix_upstream.patch and
  debian/patches/06-mpris_player-harden-fix.patch -- patches applied
  upstream
* Icon theme glass is installed again, since all icon sizes have been
  corrected
* Changed build dependency from aspell to enchant (Upstream's suggestion)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/spellchecker/configuration/spellchecker-configuration.cpp
35
35
 
36
36
void SpellcheckerConfiguration::createInstance()
37
37
{
38
 
        if (!Instance)
39
 
                Instance = new SpellcheckerConfiguration();
 
38
        if (Instance)
 
39
                return;
40
40
 
 
41
        Instance = new SpellcheckerConfiguration();
41
42
        Instance->configurationUpdated();
 
43
        Instance->FullyLoaded = true;
42
44
}
43
45
 
44
46
void SpellcheckerConfiguration::destroyInstance()
47
49
        Instance = 0;
48
50
}
49
51
 
50
 
SpellcheckerConfiguration::SpellcheckerConfiguration()
 
52
SpellcheckerConfiguration::SpellcheckerConfiguration() :
 
53
                FullyLoaded(false)
51
54
{
52
55
        createDefaultConfiguration();
53
56
}
83
86
        QStringList checked = config_file.readEntry("ASpell", "Checked", config_file.readEntry("General", "Language")).split(',', QString::SkipEmptyParts);
84
87
        int suggesterWordCount = config_file.readNumEntry("ASpell", "SuggesterWordCount");
85
88
 
86
 
        if (bold == Bold && italic == Italic && underline == Underline && accents == Accents &&
 
89
        if (FullyLoaded && bold == Bold && italic == Italic && underline == Underline && accents == Accents &&
87
90
                        caseSensivity == Case && suggester == Suggester && color == Color &&
88
91
                        checked == Checked && suggesterWordCount == SuggesterWordCount)
89
92
                return;