code cleanup in multiple files

Last changes were merged quickly without strict code-review as it was needed to integrate them promptly. Related modifications: * callwidget.cpp: Removed unnecessary line feed * callwidget.{cpp,ui}: Renamed “contactRequestView” to “contactRequestPage” for consistency * contactrequestwidget.cpp: Refactoring of a too-long line * sendcontactrequestwidget.{cpp,ui}: Better placeholders Moreover, contactrequestwidget.{cpp,ui} were missing the GPL header and copyrights' years are now updated to 2017 in every files. Change-Id: Id52f340fc62340df6cf5bda8d782fefc732beabe

code cleanup in multiple files
Last changes were merged quickly without strict code-review as it was needed to integrate them promptly. Related modifications: * callwidget.cpp: Removed unnecessary line feed * callwidget.{cpp,ui}: Renamed “contactRequestView” to “contactRequestPage” for consistency * contactrequestwidget.cpp: Refactoring of a too-long line * sendcontactrequestwidget.{cpp,ui}: Better placeholders Moreover, contactrequestwidget.{cpp,ui} were missing the GPL header and copyrights' years are now updated to 2017 in every files. Change-Id: Id52f340fc62340df6cf5bda8d782fefc732beabe
2fde81db · Anthony Léonard · 25385176 · 2fde81db · 2fde81db · 2fde81db
Commit 2fde81db authored Apr 17, 2017 by Anthony Léonard
78 changed files
--- a/aboutdialog.cpp
+++ b/aboutdialog.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/aboutdialog.h
+++ b/aboutdialog.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/accountdetails.cpp
+++ b/accountdetails.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/accountdetails.h
+++ b/accountdetails.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/accountserializationadapter.cpp
+++ b/accountserializationadapter.cpp
 /***************************************************************************
- *   Copyright (C) 2015-2016 by Savoir-faire Linux                              *
+ *   Copyright (C) 2015-2017 by Savoir-faire Linux                              *
 *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *

--- a/accountserializationadapter.h
+++ b/accountserializationadapter.h
 /***************************************************************************
- *   Copyright (C) 2015-2016 by Savoir-faire Linux                              *
+ *   Copyright (C) 2015-2017 by Savoir-faire Linux                              *
 *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *

--- a/accountstatedelegate.cpp
+++ b/accountstatedelegate.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/accountstatedelegate.h
+++ b/accountstatedelegate.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/callutilsdialog.cpp
+++ b/callutilsdialog.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/callutilsdialog.h
+++ b/callutilsdialog.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/callwidget.cpp
+++ b/callwidget.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>          *
 * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com>          *
@@ -576,7 +576,7 @@ CallWidget::contactReqListCurrentChanged(const QModelIndex &currentIdx, const QM

    ContactRequest* cr = currentIdx.data((int)Ring::Role::Object).value<ContactRequest*>();
    ui->contactRequestWidget->setCurrentContactRequest(cr);
-    ui->stackedWidget->setCurrentWidget(ui->contactRequestView);
+    ui->stackedWidget->setCurrentWidget(ui->contactRequestPage);
 }

 void
@@ -856,7 +856,6 @@ CallWidget::contactLineEdit_registeredNameFound(Account* account,NameDirectory::
    {
        case NameDirectory::LookupStatus::SUCCESS:
        {
-
            uri = URI("ring:" + address);
            qDebug() << "contactLineEdit username to search: " << username_to_lookup;
            qDebug() << uri;

--- a/callwidget.h
+++ b/callwidget.h
 /**************************************************************************
-* Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+* Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>          *
 * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com>          *

--- a/callwidget.ui
+++ b/callwidget.ui
@@ -1663,7 +1663,7 @@
                </item>
               </layout>
              </widget>
-              <widget class="QWidget" name="contactRequestView">
+              <widget class="QWidget" name="contactRequestPage">
               <layout class="QVBoxLayout" name="verticalLayout_8">
                <property name="leftMargin">
                 <number>5</number>

--- a/combar.cpp
+++ b/combar.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com>              *
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/combar.h
+++ b/combar.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com>              *
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/configurationwidget.cpp
+++ b/configurationwidget.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>          *
 * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com>          *

--- a/configurationwidget.h
+++ b/configurationwidget.h
 /**************************************************************************
-* Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+* Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>          *
 * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com>          *

--- a/contactmethodpicker.cpp
+++ b/contactmethodpicker.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/contactmethodpicker.h
+++ b/contactmethodpicker.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/contactpicker.cpp
+++ b/contactpicker.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/contactpicker.h
+++ b/contactpicker.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/contactrequestwidget.cpp
+++ b/contactrequestwidget.cpp
+/***************************************************************************
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
+ * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>          *
+ * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com>          *
+ *                                                                         *
+ * 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    *
+ * the Free Software Foundation; either version 3 of the License, or       *
+ * (at your option) any later version.                                     *
+ *                                                                         *
+ * This program is distributed in the hope that it will be useful,         *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of          *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           *
+ * GNU General Public License for more details.                            *
+ *                                                                         *
+ * You should have received a copy of the GNU General Public License       *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
+ **************************************************************************/
+
 #include "contactrequestwidget.h"
 #include "ui_contactrequestwidget.h"

