← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to libs/dimg/filters/icc/iccprofilesettings.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/dimg/filters/icc/iccprofilesettings.cpp
63
63
 
64
64
    IccProfilesSettingsPriv() :
65
65
        profilesBox(0)
66
 
        {
67
 
            favoriteProfiles.setMaxCost(10);
68
 
        }
 
66
    {
 
67
        favoriteProfiles.setMaxCost(10);
 
68
    }
69
69
 
70
70
    static const QString  configRecentlyUsedProfilesEntry;
71
71
 
78
78
// --------------------------------------------------------
79
79
 
80
80
IccProfilesSettings::IccProfilesSettings(QWidget* parent)
81
 
                   : KVBox(parent),
82
 
                     d(new IccProfilesSettingsPriv)
 
81
    : KVBox(parent),
 
82
      d(new IccProfilesSettingsPriv)
83
83
{
84
84
    QLabel* newProfileLabel  = new QLabel(i18n("Convert to:"), this);
85
85
    d->profilesBox           = new IccProfilesComboBox(this);
146
146
{
147
147
    QStringList lastProfiles = group.readPathEntry(d->configRecentlyUsedProfilesEntry, QStringList());
148
148
 
149
 
    foreach (const QString &path, lastProfiles)
 
149
    foreach (const QString& path, lastProfiles)
150
150
    {
151
151
        d->favoriteProfiles.insert(path, new bool(true));
152
152
    }