← Back to branch summary

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

« back to all changes in this revision

Viewing changes to core/libs/dimg/imagehistory/historyimageid.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/dimg/imagehistory/historyimageid.cpp
6
6
 * Date        : 2010-06-02
7
7
 * Description : class holding properties of referenced files used in non-dest. editing
8
8
 *
9
 
 * Copyright (C) 2010 by Marcel Wiesweg <marcel.wiesweg@gmx.de>
 
9
 * Copyright (C) 2010 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
10
10
 * Copyright (C) 2010 by Martin Klapetek <martin dot klapetek at gmail dot com>
11
11
 *
12
12
 * This program is free software; you can redistribute it
41
41
}
42
42
 
43
43
HistoryImageId::HistoryImageId(const QString& uuid, Type type)
44
 
    : m_type(type), m_uuid(uuid)
 
44
    : m_type(type), m_uuid(uuid), m_fileSize(0)
45
45
{
46
46
}
47
47
 
165
165
 
166
166
bool HistoryImageId::operator==(const HistoryImageId& other) const
167
167
{
168
 
    return m_uuid         == other.m_uuid
169
 
           &&  m_type         == other.m_type
170
 
           &&  m_fileName     == other.m_fileName
171
 
           &&  m_filePath     == other.m_filePath
172
 
           &&  m_creationDate == other.m_creationDate
173
 
           &&  m_uniqueHash   == other.m_uniqueHash
174
 
           &&  m_fileSize     == other.m_fileSize
175
 
           &&  m_originalUUID == other.m_originalUUID;
 
168
    return m_uuid         == other.m_uuid           &&
 
169
           m_type         == other.m_type           &&
 
170
           m_fileName     == other.m_fileName       &&
 
171
           m_filePath     == other.m_filePath       &&
 
172
           m_creationDate == other.m_creationDate   &&
 
173
           m_uniqueHash   == other.m_uniqueHash     &&
 
174
           m_fileSize     == other.m_fileSize       &&
 
175
           m_originalUUID == other.m_originalUUID;
176
176
}
177
177
 
178
178
} // namespace Digikam