← Back to branch summary

~ubuntu-branches/ubuntu/trusty/digikam/trusty

« back to all changes in this revision

Viewing changes to core/libs/widgets/iccprofiles/iccprofilescombobox.cpp

  • Committer: Package Import Robot
  • Author(s): Rohan Garg
  • Date: 2012-11-26 18:24:20 UTC
  • mfrom: (1.9.1) (3.1.23 experimental)
  • Revision ID: package-import@ubuntu.com-20121126182420-qoy6z0nx4ai0wzcl
Tags: 4:3.0.0~beta3-0ubuntu1
https://launchpad.net/bugs/890059
https://launchpad.net/bugs/1011211
https://launchpad.net/bugs/658047
* New upstream release
  - Add build-deps :  libhupnp-dev, libqtgstreamer-dev, libmagickcore-dev
* Merge from debian, remaining changes:
  - Make sure libqt4-opengl-dev, libgl1-mesa-dev and libglu1-mesa-dev only
    install on i386,amd64 and powerpc
  - Depend on libtiff-dev instead of libtiff4-dev
  - Drop digikam breaks/replaces kipi-plugins-common since we're past the
    LTS release now
  - digikam to recommend mplayerthumbs | ffmpegthumbs. We currently only
    have latter in the archives, even though former is also supposed to
    be part of kdemultimedia. (LP: #890059)
  - kipi-plugins to recommend www-browser rather than konqueror directly
    since 2.8 no direct usage of konqueror is present in the flickr
    plugin anymore (LP: #1011211)
  - Keep kubuntu_mysqld_executable_name.diff
  - Don't install libkipi translations
  - Keep deps on libcv-dev, libcvaux-dev
  - Keep split packaging of libraries
  - Replace icons from KDE 3 time in debian/xpm.d/*.xpm with the new
    versions (LP: #658047)
* Update debian/not-installed

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/libs/widgets/iccprofiles/iccprofilescombobox.cpp
6
6
 * Date        : 2009-08-11
7
7
 * Description : a combo box containing ICC profiles
8
8
 *
9
 
 * Copyright (C) 2009-2010 by Marcel Wiesweg <marcel.wiesweg@gmx.de>
 
9
 * Copyright (C) 2009-2010 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
10
10
 *
11
11
 * This program is free software; you can redistribute it
12
12
 * and/or modify it under the terms of the GNU General
42
42
namespace Digikam
43
43
{
44
44
 
45
 
IccProfilesComboBox::IccProfilesComboBox(QWidget* parent)
 
45
IccProfilesComboBox::IccProfilesComboBox(QWidget* const parent)
46
46
    : KDcrawIface::SqueezedComboBox( parent )
47
47
{
48
48
}
84
84
{
85
85
    QList<IccProfile> profiles;
86
86
    QSet<QString>     filePaths;
 
87
 
87
88
    foreach(IccProfile profile, givenProfiles) // krazy:exclude=foreach
88
89
    {
89
90
        QString filePath = profile.filePath();
182
183
 
183
184
// ------------------------------------------------------------------------------------------
184
185
 
185
 
IccProfilesMenuAction::IccProfilesMenuAction(const KIcon& icon, const QString& text, QObject* parent)
 
186
IccProfilesMenuAction::IccProfilesMenuAction(const KIcon& icon, const QString& text, QObject* const parent)
186
187
    : KActionMenu(icon, text, parent),
187
188
      m_parent(parent)
188
189
{
191
192
            this, SLOT(slotTriggered(QObject*)));
192
193
}
193
194
 
194
 
IccProfilesMenuAction::IccProfilesMenuAction(const QString& text, QObject* parent)
 
195
IccProfilesMenuAction::IccProfilesMenuAction(const QString& text, QObject* const parent)
195
196
    : KActionMenu(text, parent),
196
197
      m_parent(parent)
197
198
{
263
264
 
264
265
// ------------------------------------------------------------------------------------------
265
266
 
266
 
IccRenderingIntentComboBox::IccRenderingIntentComboBox(QWidget* parent)
 
267
IccRenderingIntentComboBox::IccRenderingIntentComboBox(QWidget* const parent)
267
268
    : KComboBox(parent)
268
269
{
269
270
    addItem("Perceptual", IccTransform::Perceptual);