← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/cameragui/gpconfigdlg.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:
utilities/cameragui/gpconfigdlg.h
48
48
 
49
49
public:
50
50
 
51
 
    GPConfigDlg(Camera *camera, CameraWidget *widget, QWidget *parent=0);
 
51
    GPConfigDlg(Camera* camera, CameraWidget* widget, QWidget* parent=0);
52
52
    ~GPConfigDlg();
53
53
 
54
54
private Q_SLOTS:
57
57
 
58
58
private:
59
59
 
60
 
    void appendWidget(QWidget *parent, CameraWidget* widget);
 
60
    void appendWidget(QWidget* parent, CameraWidget* widget);
61
61
    void updateWidgetValue(CameraWidget* widget);
62
62
 
63
63
private: