project: apply msc compliance
Change-Id: I32718d19f1f28e41aa6bf9d631bf461af036c18b
Reviewed-by: Sebastien Blin <sebastien.blin@savoirfairelinux.com>
diff --git a/accountdetails.cpp b/accountdetails.cpp
index a536dd8..fed1d3a 100644
--- a/accountdetails.cpp
+++ b/accountdetails.cpp
@@ -30,6 +30,8 @@
#include "ciphermodel.h"
#include "ringtonemodel.h"
+#include <ciso646>
+
AccountDetails::AccountDetails(QWidget *parent) :
QWidget(parent),
ui(new Ui::AccountDetails),
@@ -155,7 +157,7 @@
if (not currentAccount_->tlsPrivateKey().isEmpty())
ui->lrcfg_tlsPrivateKeyCertificate->setText(currentAccount_->tlsPrivateKey());
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) && !defined(_MSC_VER)
certMap_[ui->lrcfg_tlsCaListCertificate->objectName()] = ¤tAccount_->setTlsCaListCertificate;
certMap_[ui->lrcfg_tlsCertificate->objectName()] = ¤tAccount_->setTlsCertificate;
certMap_[ui->lrcfg_tlsPrivateKeyCertificate->objectName()] = ¤tAccount_->setTlsPrivateKey;
diff --git a/bannedcontactswidget.cpp b/bannedcontactswidget.cpp
index 5899d84..eeaaf24 100644
--- a/bannedcontactswidget.cpp
+++ b/bannedcontactswidget.cpp
@@ -28,6 +28,7 @@
#include "account.h"
#include "bannedcontactmodel.h"
+#include <ciso646>
/* Widget */
diff --git a/callutilsdialog.h b/callutilsdialog.h
index 5da6643..0ab4491 100644
--- a/callutilsdialog.h
+++ b/callutilsdialog.h
@@ -26,6 +26,8 @@
#include "smartlistdelegate.h"
+#include <ciso646>
+
class QPropertyAnimation;
class QGraphicsOpacityEffect;
diff --git a/contactrequestitemdelegate.cpp b/contactrequestitemdelegate.cpp
index 7e387ee..bca3d93 100644
--- a/contactrequestitemdelegate.cpp
+++ b/contactrequestitemdelegate.cpp
@@ -28,6 +28,8 @@
#include <QPainter>
#include <QApplication>
+#include <ciso646>
+
ContactRequestItemDelegate::ContactRequestItemDelegate(QObject* parent) :
QItemDelegate(parent)
{}
diff --git a/contactrequestlistwidget.cpp b/contactrequestlistwidget.cpp
index 859978e..1e74d39 100644
--- a/contactrequestlistwidget.cpp
+++ b/contactrequestlistwidget.cpp
@@ -30,6 +30,8 @@
#include <QAbstractItemView>
#include <QEvent>
+#include <ciso646>
+
ContactRequestListWidget::ContactRequestListWidget(QWidget *parent) :
QTreeView(parent)
{
diff --git a/deleteaccountdialog.h b/deleteaccountdialog.h
index c247cc9..d06163c 100644
--- a/deleteaccountdialog.h
+++ b/deleteaccountdialog.h
@@ -35,7 +35,7 @@
~DeleteAccountDialog();
signals:
- deleteAcceptClicked();
+ void deleteAcceptClicked();
private slots:
void on_deleteCancelBtn_clicked();
diff --git a/main.cpp b/main.cpp
index 2b3e9c2..019780c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -33,11 +33,16 @@
#include <QLibraryInfo>
#include <QFontDatabase>
+#include <ciso646>
#ifdef Q_OS_WIN
#include <windows.h>
#endif
+#ifdef _MSC_VER
+#include <gnutls/gnutls.h>
+#endif
+
#ifdef URI_PROTOCOL
#include "shmclient.h"
#endif
@@ -159,6 +164,10 @@
QFontDatabase::addApplicationFont(":/images/FontAwesome.otf");
+#ifdef _MSC_VER
+ gnutls_global_init();
+#endif
+
if (not MainWindow::instance().init()) {
return 1;
}
diff --git a/mainwindow.cpp b/mainwindow.cpp
index ccfc5b7..531d9c3 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -42,9 +42,9 @@
ui(new Ui::MainWindow)
{
ui->setupUi(this);
- connect(ui->callwidget, CallWidget::NavigationRequested,
+ connect(ui->callwidget, &CallWidget::NavigationRequested,
[this](ScreenEnum scr){Utils::slidePage(ui->navStack, ui->navStack->widget(scr));});
- connect(ui->configurationwidget, ConfigurationWidget::NavigationRequested,
+ connect(ui->configurationwidget, &ConfigurationWidget::NavigationRequested,
[this](ScreenEnum scr){Utils::slidePage(ui->navStack, ui->navStack->widget(scr));});
QIcon icon(":images/ring.png");
diff --git a/qualitydialog.cpp b/qualitydialog.cpp
index 9be1531..3df231e 100644
--- a/qualitydialog.cpp
+++ b/qualitydialog.cpp
@@ -29,6 +29,8 @@
#include "account.h"
#include "codecmodel.h"
+#include <ciso646>
+
QualityDialog::QualityDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::QualityDialog),
diff --git a/selectareadialog.cpp b/selectareadialog.cpp
index f3dd322..c983bde 100644
--- a/selectareadialog.cpp
+++ b/selectareadialog.cpp
@@ -20,6 +20,7 @@
#ifdef Q_OS_WIN
#define WIN32_LEAN_AND_MEAN 1
+#define NOMINMAX
#include <windows.h>
#include <winuser.h>
diff --git a/smartlist.cpp b/smartlist.cpp
index cda019a..21db00e 100644
--- a/smartlist.cpp
+++ b/smartlist.cpp
@@ -27,6 +27,8 @@
#include "combar.h"
#include "smartlist.h"
+#include <ciso646>
+
SmartList::SmartList(QWidget *parent) :
QTreeView(parent)
{
diff --git a/smartlistdelegate.cpp b/smartlistdelegate.cpp
index 4c164e0..97e9d94 100644
--- a/smartlistdelegate.cpp
+++ b/smartlistdelegate.cpp
@@ -32,9 +32,10 @@
// Client
#include "combar.h"
-
#include "ringthemeutils.h"
+#include <ciso646>
+
SmartListDelegate::SmartListDelegate(QObject* parent) :
QItemDelegate(parent)
{
diff --git a/utils.h b/utils.h
index f6f9686..cd21780 100644
--- a/utils.h
+++ b/utils.h
@@ -23,6 +23,7 @@
#ifdef Q_OS_WIN
#include <windows.h>
+#include <ciso646>
#else //LINUX
#define LPCWSTR char*
#endif
diff --git a/wizarddialog.cpp b/wizarddialog.cpp
index a004337..7fedb37 100644
--- a/wizarddialog.cpp
+++ b/wizarddialog.cpp
@@ -77,8 +77,8 @@
this, SLOT(handle_registeredNameFound(Account*,NameDirectory::LookupStatus,const QString&,const QString&)));
nameLookupTimer_.setSingleShot(true);
- connect(&nameLookupTimer_, QTimer::timeout, this, WizardDialog::timeoutNameLookupTimer);
- connect(ui->photoBooth, &PhotoboothWidget::photoTaken, this, WizardDialog::on_photoTaken);
+ connect(&nameLookupTimer_, &QTimer::timeout, this, &WizardDialog::timeoutNameLookupTimer);
+ connect(ui->photoBooth, &PhotoboothWidget::photoTaken, this, &WizardDialog::on_photoTaken);
ui->avatarLabel->hide();
}