diff --git a/crates/cxx-qt-lib/.gitattributes b/crates/cxx-qt-lib/.gitattributes index 16d6e4879..2507aea48 100644 --- a/crates/cxx-qt-lib/.gitattributes +++ b/crates/cxx-qt-lib/.gitattributes @@ -7,3 +7,5 @@ src/core/qlist/qlist_*.rs linguist-generated=true src/core/qset/qset_*.rs linguist-generated=true src/core/qvariant/qvariant_*.rs linguist-generated=true src/core/qvector/qvector_*.rs linguist-generated=true +include/core/qvector/qvector_*.h linguist-generated=true +include/core/qvector/qvector_private.h linguist-generated=false diff --git a/crates/cxx-qt-lib/build.rs b/crates/cxx-qt-lib/build.rs index 7bb9bef23..db041663e 100644 --- a/crates/cxx-qt-lib/build.rs +++ b/crates/cxx-qt-lib/build.rs @@ -5,7 +5,6 @@ use cxx_qt_build::CxxQtBuilder; use std::path::PathBuf; - fn qt_gui_enabled() -> bool { std::env::var("CARGO_FEATURE_QT_GUI").is_ok() } @@ -31,15 +30,19 @@ fn write_headers_in(subfolder: &str) { std::fs::read_dir(format!("include/{subfolder}")).expect("Failed to read include directory") { let entry = entry.expect("Failed to read header file!"); - let header_name = entry.file_name(); + let file_name = entry.file_name(); + let path = entry.path(); println!( "cargo::rerun-if-changed=include/{subfolder}/{header_name}", - header_name = header_name.to_string_lossy() + header_name = file_name.to_string_lossy() ); // TODO: Do we want to add the headers into a subdirectory? - std::fs::copy(entry.path(), header_dir().join(header_name)) - .expect("Failed to copy header file!"); + if path.is_dir() { + write_headers_in(&format!("{}/{}", subfolder, file_name.to_str().expect(""))); + } else { + std::fs::copy(path, header_dir().join(file_name)).expect("Failed to copy header file!"); + } } } @@ -381,6 +384,5 @@ fn main() { cc.file("src/qt_types.cpp"); println!("cargo::rerun-if-changed=src/qt_types.cpp"); }); - builder.build(); } diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector.h b/crates/cxx-qt-lib/include/core/qvector/qvector.h new file mode 100644 index 000000000..3608ea88a --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector.h @@ -0,0 +1,46 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 +// +// +#pragma once + +// The definitions file is auto-generated by the build script +#include + +#include "qvector_QByteArray.h" +#include "qvector_bool.h" +#include "qvector_f32.h" +#include "qvector_f64.h" +#include "qvector_i16.h" +#include "qvector_i32.h" +#include "qvector_i64.h" +#include "qvector_i8.h" +#ifdef CXX_QT_GUI_FEATURE +#include "qvector_QColor.h" +#endif +#include "qvector_QDate.h" +#include "qvector_QDateTime.h" +#include "qvector_QLine.h" +#include "qvector_QLineF.h" +#include "qvector_QMargins.h" +#include "qvector_QMarginsF.h" +#include "qvector_QPersistentModelIndex.h" +#include "qvector_QPoint.h" +#include "qvector_QPointF.h" +#include "qvector_QRect.h" +#include "qvector_QRectF.h" +#include "qvector_QSize.h" +#include "qvector_QSizeF.h" +#include "qvector_QString.h" +#include "qvector_QTime.h" +#include "qvector_QUrl.h" +#include "qvector_QUuid.h" +#include "qvector_QVariant.h" +#include "qvector_u16.h" +#include "qvector_u32.h" +#include "qvector_u64.h" +#include "qvector_u8.h" diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QByteArray.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QByteArray.h new file mode 100644 index 000000000..7759e5720 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QByteArray.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QByteArray = QVector<::QByteArray>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QColor.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QColor.h new file mode 100644 index 000000000..cebdd8a5b --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QColor.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QColor = QVector<::QColor>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QDate.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QDate.h new file mode 100644 index 000000000..65da1f78b --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QDate.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QDate = QVector<::QDate>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QDateTime.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QDateTime.h new file mode 100644 index 000000000..06641b2e1 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QDateTime.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QDateTime = QVector<::QDateTime>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QLine.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QLine.h new file mode 100644 index 000000000..e6fc1ca07 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QLine.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QLine = QVector<::QLine>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QLineF.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QLineF.h new file mode 100644 index 000000000..0819385ee --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QLineF.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QLineF = QVector<::QLineF>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QMargins.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QMargins.h new file mode 100644 index 000000000..2a258ce80 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QMargins.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QMargins = QVector<::QMargins>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QMarginsF.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QMarginsF.h new file mode 100644 index 000000000..7df5df738 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QMarginsF.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QMarginsF = QVector<::QMarginsF>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QPersistentModelIndex.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QPersistentModelIndex.h new file mode 100644 index 000000000..cb12b6657 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QPersistentModelIndex.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QPersistentModelIndex = QVector<::QPersistentModelIndex>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QPoint.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QPoint.h new file mode 100644 index 000000000..a42d9c692 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QPoint.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QPoint = QVector<::QPoint>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QPointF.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QPointF.h new file mode 100644 index 000000000..0684c4a94 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QPointF.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QPointF = QVector<::QPointF>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QRect.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QRect.h new file mode 100644 index 000000000..930445f23 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QRect.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QRect = QVector<::QRect>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QRectF.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QRectF.h new file mode 100644 index 000000000..c2ee78729 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QRectF.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QRectF = QVector<::QRectF>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QSize.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QSize.h new file mode 100644 index 000000000..311c06e89 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QSize.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QSize = QVector<::QSize>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QSizeF.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QSizeF.h new file mode 100644 index 000000000..79af4205a --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QSizeF.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QSizeF = QVector<::QSizeF>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QString.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QString.h new file mode 100644 index 000000000..ad441dbdc --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QString.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QString = QVector<::QString>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QTime.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QTime.h new file mode 100644 index 000000000..d4d147dbc --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QTime.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QTime = QVector<::QTime>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QUrl.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QUrl.h new file mode 100644 index 000000000..bf822388e --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QUrl.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QUrl = QVector<::QUrl>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QUuid.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QUuid.h new file mode 100644 index 000000000..a17ed334a --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QUuid.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QUuid = QVector<::QUuid>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_QVariant.h b/crates/cxx-qt-lib/include/core/qvector/qvector_QVariant.h new file mode 100644 index 000000000..78c4b5553 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_QVariant.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +#include +using QVector_QVariant = QVector<::QVariant>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_bool.h b/crates/cxx-qt-lib/include/core/qvector/qvector_bool.h new file mode 100644 index 000000000..b68d995c4 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_bool.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" + +using QVector_bool = QVector; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_f32.h b/crates/cxx-qt-lib/include/core/qvector/qvector_f32.h new file mode 100644 index 000000000..c3c5a95b3 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_f32.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" + +using QVector_f32 = QVector; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_f64.h b/crates/cxx-qt-lib/include/core/qvector/qvector_f64.h new file mode 100644 index 000000000..8668c5fbb --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_f64.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" + +using QVector_f64 = QVector; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_i16.h b/crates/cxx-qt-lib/include/core/qvector/qvector_i16.h new file mode 100644 index 000000000..34a902ff7 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_i16.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" + +using QVector_i16 = QVector<::std::int16_t>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_i32.h b/crates/cxx-qt-lib/include/core/qvector/qvector_i32.h new file mode 100644 index 000000000..c6b0df88c --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_i32.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" + +using QVector_i32 = QVector<::std::int32_t>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_i64.h b/crates/cxx-qt-lib/include/core/qvector/qvector_i64.h new file mode 100644 index 000000000..ff295ec56 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_i64.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" + +using QVector_i64 = QVector; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_i8.h b/crates/cxx-qt-lib/include/core/qvector/qvector_i8.h new file mode 100644 index 000000000..f04bf41f0 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_i8.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" + +using QVector_i8 = QVector<::std::int8_t>; diff --git a/crates/cxx-qt-lib/include/core/qvector.h b/crates/cxx-qt-lib/include/core/qvector/qvector_private.h similarity index 58% rename from crates/cxx-qt-lib/include/core/qvector.h rename to crates/cxx-qt-lib/include/core/qvector/qvector_private.h index 191905272..656674938 100644 --- a/crates/cxx-qt-lib/include/core/qvector.h +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_private.h @@ -4,37 +4,13 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 + #pragma once #include -// The definitions file is auto-generated by the build script -#include - #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef CXX_QT_GUI_FEATURE -#include -#endif - #include "rust/cxx.h" // In Qt 6 QList and QVector are the same, so we only need IsRelocatable defined @@ -143,37 +119,3 @@ qvectorReserve(QVector& v, ::rust::isize size) noexcept } } } - -using QVector_bool = QVector; -using QVector_f32 = QVector; -using QVector_f64 = QVector; -using QVector_i8 = QVector<::std::int8_t>; -using QVector_i16 = QVector<::std::int16_t>; -using QVector_i32 = QVector<::std::int32_t>; -using QVector_i64 = QVector<::std::int64_t>; -using QVector_QByteArray = QVector<::QByteArray>; -#ifdef CXX_QT_GUI_FEATURE -using QVector_QColor = QVector<::QColor>; -#endif -using QVector_QDate = QVector<::QDate>; -using QVector_QDateTime = QVector<::QDateTime>; -using QVector_QLine = QVector<::QLine>; -using QVector_QLineF = QVector<::QLineF>; -using QVector_QMargins = QVector<::QMargins>; -using QVector_QMarginsF = QVector<::QMarginsF>; -using QVector_QPersistentModelIndex = QVector<::QPersistentModelIndex>; -using QVector_QPoint = QVector<::QPoint>; -using QVector_QPointF = QVector<::QPointF>; -using QVector_QRect = QVector<::QRect>; -using QVector_QRectF = QVector<::QRectF>; -using QVector_QSize = QVector<::QSize>; -using QVector_QSizeF = QVector<::QSizeF>; -using QVector_QString = QVector<::QString>; -using QVector_QTime = QVector<::QTime>; -using QVector_QUrl = QVector<::QUrl>; -using QVector_QUuid = QVector<::QUuid>; -using QVector_QVariant = QVector<::QVariant>; -using QVector_u8 = QVector<::std::uint8_t>; -using QVector_u16 = QVector<::std::uint16_t>; -using QVector_u32 = QVector<::std::uint32_t>; -using QVector_u64 = QVector<::std::uint64_t>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_u16.h b/crates/cxx-qt-lib/include/core/qvector/qvector_u16.h new file mode 100644 index 000000000..667ab5abe --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_u16.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" + +using QVector_u16 = QVector<::std::uint16_t>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_u32.h b/crates/cxx-qt-lib/include/core/qvector/qvector_u32.h new file mode 100644 index 000000000..ac0dce0c4 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_u32.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" + +using QVector_u32 = QVector<::std::uint32_t>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_u64.h b/crates/cxx-qt-lib/include/core/qvector/qvector_u64.h new file mode 100644 index 000000000..0fa4e005b --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_u64.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" + +using QVector_u64 = QVector<::std::uint64_t>; diff --git a/crates/cxx-qt-lib/include/core/qvector/qvector_u8.h b/crates/cxx-qt-lib/include/core/qvector/qvector_u8.h new file mode 100644 index 000000000..632d5e321 --- /dev/null +++ b/crates/cxx-qt-lib/include/core/qvector/qvector_u8.h @@ -0,0 +1,13 @@ +// clang-format off +// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" + +using QVector_u8 = QVector<::std::uint8_t>; diff --git a/crates/cxx-qt-lib/src/core/qvector/generate.sh b/crates/cxx-qt-lib/src/core/qvector/generate.sh index 229ca3c75..09dc51f69 100755 --- a/crates/cxx-qt-lib/src/core/qvector/generate.sh +++ b/crates/cxx-qt-lib/src/core/qvector/generate.sh @@ -9,6 +9,25 @@ set -e SCRIPT=$(realpath "$0") SCRIPTPATH=$(dirname "$SCRIPT") +#INCLUDEPATH="~/cxx-qt/crates/cxx-qt-lib/include/core/qvector" + +function generate_qvector_header(){ +tee "$SCRIPTPATH/../../../include/core/qvector/qvector_$1.h" < +// clang-format on +// SPDX-FileContributor: Andrew Hayzen +// +// SPDX-License-Identifier: MIT OR Apache-2.0 + +//! This is an auto-generated file. Do not edit. +//! Edit instead: cxx-qt-lib/src/core/qvector/generate.sh +#pragma once +#include "qvector_private.h" +$3 +using QVector_$1 = QVector<$2>; +EOF +} function generate_bridge_primitive() { tee "$SCRIPTPATH/qvector_$1.rs" < // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//! This is an auto-generated file. Do not edit. +//! Edit instead: generate.sh #[cxx::bridge] pub mod ffi { unsafe extern "C++" { - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_$1.h"); type QVector_$1 = crate::QVector<$1>; } @@ -112,6 +134,8 @@ function generate_bridge_qt() { // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -119,7 +143,7 @@ pub mod ffi { include!("cxx-qt-lib/$2.h"); type $1 = crate::$1; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_$1.h"); type QVector_$1 = crate::QVector<$1>; } @@ -204,6 +228,38 @@ EOF rustfmt "$SCRIPTPATH/qvector_$2.rs" } +generate_qvector_header "bool" "bool" +generate_qvector_header "f32" "float" +generate_qvector_header "f64" "double" +generate_qvector_header "i8" "::std::int8_t" +generate_qvector_header "i16" "::std::int16_t" +generate_qvector_header "i32" "::std::int32_t" +generate_qvector_header "i64" "std::int64_t" +generate_qvector_header "QByteArray" "::QByteArray" "#include " +generate_qvector_header "QDate" "::QDate" "#include " +generate_qvector_header "QDateTime" "::QDateTime" "#include " +generate_qvector_header "QLine" "::QLine" "#include " +generate_qvector_header "QLineF" "::QLineF" "#include " +generate_qvector_header "QMargins" "::QMargins" "#include " +generate_qvector_header "QMarginsF" "::QMarginsF" "#include " +generate_qvector_header "QPersistentModelIndex" "::QPersistentModelIndex" "#include " +generate_qvector_header "QPoint" "::QPoint" "#include " +generate_qvector_header "QPointF" "::QPointF" "#include " +generate_qvector_header "QRect" "::QRect" "#include " +generate_qvector_header "QRectF" "::QRectF" "#include " +generate_qvector_header "QSize" "::QSize" "#include " +generate_qvector_header "QSizeF" "::QSizeF" "#include " +generate_qvector_header "QString" "::QString" "#include " +generate_qvector_header "QTime" "::QTime" "#include " +generate_qvector_header "QUuid" "::QUuid" "#include " +generate_qvector_header "QUrl" "::QUrl" "#include " +generate_qvector_header "QVariant" "::QVariant" "#include " +generate_qvector_header "u8" "::std::uint8_t" +generate_qvector_header "u16" "::std::uint16_t" +generate_qvector_header "u32" "::std::uint32_t" +generate_qvector_header "u64" "::std::uint64_t" +generate_qvector_header "QColor" "::QColor" "#include " + generate_bridge_primitive "bool" generate_bridge_primitive "f32" generate_bridge_primitive "f64" diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_bool.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_bool.rs index 6e281c39d..ace8b03e1 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_bool.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_bool.rs @@ -2,11 +2,14 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//! This is an auto-generated file. Do not edit. +//! Edit instead: generate.sh #[cxx::bridge] pub mod ffi { unsafe extern "C++" { - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_bool.h"); type QVector_bool = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_f32.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_f32.rs index 124fe65ef..08dcadfe9 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_f32.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_f32.rs @@ -2,11 +2,14 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//! This is an auto-generated file. Do not edit. +//! Edit instead: generate.sh #[cxx::bridge] pub mod ffi { unsafe extern "C++" { - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_f32.h"); type QVector_f32 = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_f64.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_f64.rs index f4ca6a25f..e599a6386 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_f64.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_f64.rs @@ -2,11 +2,14 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//! This is an auto-generated file. Do not edit. +//! Edit instead: generate.sh #[cxx::bridge] pub mod ffi { unsafe extern "C++" { - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_f64.h"); type QVector_f64 = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_i16.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_i16.rs index 5519e43cb..f7e589932 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_i16.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_i16.rs @@ -2,11 +2,14 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//! This is an auto-generated file. Do not edit. +//! Edit instead: generate.sh #[cxx::bridge] pub mod ffi { unsafe extern "C++" { - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_i16.h"); type QVector_i16 = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_i32.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_i32.rs index 3b2a75a20..061a4dcb1 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_i32.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_i32.rs @@ -2,11 +2,14 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//! This is an auto-generated file. Do not edit. +//! Edit instead: generate.sh #[cxx::bridge] pub mod ffi { unsafe extern "C++" { - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_i32.h"); type QVector_i32 = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_i64.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_i64.rs index c98b5723f..b50b189b4 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_i64.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_i64.rs @@ -2,11 +2,14 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//! This is an auto-generated file. Do not edit. +//! Edit instead: generate.sh #[cxx::bridge] pub mod ffi { unsafe extern "C++" { - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_i64.h"); type QVector_i64 = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_i8.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_i8.rs index a3865bf89..525bfebec 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_i8.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_i8.rs @@ -2,11 +2,14 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//! This is an auto-generated file. Do not edit. +//! Edit instead: generate.sh #[cxx::bridge] pub mod ffi { unsafe extern "C++" { - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_i8.h"); type QVector_i8 = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qbytearray.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qbytearray.rs index d72f670d5..6286fdee4 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qbytearray.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qbytearray.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qbytearray.h"); type QByteArray = crate::QByteArray; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QByteArray.h"); type QVector_QByteArray = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qcolor.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qcolor.rs index 4c9112ac9..4d8d2dbef 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qcolor.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qcolor.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qcolor.h"); type QColor = crate::QColor; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QColor.h"); type QVector_QColor = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qdate.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qdate.rs index bea34f2e2..0c0a73425 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qdate.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qdate.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qdate.h"); type QDate = crate::QDate; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QDate.h"); type QVector_QDate = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qdatetime.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qdatetime.rs index 568cfe57c..492e423c8 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qdatetime.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qdatetime.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qdatetime.h"); type QDateTime = crate::QDateTime; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QDateTime.h"); type QVector_QDateTime = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qline.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qline.rs index f421d4814..c2b2df85f 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qline.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qline.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qline.h"); type QLine = crate::QLine; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QLine.h"); type QVector_QLine = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qlinef.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qlinef.rs index b39a9b081..c109d7d6b 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qlinef.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qlinef.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qlinef.h"); type QLineF = crate::QLineF; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QLineF.h"); type QVector_QLineF = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qmargins.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qmargins.rs index 5a64957e4..d732f986e 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qmargins.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qmargins.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qmargins.h"); type QMargins = crate::QMargins; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QMargins.h"); type QVector_QMargins = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qmarginsf.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qmarginsf.rs index 741622984..5a090b632 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qmarginsf.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qmarginsf.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qmarginsf.h"); type QMarginsF = crate::QMarginsF; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QMarginsF.h"); type QVector_QMarginsF = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qpersistentmodelindex.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qpersistentmodelindex.rs index 517190712..4aaa0c373 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qpersistentmodelindex.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qpersistentmodelindex.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qpersistentmodelindex.h"); type QPersistentModelIndex = crate::QPersistentModelIndex; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QPersistentModelIndex.h"); type QVector_QPersistentModelIndex = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qpoint.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qpoint.rs index 8a88dde3d..27c745d60 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qpoint.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qpoint.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qpoint.h"); type QPoint = crate::QPoint; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QPoint.h"); type QVector_QPoint = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qpointf.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qpointf.rs index 315748dc5..6d6fda68f 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qpointf.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qpointf.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qpointf.h"); type QPointF = crate::QPointF; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QPointF.h"); type QVector_QPointF = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qrect.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qrect.rs index addacf7ba..c61ba8586 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qrect.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qrect.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qrect.h"); type QRect = crate::QRect; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QRect.h"); type QVector_QRect = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qrectf.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qrectf.rs index 00aff28e1..c91c98751 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qrectf.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qrectf.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qrectf.h"); type QRectF = crate::QRectF; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QRectF.h"); type QVector_QRectF = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qsize.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qsize.rs index 30885acdb..026846eea 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qsize.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qsize.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qsize.h"); type QSize = crate::QSize; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QSize.h"); type QVector_QSize = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qsizef.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qsizef.rs index 04fe8e5f1..422fa3e04 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qsizef.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qsizef.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qsizef.h"); type QSizeF = crate::QSizeF; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QSizeF.h"); type QVector_QSizeF = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qstring.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qstring.rs index bacf9dcfb..a5591b902 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qstring.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qstring.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qstring.h"); type QString = crate::QString; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QString.h"); type QVector_QString = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qtime.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qtime.rs index 2b6ae958a..803fb93c4 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qtime.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qtime.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qtime.h"); type QTime = crate::QTime; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QTime.h"); type QVector_QTime = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qurl.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qurl.rs index c68e385c5..abb3748fb 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qurl.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qurl.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qurl.h"); type QUrl = crate::QUrl; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QUrl.h"); type QVector_QUrl = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_quuid.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_quuid.rs index 8cf0a4702..40e87a03d 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_quuid.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_quuid.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/quuid.h"); type QUuid = crate::QUuid; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QUuid.h"); type QVector_QUuid = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_qvariant.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_qvariant.rs index c560bb334..293773551 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_qvariant.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_qvariant.rs @@ -2,6 +2,8 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//!This is an auto-generated file. Do not edit. Edit instead: generate.sh #[cxx::bridge] pub mod ffi { @@ -9,7 +11,7 @@ pub mod ffi { include!("cxx-qt-lib/qvariant.h"); type QVariant = crate::QVariant; - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_QVariant.h"); type QVector_QVariant = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_u16.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_u16.rs index 34fd52d45..09074bf07 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_u16.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_u16.rs @@ -2,11 +2,14 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//! This is an auto-generated file. Do not edit. +//! Edit instead: generate.sh #[cxx::bridge] pub mod ffi { unsafe extern "C++" { - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_u16.h"); type QVector_u16 = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_u32.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_u32.rs index 1b86a847a..a6b6b9fb0 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_u32.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_u32.rs @@ -2,11 +2,14 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//! This is an auto-generated file. Do not edit. +//! Edit instead: generate.sh #[cxx::bridge] pub mod ffi { unsafe extern "C++" { - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_u32.h"); type QVector_u32 = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_u64.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_u64.rs index 69b556916..27e99b9aa 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_u64.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_u64.rs @@ -2,11 +2,14 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//! This is an auto-generated file. Do not edit. +//! Edit instead: generate.sh #[cxx::bridge] pub mod ffi { unsafe extern "C++" { - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_u64.h"); type QVector_u64 = crate::QVector; } diff --git a/crates/cxx-qt-lib/src/core/qvector/qvector_u8.rs b/crates/cxx-qt-lib/src/core/qvector/qvector_u8.rs index 58dee59b0..9ec85f7c5 100644 --- a/crates/cxx-qt-lib/src/core/qvector/qvector_u8.rs +++ b/crates/cxx-qt-lib/src/core/qvector/qvector_u8.rs @@ -2,11 +2,14 @@ // SPDX-FileContributor: Andrew Hayzen // // SPDX-License-Identifier: MIT OR Apache-2.0 +// +//! This is an auto-generated file. Do not edit. +//! Edit instead: generate.sh #[cxx::bridge] pub mod ffi { unsafe extern "C++" { - include!("cxx-qt-lib/qvector.h"); + include!("cxx-qt-lib/qvector_u8.h"); type QVector_u8 = crate::QVector; }