cxx-qt-build: use file stem for cxx bridges

As this is how cxx bridges normally function, ideally we want
this for cxx-qt bridges too but the macro needs to know the file
name too.

Author: ahayzen-kdab

CHANGELOG.md

@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Internal `cxx-qt` headers have moved to the namespace `cxxqt1` and the folder `cxx-qt`
 - `cxx-qt-gen` now does not generate code requiring `cxx-qt-lib`, this allows for `cxx-qt-lib` to be optional
 - `cxx-qt-lib` headers must be given to `cxx-qt-build` with `.with_opts(cxx_qt_lib_headers::build_opts())`
+- File name is used for CXX bridges rather than module name to match upstream
 
 ### Fixed
 

crates/cxx-qt-build/Cargo.toml

@@ -14,7 +14,6 @@ repository.workspace = true
 
 [dependencies]
 cc.workspace = true
-convert_case.workspace = true
 cxx-gen.workspace = true
 cxx-qt.workspace = true
 cxx-qt-gen.workspace = true

crates/cxx-qt-build/src/lib.rs

@@ -18,7 +18,6 @@ mod qml_modules;
 use qml_modules::OwningQmlModule;
 pub use qml_modules::QmlModule;
 
-use convert_case::{Case, Casing};
 use quote::ToTokens;
 use std::{
     collections::HashSet,
@@ -65,11 +64,6 @@ impl GeneratedCpp {
             .map_err(to_diagnostic)?;
 
         let mut cxx_qt = None;
-        // TODO: later change how the resultant filename is chosen, can we match the input file like
-        // CXX does?
-        //
-        // For CXX-Qt generating one header per QObject likely makes sense, but what happens with CXX data?
-        // for now this uses the module ident
         let mut file_ident: String = "".to_owned();
         let mut tokens = proc_macro2::TokenStream::new();
 
@@ -90,7 +84,18 @@ impl GeneratedCpp {
                             rust_file_path.display());
                     }
 
-                    file_ident = m.ident.to_string().to_case(Case::Snake);
+                    // Match upstream where they use the file name as the ident
+                    //
+                    // TODO: what happens if there are folders?
+                    //
+                    // TODO: ideally CXX-Qt would also use the file name
+                    // https://github.com/KDAB/cxx-qt/pull/200/commits/4861c92e66c3a022d3f0dedd9f8fd20db064b42b
+                    file_ident = rust_file_path
+                        .file_stem()
+                        .unwrap()
+                        .to_str()
+                        .unwrap()
+                        .to_owned();
                     tokens.extend(m.into_token_stream());
                 }
                 CxxQtItem::CxxQt(m) => {

tests/basic_cxx_only/cpp/main.cpp

@@ -7,7 +7,7 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/ffi.cxx.h"
+#include "cxx-qt-gen/lib.cxx.h"
 #include "cxx_test.h"
 
 class CxxTest : public QObject

tests/qt_types_standalone/cpp/qbytearray.h

@@ -9,7 +9,7 @@
 #include <QtCore/QByteArray>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qbytearray_cxx.cxx.h"
+#include "cxx-qt-gen/qbytearray.cxx.h"
 
 class QByteArrayTest : public QObject
 {

tests/qt_types_standalone/cpp/qcolor.h

@@ -9,7 +9,7 @@
 #include <QtGui/QColor>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qcolor_cxx.cxx.h"
+#include "cxx-qt-gen/qcolor.cxx.h"
 
 class QColorTest : public QObject
 {

tests/qt_types_standalone/cpp/qcoreapplication.h

@@ -9,7 +9,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qcoreapplication_cxx.cxx.h"
+#include "cxx-qt-gen/qcoreapplication.cxx.h"
 
 class QCoreApplicationTest : public QObject
 {

tests/qt_types_standalone/cpp/qdate.h

@@ -9,7 +9,7 @@
 #include <QtCore/QDate>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qdate_cxx.cxx.h"
+#include "cxx-qt-gen/qdate.cxx.h"
 
 class QDateTest : public QObject
 {

tests/qt_types_standalone/cpp/qdatetime.h

@@ -9,7 +9,7 @@
 #include <QtCore/QDateTime>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qdatetime_cxx.cxx.h"
+#include "cxx-qt-gen/qdatetime.cxx.h"
 
 class QDateTimeTest : public QObject
 {

tests/qt_types_standalone/cpp/qguiapplication.h

@@ -9,7 +9,7 @@
 #include <QtGui/QGuiApplication>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qguiapplication_cxx.cxx.h"
+#include "cxx-qt-gen/qguiapplication.cxx.h"
 
 class QGuiApplicationTest : public QObject
 {

tests/qt_types_standalone/cpp/qhash.h

@@ -10,7 +10,7 @@
 #include <QtCore/QVariant>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qhash_cxx.cxx.h"
+#include "cxx-qt-gen/qhash.cxx.h"
 
 class QHashTest : public QObject
 {

tests/qt_types_standalone/cpp/qline.h

@@ -9,7 +9,7 @@
 #include <QtCore/QLine>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qline_cxx.cxx.h"
+#include "cxx-qt-gen/qline.cxx.h"
 
 class QLineTest : public QObject
 {

tests/qt_types_standalone/cpp/qlinef.h

@@ -9,7 +9,7 @@
 #include <QtCore/QLineF>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qlinef_cxx.cxx.h"
+#include "cxx-qt-gen/qlinef.cxx.h"
 
 class QLineFTest : public QObject
 {

tests/qt_types_standalone/cpp/qlist.h

@@ -9,7 +9,7 @@
 #include <QtCore/QList>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qlist_cxx.cxx.h"
+#include "cxx-qt-gen/qlist.cxx.h"
 
 class QListTest : public QObject
 {

tests/qt_types_standalone/cpp/qmap.h

@@ -10,7 +10,7 @@
 #include <QtCore/QVariant>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qmap_cxx.cxx.h"
+#include "cxx-qt-gen/qmap.cxx.h"
 
 class QMapTest : public QObject
 {

tests/qt_types_standalone/cpp/qmargins.h

@@ -9,7 +9,7 @@
 #include <QtCore/QMargins>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qmargins_cxx.cxx.h"
+#include "cxx-qt-gen/qmargins.cxx.h"
 
 class QMarginsTest : public QObject
 {

tests/qt_types_standalone/cpp/qmarginsf.h

@@ -9,7 +9,7 @@
 #include <QtCore/QMarginsF>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qmarginsf_cxx.cxx.h"
+#include "cxx-qt-gen/qmarginsf.cxx.h"
 
 class QMarginsFTest : public QObject
 {

tests/qt_types_standalone/cpp/qmetaobjectconnection.h

@@ -11,7 +11,7 @@
 #include <QtTest/QTest>
 #include <qobjectdefs.h>
 
-#include "cxx-qt-gen/qmetaobjectconnection_cxx.cxx.h"
+#include "cxx-qt-gen/qmetaobjectconnection.cxx.h"
 
 class MyObject : public QObject
 {

tests/qt_types_standalone/cpp/qmodelindex.h

@@ -11,7 +11,7 @@
 #include <QtCore/QStringListModel>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qmodelindex_cxx.cxx.h"
+#include "cxx-qt-gen/qmodelindex.cxx.h"
 
 // We subclass from QAbstractListModel to have a valid model to use for
 // access to createIndex();

tests/qt_types_standalone/cpp/qpersistentmodelindex.h

@@ -11,7 +11,7 @@
 #include <QtGui/QStandardItemModel>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qpersistentmodelindex_cxx.cxx.h"
+#include "cxx-qt-gen/qpersistentmodelindex.cxx.h"
 
 class QPersistentModelIndexTest : public QObject
 {

tests/qt_types_standalone/cpp/qpoint.h

@@ -9,7 +9,7 @@
 #include <QtCore/QPoint>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qpoint_cxx.cxx.h"
+#include "cxx-qt-gen/qpoint.cxx.h"
 
 class QPointTest : public QObject
 {

tests/qt_types_standalone/cpp/qpointf.h

@@ -9,7 +9,7 @@
 #include <QtCore/QPointF>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qpointf_cxx.cxx.h"
+#include "cxx-qt-gen/qpointf.cxx.h"
 
 class QPointFTest : public QObject
 {

tests/qt_types_standalone/cpp/qqmlapplicationengine.h

@@ -10,7 +10,7 @@
 #include <QtQml/QQmlApplicationEngine>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qqmlapplicationengine_cxx.cxx.h"
+#include "cxx-qt-gen/qqmlapplicationengine.cxx.h"
 
 class QQmlApplicationEngineTest : public QObject
 {

tests/qt_types_standalone/cpp/qqmlengine.h

@@ -10,7 +10,7 @@
 #include <QtQml/QQmlEngine>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qqmlengine_cxx.cxx.h"
+#include "cxx-qt-gen/qqmlengine.cxx.h"
 
 class QQmlEngineTest : public QObject
 {

tests/qt_types_standalone/cpp/qrect.h

@@ -9,7 +9,7 @@
 #include <QtCore/QRect>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qrect_cxx.cxx.h"
+#include "cxx-qt-gen/qrect.cxx.h"
 
 class QRectTest : public QObject
 {

tests/qt_types_standalone/cpp/qrectf.h

@@ -9,7 +9,7 @@
 #include <QtCore/QRectF>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qrectf_cxx.cxx.h"
+#include "cxx-qt-gen/qrectf.cxx.h"
 
 class QRectFTest : public QObject
 {

tests/qt_types_standalone/cpp/qset.h

@@ -9,7 +9,7 @@
 #include <QtCore/QSet>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qset_cxx.cxx.h"
+#include "cxx-qt-gen/qset.cxx.h"
 
 class QSetTest : public QObject
 {

tests/qt_types_standalone/cpp/qsize.h

@@ -9,7 +9,7 @@
 #include <QtCore/QSize>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qsize_cxx.cxx.h"
+#include "cxx-qt-gen/qsize.cxx.h"
 
 class QSizeTest : public QObject
 {

tests/qt_types_standalone/cpp/qsizef.h

@@ -9,7 +9,7 @@
 #include <QtCore/QSizeF>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qsizef_cxx.cxx.h"
+#include "cxx-qt-gen/qsizef.cxx.h"
 
 class QSizeFTest : public QObject
 {

tests/qt_types_standalone/cpp/qstring.h

@@ -9,7 +9,7 @@
 #include <QtCore/QString>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qstring_cxx.cxx.h"
+#include "cxx-qt-gen/qstring.cxx.h"
 
 class QStringTest : public QObject
 {

tests/qt_types_standalone/cpp/qstringlist.h

@@ -9,7 +9,7 @@
 #include <QtCore/QStringList>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qstringlist_cxx.cxx.h"
+#include "cxx-qt-gen/qstringlist.cxx.h"
 
 class QStringListTest : public QObject
 {

tests/qt_types_standalone/cpp/qtime.h

@@ -9,7 +9,7 @@
 #include <QtCore/QTime>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qtime_cxx.cxx.h"
+#include "cxx-qt-gen/qtime.cxx.h"
 
 class QTimeTest : public QObject
 {

tests/qt_types_standalone/cpp/qtimezone.h

@@ -9,7 +9,7 @@
 #include <QtCore/QTimeZone>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qtimezone_cxx.cxx.h"
+#include "cxx-qt-gen/qtimezone.cxx.h"
 
 class QTimeZoneTest : public QObject
 {

tests/qt_types_standalone/cpp/qurl.h

@@ -9,7 +9,7 @@
 #include <QtCore/QUrl>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qurl_cxx.cxx.h"
+#include "cxx-qt-gen/qurl.cxx.h"
 
 class QUrlTest : public QObject
 {

tests/qt_types_standalone/cpp/qvariant.h

@@ -9,7 +9,7 @@
 #include <QtCore/QVariant>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qvariant_cxx.cxx.h"
+#include "cxx-qt-gen/qvariant.cxx.h"
 
 // We use VariantTest in data driven tests, so register to Qt metatype system
 Q_DECLARE_METATYPE(VariantTest)

tests/qt_types_standalone/cpp/qvector.h

@@ -9,7 +9,7 @@
 #include <QtCore/QVector>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qvector_cxx.cxx.h"
+#include "cxx-qt-gen/qvector.cxx.h"
 
 class QVectorTest : public QObject
 {

tests/qt_types_standalone/cpp/qvector2d.h

@@ -9,7 +9,7 @@
 #include <QtGui/QVector2D>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qvector_2_d_cxx.cxx.h"
+#include "cxx-qt-gen/qvector2d.cxx.h"
 
 class QVector2DTest : public QObject
 {

tests/qt_types_standalone/cpp/qvector3d.h

@@ -9,7 +9,7 @@
 #include <QtGui/QVector4D>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qvector_3_d_cxx.cxx.h"
+#include "cxx-qt-gen/qvector3d.cxx.h"
 
 class QVector3DTest : public QObject
 {

tests/qt_types_standalone/cpp/qvector4d.h

@@ -9,7 +9,7 @@
 #include <QtGui/QVector4D>
 #include <QtTest/QTest>
 
-#include "cxx-qt-gen/qvector_4_d_cxx.cxx.h"
+#include "cxx-qt-gen/qvector4d.cxx.h"
 
 class QVector4DTest : public QObject
 {