← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/threadimageio/loadingdescription.h

  • 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/threadimageio/loadingdescription.h
184
184
     */
185
185
    bool                isPreviewImage() const;
186
186
 
187
 
   /**
188
 
     * Returns whether the other loading task equals this one
189
 
     */
 
187
    /**
 
188
      * Returns whether the other loading task equals this one
 
189
      */
190
190
    bool operator==(const LoadingDescription& other) const;
191
191
    bool operator!=(const LoadingDescription& other) const
192
 
        { return !operator==(other); }
 
192
    {
 
193
        return !operator==(other);
 
194
    }
193
195
    /**
194
196
     * Returns whether the other loading task equals this one
195
197
     * ignoring parameters used to specify a reduced version.