← Back to branch summary

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

« back to all changes in this revision

Viewing changes to core/libs/dialogs/dprogressdlg.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/dialogs/dprogressdlg.cpp
45
45
namespace Digikam
46
46
{
47
47
 
48
 
class DProgressDlg::DProgressDlgPriv
 
48
class DProgressDlg::Private
49
49
{
50
50
public:
51
51
 
52
 
    DProgressDlgPriv() :
 
52
    Private() :
53
53
        allowCancel(true),
54
54
        cancelled(false),
55
55
        logo(0),
74
74
    QProgressBar*       progress;
75
75
};
76
76
 
77
 
DProgressDlg::DProgressDlg(QWidget* parent, const QString& caption)
78
 
    : KDialog(parent), d(new DProgressDlgPriv)
 
77
DProgressDlg::DProgressDlg(QWidget* const parent, const QString& caption)
 
78
    : KDialog(parent), d(new Private)
79
79
{
80
80
    setCaption(caption);
81
81
    setButtons(Cancel);
186
186
    d->progress->setValue(d->progress->value() + offset);
187
187
}
188
188
 
189
 
int DProgressDlg::value()
 
189
int DProgressDlg::value() const
190
190
{
191
191
    return d->progress->value();
192
192
}