diff options
| author | J-P Nurmi <jari-pekka.nurmi@nokia.com> | 2011-01-12 17:25:58 +0200 |
|---|---|---|
| committer | Holger Schröder <holger.schroeder.ext@basyskom.de> | 2011-01-13 19:43:36 +0100 |
| commit | 060ead4720c16fdb54b18bc1b9c3d3444d26fefc (patch) | |
| tree | 2f80e9433707a7437a0468d41bf42ea81594d3f8 | |
| parent | c854198054378c0df7b41299b228843a2f60906c (diff) | |
Changes: Removed inappropriate MApplicationService references
RevBy: Holger Schroeder
| -rw-r--r-- | src/corelib/core/mcomponentcache.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/core/mcomponentdata.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/core/mcomponentcache.cpp b/src/corelib/core/mcomponentcache.cpp index 7d717c66..21c8cc8b 100644 --- a/src/corelib/core/mcomponentcache.cpp +++ b/src/corelib/core/mcomponentcache.cpp @@ -20,7 +20,9 @@ #include "mcomponentcache.h" #include "mcomponentcache_p.h" #include "mapplication.h" +#ifdef HAVE_DBUS #include "mapplicationservice.h" +#endif //HAVE_DBUS #include "mapplicationwindow.h" #include "mcomponentdata.h" #include "mgraphicssystemhelper.h" diff --git a/src/corelib/core/mcomponentdata.cpp b/src/corelib/core/mcomponentdata.cpp index a01395f4..65866926 100644 --- a/src/corelib/core/mcomponentdata.cpp +++ b/src/corelib/core/mcomponentdata.cpp @@ -38,8 +38,8 @@ #ifdef HAVE_DBUS #include "mapplicationifproxy.h" #include "mapplicationifadaptor.h" -#endif //HAVE_DBUS #include "mapplicationservice.h" +#endif //HAVE_DBUS #include "mcomponentcache.h" #include "mcomponentdata_p.h" #include "mwindow.h" @@ -1168,6 +1168,7 @@ QString MComponentData::binaryName() QString MComponentData::serviceName() { +#ifdef HAVE_DBUS if (!gMComponentDataPrivate) { qFatal("MComponentData::serviceName() - MComponentData instance not yet created."); } else if (!gMComponentDataPrivate->service) { @@ -1175,6 +1176,8 @@ QString MComponentData::serviceName() } return gMComponentDataPrivate->service->registeredName(); +#endif // HAVE_DBUS + return QString(); } M::OrientationAngle MComponentData::forcedOrientationAngle() |