astyled the code

4 files changed, 94 insertions, 93 deletions

diff --git a/libresourceqt/src/resource-engine.cpp b/libresourceqt/src/resource-engine.cpp
index e2d6113..0bc8fcd 100644
--- a/libresourceqt/src/resource-engine.cpp
+++ b/libresourceqt/src/resource-engine.cpp
@@ -14,9 +14,9 @@ static void handleGrantMessage(resmsg_t *msg, resset_t *rs, void *data);
 static void handleAdviceMessage(resmsg_t *msg, resset_t *rs, void *data);
 
 ResourceEngine::ResourceEngine(ResourceSet *resourceSet)
-    : QObject(resourceSet), connected(false), resourceSet(resourceSet),
-      libresourceConnection(NULL), libresourceSet(NULL), requestId(0),
-      messageMap(), mode(0)
+        : QObject(resourceSet), connected(false), resourceSet(resourceSet),
+        libresourceConnection(NULL), libresourceSet(NULL), requestId(0),
+        messageMap(), mode(0)
 {
 }
 
@@ -31,15 +31,15 @@ bool ResourceEngine::initialize()
 
     dbus_error_init(&dbusError);
     dbusConnection = dbus_bus_get(DBUS_BUS_SYSTEM, &dbusError);
-    if(dbus_error_is_set(&dbusError)) {
+    if (dbus_error_is_set(&dbusError)) {
         qDebug("Error getting the system bus: %s", dbusError.message);
         dbus_error_free(&dbusError);
         return false;
     }
     dbus_error_free(&dbusError);
     libresourceConnection = resproto_init(RESPROTO_ROLE_CLIENT, RESPROTO_TRANSPORT_DBUS,
-                                           connectionIsUp, dbusConnection);
-    if(libresourceConnection == NULL) {
+                                          connectionIsUp, dbusConnection);
+    if (libresourceConnection == NULL) {
         return NULL;
     }
 
@@ -148,7 +148,7 @@ bool ResourceEngine::disconnect()
     int r = resconn_disconnect(libresourceSet, &resourceMessage,
                                statusCallbackHandler);
     connected = false;
-    if(r)
+    if (r)
         return true;
     else
         return false;
@@ -157,8 +157,8 @@ bool ResourceEngine::disconnect()
 static inline quint32 allResourcesToBitmask(const ResourceSet *resourceSet)
 {
     QList<Resource *> resourceList = resourceSet->resources();
-    quint32 bitmask=0;
-    for(int i=0; i < resourceList.size(); i++) {
+    quint32 bitmask = 0;
+    for (int i = 0; i < resourceList.size(); i++) {
         bitmask += resourceTypeToLibresourceType(resourceList[i]->type());
     }
     return bitmask;
@@ -166,46 +166,46 @@ static inline quint32 allResourcesToBitmask(const ResourceSet *resourceSet)
 
 static inline quint32 resourceTypeToLibresourceType(ResourceType type)
 {
-    quint32 bitmask=0;
-    switch(type) {
-        case AudioPlaybackType:
-            bitmask += RESMSG_AUDIO_PLAYBACK;
-            break;
-        case VideoPlaybackType:
-            bitmask += RESMSG_VIDEO_PLAYBACK;
-            break;
-        case AudioRecorderType:
-            bitmask += RESMSG_AUDIO_RECORDING;
-            break;
-        case VideoRecorderType:
-            bitmask += RESMSG_VIDEO_RECORDING;
-            break;
-        case VibraType:
-            bitmask += RESMSG_VIBRA;
-            break;
-        case LedsType:
-            bitmask += RESMSG_LEDS;
-            break;
-        case BacklightType:
-            bitmask += RESMSG_BACKLIGHT;
-            break;
-        case SystemButtonType:
-            bitmask += RESMSG_SYSTEM_BUTTON;
-            break;
-        case LockButtonType:
-            bitmask += RESMSG_LOCK_BUTTON;
-            break;
-        case ScaleButtonType:
-            bitmask += RESMSG_SCALE_BUTTON;
-            break;        
-        case SnapButtonType:
-            bitmask += RESMSG_SNAP_BUTTON;
-            break;        
-        case LensCoverType:
-            bitmask += RESMSG_LENS_COVER;
-            break;        
-        default:
-            break;
+    quint32 bitmask = 0;
+    switch (type) {
+    case AudioPlaybackType:
+        bitmask += RESMSG_AUDIO_PLAYBACK;
+        break;
+    case VideoPlaybackType:
+        bitmask += RESMSG_VIDEO_PLAYBACK;
+        break;
+    case AudioRecorderType:
+        bitmask += RESMSG_AUDIO_RECORDING;
+        break;
+    case VideoRecorderType:
+        bitmask += RESMSG_VIDEO_RECORDING;
+        break;
+    case VibraType:
+        bitmask += RESMSG_VIBRA;
+        break;
+    case LedsType:
+        bitmask += RESMSG_LEDS;
+        break;
+    case BacklightType:
+        bitmask += RESMSG_BACKLIGHT;
+        break;
+    case SystemButtonType:
+        bitmask += RESMSG_SYSTEM_BUTTON;
+        break;
+    case LockButtonType:
+        bitmask += RESMSG_LOCK_BUTTON;
+        break;
+    case ScaleButtonType:
+        bitmask += RESMSG_SCALE_BUTTON;
+        break;
+    case SnapButtonType:
+        bitmask += RESMSG_SNAP_BUTTON;
+        break;
+    case LensCoverType:
+        bitmask += RESMSG_LENS_COVER;
+        break;
+    default:
+        break;
     }
     return bitmask;
 }
@@ -213,9 +213,9 @@ static inline quint32 resourceTypeToLibresourceType(ResourceType type)
 static inline quint32 optionalResourcesToBitmask(const ResourceSet *resourceSet)
 {
     QList<Resource *> resourceList = resourceSet->resources();
-    quint32 bitmask=0;
-    for(int i=0; i < resourceList.size(); i++) {
-        if(resourceList[i]->isOptional()) {
+    quint32 bitmask = 0;
+    for (int i = 0; i < resourceList.size(); i++) {
+        if (resourceList[i]->isOptional()) {
             bitmask += resourceTypeToLibresourceType(resourceList[i]->type());
         }
     }
@@ -232,12 +232,12 @@ static void statusCallbackHandler(resset_t *libresourceSet, resmsg_t *message)
 void ResourceEngine::handleStatusMessage(quint32 requestNo)
 {
     resmsg_type_t messageType = messageMap.take(requestNo);
-    if(messageType == RESMSG_REGISTER) {
+    if (messageType == RESMSG_REGISTER) {
         qDebug("connected!");
         connected = true;
         emit connectedToManager();
     }
-    else if(messageType == RESMSG_UNREGISTER) {
+    else if (messageType == RESMSG_UNREGISTER) {
         qDebug("disconnected!");
         connected = false;
         emit disconnectedFromManager();
diff --git a/libresourceqt/src/resource-set.cpp b/libresourceqt/src/resource-set.cpp
index f8f3826..93af954 100644
--- a/libresourceqt/src/resource-set.cpp
+++ b/libresourceqt/src/resource-set.cpp
@@ -3,8 +3,8 @@ using namespace ResourcePolicy;
 
 
 ResourceSet::ResourceSet(const QString &applicationClass, QObject * parent)
-    : QObject(parent), resourceClass(applicationClass), autoRelease(false),
-      alwaysReply(false)
+        : QObject(parent), resourceClass(applicationClass), autoRelease(false),
+        alwaysReply(false)
 
 {
     identifier = (quint32)this;
@@ -13,7 +13,7 @@ ResourceSet::ResourceSet(const QString &applicationClass, QObject * parent)
 
 ResourceSet::~ResourceSet()
 {
-    for(int i=0;i<NumberOfTypes;i++) {
+    for (int i = 0;i < NumberOfTypes;i++) {
         delete resourceSet[i];
     }
 }
@@ -25,7 +25,7 @@ bool ResourceSet::finalize()
 
 void ResourceSet::addResource(const Resource *resource)
 {
-    if((resource->type() == AudioPlaybackType) || (resource->type() == AudioRecorderType)) {
+    if ((resource->type() == AudioPlaybackType) || (resource->type() == AudioRecorderType)) {
         qDebug("audioResource...");
     }
     resourceSet[resource->type()] = resource->clone();
@@ -33,14 +33,14 @@ void ResourceSet::addResource(const Resource *resource)
 
 void ResourceSet::addResources(const QList<Resource *>resources)
 {
-    for(int i=0; i < resources.size(); i++) {
+    for (int i = 0; i < resources.size(); i++) {
         addResource(resources.at(i));
     }
 }
 
 void ResourceSet::delResource(ResourceType type)
 {
-    if(contains(type)) {
+    if (contains(type)) {
         delete resourceSet[type];
         resourceSet[type] = NULL;
     }
@@ -48,7 +48,7 @@ void ResourceSet::delResource(ResourceType type)
 
 bool ResourceSet::contains(ResourceType type) const
 {
-    if((type < NumberOfTypes) && (resourceSet[type] != NULL))
+    if ((type < NumberOfTypes) && (resourceSet[type] != NULL))
         return true;
     else
         return false;
@@ -56,12 +56,13 @@ bool ResourceSet::contains(ResourceType type) const
 
 bool ResourceSet::contains(const QList<ResourceType> &types) const
 {
-    bool containsAll=true;
-    int i=0;
+    bool containsAll = true;
+    int i = 0;
     do {
         containsAll = contains(types.at(i));
         i++;
-    } while((i < types.size()) && containsAll);
+    }
+    while ((i < types.size()) && containsAll);
     return containsAll;
 }
 
@@ -73,8 +74,8 @@ quint32 ResourceSet::id() const
 QList<Resource *> ResourceSet::resources() const
 {
     QList<Resource *> listOfResources;
-    for(int i=0; i < NumberOfTypes; i++) {
-        if(resourceSet[i] != NULL) {
+    for (int i = 0; i < NumberOfTypes; i++) {
+        if (resourceSet[i] != NULL) {
             Resource *clone = resourceSet[i]->clone();
             listOfResources.append(clone);
         }
@@ -84,7 +85,7 @@ QList<Resource *> ResourceSet::resources() const
 
 Resource * ResourceSet::resource(ResourceType type) const
 {
-    if(contains(type))
+    if (contains(type))
         return resourceSet[type]->clone();
     else
         return NULL;
diff --git a/libresourceqt/src/resource.cpp b/libresourceqt/src/resource.cpp
index c9bd79e..d288ae6 100644
--- a/libresourceqt/src/resource.cpp
+++ b/libresourceqt/src/resource.cpp
@@ -3,14 +3,14 @@
 using namespace ResourcePolicy;
 
 Resource::Resource()
-    :   optional(false),
+        :   optional(false),
         identifier(0), granted(false)
 {
     identifier = (quint32)this;
 }
 
 Resource::Resource(const Resource &other)
-    :   optional(other.optional),
+        :   optional(other.optional),
         identifier(other.identifier), granted(other.granted)
 {
 }
diff --git a/libresourceqt/src/resources.cpp b/libresourceqt/src/resources.cpp
index c763ebc..12d9492 100644
--- a/libresourceqt/src/resources.cpp
+++ b/libresourceqt/src/resources.cpp
@@ -3,12 +3,12 @@
 using namespace ResourcePolicy;
 
 AudioResource::AudioResource(const QString &audioGroup)
-    :   Resource(), group(audioGroup), pid(0), stream(QString())
+        :   Resource(), group(audioGroup), pid(0), stream(QString())
 {
 }
 
 AudioResource::AudioResource(const AudioResource &other)
-    :   Resource(other), group(other.group), pid(other.pid), stream(other.stream)
+        :   Resource(other), group(other.group), pid(other.pid), stream(other.stream)
 {
 }
 
@@ -57,12 +57,12 @@ ResourceType AudioResource::type() const
 }
 
 AudioRecorderResource::AudioRecorderResource(const QString & audioGroup)
-    :   Resource(), group(audioGroup), pid(0), stream(QString())
+        :   Resource(), group(audioGroup), pid(0), stream(QString())
 {
 }
 
 AudioRecorderResource::AudioRecorderResource(const AudioRecorderResource &other)
-    :   Resource(other), group(other.group), pid(other.pid), stream(other.stream)
+        :   Resource(other), group(other.group), pid(other.pid), stream(other.stream)
 {
 }
 
@@ -106,12 +106,12 @@ ResourceType AudioRecorderResource::type() const
 }
 
 VideoResource::VideoResource()
-    :   Resource()
+        :   Resource()
 {
 }
 
 VideoResource::VideoResource(const VideoResource &other)
-    :    Resource(other)
+        :    Resource(other)
 {
 }
 
@@ -130,12 +130,12 @@ ResourceType VideoResource::type() const
 }
 
 VideoRecorderResource::VideoRecorderResource()
-    :   Resource()
+        :   Resource()
 {
 }
 
 VideoRecorderResource::VideoRecorderResource(const VideoRecorderResource &other)
-    :    Resource(other)
+        :    Resource(other)
 {
 }
 
@@ -154,12 +154,12 @@ ResourceType VideoRecorderResource::type() const
 }
 
 VibraResource::VibraResource()
-    :   Resource()
+        :   Resource()
 {
 }
 
 VibraResource::VibraResource(const VibraResource &other)
-    :    Resource(other)
+        :    Resource(other)
 {
 }
 
@@ -178,12 +178,12 @@ ResourceType VibraResource::type() const
 }
 
 LedsResource::LedsResource()
-    :   Resource()
+        :   Resource()
 {
 }
 
 LedsResource::LedsResource(const LedsResource &other)
-    :    Resource(other)
+        :    Resource(other)
 {
 }
 
@@ -202,12 +202,12 @@ ResourceType LedsResource::type() const
 }
 
 BacklightResource::BacklightResource()
-    :   Resource()
+        :   Resource()
 {
 }
 
 BacklightResource::BacklightResource(const BacklightResource &other)
-    :    Resource(other)
+        :    Resource(other)
 {
 }
 
@@ -226,12 +226,12 @@ ResourceType BacklightResource::type() const
 }
 
 SystemButtonResource::SystemButtonResource()
-    :   Resource()
+        :   Resource()
 {
 }
 
 SystemButtonResource::SystemButtonResource(const SystemButtonResource &other)
-    :    Resource(other)
+        :    Resource(other)
 {
 }
 
@@ -250,12 +250,12 @@ ResourceType SystemButtonResource::type() const
 }
 
 LockButtonResource::LockButtonResource()
-    :   Resource()
+        :   Resource()
 {
 }
 
 LockButtonResource::LockButtonResource(const LockButtonResource &other)
-    :    Resource(other)
+        :    Resource(other)
 {
 }
 
@@ -274,12 +274,12 @@ ResourceType LockButtonResource::type() const
 }
 
 ScaleButtonResource::ScaleButtonResource()
-    :   Resource()
+        :   Resource()
 {
 }
 
 ScaleButtonResource::ScaleButtonResource(const ScaleButtonResource &other)
-    :    Resource(other)
+        :    Resource(other)
 {
 }
 
@@ -298,12 +298,12 @@ ResourceType ScaleButtonResource::type() const
 }
 
 SnapButtonResource::SnapButtonResource()
-    :   Resource()
+        :   Resource()
 {
 }
 
 SnapButtonResource::SnapButtonResource(const SnapButtonResource &other)
-    :    Resource(other)
+        :    Resource(other)
 {
 }
 
@@ -322,12 +322,12 @@ ResourceType SnapButtonResource::type() const
 }
 
 LensCoverResource::LensCoverResource()
-    :   Resource()
+        :   Resource()
 {
 }
 
 LensCoverResource::LensCoverResource(const LensCoverResource &other)
-    :    Resource(other)
+        :    Resource(other)
 {
 }