← Back to branch summary

~timo-jyrinki/ubuntu/trusty/maliit-framework/fix_qt52

« back to all changes in this revision

Viewing changes to connection/serverdbusaddress.h

  • Committer: Package Import Robot
  • Author(s): Ricardo Salveti de Araujo, Sergio Schvezov, Ricardo Salveti de Araujo
  • Date: 2013-07-23 19:47:04 UTC
  • mfrom: (1.1.2) (1.2.1 experimental)
  • Revision ID: package-import@ubuntu.com-20130723194704-1lsy1kmlda069cea
Tags: 0.99.0+git20130615+97e8335-0ubuntu1
[ Sergio Schvezov ]
* New build from HEAD 97e8335.
* Packaging import from lp:phablet-extras/maliit-framework.

[ Ricardo Salveti de Araujo ]
* debian/control: adding vcs and fixing dependencies
* General package cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
connection/serverdbusaddress.h
18
18
#include <QObject>
19
19
#include <QString>
20
20
 
21
 
#ifdef HAVE_GLIB_DBUS
22
 
struct DBusServer;
23
 
#else
24
21
class QDBusServer;
25
 
#endif
26
22
 
27
23
namespace Maliit {
28
24
namespace Server {
48
44
{
49
45
public:
50
46
    explicit Address();
51
 
    ~Address();
 
47
    virtual ~Address();
52
48
 
53
 
#ifdef HAVE_GLIB_DBUS
54
 
    virtual DBusServer* connect() = 0;
55
 
#else
56
49
    virtual QDBusServer* connect() = 0;
57
 
#endif
58
50
};
59
51
 
60
52
class DynamicAddress : public Address
64
56
    explicit DynamicAddress();
65
57
 
66
58
    //! reimpl
67
 
#ifdef HAVE_GLIB_DBUS
68
 
    virtual DBusServer* connect();
69
 
#else
70
59
    virtual QDBusServer* connect();
71
 
#endif
72
60
 
73
61
private:
74
62
    QScopedPointer<AddressPublisher> publisher;
81
69
    explicit FixedAddress(const QString &address);
82
70
 
83
71
    //! reimpl
84
 
#ifdef HAVE_GLIB_DBUS
85
 
    virtual DBusServer* connect();
86
 
#else
87
72
    virtual QDBusServer* connect();
88
 
#endif
89
73
 
90
74
private:
91
75
    QString mAddress;