@@ -18,7 +37,8 @@ ContactRequestWidget::setCurrentContactRequest(ContactRequest *cr)
 {
    cr_ = cr;
    if (cr_ != nullptr) {
-        ui->remoteIdLabel->setText(QString("Current ContactRequest: %1").arg(QString::fromLocal8Bit(cr_->roleData(Qt::DisplayRole).value<QByteArray>())));
+        QString remoteId = QString::fromLocal8Bit(cr_->roleData(Qt::DisplayRole).value<QByteArray>());
+        ui->remoteIdLabel->setText(QString("Current ContactRequest: %1").arg(remoteId));
    }
 }


--- a/contactrequestwidget.h
+++ b/contactrequestwidget.h
+/***************************************************************************
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
+ * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>          *
+ * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com>          *
+ *                                                                         *
+ * 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    *
+ * the Free Software Foundation; either version 3 of the License, or       *
+ * (at your option) any later version.                                     *
+ *                                                                         *
+ * This program is distributed in the hope that it will be useful,         *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of          *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           *
+ * GNU General Public License for more details.                            *
+ *                                                                         *
+ * You should have received a copy of the GNU General Public License       *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
+ **************************************************************************/
+
 #ifndef CONTACTREQUESTWIDGET_H
 #define CONTACTREQUESTWIDGET_H


--- a/currentaccountwidget.cpp
+++ b/currentaccountwidget.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>          *
 * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com>          *
 *                                                                         *

