Replace static method wrappers with aliases (#1243)

jnbooth · web-flow · commit 64d4ee6ba01a · 2025-03-31T09:38:42.000+02:00
* cxx-qt-lib: replace static method wrappers with aliases

* cxx-qt-lib: run clang-format on qpoint.h

* cxx-qt-lib: revert changes to QUuid

* cxx-qt-lib: use function refs instead of pointers

* cxx-qt-lib: inline function pointers
diff --git a/crates/cxx-qt-lib/build.rs b/crates/cxx-qt-lib/build.rs
@@ -342,10 +342,6 @@ fn main() {
         cpp_files.extend(["qml/qqmlapplicationengine", "qml/qqmlengine"]);
     }
 
-    if qt_quickcontrols_enabled() {
-        cpp_files.extend(["quickcontrols/qquickstyle"]);
-    }
-
     if !emscripten_targeted {
         cpp_files.extend(["core/qdatetime", "core/qtimezone"]);
     }
diff --git a/crates/cxx-qt-lib/include/core/qdate.h b/crates/cxx-qt-lib/include/core/qdate.h
@@ -15,17 +15,17 @@
 namespace rust {
 namespace cxxqtlib1 {
 
-QDate
-qdateCurrentDate();
+inline QDate (*qdateCurrentDate)() = QDate::currentDate;
+
+inline bool (*qdateIsLeapYear)(int) = QDate::isLeapYear;
+
 QDate
 qdateFromString(const QString& string, const QString& format);
 QDate
 qdateFromString(const QString& string, Qt::DateFormat format);
 // In Qt 5 d is const-ref, in Qt 6 it is value
 qint64
 qdateDaysTo(const QDate& date, QDate d);
-bool
-qdateIsLeapYear(::std::int32_t year);
 QString
 qdateToFormat(const QDate& date, const QString& format);
 
diff --git a/crates/cxx-qt-lib/include/core/qdatetime.h b/crates/cxx-qt-lib/include/core/qdatetime.h
@@ -28,18 +28,19 @@ struct IsRelocatable<QDateTime> : ::std::true_type
 namespace rust {
 namespace cxxqtlib1 {
 
-QDateTime
-qdatetimeCurrentDateTime();
-QDateTime
-qdatetimeCurrentDateTimeUtc();
-qint64
-qdatetimeCurrentMSecsSinceEpoch();
-qint64
-qdatetimeCurrentSecsSinceEpoch();
-QDateTime
-qdatetimeFromMSecsSinceEpoch(qint64 msecs, const QTimeZone& timeZone);
-QDateTime
-qdatetimeFromSecsSinceEpoch(qint64 secs, const QTimeZone& timeZone);
+inline QDateTime (*qdatetimeCurrentDateTime)() = QDateTime::currentDateTime;
+inline QDateTime (*qdatetimeCurrentDateTimeUtc)() =
+  QDateTime::currentDateTimeUtc;
+inline qint64 (*qdatetimeCurrentMSecsSinceEpoch)() =
+  QDateTime::currentMSecsSinceEpoch;
+inline qint64 (*qdatetimeCurrentSecsSinceEpoch)() =
+  QDateTime::currentSecsSinceEpoch;
+
+inline QDateTime (*qdatetimeFromMSecsSinceEpoch)(qint64, const QTimeZone&) =
+  QDateTime::fromMSecsSinceEpoch;
+inline QDateTime (*qdatetimeFromSecsSinceEpoch)(qint64, const QTimeZone&) =
+  QDateTime::fromSecsSinceEpoch;
+
 void
 qdatetimeSetDate(QDateTime& datetime, QDate date);
 void
diff --git a/crates/cxx-qt-lib/include/core/qpoint.h b/crates/cxx-qt-lib/include/core/qpoint.h
@@ -14,8 +14,8 @@
 namespace rust {
 namespace cxxqtlib1 {
 
-::std::int32_t
-qpointDotProduct(const QPoint& p1, const QPoint& p2);
+inline ::std::int32_t (*qpointDotProduct)(const QPoint&,
+                                          const QPoint&) = QPoint::dotProduct;
 
 }
 }
diff --git a/crates/cxx-qt-lib/include/core/qpointf.h b/crates/cxx-qt-lib/include/core/qpointf.h
@@ -12,8 +12,8 @@
 namespace rust {
 namespace cxxqtlib1 {
 
-double
-qpointfDotProduct(const QPointF& p1, const QPointF& p2);
+inline double (*qpointfDotProduct)(const QPointF&,
+                                   const QPointF&) = QPointF::dotProduct;
 
 }
 }
diff --git a/crates/cxx-qt-lib/include/core/qtime.h b/crates/cxx-qt-lib/include/core/qtime.h
@@ -15,10 +15,12 @@
 namespace rust {
 namespace cxxqtlib1 {
 
-QTime
-qtimeCurrentTime();
-QTime
-qtimeFromMSecsSinceStartOfDay(::std::int32_t msecs);
+inline QTime (*qtimeCurrentTime)() = QTime::currentTime;
+inline QTime (*qtimeFromMSecsSinceStartOfDay)(::std::int32_t) =
+  QTime::fromMSecsSinceStartOfDay;
+
+inline bool (*qtimeIsValid)(int, int, int, int) = QTime::isValid;
+
 // In Qt 5 t is const-ref, in Qt 6 it is value
 ::std::int32_t
 qtimeMSecsTo(const QTime& time, QTime t);
@@ -30,7 +32,5 @@ qtimeFromString(const QString& string, Qt::DateFormat format);
 ::std::int32_t
 qtimeSecsTo(const QTime& time, QTime t);
 
-bool
-qtimeIsValid(int h, int m, int s, int ms);
 }
 }
diff --git a/crates/cxx-qt-lib/include/core/qtimezone.h b/crates/cxx-qt-lib/include/core/qtimezone.h
@@ -19,8 +19,9 @@ using QTimeZoneTimeType = QTimeZone::TimeType;
 namespace rust {
 namespace cxxqtlib1 {
 
-QList<QByteArray>
-qtimezoneAvailableTimeZoneIds();
+inline QList<QByteArray> (*qtimezoneAvailableTimeZoneIds)() =
+  QTimeZone::availableTimeZoneIds;
+
 ::std::unique_ptr<QTimeZone>
 qtimezoneClone(const QTimeZone& timezone);
 ::std::unique_ptr<QTimeZone>
@@ -35,8 +36,7 @@ ::std::unique_ptr<QTimeZone>
 qtimezoneFromIana(const QByteArray& ianaId);
 ::std::unique_ptr<QTimeZone>
 qtimezoneSystemTimeZone();
-QByteArray
-qtimezoneSystemTimeZoneId();
+inline QByteArray (*qtimezoneSystemTimeZoneId)() = QTimeZone::systemTimeZoneId;
 ::std::unique_ptr<QTimeZone>
 qtimezoneUtc();
 
diff --git a/crates/cxx-qt-lib/include/core/qurl.h b/crates/cxx-qt-lib/include/core/qurl.h
@@ -37,16 +37,14 @@ QString
 qurlFragment(const QUrl& url);
 QUrl
 qurlFromEncoded(const QByteArray& input);
+inline QUrl (*qurlFromLocalFile)(const QString&) = QUrl::fromLocalFile;
+inline QString (*qurlFromPercentEncoding)(const QByteArray&) =
+  QUrl::fromPercentEncoding;
 QUrl
-qurlFromLocalFile(const QString& localFile);
-QString
-qurlFromPercentEncoding(const QByteArray& input);
-QUrl
-qurlFromUserInput(const QString& userInput, const QString& workingDirectory);
+qurlFromUserInput(const QString& userInput, const QString& workingDictionary);
 QString
 qurlHost(const QUrl& url);
-QStringList
-qurlIdnWhitelist();
+inline QStringList (*qurlIdnWhitelist)() = QUrl::idnWhitelist;
 QString
 qurlPath(const QUrl& url);
 QString
@@ -59,8 +57,7 @@ void
 qurlSetFragment(QUrl& url, const QString& fragment);
 void
 qurlSetHost(QUrl& url, const QString& host);
-void
-qurlSetIdnWhitelist(const QStringList& list);
+inline void (*qurlSetIdnWhitelist)(const QStringList&) = QUrl::setIdnWhitelist;
 void
 qurlSetPassword(QUrl& url, const QString& password);
 void
@@ -81,10 +78,10 @@ QByteArray
 qurlToEncoded(const QUrl& url);
 QString
 qurlToQString(const QUrl& url);
-QByteArray
-qurlToPercentEncoding(const QString& input,
-                      const QByteArray& exclude,
-                      const QByteArray& include);
+inline QByteArray (*qurlToPercentEncoding)(const QString&,
+                                           const QByteArray&,
+                                           const QByteArray&) =
+  QUrl::toPercentEncoding;
 QString
 qurlUserInfo(const QUrl& url);
 QString
diff --git a/crates/cxx-qt-lib/include/gui/qcolor.h b/crates/cxx-qt-lib/include/gui/qcolor.h
@@ -34,35 +34,30 @@ namespace cxxqtlib1 {
 using QColorNameFormat = QColor::NameFormat;
 using QColorSpec = QColor::Spec;
 
-QStringList
-qcolorColorNames();
-QColor
-qcolorInitFromCmyk(::std::int32_t c,
-                   ::std::int32_t m,
-                   ::std::int32_t y,
-                   ::std::int32_t k,
-                   ::std::int32_t a);
+inline QStringList (*qcolorColorNames)() = QColor::colorNames;
+inline QColor (*qcolorInitFromCmyk)(::std::int32_t,
+                                    ::std::int32_t,
+                                    ::std::int32_t,
+                                    ::std::int32_t,
+                                    ::std::int32_t) = QColor::fromCmyk;
 QColor
 qcolorInitFromCmykF(float c, float m, float y, float k, float a);
-QColor
-qcolorInitFromHsl(::std::int32_t h,
-                  ::std::int32_t s,
-                  ::std::int32_t l,
-                  ::std::int32_t a);
+inline QColor (*qcolorInitFromHsl)(::std::int32_t,
+                                   ::std::int32_t,
+                                   ::std::int32_t,
+                                   ::std::int32_t) = QColor::fromHsl;
 QColor
 qcolorInitFromHslF(float h, float s, float l, float a);
-QColor
-qcolorInitFromHsv(::std::int32_t h,
-                  ::std::int32_t s,
-                  ::std::int32_t v,
-                  ::std::int32_t a);
+inline QColor (*qcolorInitFromHsv)(::std::int32_t,
+                                   ::std::int32_t,
+                                   ::std::int32_t,
+                                   ::std::int32_t) = QColor::fromHsv;
 QColor
 qcolorInitFromHsvF(float h, float s, float v, float a);
-QColor
-qcolorInitFromRgb(::std::int32_t red,
-                  ::std::int32_t green,
-                  ::std::int32_t blue,
-                  ::std::int32_t alpha);
+inline QColor (*qcolorInitFromRgb)(::std::int32_t,
+                                   ::std::int32_t,
+                                   ::std::int32_t,
+                                   ::std::int32_t) = QColor::fromRgb;
 QColor
 qcolorInitFromRgbF(float red, float green, float blue, float alpha);
 
diff --git a/crates/cxx-qt-lib/include/gui/qguiapplication.h b/crates/cxx-qt-lib/include/gui/qguiapplication.h
@@ -19,26 +19,24 @@ namespace cxxqtlib1 {
 ::std::unique_ptr<QGuiApplication>
 qguiapplicationNew(const QVector<QByteArray>& args);
 
-void
-qguiapplicationSetFont(QGuiApplication& app, const QFont& font);
+inline void (*qguiapplicationSetFont)(const QFont&) = QGuiApplication::setFont;
 
-QFont
-qguiapplicationFont(const QGuiApplication& app);
+inline QFont (*qguiapplicationFont)() = QGuiApplication::font;
 
-void
-qguiapplicationSetDesktopFileName(const QString& name);
+inline void (*qguiapplicationSetDesktopFileName)(const QString&) =
+  QGuiApplication::setDesktopFileName;
 
-QString
-qguiapplicationDesktopFileName();
+inline QString (*qguiapplicationDesktopFileName)() =
+  QGuiApplication::desktopFileName;
 
-Qt::KeyboardModifiers
-qguiapplicationKeyboardModifiers();
+inline Qt::KeyboardModifiers (*qguiapplicationKeyboardModifiers)() =
+  QGuiApplication::keyboardModifiers;
 
-Qt::MouseButtons
-qguiapplicationMouseButtons();
+inline Qt::MouseButtons (*qguiapplicationMouseButtons)() =
+  QGuiApplication::mouseButtons;
 
-Qt::KeyboardModifiers
-qguiapplicationQueryKeyboardModifiers();
+inline Qt::KeyboardModifiers (*qguiapplicationQueryKeyboardModifiers)() =
+  QGuiApplication::queryKeyboardModifiers;
 
 }
 }
diff --git a/crates/cxx-qt-lib/include/quickcontrols/qquickstyle.h b/crates/cxx-qt-lib/include/quickcontrols/qquickstyle.h
@@ -18,14 +18,12 @@
 namespace rust {
 namespace cxxqtlib1 {
 
-QString
-qquickstyleName();
+inline QString (*qquickstyleName)() = QQuickStyle::name;
 
-void
-qquickstyleSetFallbackStyle(const QString& style);
+inline void (*qquickstyleSetFallbackStyle)(const QString&) =
+  QQuickStyle::setFallbackStyle;
 
-void
-qquickstyleSetStyle(const QString& style);
+inline void (*qquickstyleSetStyle)(const QString&) = QQuickStyle::setStyle;
 
 }
 }
diff --git a/crates/cxx-qt-lib/src/core/qdate.cpp b/crates/cxx-qt-lib/src/core/qdate.cpp
@@ -21,12 +21,6 @@ static_assert(::std::is_trivially_copyable<QDate>::value,
 namespace rust {
 namespace cxxqtlib1 {
 
-QDate
-qdateCurrentDate()
-{
-  return QDate::currentDate();
-}
-
 qint64
 qdateDaysTo(const QDate& date, QDate d)
 {
@@ -46,12 +40,6 @@ qdateFromString(const QString& string, Qt::DateFormat format)
   return QDate::fromString(string, format);
 }
 
-bool
-qdateIsLeapYear(::std::int32_t year)
-{
-  return QDate::isLeapYear(static_cast<int>(year));
-}
-
 QString
 qdateToFormat(const QDate& date, const QString& format)
 {
diff --git a/crates/cxx-qt-lib/src/core/qdatetime.cpp b/crates/cxx-qt-lib/src/core/qdatetime.cpp
@@ -27,42 +27,6 @@ static_assert(QTypeInfo<QDateTime>::isRelocatable);
 namespace rust {
 namespace cxxqtlib1 {
 
-QDateTime
-qdatetimeCurrentDateTime()
-{
-  return QDateTime::currentDateTime();
-}
-
-QDateTime
-qdatetimeCurrentDateTimeUtc()
-{
-  return QDateTime::currentDateTimeUtc();
-}
-
-qint64
-qdatetimeCurrentMSecsSinceEpoch()
-{
-  return QDateTime::currentMSecsSinceEpoch();
-}
-
-qint64
-qdatetimeCurrentSecsSinceEpoch()
-{
-  return QDateTime::currentSecsSinceEpoch();
-}
-
-QDateTime
-qdatetimeFromMSecsSinceEpoch(qint64 msecs, const QTimeZone& timeZone)
-{
-  return QDateTime::fromMSecsSinceEpoch(msecs, timeZone);
-}
-
-QDateTime
-qdatetimeFromSecsSinceEpoch(qint64 secs, const QTimeZone& timeZone)
-{
-  return QDateTime::fromSecsSinceEpoch(secs, timeZone);
-}
-
 void
 qdatetimeSetDate(QDateTime& datetime, QDate date)
 {
diff --git a/crates/cxx-qt-lib/src/core/qpoint.cpp b/crates/cxx-qt-lib/src/core/qpoint.cpp
@@ -20,15 +20,3 @@ assert_alignment_and_size(QPoint, {
 });
 
 static_assert(::std::is_trivially_copyable<QPoint>::value);
-
-namespace rust {
-namespace cxxqtlib1 {
-
-::std::int32_t
-qpointDotProduct(const QPoint& p1, const QPoint& p2)
-{
-  return QPoint::dotProduct(p1, p2);
-}
-
-}
-}
diff --git a/crates/cxx-qt-lib/src/core/qpointf.cpp b/crates/cxx-qt-lib/src/core/qpointf.cpp
@@ -20,15 +20,3 @@ assert_alignment_and_size(QPointF, {
 
 static_assert(::std::is_trivially_copyable<QPointF>::value,
               "QPointF should be trivially copyable");
-
-namespace rust {
-namespace cxxqtlib1 {
-
-double
-qpointfDotProduct(const QPointF& p1, const QPointF& p2)
-{
-  return QPointF::dotProduct(p1, p2);
-}
-
-}
-}
diff --git a/crates/cxx-qt-lib/src/core/qtime.cpp b/crates/cxx-qt-lib/src/core/qtime.cpp
diff --git a/crates/cxx-qt-lib/src/core/qtimezone.cpp b/crates/cxx-qt-lib/src/core/qtimezone.cpp
diff --git a/crates/cxx-qt-lib/src/core/qurl.cpp b/crates/cxx-qt-lib/src/core/qurl.cpp
diff --git a/crates/cxx-qt-lib/src/gui/qcolor.cpp b/crates/cxx-qt-lib/src/gui/qcolor.cpp
diff --git a/crates/cxx-qt-lib/src/gui/qguiapplication.cpp b/crates/cxx-qt-lib/src/gui/qguiapplication.cpp
diff --git a/crates/cxx-qt-lib/src/gui/qguiapplication.rs b/crates/cxx-qt-lib/src/gui/qguiapplication.rs
diff --git a/crates/cxx-qt-lib/src/quickcontrols/qquickstyle.cpp b/crates/cxx-qt-lib/src/quickcontrols/qquickstyle.cpp

Original file line number	Diff line number	Diff line change
`@@ -342,10 +342,6 @@ fn main() {`
`342`	`342`	`cpp_files.extend(["qml/qqmlapplicationengine", "qml/qqmlengine"]);`
`343`	`343`	`}`
`344`	`344`
`345`		`- if qt_quickcontrols_enabled() {`
`346`		`- cpp_files.extend(["quickcontrols/qquickstyle"]);`
`347`		`- }`
`348`		`-`
`349`	`345`	`if !emscripten_targeted {`
`350`	`346`	`cpp_files.extend(["core/qdatetime", "core/qtimezone"]);`
`351`	`347`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`	`namespace rust {`
`15`	`15`	`namespace cxxqtlib1 {`
`16`	`16`
`17`		`-::std::int32_t`
`18`		`-qpointDotProduct(const QPoint& p1, const QPoint& p2);`
	`17`	`+inline ::std::int32_t (*qpointDotProduct)(const QPoint&,`
	`18`	`+ const QPoint&) = QPoint::dotProduct;`
`19`	`19`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@`
`12`	`12`	`namespace rust {`
`13`	`13`	`namespace cxxqtlib1 {`
`14`	`14`
`15`		`-double`
`16`		`-qpointfDotProduct(const QPointF& p1, const QPointF& p2);`
	`15`	`+inline double (*qpointfDotProduct)(const QPointF&,`
	`16`	`+ const QPointF&) = QPointF::dotProduct;`
`17`	`17`
`18`	`18`	`}`
`19`	`19`	`}`