Commit e0a60b5b authored by Andreas Traczyk's avatar Andreas Traczyk

project: apply msc compliance

Change-Id: I32718d19f1f28e41aa6bf9d631bf461af036c18b
Reviewed-by: Sébastien Blin's avatarSebastien Blin <sebastien.blin@savoirfairelinux.com>
parent e8cf755f
......@@ -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 @@ AccountDetails::setAccount(Account* currentAccount) {
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()] = &currentAccount_->setTlsCaListCertificate;
certMap_[ui->lrcfg_tlsCertificate->objectName()] = &currentAccount_->setTlsCertificate;
certMap_[ui->lrcfg_tlsPrivateKeyCertificate->objectName()] = &currentAccount_->setTlsPrivateKey;
......
......@@ -28,6 +28,7 @@
#include "account.h"
#include "bannedcontactmodel.h"
#include <ciso646>
/* Widget */
......
......@@ -26,6 +26,8 @@
#include "smartlistdelegate.h"
#include <ciso646>
class QPropertyAnimation;
class QGraphicsOpacityEffect;
......
......@@ -28,6 +28,8 @@
#include <QPainter>
#include <QApplication>
#include <ciso646>
ContactRequestItemDelegate::ContactRequestItemDelegate(QObject* parent) :
QItemDelegate(parent)
{}
......
......@@ -30,6 +30,8 @@
#include <QAbstractItemView>
#include <QEvent>
#include <ciso646>
ContactRequestListWidget::ContactRequestListWidget(QWidget *parent) :
QTreeView(parent)
{
......
......@@ -35,7 +35,7 @@ public:
~DeleteAccountDialog();
signals:
deleteAcceptClicked();
void deleteAcceptClicked();
private slots:
void on_deleteCancelBtn_clicked();
......
......@@ -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 @@ main(int argc, char *argv[])
QFontDatabase::addApplicationFont(":/images/FontAwesome.otf");
#ifdef _MSC_VER
gnutls_global_init();
#endif
if (not MainWindow::instance().init()) {
return 1;
}
......
......@@ -42,9 +42,9 @@ MainWindow::MainWindow(QWidget* parent) :
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");
......
......@@ -29,6 +29,8 @@
#include "account.h"
#include "codecmodel.h"
#include <ciso646>
QualityDialog::QualityDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::QualityDialog),
......
......@@ -20,6 +20,7 @@
#ifdef Q_OS_WIN
#define WIN32_LEAN_AND_MEAN 1
#define NOMINMAX
#include <windows.h>
#include <winuser.h>
......
......@@ -27,6 +27,8 @@
#include "combar.h"
#include "smartlist.h"
#include <ciso646>
SmartList::SmartList(QWidget *parent) :
QTreeView(parent)
{
......
......@@ -32,9 +32,10 @@
// Client
#include "combar.h"
#include "ringthemeutils.h"
#include <ciso646>
SmartListDelegate::SmartListDelegate(QObject* parent) :
QItemDelegate(parent)
{
......
......@@ -23,6 +23,7 @@
#ifdef Q_OS_WIN
#include <windows.h>
#include <ciso646>
#else //LINUX
#define LPCWSTR char*
#endif
......
......@@ -77,8 +77,8 @@ WizardDialog::WizardDialog(WizardMode wizardMode, Account* toBeMigrated, QWidget
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();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment