[ #13801 ] Fix indentation, beautify the code, add comment

kde/src/AccountWizard.cpp

@@ -2,6 +2,7 @@
  *   Copyright (C) 2009-2012 by Savoir-Faire Linux                         *
  *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>         *
  *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
+ *              ^^ Refuse any liability for this code                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *

kde/src/AccountWizard.h

@@ -36,13 +36,10 @@ class AccountWizard : public QWizard
 Q_OBJECT
 
 public:
-
    enum { Page_Intro, Page_AutoMan, Page_Type, Page_Email, Page_SIPForm, Page_IAXForm, Page_Stun, Page_Conclusion };
-
    AccountWizard(QWidget * parent = 0);
    ~AccountWizard();
    void accept();
-
 };
 
 /***************************************************************************

kde/src/CallView.cpp

@@ -69,7 +69,6 @@ CallTreeItemDelegate(CallView* widget)
 
          if (index.parent().isValid() && !index.parent().child(index.row()+1,0).isValid())
             sh.rheight() += 15;
-            
       }
 
       return sh;
@@ -113,7 +112,6 @@ CallTreeItemDelegate(CallView* widget)
          for (int i =0;i < childCount;i++) {
             r.setHeight(r.height() + sizeHint(option,index).height());
          }
-//          qDebug() << "\n\nFINAL SIZE" << r;
       }
 
       r.setTop(r.top() + m_ConferenceDrawer.leftMargin());
@@ -180,13 +178,13 @@ CallTreeItemDelegate(CallView* widget)
             widget->setMaximumSize((m_tree->viewport()->width() - m_ConferenceDrawer.leftMargin() - m_ConferenceDrawer.rightMargin())-m_ConferenceDrawer.leftMargin(),max);
          }
       }
-      
+
       if (index.parent().isValid() && !index.parent().child(index.row()+1,0).isValid()) {
          m_ConferenceDrawer.drawBoxBottom(index, 0, option, painter);
       }
     }
 
-    
+
 private:
    CallView*      m_tree;
    ConferenceBox  m_ConferenceDrawer;

kde/src/CallView.h

@@ -18,10 +18,13 @@
 #ifndef CALL_VIEW
 #define CALL_VIEW
 
+//Qt
 #include <QtGui/QTreeWidget>
 #include <QtGui/QPainter>
 #include <QtGui/QStyledItemDelegate>
 #include <QtCore/QTimer>
+
+//SFLPhone
 #include "lib/CallModel.h"
 
 //Qt

kde/src/SFLPhone.cpp

@@ -252,35 +252,37 @@ void SFLPhone::setupActions()
    action_configureSflPhone = KStandardAction::preferences(m_pView, SLOT(configureSflPhone()), this);
    action_configureSflPhone->setText(i18n("Configure SFLphone"));
 
-   action_displayDialpad = new KAction(KIcon(QIcon(ICON_DISPLAY_DIALPAD)), i18n("Display dialpad"), this);
+   action_displayDialpad        = new KAction(KIcon(QIcon(ICON_DISPLAY_DIALPAD)), i18n("Display dialpad")                 , this);
+   action_displayMessageBox     = new KAction(KIcon("mail-message-new"), i18n("Display text message box")                 , this);
+   action_displayVolumeControls = new KAction(KIcon(QIcon(ICON_DISPLAY_VOLUME_CONSTROLS)), i18n("Display volume controls"), this);
+   action_pastenumber           = new KAction(KIcon("edit-paste"), i18n("Paste")                                          , this);
+   action_showContactDock       = new KAction(KIcon("edit-find-user")   , i18n("Display Contact")                         , this);
+   action_showHistoryDock       = new KAction(KIcon("view-history")     , i18n("Display history")                         , this);
+   action_showBookmarkDock      = new KAction(KIcon("bookmark-new-list"), i18n("Display bookmark")                        , this);
+   action_accountCreationWizard = new KAction(i18n("Account creation wizard")                                             , this);
+
+
    action_displayDialpad->setCheckable( true );
    action_displayDialpad->setChecked  ( ConfigurationSkeleton::displayDialpad() );
    action_configureSflPhone->setText(i18n("Configure SFLphone"));
 
-   action_displayMessageBox = new KAction(KIcon("mail-message-new"), i18n("Display text message box"), this);
    action_displayMessageBox->setCheckable( true );
    action_displayMessageBox->setChecked  ( ConfigurationSkeleton::displayMessageBox() );
 
-   action_displayVolumeControls = new KAction(KIcon(QIcon(ICON_DISPLAY_VOLUME_CONSTROLS)), i18n("Display volume controls"), this);
    action_displayVolumeControls->setCheckable( true );
    action_displayVolumeControls->setChecked  ( ConfigurationSkeleton::displayVolume() );
 
-   action_pastenumber = new KAction(KIcon("edit-paste"), i18n("Paste"), this);
    action_pastenumber->setShortcut ( Qt::CTRL + Qt::Key_V );
 
-   action_showContactDock  = new KAction(KIcon("edit-find-user")   , i18n("Display Contact") , this);
    action_showContactDock->setCheckable( true );
    action_showContactDock->setChecked(ConfigurationSkeleton::displayContactDock());
 
-   action_showHistoryDock  = new KAction(KIcon("view-history")     , i18n("Display history") , this);
    action_showHistoryDock->setCheckable( true );
    action_showHistoryDock->setChecked(ConfigurationSkeleton::displayHistoryDock());
 
-   action_showBookmarkDock = new KAction(KIcon("bookmark-new-list"), i18n("Display bookmark"), this);
    action_showBookmarkDock->setCheckable( true );
    action_showBookmarkDock->setChecked(ConfigurationSkeleton::displayBookmarkDock());
 
-   action_accountCreationWizard = new KAction(i18n("Account creation wizard"), this);
 
 
    action_configureShortcut = new KAction(KIcon(KIcon("configure-shortcuts")), i18n("Configure Shortcut"), this);

kde/src/SFLPhoneAccessibility.cpp

@@ -28,18 +28,18 @@ SFLPhoneAccessibility* SFLPhoneAccessibility::m_pInstance=nullptr;
 SFLPhoneAccessibility::SFLPhoneAccessibility() : QObject(0),QList<KAction*>()
 {
    KAction* action = new KAction(0);
-   action->setObjectName("listCall");
-   action->setShortcut( Qt::CTRL + Qt::Key_L );
-   action->setText("List all current calls");
-   action->setIcon(KIcon("text-speak"));
+   action->setObjectName ( "listCall"               );
+   action->setShortcut   ( Qt::CTRL + Qt::Key_L     );
+   action->setText       ( "List all current calls" );
+   action->setIcon       ( KIcon("text-speak")      );
    *this << action;
    connect(action,SIGNAL(triggered(bool)),this,SLOT(listCall()));
 
    action = new KAction(0);
-   action->setObjectName("currentCallDetails");
-   action->setShortcut( Qt::CTRL + Qt::Key_I );
-   action->setText("Get current call details");
-   action->setIcon(KIcon("text-speak"));
+   action->setObjectName ( "currentCallDetails"       );
+   action->setShortcut   ( Qt::CTRL + Qt::Key_I       );
+   action->setText       ( "Get current call details" );
+   action->setIcon       ( KIcon("text-speak")        );
    *this << action;
    connect(action,SIGNAL(triggered(bool)),this,SLOT(currentCallDetails()));
 }
@@ -92,7 +92,7 @@ void SFLPhoneAccessibility::currentCallDetails()
             toSay += i18n(", the peer phone number is %1 ",numberToDigit(call->getPeerPhoneNumber())    );
          else if (!call->getCallNumber().isEmpty())
             toSay += i18n(", the phone number is %1 ",numberToDigit(call->getCallNumber()));
-         
+
          int nSec = QDateTime::fromTime_t(call->getStartTimeStamp().toInt()).time().secsTo( QTime::currentTime() );
          if (nSec>0)
             toSay += i18n(" and you have been talking since %1 seconds",nSec );

kde/src/SFLPhoneAccessibility.h

@@ -26,10 +26,14 @@ class SFLPhoneAccessibility : public QObject, public QList<KAction*>
 {
    Q_OBJECT
 public:
+   //Singleton
    static SFLPhoneAccessibility* getInstance();
 private:
+   //Constructor
    SFLPhoneAccessibility();
    QString numberToDigit(QString number);
+
+   //Static attributes
    static SFLPhoneAccessibility* m_pInstance;
 
 public slots:

kde/src/SFLPhoneView.cpp

@@ -414,15 +414,18 @@ void SFLPhoneView::updateWindowCallState()
             actionTexts     [ SFLPhone::Refuse   ] = ACTION_LABEL_REFUSE         ;
             m_pMessageBoxW->setVisible(false || IM_ACTIVE)   ;
             break;
+
          case CALL_STATE_RINGING:
             enabledActions  [ SFLPhone::Hold     ] = false                       ;
             enabledActions  [ SFLPhone::Transfer ] = false                       ;
             m_pMessageBoxW->setVisible(false)                                    ;
             break;
+
          case CALL_STATE_CURRENT:
             buttonIconFiles [ SFLPhone::Record   ] = ICON_REC_DEL_ON             ;
             m_pMessageBoxW->setVisible((true && ConfigurationSkeleton::displayMessageBox()) || IM_ACTIVE);
             break;
+
          case CALL_STATE_DIALING:
             enabledActions  [ SFLPhone::Hold     ] = false                       ;
             enabledActions  [ SFLPhone::Transfer ] = false                       ;
@@ -431,11 +434,13 @@ void SFLPhoneView::updateWindowCallState()
             buttonIconFiles [ SFLPhone::Accept   ] = ICON_ACCEPT                 ;
             m_pMessageBoxW->setVisible(false)                                    ;
             break;
+
          case CALL_STATE_HOLD:
             buttonIconFiles [ SFLPhone::Hold     ] = ICON_UNHOLD                 ;
             actionTexts     [ SFLPhone::Hold     ] = ACTION_LABEL_UNHOLD         ;
             m_pMessageBoxW->setVisible(false)                                    ;
             break;
+
          case CALL_STATE_FAILURE:
             enabledActions  [ SFLPhone::Accept   ] = false                       ;
             enabledActions  [ SFLPhone::Hold     ] = false                       ;
@@ -443,6 +448,7 @@ void SFLPhoneView::updateWindowCallState()
             enabledActions  [ SFLPhone::Record   ] = false                       ;
             m_pMessageBoxW->setVisible(false)                                    ;
             break;
+
          case CALL_STATE_BUSY:
             enabledActions  [ SFLPhone::Accept   ] = false                       ;
             enabledActions  [ SFLPhone::Hold     ] = false                       ;
@@ -450,6 +456,7 @@ void SFLPhoneView::updateWindowCallState()
             enabledActions  [ SFLPhone::Record   ] = false                       ;
             m_pMessageBoxW->setVisible(false)                                    ;
             break;
+
          case CALL_STATE_TRANSFERRED:
             buttonIconFiles [ SFLPhone::Accept   ] = ICON_EXEC_TRANSF            ;
             actionTexts     [ SFLPhone::Transfer ] = ACTION_LABEL_GIVE_UP_TRANSF ;
@@ -457,6 +464,7 @@ void SFLPhoneView::updateWindowCallState()
             m_pMessageBoxW->setVisible(false || IM_ACTIVE)                       ;
             transfer = true;
             break;
+
          case CALL_STATE_TRANSF_HOLD:
             buttonIconFiles [ SFLPhone::Accept   ] = ICON_EXEC_TRANSF            ;
             buttonIconFiles [ SFLPhone::Hold     ] = ICON_UNHOLD                 ;
@@ -465,25 +473,31 @@ void SFLPhoneView::updateWindowCallState()
             m_pMessageBoxW->setVisible(false)                                    ;
             transfer = true;
             break;
+
          case CALL_STATE_OVER:
             kDebug() << "Error : Reached CALL_STATE_OVER with call "  << call->getCallId() << "!";
             m_pMessageBoxW->setVisible(false)                                    ;
             break;
+
          case CALL_STATE_ERROR:
             kDebug() << "Error : Reached CALL_STATE_ERROR with call " << call->getCallId() << "!";
             m_pMessageBoxW->setVisible(false)                                    ;
             break;
+
          case CALL_STATE_CONFERENCE:
             enabledActions  [ SFLPhone::Transfer ] = false                       ;
             m_pMessageBoxW->setVisible(false || IM_ACTIVE)                       ;
             break;
+
          case CALL_STATE_CONFERENCE_HOLD:
             enabledActions  [ SFLPhone::Transfer ] = false                       ;
             m_pMessageBoxW->setVisible(false)                                    ;
             break;
+
          default: 
             kDebug() << "Error : Reached unexisting state for call "  << call->getCallId() << "(" << call->toHumanStateName() << "!";
             break;
+
       }
    }
 

kde/src/main.cpp

@@ -82,7 +82,7 @@ int main(int argc, char **argv)
       //configuration dbus
       TreeWidgetCallModel::init();
 
-      
+
       SFLPhone* sflphoneWindow_ = new SFLPhone();
       if( ! sflphoneWindow_->initialize() ) {
          exit(1);
@@ -96,13 +96,13 @@ int main(int argc, char **argv)
          sflphoneWindow_->show();
       else
          sflphoneWindow_->hide();
-      
+
 
       int retVal = app->exec();
 
       delete sflphoneWindow_;
       ConfigurationSkeleton::self()->writeConfig();
-      
+
       delete app;
       return retVal;
    }

kde/src/widgets/AcceleratedVideoWidget.cpp

 /***************************************************************************
  *   Copyright (C) 2009-2012 by Savoir-Faire Linux                         *
  *   Author : Emmanuel Lepage Valle <emmanuel.lepage@savoirfairelinux.com >*
+ *            Nokia                                                        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -26,9 +27,9 @@
 #include <QtGui/QImage>
  #include <QtCore/QPropertyAnimation>
 
-static const qreal FACE_SIZE = 0.4;
+static const qreal FACE_SIZE    = 0.4;
 
-static const qreal speeds[] = { 1.8f, 2.4f, 3.6f };
+static const qreal speeds[]     = { 1.8f, 2.4f, 3.6f };
 static const qreal amplitudes[] = { 2.0f, 2.5f, 3.0f };
 
 static inline void qSetColor(float colorVec[], QColor c)

kde/src/widgets/AcceleratedVideoWidget.h

 /***************************************************************************
  *   Copyright (C) 2009-2012 by Savoir-Faire Linux                         *
  *   Author : Emmanuel Lepage Valle <emmanuel.lepage@savoirfairelinux.com >*
+ *            Nokia                                                        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *

kde/src/widgets/BookmarkDock.cpp

@@ -69,26 +69,26 @@ BookmarkDock::BookmarkDock(QWidget* parent) : QDockWidget(parent)
    setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
    setMinimumSize(250,0);
 
-   m_pFilterLE   = new KLineEdit(this);
-   m_pSplitter   = new QSplitter(Qt::Vertical,this);
-   m_pItemView   = new CategorizedTreeWidget(this);
-   m_pMostUsedCK = new QCheckBox(this);
+   m_pFilterLE             = new KLineEdit            ( this              );
+   m_pSplitter             = new QSplitter            ( Qt::Vertical,this );
+   m_pItemView             = new CategorizedTreeWidget( this              );
+   m_pMostUsedCK           = new QCheckBox            ( this              );
+   QWidget* mainWidget     = new QWidget              ( this              );
+   QVBoxLayout* mainLayout = new QVBoxLayout          ( mainWidget        );
 
    m_pFilterLE->setPlaceholderText(i18n("Filter"));
 
    m_pMostUsedCK->setChecked(ConfigurationSkeleton::displayContactCallHistory());
-   
-   QWidget* mainWidget = new QWidget(this);
+
    setWidget(mainWidget);
 
    m_pMostUsedCK->setText(i18n("Show most called contacts"));
 
-   QVBoxLayout* mainLayout = new QVBoxLayout(mainWidget);
 
-   mainLayout->addWidget(m_pMostUsedCK);
-   mainLayout->addWidget(m_pSplitter);
-   m_pSplitter->addWidget(m_pItemView);
-   mainLayout->addWidget(m_pFilterLE);
+   mainLayout->addWidget ( m_pMostUsedCK );
+   mainLayout->addWidget ( m_pSplitter   );
+   m_pSplitter->addWidget( m_pItemView   );
+   mainLayout->addWidget ( m_pFilterLE   );
 
    m_pSplitter->setChildrenCollapsible(true);
    m_pSplitter->setStretchFactor(0,7);

kde/src/widgets/CallTreeItem.cpp

@@ -194,12 +194,14 @@ void CallTreeItem::setCall(Call *call)
          baseColor.setRed  (baseColor.red()  + (textColor.red()  -baseColor.red())  *0.6);
          baseColor.setGreen(baseColor.green()+ (textColor.green()-baseColor.green())*0.6);
 
-         m_pHistoryPeerL = new QLabel(i18n("<b>Conference</b>"),this);
-         m_pHistoryPeerL->setStyleSheet("color:"+baseColor.name());
-         m_pIconL = new QLabel(" ",this);
+         m_pHistoryPeerL         = new QLabel( i18n("<b>Conference</b>"),this );
+         m_pIconL                = new QLabel( " ",this                       );
          QHBoxLayout* mainLayout = new QHBoxLayout();
-         mainLayout->addWidget(m_pIconL);
-         mainLayout->addWidget(m_pHistoryPeerL);
+         m_pHistoryPeerL->setStyleSheet("color:"+baseColor.name());
+
+         mainLayout->addWidget( m_pIconL        );
+         mainLayout->addWidget( m_pHistoryPeerL );
+
          setLayout(mainLayout);
          m_Init = true;
       }
@@ -213,35 +215,34 @@ void CallTreeItem::setCall(Call *call)
    m_pTransferNumberL  = new QLabel(" ");
    m_pElapsedL         = new QLabel(" ");
    QSpacerItem* verticalSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding);
-   
+
    m_pTransferPrefixL->setVisible(false);
    m_pTransferNumberL->setVisible(false);
-   
+
    QHBoxLayout* mainLayout = new QHBoxLayout();
    mainLayout->setContentsMargins ( 3, 1, 2, 1);
-   
-   
+
    m_pBtnConf = new TranslucentButtons(this);
    m_pBtnConf->setVisible(false);
    m_pBtnConf->setParent(this);
    m_pBtnConf->setText(i18n("Conference"));
    m_pBtnConf->setPixmap(new QImage(KStandardDirs::locate("data","sflphone-client-kde/confBlackWhite.png")));
    connect(m_pBtnConf,SIGNAL(dataDropped(QMimeData*)),this,SLOT(conversationEvent(QMimeData*)));
-   
+
    m_pBtnTrans = new TranslucentButtons(this);
    m_pBtnTrans->setText(i18n("Transfer"));
    m_pBtnTrans->setVisible(false);
    m_pBtnTrans->setPixmap(new QImage(KStandardDirs::locate("data","sflphone-client-kde/transferarraw.png")));
    connect(m_pBtnTrans,SIGNAL(dataDropped(QMimeData*)),this,SLOT(transferEvent(QMimeData*)));
-   
+
    m_pElapsedL->setStyleSheet("margin-right:5px;");