Changes: Unit test cleanups

RevBy: TrustMe

src/extensions/screenlock/unlockarea.h

@@ -47,12 +47,12 @@ class UnlockArea : public MStylableWidget
 private:
     void updateState();
 
-    MWidget         *m_unlock_icon;
-    bool             m_enabled;
-    bool             m_active;
+    MWidget *m_unlock_icon;
+    bool m_enabled;
+    bool m_active;
 
 #ifdef UNIT_TEST
-    friend class ut_unlockarea;
+    friend class Ut_UnlockArea;
 #endif
 };
 

src/systemui/batterybusinesslogic.h

@@ -1,32 +1,32 @@
 /****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary (-ies).
-** All rights reserved.
-** Contact: Nokia Corporation ([email protected])
-**
-** This file is part of systemui.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at [email protected].
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation
-** and appearing in the file LICENSE.LGPL included in the packaging
-** of this file.
-**
-****************************************************************************/
+ **
+ ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary (-ies).
+ ** All rights reserved.
+ ** Contact: Nokia Corporation ([email protected])
+ **
+ ** This file is part of systemui.
+ **
+ ** If you have questions regarding the use of this file, please contact
+ ** Nokia at [email protected].
+ **
+ ** This library is free software; you can redistribute it and/or
+ ** modify it under the terms of the GNU Lesser General Public
+ ** License version 2.1 as published by the Free Software Foundation
+ ** and appearing in the file LICENSE.LGPL included in the packaging
+ ** of this file.
+ **
+ ****************************************************************************/
 #ifndef BATTERYBUSINESSLOGIC_H
 #define BATTERYBUSINESSLOGIC_H
 
 #include <QObject>
 #include <QTime>
 
 #ifdef HAVE_QMSYSTEM
-  #include <qmled.h>
-  #include <qmbattery.h>
-  #include <qmdevicemode.h>
-  #include <qmdisplaystate.h>
+#include <qmled.h>
+#include <qmbattery.h>
+#include <qmdevicemode.h>
+#include <qmdisplaystate.h>
 #endif
 
 class QTimer;
@@ -38,34 +38,33 @@ class MNotification;
  * not generate new notifications. The BatteryBusinessLogic will connect to this
  * signal and handle the notifications.
  */
