← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/dialogs/dbusydlg.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/dialogs/dbusydlg.h
49
49
 
50
50
public:
51
51
 
52
 
    explicit DBusyDlg(const QString& txt, QWidget *parent=0);
 
52
    explicit DBusyDlg(const QString& txt, QWidget* parent=0);
53
53
    virtual ~DBusyDlg();
54
54
 
55
55
    void setBusyThread(DBusyThread* thread);
71
71
 
72
72
public:
73
73
 
74
 
    DBusyThread(QObject *parent);
 
74
    DBusyThread(QObject* parent);
75
75
    virtual ~DBusyThread();
76
76
 
77
77
Q_SIGNALS: