Skip to content

Commit 2dc99f2

Browse files
treefrogframeworktreefrogframework
committed
updated vite modules
1 parent e17310e commit 2dc99f2

9 files changed

Lines changed: 254 additions & 80 deletions

File tree

‎src/tactionview.cpp‎

Lines changed: 78 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2010-2019, AOYAMA Kazuharu
1+
/* Copyright (c) 2010-2025, AOYAMA Kazuharu
22
* All rights reserved.
33
*
44
* This software may be used and distributed according to the terms of
@@ -81,68 +81,113 @@ QVariantMap TActionView::flashVariants() const
8181
}
8282

8383
/*!
84+
\fn QString TActionView::echo(const THtmlAttribute &attr)
8485
Outputs the string of the HTML attribute \a attr to a view
8586
template.
8687
*/
87-
QString TActionView::echo(const THtmlAttribute &attr)
88-
{
89-
responsebody += attr.toString().trimmed();
90-
return QString();
91-
}
9288

9389
/*!
9490
\fn QString TActionView::echo(const QVariant &var)
9591
Outputs the variant variable \a var to a view template.
9692
*/
97-
QString TActionView::echo(const QVariant &var)
98-
{
99-
if (var.userType() == QMetaType::QUrl) {
100-
responsebody += var.toUrl().toString(QUrl::FullyEncoded);
101-
} else {
102-
responsebody += var.toString();
103-
}
104-
return QString();
105-
}
10693

10794
/*!
95+
\fn QString TActionView::echo(const QVariantMap &map)
10896
Outputs the variantmap variable \a map to a view template.
10997
*/
110-
QString TActionView::echo(const QVariantMap &map)
111-
{
112-
responsebody += QJsonDocument::fromVariant(map).toJson(QJsonDocument::Compact);
113-
return QString();
114-
}
11598

11699
/*!
100+
\fn QString TActionView::eh(const THtmlAttribute &attr)
117101
Outputs a escaped string of the HTML attribute \a attr to
118102
a view template.
119103
*/
120-
QString TActionView::eh(const THtmlAttribute &attr)
121-
{
122-
return echo(THttpUtility::htmlEscape(attr.toString().trimmed()));
123-
}
124104

125105
/*!
126106
\fn QString TActionView::eh(const QVariant &var)
127107
Outputs a escaped string of the variant variable \a var
128108
to a view template.
129109
*/
130-
QString TActionView::eh(const QVariant &var)
110+
111+
/*!
112+
\fn QString TActionView::eh(const QVariantMap &map)
113+
Outputs a escaped string of the variantmap variable \a map
114+
to a view template.
115+
*/
116+
117+
118+
QString TActionView::fromValue(int n, int base)
119+
{
120+
return QString::number(n, base);
121+
}
122+
123+
124+
QString TActionView::fromValue(long n, int base)
125+
{
126+
return QString::number(n, base);
127+
}
128+
129+
130+
QString TActionView::fromValue(ulong n, int base)
131+
{
132+
return QString::number(n, base);
133+
}
134+
135+
136+
QString TActionView::fromValue(qlonglong n, int base)
137+
{
138+
return QString::number(n, base);
139+
}
140+
141+
142+
QString TActionView::fromValue(qulonglong n, int base)
143+
{
144+
return QString::number(n, base);
145+
}
146+
147+
148+
QString TActionView::fromValue(double d, char format, int precision)
149+
{
150+
return QString::number(d, format, precision);
151+
}
152+
153+
154+
QString TActionView::fromValue(const QJsonObject &object)
155+
{
156+
return QJsonDocument(object).toJson(QJsonDocument::Compact);
157+
}
158+
159+
160+
QString TActionView::fromValue(const QJsonArray &array)
161+
{
162+
return QJsonDocument(array).toJson(QJsonDocument::Compact);
163+
}
164+
165+
166+
QString TActionView::fromValue(const QJsonDocument &doc)
167+
{
168+
return doc.toJson(QJsonDocument::Compact);
169+
}
170+
171+
172+
QString TActionView::fromValue(const THtmlAttribute &attr)
173+
{
174+
return attr.toString().trimmed();
175+
}
176+
177+
178+
QString TActionView::fromValue(const QVariant &var)
131179
{
132180
if (var.userType() == QMetaType::QUrl) {
133-
return echo(var.toUrl().toString(QUrl::FullyEncoded));
181+
return var.toUrl().toString(QUrl::FullyEncoded);
134182
} else {
135-
return echo(THttpUtility::htmlEscape(var.toString()));
183+
return var.toString();
136184
}
137185
}
138186

