← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to kde/src/lib/dbus/metatypes.h

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-01-07 14:51:16 UTC
  • mfrom: (4.3.5 sid)
  • Revision ID: package-import@ubuntu.com-20150107145116-yxnafinf4lrdvrmx
Tags: 1.4.1-0.1ubuntu1
* Merge with Debian, remaining changes:
 - Drop soprano, nepomuk build-dep
* Drop ubuntu patches, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/lib/dbus/metatypes.h
30
30
typedef QMap<QString, int> MapStringInt;
31
31
typedef QVector<int> VectorInt;
32
32
typedef QVector< QMap<QString, QString> > VectorMapStringString;
 
33
typedef QVector< QString > VectorString;
 
34
typedef QMap< QString, QMap< QString, QVector<QString> > > MapStringMapStringVectorString;
 
35
typedef QMap< QString, QVector<QString> > MapStringVectorString;
33
36
 
34
37
Q_DECLARE_METATYPE(MapStringString)
35
38
Q_DECLARE_METATYPE(MapStringInt)
36
39
Q_DECLARE_METATYPE(VectorMapStringString)
 
40
Q_DECLARE_METATYPE(MapStringMapStringVectorString)
37
41
Q_DECLARE_METATYPE(VectorInt)
 
42
Q_DECLARE_METATYPE(VectorString)
 
43
Q_DECLARE_METATYPE(MapStringVectorString)
38
44
 
39
45
static bool dbus_metaTypeInit = false;
40
46
inline void registerCommTypes() {
41
47
        qDBusRegisterMetaType<MapStringString>();
42
48
        qDBusRegisterMetaType<MapStringInt>();
43
49
        qDBusRegisterMetaType<VectorMapStringString>();
44
 
        qDBusRegisterMetaType<VectorInt>();
 
50
        qDBusRegisterMetaType<MapStringMapStringVectorString>();
 
51
        qDBusRegisterMetaType<VectorInt>();
 
52
        qDBusRegisterMetaType<VectorString>();
 
53
        qDBusRegisterMetaType<MapStringVectorString>();
45
54
   dbus_metaTypeInit = true;
46
55
}
47
56
#pragma GCC diagnostic pop