Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,8 @@ fn main() {
"core/qbuffer",
"core/qdeadlinetimer",
"core/qiodevice",
"core/qhash/qhash_i32_qvariant",
"core/qlist/qlist_qdeadlinetimer",
"core/qlist/qlist_qpair_qbytearray_qbytearray",
"core/qmap/qmap_qbytearray_qvariant",
"core/qobject",
Expand Down Expand Up @@ -268,6 +270,7 @@ fn main() {
"core/qlist/qlist_qnetworkdatagram",
"core/qlist/qlist_qnetworkinterface",
"core/qlist/qlist_qnetworkproxy",
"core/qset/qset_qhostaddress",
"net/raw_header_list",
"net/qabstractsocket",
"net/qauthenticator",
Expand Down Expand Up @@ -364,6 +367,7 @@ fn main() {
.build_cpp(&["request/qhttp1configuration"])
.build_rust(&[
"core/qlist/qlist_qhttp1configuration",
"core/qset/qset_qhttp1configuration",
"request/qhttp1configuration",
]);
}
Expand Down Expand Up @@ -425,12 +429,18 @@ fn main() {
"core/qlist/qlist_qocspresponse",
"core/qlist/qlist_qsslcertificate",
"core/qlist/qlist_qsslcertificateextension",
"core/qlist/qlist_qsslcipher",
"core/qlist/qlist_qsslconfiguration",
"core/qlist/qlist_qssldiffiehellmanparameters",
"core/qlist/qlist_qsslellipticcurve",
"core/qlist/qlist_qsslerror",
"core/qlist/qlist_qsslkey",
"core/qlist/qlist_qsslpresharedkeyauthenticator",
"core/qset/qset_qocspresponse",
"core/qset/qset_qsslcertificate",
"core/qset/qset_qssldiffiehellmanparameters",
"core/qset/qset_qsslellipticcurve",
"core/qset/qset_qsslerror",
"ssl/qcryptographichash",
"ssl/qdtls",
"ssl/qdtlsclientverifier",
Expand Down
1 change: 1 addition & 0 deletions include/core/qvariant/qvariant.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

#include <cxx-qt-io/definitions.h>
#include <cxx-qt-lib/qvariant.h>

#ifdef CXX_QT_IO_REQUEST_FEATURE
Expand Down
3 changes: 3 additions & 0 deletions include/network/qsslcertificate.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ inline bool (*qsslcertificateImportPkcs12)(
inline QList<QSslError> (*qsslcertificateVerify)(const QList<QSslCertificate>&,
const QString&) =
QSslCertificate::verify;

QSslCertificate
qsslcertificateDefault();
}

}
2 changes: 1 addition & 1 deletion src/core/qbuffer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ mod tests {
buffer
}

fn as_str(buffer: &QBuffer) -> Cow<str> {
fn as_str(buffer: &QBuffer) -> Cow<'_, str> {
String::from_utf8_lossy(buffer.as_slice())
}

Expand Down
169 changes: 0 additions & 169 deletions src/core/qhash/generate.sh

This file was deleted.

15 changes: 11 additions & 4 deletions src/core/qhash/qhash_i32_qvariant.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
//! This is an auto-generated file. Do not edit.
//! Edit instead: src/core/qhash/generate.sh

#[cxx::bridge]
pub mod ffi {
unsafe extern "C++" {
include!("cxx-qt-lib/qvariant.h");
type QVariant = cxx_qt_lib::QVariant;

include!("cxx-qt-lib/qhash_i32_QVariant.h");
include!("cxx-qt-io/qhash_i32_qvariant.h");
type QHash_i32_QVariant = cxx_qt_lib::QHash<super::QHashPair_i32_QVariant>;
}

Expand Down Expand Up @@ -96,3 +93,13 @@ pub(crate) fn remove(hash: &mut ffi::QHash_i32_QVariant, key: &i32) -> bool {
}

pub struct QHashPair_i32_QVariant;

#[cfg(test)]
mod tests {
#[test]
fn len() {
let empty = super::default();
assert_eq!(super::len(&empty), 0);
std::mem::drop(empty);
}
}
20 changes: 20 additions & 0 deletions src/core/qlist/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,16 @@ pub(crate) fn len(s: &ffi::QList_$1) -> isize {
pub(crate) fn remove(s: &mut ffi::QList_$1, pos: isize) {
ffi::qlist_remove_$1(s, pos);
}

#[cfg(test)]
mod tests {
#[test]
fn len() {
let empty = super::default();
assert_eq!(super::len(&empty), 0);
std::mem::drop(empty);
}
}
EOF
rustfmt "$SCRIPTPATH/qlist_$LOWER.rs"
}
Expand Down Expand Up @@ -256,6 +266,16 @@ pub(crate) fn len(s: &ffi::QList_$1) -> isize {
pub(crate) fn remove(s: &mut ffi::QList_$1, pos: isize) {
ffi::qlist_remove_$1(s, pos);
}

#[cfg(test)]
mod tests {
#[test]
fn len() {
let empty = super::default();
assert_eq!(super::len(&empty), 0);
std::mem::drop(empty);
}
}
EOF
rustfmt +nightly "$SCRIPTPATH/qlist_$LOWER.rs"
}
Expand Down
10 changes: 10 additions & 0 deletions src/core/qlist/qlist_qdeadlinetimer.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/core/qlist/qlist_qdtlsgeneratorparameters.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/core/qlist/qlist_qhostaddress.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/core/qlist/qlist_qhstspolicy.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/core/qlist/qlist_qhttp1configuration.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/core/qlist/qlist_qhttp2configuration.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading