mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(app): clean some pieces of code and improve build (providers)

Browse source
This commit is contained in:
Ronan Abhamon 2018-03-14 10:48:11 +01:00
parent b05e003d68
commit 2078a309ad
3 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/app/providers/AvatarProvider.cpp
View file

@ -20,8 +20,8 @@
* Author: Ronan Abhamon
*/
#include "../../utils/Utils.hpp"
#include "../paths/Paths.hpp"
#include "app/paths/Paths.hpp"
#include "utils/Utils.hpp"
#include "AvatarProvider.hpp"
@ -30,10 +30,10 @@
const QString AvatarProvider::PROVIDER_ID = "avatar";
AvatarProvider::AvatarProvider () : QQuickImageProvider(
QQmlImageProviderBase::Image,
QQmlImageProviderBase::ForceAsynchronousImageLoading
) {
mAvatarsPath = ::Utils::coreStringToAppString(Paths::getAvatarsDirPath());
QQmlImageProviderBase::Image,
QQmlImageProviderBase::ForceAsynchronousImageLoading
) {
mAvatarsPath = Utils::coreStringToAppString(Paths::getAvatarsDirPath());
}
QImage AvatarProvider::requestImage (const QString &id, QSize *size, const QSize &) {

38
src/app/providers/ImageProvider.cpp
View file

@ -25,14 +25,14 @@
#include <QPainter>
#include <QSvgRenderer>
#include "../App.hpp"
#include "app/App.hpp"
#include "ImageProvider.hpp"
using namespace std;
// =============================================================================
using namespace std;
namespace {
// Max image size in bytes. (100Kb)
constexpr qint64 cMaxImageSize = 102400;
@ -40,8 +40,8 @@ namespace {
static void removeAttribute (QXmlStreamAttributes &readerAttributes, const QString &name) {
auto it = find_if(readerAttributes.cbegin(), readerAttributes.cend(), [&name](const QXmlStreamAttribute &attribute) {
return name == attribute.name() && !attribute.prefix().length();
});
return name == attribute.name() && !attribute.prefix().length();
});
if (it != readerAttributes.cend())
readerAttributes.remove(int(distance(readerAttributes.cbegin(), it)));
}
@ -72,8 +72,8 @@ static QByteArray parseFillAndStroke (QXmlStreamAttributes &readerAttributes, co
continue;
}
::removeAttribute(readerAttributes, list[2]);
attributes.append(::buildByteArrayAttribute(list[2].toLatin1(), colorValue.value<QColor>().name().toLatin1()));
removeAttribute(readerAttributes, list[2]);
attributes.append(buildByteArrayAttribute(list[2].toLatin1(), colorValue.value<QColor>().name().toLatin1()));
}
return attributes;
@ -115,7 +115,7 @@ static QByteArray parseStyle (QXmlStreamAttributes &readerAttributes, const Colo
}
}
::removeAttribute(readerAttributes, "style");
removeAttribute(readerAttributes, "style");
if (attribute.length() > 0) {
attribute.prepend("style=\"");
@ -128,8 +128,8 @@ static QByteArray parseStyle (QXmlStreamAttributes &readerAttributes, const Colo
static QByteArray parseAttributes (const QXmlStreamReader &reader, const Colors &colors) {
QXmlStreamAttributes readerAttributes = reader.attributes();
QByteArray attributes = ::parseFillAndStroke(readerAttributes, colors);
attributes.append(::parseStyle(readerAttributes, colors));
QByteArray attributes = parseFillAndStroke(readerAttributes, colors);
attributes.append(parseStyle(readerAttributes, colors));
for (const auto &attribute : readerAttributes) {
const QByteArray prefix = attribute.prefix().toLatin1();
@ -139,7 +139,7 @@ static QByteArray parseAttributes (const QXmlStreamReader &reader, const Colors
}
attributes.append(
::buildByteArrayAttribute(attribute.name().toLatin1(), attribute.value().toLatin1())
buildByteArrayAttribute(attribute.name().toLatin1(), attribute.value().toLatin1())
);
}
@ -177,9 +177,9 @@ static QByteArray parseStartElement (const QXmlStreamReader &reader, const Color
QByteArray startElement = "<";
startElement.append(reader.name().toLatin1());
startElement.append(" ");
startElement.append(::parseAttributes(reader, colors));
startElement.append(parseAttributes(reader, colors));
startElement.append(" ");
startElement.append(::parseDeclarations(reader));
startElement.append(parseDeclarations(reader));
startElement.append(">");
return startElement;
}
@ -209,15 +209,15 @@ static QByteArray computeContent (QFile &file) {
break;
case QXmlStreamReader::StartDocument:
content.append(::parseStartDocument(reader));
content.append(parseStartDocument(reader));
break;
case QXmlStreamReader::StartElement:
content.append(::parseStartElement(reader, *colors));
content.append(parseStartElement(reader, *colors));
break;
case QXmlStreamReader::EndElement:
content.append(::parseEndElement(reader));
content.append(parseEndElement(reader));
break;
case QXmlStreamReader::Characters:
@ -237,9 +237,9 @@ static QByteArray computeContent (QFile &file) {
const QString ImageProvider::PROVIDER_ID = "internal";
ImageProvider::ImageProvider () : QQuickImageProvider(
QQmlImageProviderBase::Image,
QQmlImageProviderBase::ForceAsynchronousImageLoading
) {}
QQmlImageProviderBase::Image,
QQmlImageProviderBase::ForceAsynchronousImageLoading
) {}
// -----------------------------------------------------------------------------

12
src/app/providers/ThumbnailProvider.cpp
View file

@ -20,8 +20,8 @@
* Author: Ronan Abhamon
*/
#include "../../utils/Utils.hpp"
#include "../paths/Paths.hpp"
#include "app/paths/Paths.hpp"
#include "utils/Utils.hpp"
#include "ThumbnailProvider.hpp"
@ -30,10 +30,10 @@
const QString ThumbnailProvider::PROVIDER_ID = "thumbnail";
ThumbnailProvider::ThumbnailProvider () : QQuickImageProvider(
QQmlImageProviderBase::Image,
QQmlImageProviderBase::ForceAsynchronousImageLoading
) {
mThumbnailsPath = ::Utils::coreStringToAppString(Paths::getThumbnailsDirPath());
QQmlImageProviderBase::Image,
QQmlImageProviderBase::ForceAsynchronousImageLoading
) {
mThumbnailsPath = Utils::coreStringToAppString(Paths::getThumbnailsDirPath());
}
QImage ThumbnailProvider::requestImage (const QString &id, QSize *size, const QSize &) {