← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extra/kipi-plugins/acquireimages/plugin_acquireimages.h

  • 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:
extra/kipi-plugins/acquireimages/plugin_acquireimages.h
36
36
 
37
37
class KAction;
38
38
 
39
 
namespace KIPI
40
 
{
41
 
    class Interface;
42
 
}
43
 
 
44
39
namespace KSaneIface
45
40
{
46
41
    class KSaneWidget;
60
55
    Plugin_AcquireImages(QObject* const parent, const QVariantList& args);
61
56
    virtual ~Plugin_AcquireImages();
62
57
 
63
 
    KIPI::Category category(KAction* action) const;
64
 
    void setup(QWidget*);
 
58
    void setup(QWidget* const);
65
59
 
66
60
public Q_SLOTS:
67
61
 
69
63
 
70
64
private:
71
65
 
 
66
    void setupActions();
 
67
 
 
68
private:
 
69
 
72
70
    QWidget*                 m_parentWidget;
73
71
 
74
72
    KAction*                 m_action_scanimages;
75
73
 
76
74
    KSaneIface::KSaneWidget* m_saneWidget;
77
75
 
78
 
    KIPI::Interface*         m_interface;
79
 
 
80
76
    QPointer <ScanDialog>    m_scanDlg;
81
77
};
82
78