mirrors/lqml
1
Fork 0
mirror of https://gitlab.com/eql/lqml.git synced 2026-01-25 05:50:47 -08:00
Code Issues Projects Releases Packages Wiki Activity

revisions

Browse source
This commit is contained in:
pls.153 2023-09-23 17:44:26 +02:00
parent 6a664c9d27
commit 3387f23ff6
10 changed files with 120 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/cpp/ecl_ext.cpp
View file

@ -217,9 +217,9 @@ cl_object qfind_children2(cl_object l_obj, cl_object l_name, cl_object l_class)
QByteArray className(toCString(l_class));
QObject* qobject = toQObjectPointer(l_obj);
if (qobject != nullptr) {
QObjectList children = qobject->findChildren<QObject*>(objectName);
const QObjectList children = qobject->findChildren<QObject*>(objectName);
cl_object l_children = ECL_NIL;
for (QObject* child : qAsConst(children)) {
for (QObject* child : children) {
QByteArray className2(child->metaObject()->className());
if (className.isEmpty() || (className == className2)) {
l_children = CONS(from_qobject_pointer(child),
@ -240,9 +240,9 @@ cl_object qchildren(cl_object l_item) {
QObject* qobject = toQObjectPointer(l_item);
QQuickItem* item = qobject_cast<QQuickItem*>(qobject); // type check
if (item != nullptr) {
QList<QQuickItem*> children = item->childItems();
const QList<QQuickItem*> children = item->childItems();
cl_object l_children = ECL_NIL;
for (QQuickItem* child : qAsConst(children)) {
for (QQuickItem* child : children) {
l_children = CONS(from_qobject_pointer(child),
l_children);
}
@ -410,7 +410,7 @@ cl_object qexec2(cl_object l_milliseconds) {
cl_object qexit() {
/// args: ()
/// Calls QEventLoop::exit(), in order to exit event processing after a call
/// QEXEC with a timeout. Returns T if the event loop has effectively been
/// to QEXEC with a timeout. Returns T if the event loop has effectively been
/// exited.
ecl_process_env()->nvalues = 1;
if (LQML::eventLoop) {
@ -670,9 +670,9 @@ cl_object qdirectory(cl_object l_dir) {
/// paths.
/// (qdirectory "assets:/lib")
QDir dir(toQString(l_dir));
QFileInfoList infos(dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot));
const QFileInfoList infos(dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot));
cl_object l_files = ECL_NIL;
for (QFileInfo info : qAsConst(infos)) {
for (QFileInfo info : infos) {
QString path(info.absoluteFilePath());
if (info.isDir()) {
path.append("/");

4
src/cpp/ecl_fun_plugin.h
View file

@ -392,8 +392,8 @@ cl_object from_qvariant(const QVariant& var) {
case QMetaType::QUrl: l_obj = from_qstring(var.toString()); break;
// special case (can be nested)
case QMetaType::QVariantList: {
QVariantList list(var.value<QVariantList>());
for (QVariant v : qAsConst(list)) {
const QVariantList list(var.value<QVariantList>());
for (QVariant v : list) {
l_obj = CONS(from_qvariant(v), l_obj);
}
l_obj = cl_nreverse(l_obj);

2
src/cpp/main.h
View file

@ -103,7 +103,7 @@ public:
const int code = s.at(0).unicode();
switch (code) {
// replace iOS smart quotation marks with standard ones
// (Frensh, ...)
// (French, ...)
case 171:
case 187:
s[0] = QChar('"');

4
src/cpp/marshal.cpp
View file

@ -318,8 +318,8 @@ cl_object from_qvariant(const QVariant& var) {
case QMetaType::QUrl: l_obj = from_qstring(var.toString()); break;
// special case (can be nested)
case QMetaType::QVariantList: {
QVariantList list(var.value<QVariantList>());
for (QVariant v : qAsConst(list)) {
const QVariantList list(var.value<QVariantList>());
for (QVariant v : list) {
l_obj = CONS(from_qvariant(v), l_obj);
}
l_obj = cl_nreverse(l_obj);