139-
/*!
140-
Outputs a escaped string of the variantmap variable \a map
141-
to a view template.
142-
*/
143-
QString TActionView::eh(const QVariantMap &map)
187+
188+
QString TActionView::fromValue(const QVariantMap &map)
144189
{
145-
return echo(THttpUtility::htmlEscape(QJsonDocument::fromVariant(map).toJson(QJsonDocument::Compact)));
190+
return QJsonDocument::fromVariant(map).toJson(QJsonDocument::Compact);
146191
}
147192

148193
/*!

‎src/tactionview.h‎

Lines changed: 74 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,22 @@ class T_CORE_EXPORT TActionView : public QObject, public TActionHelper, public T
6363

6464
QString responsebody;
6565

66+
static inline QString fromValue(const QString &str) { return str; }
67+
static inline QString fromValue(const char *str) { return QString(str); } // using codecForCStrings()
68+
static inline QString fromValue(const QByteArray &str) { return QString(str); } // using codecForCStrings()
69+
static QString fromValue(int n, int base = 10);
70+
static QString fromValue(long n, int base = 10);
71+
static QString fromValue(ulong n, int base = 10);
72+
static QString fromValue(qlonglong n, int base = 10);
73+
static QString fromValue(qulonglong n, int base = 10);
74+
static QString fromValue(double d, char format = 'g', int precision = 6);
75+
static QString fromValue(const QJsonObject &object);
76+
static QString fromValue(const QJsonArray &array);
77+
static QString fromValue(const QJsonDocument &doc);
78+
static QString fromValue(const THtmlAttribute &attr);
79+
static QString fromValue(const QVariant &var);
80+
static QString fromValue(const QVariantMap &map);
81+
6682
private:
6783
T_DISABLE_COPY(TActionView)
6884
T_DISABLE_MOVE(TActionView)
@@ -114,66 +130,68 @@ inline const QVariantMap &TActionView::allVariants() const
114130

115131
inline QString TActionView::echo(const QString &str)
116132
{
117-
responsebody += str;
133+
responsebody += fromValue(str);
118134
return QString();
119135
}
120136

121137
inline QString TActionView::echo(const char *str)
122138
{
123-
responsebody += QString(str); // using codecForCStrings()
139+
responsebody += fromValue(str);
124140
return QString();
125141
}
126142

127143
inline QString TActionView::echo(const QByteArray &str)
128144
{
129-
responsebody += QString(str); // using codecForCStrings()
145+
responsebody += fromValue(str);
130146
return QString();
131147
}
132148

133149
inline QString TActionView::echo(int n, int base)
134150
{
135-
responsebody += QString::number(n, base);
151+
responsebody += fromValue(n, base);
136152
return QString();
137153
}
138154

139155
inline QString TActionView::echo(long n, int base)
140156
{
141-
responsebody += QString::number(n, base);
157+
responsebody += fromValue(n, base);
142158
return QString();
143159
}
144160

145161
inline QString TActionView::echo(ulong n, int base)
146162
{
147-
responsebody += QString::number(n, base);
163+
responsebody += fromValue(n, base);
148164
return QString();
149165
}
150166

151167
inline QString TActionView::echo(qlonglong n, int base)
152168
{
153-
responsebody += QString::number(n, base);
169+
responsebody += fromValue(n, base);
154170
return QString();
155171
}
156172

157173
inline QString TActionView::echo(qulonglong n, int base)
158174
{
159-
responsebody += QString::number(n, base);
175+
responsebody += fromValue(n, base);
160176
return QString();
161177
}
162178

163179
inline QString TActionView::echo(double d, char format, int precision)
164180
{
165-
responsebody += QString::number(d, format, precision);
181+
responsebody += fromValue(d, format, precision);
166182
return QString();
167183
}
168184

169185
inline QString TActionView::echo(const QJsonObject &object)
170186
{
171-
return echo(QJsonDocument(object));
187+
responsebody += fromValue(object);
188+
return QString();
172189
}
173190

174191
inline QString TActionView::echo(const QJsonArray &array)
175192
{
176-
return echo(QJsonDocument(array));
193+
responsebody += fromValue(array);
194+
return QString();
177195
}
178196

179197
inline QString TActionView::echo(const QJsonDocument &doc)
@@ -182,64 +200,97 @@ inline QString TActionView::echo(const QJsonDocument &doc)
182200
return QString();
183201
}
184202

203+
inline QString TActionView::echo(const THtmlAttribute &attr)
204+
{
205+
responsebody += fromValue(attr);
206+
return QString();
207+
}
208+
209+
inline QString TActionView::echo(const QVariant &var)
210+
{
211+
responsebody += fromValue(var);
212+
return QString();
213+
}
214+
215+
inline QString TActionView::echo(const QVariantMap &map)
216+
{
217+
responsebody += fromValue(map);
218+
return QString();
219+
}
220+
185221
inline QString TActionView::eh(const QString &str)
186222
{
187-
return echo(THttpUtility::htmlEscape(str));
223+
return echo(THttpUtility::htmlEscape(fromValue(str)));
188224
}
189225

190226
inline QString TActionView::eh(const char *str)
191227
{
192-
return echo(THttpUtility::htmlEscape(str));
228+
return echo(THttpUtility::htmlEscape(fromValue(str)));
193229
}
194230

195231
inline QString TActionView::eh(const QByteArray &str)
196232
{
197-
return echo(THttpUtility::htmlEscape(str));
233+
return echo(THttpUtility::htmlEscape(fromValue(str)));
198234
}
199235

200236
inline QString TActionView::eh(int n, int base)
201237
{
202-
return echo(THttpUtility::htmlEscape(QString::number(n, base)));
238+
return echo(THttpUtility::htmlEscape(fromValue(n, base)));
203239
}
204240

205241
inline QString TActionView::eh(long n, int base)
206242
{
207-
return echo(THttpUtility::htmlEscape(QString::number(n, base)));
243+
return echo(THttpUtility::htmlEscape(fromValue(n, base)));
208244
}
209245

210246
inline QString TActionView::eh(ulong n, int base)
211247
{
212-
return echo(THttpUtility::htmlEscape(QString::number(n, base)));
248+
return echo(THttpUtility::htmlEscape(fromValue(n, base)));
213249
}
214250

215251
inline QString TActionView::eh(qlonglong n, int base)
216252
{
217-
return echo(THttpUtility::htmlEscape(QString::number(n, base)));
253+
return echo(THttpUtility::htmlEscape(fromValue(n, base)));
218254
}
219255

220256
inline QString TActionView::eh(qulonglong n, int base)
221257
{
222-
return echo(THttpUtility::htmlEscape(QString::number(n, base)));
258+
return echo(THttpUtility::htmlEscape(fromValue(n, base)));
223259
}
224260

225261
inline QString TActionView::eh(double d, char format, int precision)
226262
{
227-
return echo(THttpUtility::htmlEscape(QString::number(d, format, precision)));
263+
return echo(THttpUtility::htmlEscape(fromValue(d, format, precision)));
228264
}
229265

230266
inline QString TActionView::eh(const QJsonObject &object)
231267
{
232-
return eh(QJsonDocument(object));
268+
return echo(THttpUtility::htmlEscape(fromValue(object)));
233269
}
234270

235271
inline QString TActionView::eh(const QJsonArray &array)
236272
{
237-
return eh(QJsonDocument(array));
273+
return echo(THttpUtility::htmlEscape(fromValue(array)));
238274
}
239275

240276
inline QString TActionView::eh(const QJsonDocument &doc)
241277
{
242-
return echo(THttpUtility::htmlEscape(doc.toJson(QJsonDocument::Compact)));
278+
return echo(THttpUtility::htmlEscape(fromValue(doc)));
279+
}
280+
281+
inline QString TActionView::eh(const THtmlAttribute &attr)
282+
{
283+
return echo(THttpUtility::htmlEscape(fromValue(attr)));
284+
}
285+
286+
inline QString TActionView::eh(const QVariant &var)
287+
{
288+
return echo(THttpUtility::htmlEscape(fromValue(var)));
289+
}
290+
291+
inline QString TActionView::eh(const QVariantMap &map)
292+
{
293+
return echo(THttpUtility::htmlEscape(fromValue(map)));
243294
}
244295

245296
inline void TActionView::setController(TAbstractController *controller)

‎src/test/mailmessage/main.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,18 +154,18 @@ void TestMailMessage::dateTime_data()
154154
QTest::addColumn<QString>("result");
155155

156156
// Timezone
157-
uint utc = QDateTime(QDate(2000,1,1), QTime(0,0,0), Qt::UTC).toSecsSinceEpoch();
158-
uint local = QDateTime(QDate(2000,1,1), QTime(0,0,0), Qt::LocalTime).toSecsSinceEpoch();
157+
uint utc = QDateTime(QDate(2000,1,1), QTime(0,0,0), QTimeZone::UTC).toSecsSinceEpoch();
158+
uint local = QDateTime(QDate(2000,1,1), QTime(0,0,0), QTimeZone::LocalTime).toSecsSinceEpoch();
159159
int offset = (utc - local) / 60;
160160
QString offsetStr = QString("%1%2%3")
161161
.arg(offset > 0 ? '+' : '-')
162162
.arg(qAbs(offset) / 60, 2, 10, QLatin1Char('0'))
163163
.arg(qAbs(offset) % 60, 2, 10, QLatin1Char('0'));
164164

165-
QTest::newRow("1") << QDateTime(QDate(2011,3,28), QTime(12,11,04), Qt::LocalTime) << "Mon, 28 Mar 2011 12:11:04 " + offsetStr;
166-
QTest::newRow("2") << QDateTime(QDate(2014,3,31), QTime( 1, 0, 0), Qt::LocalTime) << "Mon, 31 Mar 2014 01:00:00 " + offsetStr;
167-
QTest::newRow("3") << QDateTime(QDate(2011,3,28), QTime(12,11,04), Qt::UTC) << "Mon, 28 Mar 2011 12:11:04 +0000";
168-
QTest::newRow("4") << QDateTime(QDate(2014,3,31), QTime( 1, 0, 0), Qt::UTC) << "Mon, 31 Mar 2014 01:00:00 +0000";
165+
QTest::newRow("1") << QDateTime(QDate(2011,3,28), QTime(12,11,04), QTimeZone::LocalTime) << "Mon, 28 Mar 2011 12:11:04 " + offsetStr;
166+
QTest::newRow("2") << QDateTime(QDate(2014,3,31), QTime( 1, 0, 0), QTimeZone::LocalTime) << "Mon, 31 Mar 2014 01:00:00 " + offsetStr;
167+
QTest::newRow("3") << QDateTime(QDate(2011,3,28), QTime(12,11,04), QTimeZone::UTC) << "Mon, 28 Mar 2011 12:11:04 +0000";
168+
QTest::newRow("4") << QDateTime(QDate(2014,3,31), QTime( 1, 0, 0), QTimeZone::UTC) << "Mon, 31 Mar 2014 01:00:00 +0000";
169169
}
170170

171171
void TestMailMessage::dateTime()

0 commit comments

Comments
 (0)