← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extra/libkexiv2/libkexiv2/kexiv2previews.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:
extra/libkexiv2/libkexiv2/kexiv2previews.cpp
35
35
namespace KExiv2Iface
36
36
{
37
37
 
38
 
class KExiv2Previews::KExiv2PreviewsPriv
 
38
class KExiv2Previews::Private
39
39
{
40
40
public:
41
41
 
42
 
    KExiv2PreviewsPriv()
 
42
    Private()
43
43
    {
44
44
        manager = 0;
45
45
    }
46
46
 
47
 
    ~KExiv2PreviewsPriv()
 
47
    ~Private()
48
48
    {
49
49
        delete manager;
50
50
    }
74
74
};
75
75
 
76
76
KExiv2Previews::KExiv2Previews(const QString& filePath)
77
 
    : d(new KExiv2PreviewsPriv)
 
77
    : d(new Private)
78
78
{
79
79
    try
80
80
    {
83
83
    }
84
84
    catch( Exiv2::Error& e )
85
85
    {
86
 
        KExiv2::KExiv2Priv::printExiv2ExceptionError("Cannot load metadata using Exiv2 ", e);
 
86
        KExiv2::Private::printExiv2ExceptionError("Cannot load metadata using Exiv2 ", e);
87
87
    }
88
88
}
89
89
 
90
90
KExiv2Previews::KExiv2Previews(const QByteArray& imgData)
91
 
    : d(new KExiv2PreviewsPriv)
 
91
    : d(new Private)
92
92
{
93
93
    try
94
94
    {
97
97
    }
98
98
    catch( Exiv2::Error& e )
99
99
    {
100
 
        KExiv2::KExiv2Priv::printExiv2ExceptionError("Cannot load metadata using Exiv2 ", e);
 
100
        KExiv2::Private::printExiv2ExceptionError("Cannot load metadata using Exiv2 ", e);
101
101
    }
102
102
}
103
103
 
164
164
    }
165
165
    catch( Exiv2::Error& e )
166
166
    {
167
 
        KExiv2::KExiv2Priv::printExiv2ExceptionError("Cannot load metadata using Exiv2 ", e);
 
167
        KExiv2::Private::printExiv2ExceptionError("Cannot load metadata using Exiv2 ", e);
168
168
        return QByteArray();
169
169
    }
170
170
}