From 95accfc9b938184249a1702fa51b9174f85ffda6 Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
Date: Wed, 18 Mar 2015 19:01:21 -0400
Subject: [PATCH] build: Fix warnings on Fedora
Refs #66886
---
src/account.cpp | 1 +
src/accountmodel.cpp | 2 +-
src/call.cpp | 6 +++---
src/callmodel.cpp | 2 +-
src/ringtonemodel.cpp | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/account.cpp b/src/account.cpp
index c83c5cdb..d00972bf 100644
--- a/src/account.cpp
+++ b/src/account.cpp
@@ -128,6 +128,7 @@ Account* AccountPrivate::buildNewAccountFromAlias(Account::Protocol proto, const
case Account::Protocol::RING:
tmp = configurationManager.getAccountTemplate(DRing::Account::ProtocolNames::RING);
break;
+ case Account::Protocol::COUNT__:
default:
break;
}
diff --git a/src/accountmodel.cpp b/src/accountmodel.cpp
index c2395b4e..7103a4d5 100644
--- a/src/accountmodel.cpp
+++ b/src/accountmodel.cpp
@@ -51,7 +51,7 @@ AccountModel::AccountModel() : QAbstractListModel(QCoreApplication::instance())
,d_ptr(new AccountModelPrivate(this))
{
//Make sure the daemon is running as this can be called first
- InstanceInterface& instance = DBus::InstanceManager::instance();
+ DBus::InstanceManager::instance();
}
///Prevent constructor loop
diff --git a/src/call.cpp b/src/call.cpp
index 001b441a..fecf1372 100644
--- a/src/call.cpp
+++ b/src/call.cpp
@@ -416,7 +416,7 @@ Call* Call::buildHistoryCall(const QMap<QString,QString>& hc)
const QString& callId = hc[ Call::HistoryMapFields::CALLID ] ;
const QString& name = hc[ Call::HistoryMapFields::DISPLAY_NAME ] ;
const QString& number = hc[ Call::HistoryMapFields::PEER_NUMBER ] ;
- const QString& type = hc[ Call::HistoryMapFields::STATE ] ;
+ //const QString& type = hc[ Call::HistoryMapFields::STATE ] ;
const QString& direction = hc[ Call::HistoryMapFields::DIRECTION ] ;
const QString& cert_path = hc[ Call::HistoryMapFields::CERT_PATH ] ;
const bool missed = hc[ Call::HistoryMapFields::MISSED ] == "1" ;
@@ -476,8 +476,8 @@ Call* Call::buildHistoryCall(const QMap<QString,QString>& hc)
}
//Check the certificate
- if (!hc[Call::HistoryMapFields::CERT_PATH].isEmpty()) {
- call->d_ptr->m_pCertificate = CertificateModel::instance()->getCertificate(QUrl(hc[Call::HistoryMapFields::CERT_PATH]),acc);
+ if (!cert_path.isEmpty()) {
+ call->d_ptr->m_pCertificate = CertificateModel::instance()->getCertificate(QUrl(cert_path),acc);
}
return call;
diff --git a/src/callmodel.cpp b/src/callmodel.cpp
index 6a2a20eb..0b337e7e 100644
--- a/src/callmodel.cpp
+++ b/src/callmodel.cpp
@@ -137,7 +137,7 @@ m_pUserActionModel(nullptr)
CallModel::CallModel() : QAbstractItemModel(QCoreApplication::instance()),d_ptr(new CallModelPrivate(this))
{
//Register with the daemon
- InstanceInterface& instance = DBus::InstanceManager::instance();
+ DBus::InstanceManager::instance();
setObjectName("CallModel");
#ifdef ENABLE_VIDEO
VideoRendererManager::instance();
diff --git a/src/ringtonemodel.cpp b/src/ringtonemodel.cpp
index ab2529eb..8c51e4b8 100644
--- a/src/ringtonemodel.cpp
+++ b/src/ringtonemodel.cpp
@@ -29,7 +29,7 @@
RingToneModel::RingToneModel(Account* a) : QAbstractTableModel(a),m_pAccount(a),m_pTimer(nullptr),
m_pCurrent(nullptr)
{
- ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
+// ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
QMap<QString,QString> m_hRingtonePath ;//= configurationManager.getRingtoneList();
QMutableMapIterator<QString, QString> iter(m_hRingtonePath);
while (iter.hasNext()) {
--
GitLab