From 3e5c8a62578dcc3b1f63d2b9cf44032a4ea731b9 Mon Sep 17 00:00:00 2001
From: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
Date: Tue, 19 Jan 2016 14:00:45 -0500
Subject: [PATCH] Fix trivial warnings
These are warnings which have easy fixes. They heavily pollute the
compillation log as some appear multiple times. They also mask
warnings which are introduces by new patches.
Change-Id: Ic735af257550027901186aac190e660ed218e12c
Tuleap: #211
---
src/callmodel.cpp | 2 ++
src/collectionextensioninterface.h | 2 +-
src/foldercertificatecollection.cpp | 6 ++++++
src/foldercertificatecollection.h | 1 +
src/localtextrecordingcollection.cpp | 11 +++++++++++
src/localtextrecordingcollection.h | 2 ++
src/media/recordingmodel.cpp | 3 ++-
src/numbercompletionmodel.cpp | 2 +-
src/private/shmrenderer.cpp | 2 +-
src/qtwrapper/callmanager_wrap.h | 7 -------
src/recentmodel.cpp | 3 +++
src/useractionmodel.cpp | 8 ++++----
12 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/src/callmodel.cpp b/src/callmodel.cpp
index 4b595361..3982f0cf 100644
--- a/src/callmodel.cpp
+++ b/src/callmodel.cpp
@@ -557,6 +557,8 @@ Call* CallModelPrivate::addIncomingCall(const QString& callId)
Call* CallModelPrivate::addExistingCall(const QString& callId, const QString& state)
{
+ Q_UNUSED(state)
+
qDebug() << "New foreign call:" << callId;
auto call = CallPrivate::buildExistingCall(callId);
diff --git a/src/collectionextensioninterface.h b/src/collectionextensioninterface.h
index 66f51615..4a3f64c0 100644
--- a/src/collectionextensioninterface.h
+++ b/src/collectionextensioninterface.h
@@ -53,7 +53,7 @@ Q_SIGNALS:
#define DECLARE_COLLECTION_EXTENSION_M1(x, y) x ## y
#define DECLARE_COLLECTION_EXTENSION_M2(x, y) DECLARE_COLLECTION_EXTENSION_M1(x, y)
-#define DECLARE_COLLECTION_EXTENSION(T) \
+#define DECLARE_COLLECTION_EXTENSION(T) __attribute__ ((unused)) \
static auto DECLARE_COLLECTION_EXTENSION_M2(val,__COUNTER__) = []{\
CollectionExtensionModel::registerExtension<T>();\
return 0;\
diff --git a/src/foldercertificatecollection.cpp b/src/foldercertificatecollection.cpp
index 8874a093..b16c753a 100644
--- a/src/foldercertificatecollection.cpp
+++ b/src/foldercertificatecollection.cpp
@@ -177,6 +177,12 @@ QList<CollectionInterface::Element> FolderCertificateCollection::listId() const
return d_ptr->getCertificateList();
}
+bool FolderCertificateCollection::listId(std::function<void(const QList<CollectionInterface::Element>)> callback) const
+{
+ Q_UNUSED(callback)
+ return false;
+}
+
bool FolderCertificateCollection::clear()
{
return false;
diff --git a/src/foldercertificatecollection.h b/src/foldercertificatecollection.h
index 709ff865..df2d00af 100644
--- a/src/foldercertificatecollection.h
+++ b/src/foldercertificatecollection.h
@@ -64,6 +64,7 @@ public:
virtual bool isEnabled() const override;
virtual QByteArray id () const override;
virtual QList<Element> listId () const override;
+ virtual bool listId (std::function<void(const QList<Element>)> callback) const override;
virtual FlagPack<SupportedFeatures> supportedFeatures() const override;
//Getter
diff --git a/src/localtextrecordingcollection.cpp b/src/localtextrecordingcollection.cpp
index a95b2166..91623caa 100644
--- a/src/localtextrecordingcollection.cpp
+++ b/src/localtextrecordingcollection.cpp
@@ -221,12 +221,23 @@ bool LocalTextRecordingCollection::listId(std::function<void(const QList<Element
return true;
}
+QList<CollectionInterface::Element> LocalTextRecordingCollection::listId() const
+{
+ return {};
+}
+
bool LocalTextRecordingCollection::fetch(const Element& e)
{
Q_UNUSED(e);
return false;
}
+bool LocalTextRecordingCollection::fetch( const QList<CollectionInterface::Element>& elements)
+{
+ Q_UNUSED(elements)
+ return false;
+}
+
Media::TextRecording* LocalTextRecordingCollection::fetchFor(const ContactMethod* cm)
{
const QByteArray& sha1 = cm->sha1();
diff --git a/src/localtextrecordingcollection.h b/src/localtextrecordingcollection.h
index 331a2fdd..a0fdcf1d 100644
--- a/src/localtextrecordingcollection.h
+++ b/src/localtextrecordingcollection.h
@@ -43,7 +43,9 @@ public:
virtual bool isEnabled() const override;
virtual QByteArray id () const override;
virtual bool fetch(const Element& e) override;
+ virtual bool fetch(const QList<CollectionInterface::Element>& elements) override;
virtual bool listId(std::function<void(const QList<Element>)> callback) const override;
+ virtual QList<Element> listId() const override;
Media::TextRecording* fetchFor (const ContactMethod* cm);
Media::TextRecording* createFor(const ContactMethod* cm);
diff --git a/src/media/recordingmodel.cpp b/src/media/recordingmodel.cpp
index 085b5a5f..b0eaf407 100644
--- a/src/media/recordingmodel.cpp
+++ b/src/media/recordingmodel.cpp
@@ -85,6 +85,8 @@ m_pAudioVideo(nullptr)/*,m_pFiles(nullptr)*/
void RecordingModelPrivate::forwardInsertion(const QMap<QString,QString>& message, ContactMethod* cm, Media::Media::Direction direction)
{
+ Q_UNUSED(message)
+ Q_UNUSED(direction)
emit q_ptr->newTextMessage(static_cast<Media::TextRecording*>(sender()), cm);
}
@@ -328,4 +330,3 @@ Media::TextRecording* Media::RecordingModel::createTextRecording(const ContactMe
}
#include <recordingmodel.moc>
-
diff --git a/src/numbercompletionmodel.cpp b/src/numbercompletionmodel.cpp
index 3e648e5e..9eaecbdb 100644
--- a/src/numbercompletionmodel.cpp
+++ b/src/numbercompletionmodel.cpp
@@ -444,7 +444,7 @@ void NumberCompletionModelPrivate::getRange(QMap<QString,NumberWrapper*> map, co
endOk = (iEnd.key().left(prefixLen) == pref);
- size = ::ceil((static_cast<float>(size))/2.0f);
+ size = (int)::ceil((static_cast<float>(size))/2.0f);
}
while (iBeg.key().left(prefixLen) != pref && iBeg != map.end() && iBeg != iEnd)
diff --git a/src/private/shmrenderer.cpp b/src/private/shmrenderer.cpp
index 8cd7d033..a7d39964 100644
--- a/src/private/shmrenderer.cpp
+++ b/src/private/shmrenderer.cpp
@@ -193,7 +193,7 @@ bool ShmRendererPrivate::getNewFrame(bool wait)
auto currentTime = std::chrono::system_clock::now();
const std::chrono::duration<double> seconds = currentTime - m_lastFrameDebug;
if (seconds.count() >= FPS_RATE_SEC) {
- m_Fps = m_fpsC / seconds.count();
+ m_Fps = (int)(m_fpsC / seconds.count());
m_fpsC = 0;
m_lastFrameDebug = currentTime;
#ifdef DEBUG_FPS
diff --git a/src/qtwrapper/callmanager_wrap.h b/src/qtwrapper/callmanager_wrap.h
index 62badbb4..5537e341 100644
--- a/src/qtwrapper/callmanager_wrap.h
+++ b/src/qtwrapper/callmanager_wrap.h
@@ -303,13 +303,6 @@ public Q_SLOTS: // METHODS
return temp;
}
- Q_DECL_DEPRECATED QString getCurrentAudioCodecName(const QString &callID)
- {
- QString temp(
- DRing::getCurrentAudioCodecName(callID.toStdString()).c_str());
- return temp;
- }
-
QStringList getDisplayNames(const QString &confID)
{
QStringList temp =
diff --git a/src/recentmodel.cpp b/src/recentmodel.cpp
index acb17c48..9692510f 100644
--- a/src/recentmodel.cpp
+++ b/src/recentmodel.cpp
@@ -730,6 +730,7 @@ void RecentModelPrivate::slotLastUsedChanged(ContactMethod* cm, time_t t)
void RecentModelPrivate::slotContactChanged(ContactMethod* cm, Person* np, Person* op)
{
Q_UNUSED(np)
+ Q_UNUSED(op)
// m_hCMsToNodes contains RecentViewNode pointers, take will return a default
// constructed ptr (e.g nullptr) if key is not in the QHash
if (auto n = m_hCMsToNodes.take(cm)) {
@@ -1053,6 +1054,8 @@ void RecentModelPrivate::slotConferenceChanged(Call* conf)
void
RecentModelPrivate::slotCurrentCallChanged(const QModelIndex ¤t, const QModelIndex &previous)
{
+ Q_UNUSED(previous)
+
auto callIdx = q_ptr->getIndex(CallModel::instance().getCall(current));
if (callIdx.isValid()) {
/* in the case of a conference, we select the call;
diff --git a/src/useractionmodel.cpp b/src/useractionmodel.cpp
index 6c537b65..968223c2 100644
--- a/src/useractionmodel.cpp
+++ b/src/useractionmodel.cpp
@@ -978,7 +978,7 @@ bool UserActionModel::execute(const UserActionModel::Action action) const
const auto objT = qvariant_cast<Ring::ObjectType>(objTv);
Call* c = nullptr;
- Account* a = nullptr;
+ // Account* a = nullptr; TODO: uncomment when account is needed
ContactMethod* cm = nullptr;
Person* p = nullptr;
@@ -987,11 +987,11 @@ bool UserActionModel::execute(const UserActionModel::Action action) const
case Ring::ObjectType::Person :
p = qvariant_cast<Person*>(idx.data(static_cast<int>(Ring::Role::Object)));
cm = p->phoneNumbers().size() == 1 ? p->phoneNumbers()[0] : nullptr;
- a = cm ? cm->account() : nullptr;
+ // a = cm ? cm->account() : nullptr; TODO: uncomment when account is needed
break;
case Ring::ObjectType::ContactMethod :
cm = qvariant_cast<ContactMethod*>(idx.data(static_cast<int>(Ring::Role::Object)));
- a = cm->account();
+ // a = cm->account(); TODO: uncomment when account is needed
p = cm->contact();
//TODO maybe add "QList<Call*> currentCalls()" const to ContactMethod::?
break;
@@ -999,7 +999,7 @@ bool UserActionModel::execute(const UserActionModel::Action action) const
c = qvariant_cast<Call*>(idx.data(static_cast<int>(Ring::Role::Object)));
cm = c->peerContactMethod();
p = cm ? cm->contact() : nullptr;
- a = c->account();
+ // a = c->account(); TODO: uncomment when account is needed
break;
case Ring::ObjectType::Media : //TODO
case Ring::ObjectType::COUNT__ :
--
GitLab