--- a/currentaccountwidget.h
+++ b/currentaccountwidget.h
 /**************************************************************************
-* Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+* Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>          *
 * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com>          *
 *                                                                         *

--- a/globalsystemtray.cpp
+++ b/globalsystemtray.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/globalsystemtray.h
+++ b/globalsystemtray.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/idlabel.cpp
+++ b/idlabel.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com>              *
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/idlabel.h
+++ b/idlabel.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com>              *
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/imdelegate.cpp
+++ b/imdelegate.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/imdelegate.h
+++ b/imdelegate.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/instantmessagingwidget.cpp
+++ b/instantmessagingwidget.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/instantmessagingwidget.h
+++ b/instantmessagingwidget.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/main.cpp
+++ b/main.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/mainwindow.h
+++ b/mainwindow.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/navstack.cpp
+++ b/navstack.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/navstack.h
+++ b/navstack.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/navwidget.cpp
+++ b/navwidget.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/navwidget.h
+++ b/navwidget.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/pathpassworddialog.cpp
+++ b/pathpassworddialog.cpp
 /***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/pathpassworddialog.h
+++ b/pathpassworddialog.h
 /***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/photoboothdialog.cpp
+++ b/photoboothdialog.cpp
 /***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/photoboothdialog.h
+++ b/photoboothdialog.h
 /***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/pixbufmanipulator.cpp
+++ b/pixbufmanipulator.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>          *
 * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com>          *

--- a/pixbufmanipulator.h
+++ b/pixbufmanipulator.h
 /***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/qualitydialog.cpp
+++ b/qualitydialog.cpp
 /***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 * Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>  *
 *                                                                         *

--- a/qualitydialog.h
+++ b/qualitydialog.h
 /***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/ringbutton.cpp
+++ b/ringbutton.cpp
 /***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2017 by Savoir-faire Linux                                *
 * Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com>              *
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/ringbutton.h
+++ b/ringbutton.h
 /***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2017 by Savoir-faire Linux                                *
 * Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com>              *
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/ringcontactlineedit.cpp
+++ b/ringcontactlineedit.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com>              *
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/ringcontactlineedit.h
+++ b/ringcontactlineedit.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com>              *
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/ringthemeutils.h
+++ b/ringthemeutils.h
 /***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/selectareadialog.cpp
+++ b/selectareadialog.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/selectareadialog.h
+++ b/selectareadialog.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/sendcontactrequestwidget.cpp
+++ b/sendcontactrequestwidget.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>          *
 * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com>          *
 *                                                                         *
@@ -32,8 +32,7 @@ SendContactRequestWidget::SendContactRequestWidget(QWidget *parent) :
    ui(new Ui::SendContactRequestWidget)
 {
    ui->setupUi(this);
-    ui->contactRequestInfo->setText("Contact Request Bruh!!!!\n");
-    ui->peerContactID->setText("ContactID\n");
+    ui->peerContactID->setText("ContactID"); // TODO: Display RingID/Username
 }

 SendContactRequestWidget::~SendContactRequestWidget()

--- a/sendcontactrequestwidget.h
+++ b/sendcontactrequestwidget.h
 /**************************************************************************
-* Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+* Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>          *
 * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com>          *
 *                                                                         *

--- a/sendcontactrequestwidget.ui
+++ b/sendcontactrequestwidget.ui
@@ -23,7 +23,7 @@
      </size>
     </property>
     <property name="text">
-      <string/>
+      <string>ContactID</string>
     </property>
    </widget>
   </item>
@@ -36,7 +36,7 @@
      </size>
     </property>
     <property name="text">
-      <string/>
+      <string>TODO: Explain the purpose of a contact request</string>
     </property>
    </widget>
   </item>

--- a/settingskey.h
+++ b/settingskey.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/shmclient.cpp
+++ b/shmclient.cpp
 /***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/shmclient.h
+++ b/shmclient.h
 /***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/smartlist.cpp
+++ b/smartlist.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com>              *
 * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>          *
 * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com>          *

--- a/smartlist.h
+++ b/smartlist.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com>              *
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/smartlistdelegate.cpp
+++ b/smartlistdelegate.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/smartlistdelegate.h
+++ b/smartlistdelegate.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/stylesheet.css
+++ b/stylesheet.css
@@ -288,7 +288,7 @@ QListView#contactView{
    background: transparent;
 }

-QWidget#messagingPage, QWidget#contactRequestView{
+QWidget#messagingPage, QWidget#contactRequestPage{
    background: rgb(242, 242, 242);
 }


--- a/utils.cpp
+++ b/utils.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/utils.h
+++ b/utils.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/videooverlay.cpp
+++ b/videooverlay.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/videooverlay.h
+++ b/videooverlay.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/videoview.cpp
+++ b/videoview.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/videoview.h
+++ b/videoview.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/videowidget.cpp
+++ b/videowidget.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/videowidget.h
+++ b/videowidget.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/windowscontactbackend.cpp
+++ b/windowscontactbackend.cpp
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/windowscontactbackend.h
+++ b/windowscontactbackend.h
 /***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                                *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                                *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *

--- a/wizarddialog.cpp
+++ b/wizarddialog.cpp
 /**************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>          *
 * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com>          *

--- a/wizarddialog.h
+++ b/wizarddialog.h
 /**************************************************************************
-* Copyright (C) 2015-2016 by Savoir-faire Linux                           *
+* Copyright (C) 2015-2017 by Savoir-faire Linux                           *
 * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
 * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com>          *
 * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com>          *