Skip to content

cxx-qt-gen: use extern "C++" block to define Qt lib types #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 2, 2022
Merged

cxx-qt-gen: use extern "C++" block to define Qt lib types #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ mod my_object {

const DEFAULT_STR: &str = r#"{"number": 1, "string": "Hello World!"}"#;

#[namespace = ""]
unsafe extern "C++" {
include!("cxx-qt-lib/include/qt_types.h");
type QString = cxx_qt_lib::QString;
}

pub struct Data {
pub number: i32,
pub string: UniquePtr<QString>,
Expand Down
27 changes: 0 additions & 27 deletions cxx-qt-gen/src/gen_rs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,33 +533,6 @@ pub fn generate_qobject_cxx(
#[cxx_name = #class_name_str]
type #rust_class_name_cpp;

include!("cxx-qt-lib/include/qt_types.h");
#[namespace = ""]
type QColor = cxx_qt_lib::QColor;
#[namespace = ""]
type QDate = cxx_qt_lib::QDate;
#[namespace = ""]
type QDateTime = cxx_qt_lib::QDateTime;
#[namespace = ""]
type QPoint = cxx_qt_lib::QPoint;
#[namespace = ""]
type QPointF = cxx_qt_lib::QPointF;
#[namespace = ""]
type QRect = cxx_qt_lib::QRect;
#[namespace = ""]
type QRectF = cxx_qt_lib::QRectF;
#[namespace = ""]
type QSize = cxx_qt_lib::QSize;
#[namespace = ""]
type QSizeF = cxx_qt_lib::QSizeF;
#[namespace = ""]
type QString = cxx_qt_lib::QString;
#[namespace = ""]
type QTime = cxx_qt_lib::QTime;
#[namespace = ""]
type QUrl = cxx_qt_lib::QUrl;
#[namespace = ""]
type QVariant = cxx_qt_lib::QVariant;
#update_requester_type

#(#cpp_functions)*
Expand Down
6 changes: 6 additions & 0 deletions cxx-qt-gen/test_inputs/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
mod my_object {
#[namespace = ""]
unsafe extern "C++" {
include!("cxx-qt-lib/include/qt_types.h");
type QString = cxx_qt_lib::QString;
}

#[derive(Default)]
pub struct Data {
number: i32,
Expand Down
8 changes: 7 additions & 1 deletion cxx-qt-gen/test_inputs/invokables.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
mod my_object {
use cxx_qt_lib::QColor;
#[namespace = ""]
unsafe extern "C++" {
include!("cxx-qt-lib/include/qt_types.h");
type QColor = cxx_qt_lib::QColor;
type QPoint = cxx_qt_lib::QPoint;
type QString = cxx_qt_lib::QString;
}

#[derive(Default)]
pub struct RustObj;
Expand Down
6 changes: 5 additions & 1 deletion cxx-qt-gen/test_inputs/properties.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
mod my_object {
use cxx_qt_lib::QColor;
#[namespace = ""]
unsafe extern "C++" {
include!("cxx-qt-lib/include/qt_types.h");
type QColor = cxx_qt_lib::QColor;
}

#[derive(Default)]
pub struct Data {
Expand Down
7 changes: 6 additions & 1 deletion cxx-qt-gen/test_inputs/signals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
mod my_object {
use cxx_qt_lib::QVariant;
#[namespace = ""]
unsafe extern "C++" {
include!("cxx-qt-lib/include/qt_types.h");
type QPoint = cxx_qt_lib::QPoint;
type QVariant = cxx_qt_lib::QVariant;
}

#[cxx_qt::signals(MyObject)]
enum MySignals {
Expand Down
18 changes: 18 additions & 0 deletions cxx-qt-gen/test_inputs/types_qt_invokable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
mod my_object {
#[namespace = ""]
unsafe extern "C++" {
include!("cxx-qt-lib/include/qt_types.h");
type QColor = cxx_qt_lib::QColor;
type QDate = cxx_qt_lib::QDate;
type QDateTime = cxx_qt_lib::QDateTime;
type QPoint = cxx_qt_lib::QPoint;
type QPointF = cxx_qt_lib::QPointF;
type QRect = cxx_qt_lib::QRect;
type QRectF = cxx_qt_lib::QRectF;
type QSize = cxx_qt_lib::QSize;
type QSizeF = cxx_qt_lib::QSizeF;
type QString = cxx_qt_lib::QString;
type QTime = cxx_qt_lib::QTime;
type QUrl = cxx_qt_lib::QUrl;
type QVariant = cxx_qt_lib::QVariant;
}

#[derive(Default)]
pub struct Data;

Expand Down
18 changes: 18 additions & 0 deletions cxx-qt-gen/test_inputs/types_qt_property.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
mod my_object {
#[namespace = ""]
unsafe extern "C++" {
include!("cxx-qt-lib/include/qt_types.h");
type QColor = cxx_qt_lib::QColor;
type QDate = cxx_qt_lib::QDate;
type QDateTime = cxx_qt_lib::QDateTime;
type QPoint = cxx_qt_lib::QPoint;
type QPointF = cxx_qt_lib::QPointF;
type QRect = cxx_qt_lib::QRect;
type QRectF = cxx_qt_lib::QRectF;
type QSize = cxx_qt_lib::QSize;
type QSizeF = cxx_qt_lib::QSizeF;
type QString = cxx_qt_lib::QString;
type QTime = cxx_qt_lib::QTime;
type QUrl = cxx_qt_lib::QUrl;
type QVariant = cxx_qt_lib::QVariant;
}

#[derive(Default)]
pub struct Data {
color: UniquePtr<QColor>,
Expand Down
28 changes: 0 additions & 28 deletions cxx-qt-gen/test_outputs/custom_default.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,6 @@ mod my_object {
#[cxx_name = "MyObject"]
type MyObjectQt;

include!("cxx-qt-lib/include/qt_types.h");
#[namespace = ""]
type QColor = cxx_qt_lib::QColor;
#[namespace = ""]
type QDate = cxx_qt_lib::QDate;
#[namespace = ""]
type QDateTime = cxx_qt_lib::QDateTime;
#[namespace = ""]
type QPoint = cxx_qt_lib::QPoint;
#[namespace = ""]
type QPointF = cxx_qt_lib::QPointF;
#[namespace = ""]
type QRect = cxx_qt_lib::QRect;
#[namespace = ""]
type QRectF = cxx_qt_lib::QRectF;
#[namespace = ""]
type QSize = cxx_qt_lib::QSize;
#[namespace = ""]
type QSizeF = cxx_qt_lib::QSizeF;
#[namespace = ""]
type QString = cxx_qt_lib::QString;
#[namespace = ""]
type QTime = cxx_qt_lib::QTime;
#[namespace = ""]
type QUrl = cxx_qt_lib::QUrl;
#[namespace = ""]
type QVariant = cxx_qt_lib::QVariant;

#[rust_name = "public"]
fn getPublic(self: &MyObjectQt) -> i32;
#[rust_name = "set_public"]
Expand Down
34 changes: 6 additions & 28 deletions cxx-qt-gen/test_outputs/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,6 @@ mod my_object {
#[cxx_name = "MyObject"]
type MyObjectQt;

include!("cxx-qt-lib/include/qt_types.h");
#[namespace = ""]
type QColor = cxx_qt_lib::QColor;
#[namespace = ""]
type QDate = cxx_qt_lib::QDate;
#[namespace = ""]
type QDateTime = cxx_qt_lib::QDateTime;
#[namespace = ""]
type QPoint = cxx_qt_lib::QPoint;
#[namespace = ""]
type QPointF = cxx_qt_lib::QPointF;
#[namespace = ""]
type QRect = cxx_qt_lib::QRect;
#[namespace = ""]
type QRectF = cxx_qt_lib::QRectF;
#[namespace = ""]
type QSize = cxx_qt_lib::QSize;
#[namespace = ""]
type QSizeF = cxx_qt_lib::QSizeF;
#[namespace = ""]
type QString = cxx_qt_lib::QString;
#[namespace = ""]
type QTime = cxx_qt_lib::QTime;
#[namespace = ""]
type QUrl = cxx_qt_lib::QUrl;
#[namespace = ""]
type QVariant = cxx_qt_lib::QVariant;

#[namespace = "rust::cxxqtlib1"]
type UpdateRequester = cxx_qt_lib::UpdateRequesterCpp;

Expand Down Expand Up @@ -67,6 +39,12 @@ mod my_object {
#[cxx_name = "handleUpdateRequest"]
fn call_handle_update_request(self: &mut RustObj, cpp: Pin<&mut MyObjectQt>);
}

#[namespace = ""]
unsafe extern "C++" {
include!("cxx-qt-lib/include/qt_types.h");
type QString = cxx_qt_lib::QString;
}
}

pub use self::cxx_qt_my_object::*;
Expand Down
38 changes: 8 additions & 30 deletions cxx-qt-gen/test_outputs/invokables.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,6 @@ mod my_object {
#[cxx_name = "MyObject"]
type MyObjectQt;

include!("cxx-qt-lib/include/qt_types.h");
#[namespace = ""]
type QColor = cxx_qt_lib::QColor;
#[namespace = ""]
type QDate = cxx_qt_lib::QDate;
#[namespace = ""]
type QDateTime = cxx_qt_lib::QDateTime;
#[namespace = ""]
type QPoint = cxx_qt_lib::QPoint;
#[namespace = ""]
type QPointF = cxx_qt_lib::QPointF;
#[namespace = ""]
type QRect = cxx_qt_lib::QRect;
#[namespace = ""]
type QRectF = cxx_qt_lib::QRectF;
#[namespace = ""]
type QSize = cxx_qt_lib::QSize;
#[namespace = ""]
type QSizeF = cxx_qt_lib::QSizeF;
#[namespace = ""]
type QString = cxx_qt_lib::QString;
#[namespace = ""]
type QTime = cxx_qt_lib::QTime;
#[namespace = ""]
type QUrl = cxx_qt_lib::QUrl;
#[namespace = ""]
type QVariant = cxx_qt_lib::QVariant;

#[namespace = "cxx_qt::nested_object"]
type NestedObject = crate::cxx_qt_nested_object::FFICppObj;

Expand Down Expand Up @@ -76,6 +48,14 @@ mod my_object {
#[cxx_name = "initialiseCpp"]
fn initialise_cpp(cpp: Pin<&mut MyObjectQt>);
}

#[namespace = ""]
unsafe extern "C++" {
include!("cxx-qt-lib/include/qt_types.h");
type QColor = cxx_qt_lib::QColor;
type QPoint = cxx_qt_lib::QPoint;
type QString = cxx_qt_lib::QString;
}
}

pub use self::cxx_qt_my_object::*;
Expand All @@ -85,8 +65,6 @@ mod cxx_qt_my_object {
pub type FFICppObj = super::my_object::MyObjectQt;
type UniquePtr<T> = cxx::UniquePtr<T>;

use cxx_qt_lib::QColor;

#[derive(Default)]
pub struct RustObj;

Expand Down
28 changes: 0 additions & 28 deletions cxx-qt-gen/test_outputs/naming.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,6 @@ mod my_object {
#[cxx_name = "MyObject"]
type MyObjectQt;

include!("cxx-qt-lib/include/qt_types.h");
#[namespace = ""]
type QColor = cxx_qt_lib::QColor;
#[namespace = ""]
type QDate = cxx_qt_lib::QDate;
#[namespace = ""]
type QDateTime = cxx_qt_lib::QDateTime;
#[namespace = ""]
type QPoint = cxx_qt_lib::QPoint;
#[namespace = ""]
type QPointF = cxx_qt_lib::QPointF;
#[namespace = ""]
type QRect = cxx_qt_lib::QRect;
#[namespace = ""]
type QRectF = cxx_qt_lib::QRectF;
#[namespace = ""]
type QSize = cxx_qt_lib::QSize;
#[namespace = ""]
type QSizeF = cxx_qt_lib::QSizeF;
#[namespace = ""]
type QString = cxx_qt_lib::QString;
#[namespace = ""]
type QTime = cxx_qt_lib::QTime;
#[namespace = ""]
type QUrl = cxx_qt_lib::QUrl;
#[namespace = ""]
type QVariant = cxx_qt_lib::QVariant;

#[rust_name = "property_name"]
fn getPropertyName(self: &MyObjectQt) -> i32;
#[rust_name = "set_property_name"]
Expand Down
28 changes: 0 additions & 28 deletions cxx-qt-gen/test_outputs/passthrough.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,6 @@ pub mod my_object {
#[cxx_name = "MyObject"]
type MyObjectQt;

include!("cxx-qt-lib/include/qt_types.h");
#[namespace = ""]
type QColor = cxx_qt_lib::QColor;
#[namespace = ""]
type QDate = cxx_qt_lib::QDate;
#[namespace = ""]
type QDateTime = cxx_qt_lib::QDateTime;
#[namespace = ""]
type QPoint = cxx_qt_lib::QPoint;
#[namespace = ""]
type QPointF = cxx_qt_lib::QPointF;
#[namespace = ""]
type QRect = cxx_qt_lib::QRect;
#[namespace = ""]
type QRectF = cxx_qt_lib::QRectF;
#[namespace = ""]
type QSize = cxx_qt_lib::QSize;
#[namespace = ""]
type QSizeF = cxx_qt_lib::QSizeF;
#[namespace = ""]
type QString = cxx_qt_lib::QString;
#[namespace = ""]
type QTime = cxx_qt_lib::QTime;
#[namespace = ""]
type QUrl = cxx_qt_lib::QUrl;
#[namespace = ""]
type QVariant = cxx_qt_lib::QVariant;

#[rust_name = "number"]
fn getNumber(self: &MyObjectQt) -> i32;
#[rust_name = "set_number"]
Expand Down
Loading