flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 02:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #77 Break dependency of htmlutils on propertyindexlist

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-08-28 18:05:34 +01:00
parent 515dc7fef1
commit 2391d242ed
2 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackmisc/htmlutils.cpp
View File

@@ -8,6 +8,7 @@
#include "blackmisc/htmlutils.h" #include "blackmisc/htmlutils.h"
#include <QStringBuilder> #include <QStringBuilder>
#include <QStringList>
namespace BlackMisc namespace BlackMisc
{ {
@@ -33,11 +34,6 @@ namespace BlackMisc
return u"<table>" % html % u"</table>"; return u"<table>" % html % u"</table>";
} }
QString unwrappedTooltip(const QString &text)
{
return u"<p style='white-space:pre'>" % text % u"</p>";
}
QString asHyperlink(const QString &url, const QString &text) QString asHyperlink(const QString &url, const QString &text)
{ {
return text.isEmpty() ? return text.isEmpty() ?

21
src/blackmisc/htmlutils.h
View File

@@ -11,36 +11,15 @@
#ifndef BLACKMISC_HTMLUTILS_H #ifndef BLACKMISC_HTMLUTILS_H
#define BLACKMISC_HTMLUTILS_H #define BLACKMISC_HTMLUTILS_H
#include "blackmisc/propertyindexlist.h"
#include "blackmisc/blackmiscexport.h" #include "blackmisc/blackmiscexport.h"
#include <QStringBuilder> #include <QStringBuilder>
//! Free functions in BlackMisc //! Free functions in BlackMisc
namespace BlackMisc namespace BlackMisc
{ {
//! Container to standard HTML table
template <class Obj, class Container> QString toHtmlTable(const CPropertyIndexList &indexes, const Container &container)
{
if (indexes.isEmpty() || container.isEmpty()) { return {}; }
QString html;
for (const Obj &obj : container)
{
QString rowHtml;
for (const CPropertyIndex &index : indexes)
{
rowHtml += u"<td>" % obj.propertyByIndex(index).toQString(true) % u"</td>";
}
html += u"<tr>" % rowHtml % u"</tr>";
}
return u"<table>" % html % u"</table>";
}
//! Values as HTML table //! Values as HTML table
BLACKMISC_EXPORT QString toHtmTable(const QStringList &values, int columns); BLACKMISC_EXPORT QString toHtmTable(const QStringList &values, int columns);
//! As white space preformatted
BLACKMISC_EXPORT QString unwrappedTooltip(const QString &text);
//! As hyperlink //! As hyperlink
BLACKMISC_EXPORT QString asHyperlink(const QString &url, const QString &text = ""); BLACKMISC_EXPORT QString asHyperlink(const QString &url, const QString &text = "");