← Back to branch summary

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

« back to all changes in this revision

Viewing changes to core/libs/imageproperties/imagepropertiesversionstab.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/imageproperties/imagepropertiesversionstab.cpp
56
56
namespace Digikam
57
57
{
58
58
 
59
 
class ImagePropertiesVersionsTab::ImagePropertiesVersionsTabPriv
 
59
class ImagePropertiesVersionsTab::Private
60
60
{
61
61
public:
62
62
 
63
 
    ImagePropertiesVersionsTabPriv()
 
63
    Private()
64
64
    {
65
65
        versionsWidget       = 0;
66
66
        filtersHistoryWidget = 0;
76
76
 
77
77
    static const QString           configActiveTab;
78
78
};
79
 
const QString ImagePropertiesVersionsTab::ImagePropertiesVersionsTabPriv::configActiveTab("Version Properties Tab");
 
79
const QString ImagePropertiesVersionsTab::Private::configActiveTab("Version Properties Tab");
80
80
 
81
 
ImagePropertiesVersionsTab::ImagePropertiesVersionsTab(QWidget* parent)
82
 
    : KTabWidget(parent), d(new ImagePropertiesVersionsTabPriv)
 
81
ImagePropertiesVersionsTab::ImagePropertiesVersionsTab(QWidget* const parent)
 
82
    : KTabWidget(parent), d(new Private)
83
83
{
84
84
    d->versionsWidget = new VersionsWidget(this);
85
85
    insertTab(0, d->versionsWidget, i18n("Versions"));