-class LowBatteryNotifier : public QObject
-{
+class LowBatteryNotifier: public QObject {
     Q_OBJECT
 
 public:
-    LowBatteryNotifier (QObject* parent = 0);
-    virtual ~LowBatteryNotifier ();
+    LowBatteryNotifier(QObject* parent = 0);
+    virtual ~LowBatteryNotifier();
 
 public slots:
-    void showLowBatteryNotification ();
+    void showLowBatteryNotification();
 
 private slots:
 #ifdef HAVE_QMSYSTEM
     void displayStateChanged (MeeGo::QmDisplayState::DisplayState state);
 #endif
 
 signals:
-    void lowBatteryAlert ();
+    void lowBatteryAlert();
 
 private:
 #ifdef HAVE_QMSYSTEM
-    MeeGo::QmDisplayState       *m_Display;
+    MeeGo::QmDisplayState *m_Display;
 #endif
-    QTimer                      *m_Timer;
-    QTime                        m_Time;
-    bool                         m_Sleep;
-    int                          m_ActiveInterval;
-    int                          m_InactiveInterval;
+    QTimer *m_Timer;
+    QTime m_Time;
+    bool m_Sleep;
+    int m_ActiveInterval;
+    int m_InactiveInterval;
 
 #ifdef UNIT_TEST
     friend class Ut_LowBatteryNotifier;
@@ -75,13 +74,12 @@ private slots:
 /*!
  * Implements the configuration and state for the battery, the power save mode.
  */
-class BatteryBusinessLogic : public QObject
-{
+class BatteryBusinessLogic : public QObject {
     Q_OBJECT
 
 public:
-    BatteryBusinessLogic (QObject* parent = 0);
-    virtual ~BatteryBusinessLogic ();
+    BatteryBusinessLogic(QObject* parent = 0);
+    virtual ~BatteryBusinessLogic();
 
     typedef enum {
         NotificationCharging,
@@ -92,22 +90,19 @@ class BatteryBusinessLogic : public QObject
         NotificationEnteringPSM,
         NotificationExitingPSM,
         NotificationLowBattery,
-        NotificationNoEnoughPower,
+        NotificationNoEnoughPower
     } NotificationID;
 
 signals:
     /*
      * To simplify the test case we use this signal that we can catch. See 
      * NB#171466 for further details.
      */
-    void notificationSent (
-            QString      eventType,
-            QString      text,
-            QString      icon);
+    void notificationSent(QString eventType, QString text, QString icon);
 
 public slots:
-    void initBattery ();
-    void lowBatteryAlert ();
+    void initBattery();
+    void lowBatteryAlert();
 
 private slots:
 #ifdef HAVE_QMSYSTEM
@@ -116,24 +111,21 @@ private slots:
     void batteryChargerEvent (MeeGo::QmBattery::ChargerType type);
     void devicePSMStateChanged (MeeGo::QmDeviceMode::PSMState PSMState);
 #endif
-    void utiliseLED (bool activate, const QString &pattern);
+    void utiliseLED(bool activate, const QString &pattern);
 
 private:
-    void sendNotification (BatteryBusinessLogic::NotificationID id); 
-    void sendNotification (
-            const QString &eventType, 
-            const QString &text,
-            const QString &icon = QString(""));
+    void sendNotification(BatteryBusinessLogic::NotificationID id);
+    void sendNotification(const QString &eventType, const QString &text, const QString &icon = QString(""));
     void removeNotification(const QString &eventType);
-    QString chargingImageId ();
+    QString chargingImageId();
 
-    LowBatteryNotifier              *m_LowBatteryNotifier;
-    MNotification                   *m_notification;
+    LowBatteryNotifier *m_LowBatteryNotifier;
+    MNotification *m_notification;
 #ifdef HAVE_QMSYSTEM
-    MeeGo::QmBattery                *m_Battery;
-    MeeGo::QmDeviceMode             *m_DeviceMode;
-    MeeGo::QmLED                    *m_Led;
-    MeeGo::QmBattery::ChargerType    m_ChargerType;
+    MeeGo::QmBattery *m_Battery;
+    MeeGo::QmDeviceMode *m_DeviceMode;
+    MeeGo::QmLED *m_Led;
+    MeeGo::QmBattery::ChargerType m_ChargerType;
 #endif
 
 #ifdef UNIT_TEST
@@ -142,6 +134,4 @@ private slots:
 #endif
 };
 
-
 #endif
-

src/systemui/diskspacenotifier.h

@@ -20,8 +20,9 @@
 #ifndef DISKSPACENOTIFIER_H_
 #define DISKSPACENOTIFIER_H_
 
-#include <QSet>
+#include <QObject>
 #include <QMap>
+#include <QPair>
 
 class MNotification;
 

src/systemui/shutdownbusinesslogic.h

@@ -32,30 +32,28 @@ class ShutdownUI;
  * \brief Business logic for the shutdown subsystem. 
  *
  * This class connects the systemStateChanged() signal of the QmSystem library
- * and notify the user about the state changes. The class does nothing else.
- * The messages are sent, when:
+ * and notify the user about the state changes. The messages are sent, when:
  * 1) Shutdown is happening.
  * 2) Thermal emergency shutdown is happening.
  * 3) Battery low shutdown is happening.
  * 4) The shutdown is aborted because the USB is connected.
- *
  */
 class ShutdownBusinessLogic : public QObject
 {
     Q_OBJECT
 
 public:
     ShutdownBusinessLogic(QObject *parent = 0);
-    virtual ~ShutdownBusinessLogic ();
+    virtual ~ShutdownBusinessLogic();
 
-    void showUI(QString text1 = QString (""), QString text2 = QString (""), int timeout = 2000);
+    void showUI(QString text1 = QString(), QString text2 = QString(), int timeout = 2000);
 
 public slots:
 #ifdef HAVE_QMSYSTEM
     /*!
      * This function is called when the QmSystem reports a state change.
      */
-    void systemStateChanged (MeeGo::QmSystemState::StateIndication what);
+    void systemStateChanged(MeeGo::QmSystemState::StateIndication what);
 #endif
 
 private:
@@ -69,7 +67,7 @@ public slots:
     ShutdownUI *shutdownUi;
 
 #ifdef HAVE_QMSYSTEM
-    MeeGo::QmSystemState   *m_State;
+    MeeGo::QmSystemState *m_State;
 #endif
 
 #ifdef UNIT_TEST
@@ -84,12 +82,10 @@ class ShutdownBusinessLogicAdaptor : public QDBusAbstractAdaptor
     Q_CLASSINFO("D-Bus Interface", "com.nokia.systemui.shutdownui")
 
 public:
-    ShutdownBusinessLogicAdaptor (
-            QObject                  *parent,
-            ShutdownBusinessLogic    *logic);
+    ShutdownBusinessLogicAdaptor(QObject *parent, ShutdownBusinessLogic *logic);
 
 public slots:
-    Q_NOREPLY void showScreen (QString text1, QString text2, int timeout);
+    Q_NOREPLY void showScreen(QString text1, QString text2, int timeout);
 
 private:
     ShutdownBusinessLogic *shutdownBusinessLogic;