WIP: cxx-qt-lib: use cfg for differing Qt 5 and Qt 6 types

Author: ahayzen-kdab

Cargo.toml

@@ -60,3 +60,11 @@ syn = { version = "2.0", features = ["extra-traits", "full"] }
 quote = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+
+[patch.crates-io]
+# Use a patched cxx so that duplicate names with different cfg options don't fail
+#
+# git = "https://github.com/ahayzen-kdab/cxx.git", branch = "cfg-duplicate-names"
+cxx = { path = "/var/home/andrew/Projects/cxx-qt/cxx" }
+cxx-build = { path = "/var/home/andrew/Projects/cxx-qt/cxx/gen/build" }
+cxx-gen = { path = "/var/home/andrew/Projects/cxx-qt/cxx/gen/lib" }

crates/cxx-qt-lib-headers/include/core/qstring.h

@@ -33,11 +33,6 @@ qstringToRustString(const QString& string);
 
 QString
 qstringArg(const QString& string, const QString& a);
-::rust::isize
-qstringIndexOf(const QString& string,
-               const QString& str,
-               ::rust::isize from,
-               Qt::CaseSensitivity cs);
 QString&
 qstringInsert(QString& string, ::rust::isize pos, const QString& str);
 QString

crates/cxx-qt-lib/src/core/qstring.cpp

@@ -61,22 +61,6 @@ qstringArg(const QString& string, const QString& a)
   return string.arg(a);
 }
 
-::rust::isize
-qstringIndexOf(const QString& string,
-               const QString& str,
-               ::rust::isize from,
-               Qt::CaseSensitivity cs)
-{
-  // Qt 5 has an int Qt 6 has a qsizetype
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-  return static_cast<::rust::isize>(
-    string.indexOf(str, static_cast<qsizetype>(from), cs));
-#else
-  return static_cast<::rust::isize>(
-    string.indexOf(str, static_cast<int>(from), cs));
-#endif
-}
-
 QString&
 qstringInsert(QString& string, ::rust::isize pos, const QString& str)
 {

crates/cxx-qt-lib/src/core/qstring.rs

@@ -17,6 +17,14 @@ mod ffi {
         type SplitBehaviorFlags = crate::SplitBehaviorFlags;
     }
 
+    #[cfg(cxxqt_qt_version_major = "6")]
+    unsafe extern "C++" {
+        include!("cxx-qt-lib/qtypes.h");
+
+        #[cxx_name = "qsizetype"]
+        type QSizeType = crate::QSizeType;
+    }
+
     unsafe extern "C++" {
         include!("cxx-qt-lib/qbytearray.h");
         type QByteArray = crate::QByteArray;
@@ -43,6 +51,23 @@ mod ffi {
         #[rust_name = "ends_with"]
         fn endsWith(self: &QString, s: &QString, cs: CaseSensitivity) -> bool;
 
+        /// Returns the index position of the first occurrence of the string str in this string,
+        /// searching forward from index position from. Returns -1 if str is not found.
+        #[cfg(cxxqt_qt_version_major = "5")]
+        #[rust_name = "index_of"]
+        fn indexOf(self: &QString, str: &QString, from: i32, cs: CaseSensitivity) -> i32;
+
+        /// Returns the index position of the first occurrence of the string str in this string,
+        /// searching forward from index position from. Returns -1 if str is not found.
+        #[cfg(cxxqt_qt_version_major = "6")]
+        #[rust_name = "index_of"]
+        fn indexOf(
+            self: &QString,
+            str: &QString,
+            from: QSizeType,
+            cs: CaseSensitivity,
+        ) -> QSizeType;
+
         /// Returns true if the string has no characters; otherwise returns false.
         #[rust_name = "is_empty"]
         fn isEmpty(self: &QString) -> bool;
@@ -124,14 +149,6 @@ mod ffi {
         #[rust_name = "qstring_arg"]
         fn qstringArg(string: &QString, a: &QString) -> QString;
         #[doc(hidden)]
-        #[rust_name = "qstring_index_of"]
-        fn qstringIndexOf(
-            string: &QString,
-            str: &QString,
-            from: isize,
-            cs: CaseSensitivity,
-        ) -> isize;
-        #[doc(hidden)]
         #[rust_name = "qstring_insert"]
         fn qstringInsert<'a>(string: &'a mut QString, pos: isize, str: &QString)
             -> &'a mut QString;
@@ -302,12 +319,6 @@ impl QString {
         self.compare_i32(other, cs).cmp(&0)
     }
 
-    /// Returns the index position of the first occurrence of the string str in this string,
-    /// searching forward from index position from. Returns -1 if str is not found.
-    pub fn index_of(&self, str: &QString, from: isize, cs: ffi::CaseSensitivity) -> isize {
-        ffi::qstring_index_of(self, str, from, cs)
-    }
-
     /// Inserts the string str at the given index position and returns a mutable reference to this string.
     pub fn insert<'a>(&'a mut self, pos: isize, str: &Self) -> &'a mut Self {
         ffi::qstring_insert(self, pos, str)