← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/dialogs/dprogressdlg.cpp

  • 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/dialogs/dprogressdlg.cpp
50
50
{
51
51
public:
52
52
 
53
 
    DProgressDlgPriv()
 
53
    DProgressDlgPriv() :
 
54
        allowCancel(true),
 
55
        cancelled(false),
 
56
        logo(0),
 
57
        title(0),
 
58
        label(0),
 
59
        actionPix(0),
 
60
        actionLabel(0),
 
61
        progress(0)
54
62
    {
55
 
        progress    = 0;
56
 
        actionLabel = 0;
57
 
        actionPix   = 0;
58
 
        logo        = 0;
59
 
        title       = 0;
60
 
        label       = 0;
61
 
        allowCancel = true;
62
 
        cancelled   = false;
63
63
    }
64
64
 
65
65
    bool                allowCancel;
76
76
};
77
77
 
78
78
DProgressDlg::DProgressDlg(QWidget* parent, const QString& caption)
79
 
            : KDialog(parent), d(new DProgressDlgPriv)
 
79
    : KDialog(parent), d(new DProgressDlgPriv)
80
80
{
81
81
    setCaption(caption);
82
82
    setButtons(Cancel);
148
148
void DProgressDlg::addedAction(const QPixmap& itemPix, const QString& text)
149
149
{
150
150
    QPixmap pix = itemPix;
 
151
 
151
152
    if (pix.isNull())
152
153
    {
153
154
        pix = DesktopIcon("image-missing", KIconLoader::SizeMedium);    // 32x32 px