Removed deprecated funtions and changed code to use new functions

This commit is contained in:
Klaus Basan
2017-01-05 04:18:37 +01:00
committed by Mathew Sutcliffe
parent bac77e233d
commit 9eff387207
16 changed files with 43 additions and 79 deletions

View File

@@ -8,7 +8,6 @@
*/
#include "blackmisc/network/authenticateduser.h"
#include "blackmisc/iconlist.h"
#include "blackmisc/icons.h"
#include "blackmisc/logcategory.h"
#include "blackmisc/logcategorylist.h"
@@ -120,7 +119,7 @@ namespace BlackMisc
CIcon CAuthenticatedUser::toIcon() const
{
return CIconList::iconByIndex(CIcons::StandardIconUser16);
return CIcon::iconByIndex(CIcons::StandardIconUser16);
}
CVariant CAuthenticatedUser::propertyByIndex(const BlackMisc::CPropertyIndex &index) const

View File

@@ -93,18 +93,18 @@ namespace BlackMisc
switch (this->m_voiceCapabilities)
{
case Voice:
return CIconList::iconByIndex(CIcons::NetworkCapabilityVoiceBackground);
return CIcon::iconByIndex(CIcons::NetworkCapabilityVoiceBackground);
case TextOnly:
return CIconList::iconByIndex(CIcons::NetworkCapabilityTextOnly);
return CIcon::iconByIndex(CIcons::NetworkCapabilityTextOnly);
case Unknown:
return CIconList::iconByIndex(CIcons::NetworkCapabilityUnknown);
return CIcon::iconByIndex(CIcons::NetworkCapabilityUnknown);
case VoiceReceivingOnly:
return CIconList::iconByIndex(CIcons::NetworkCapabilityVoiceReceiveOnlyBackground);
return CIcon::iconByIndex(CIcons::NetworkCapabilityVoiceReceiveOnlyBackground);
default:
break;
}
Q_ASSERT(false);
return CIconList::iconByIndex(CIcons::NetworkCapabilityUnknown); // never reached
return CIcon::iconByIndex(CIcons::NetworkCapabilityUnknown); // never reached
}
const CVoiceCapabilities &CVoiceCapabilities::fromVoiceCapabilities(CVoiceCapabilities::VoiceCapabilities capabilities)