From ba6da187f3f3e7ccb0d1cd4b30e50b62b2c58eb7 Mon Sep 17 00:00:00 2001 From: njohnson Date: Sun, 7 Sep 2025 23:15:56 -0400 Subject: [PATCH] Updated xgameworldsp --- libs/xassets/xgameworldsp.cpp | 16 +++------------- libs/xassets/xgameworldsp.h | 8 ++------ 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/libs/xassets/xgameworldsp.cpp b/libs/xassets/xgameworldsp.cpp index 6d297b8..b095932 100644 --- a/libs/xassets/xgameworldsp.cpp +++ b/libs/xassets/xgameworldsp.cpp @@ -3,7 +3,7 @@ XGameWorldSp::XGameWorldSp() : XAsset() - , mName("") + , mName() , mPath() { SetType(ASSET_TYPE_GAMEWORLD_SP); @@ -18,24 +18,14 @@ XGameWorldSp::~XGameWorldSp() void XGameWorldSp::ParseData(QDataStream *aStream) { // Parse the name string if (GetPtr() == -1) { - mName = XString::ParseCustom(aStream); + mName.ParsePtr(aStream, false); - // Parse the path data using our new XPathData class mPath.ParseData(aStream); } } void XGameWorldSp::Clear() { - mName.clear(); + mName.Clear(); mPath.Clear(); } - -QString XGameWorldSp::GetName() const { - return mName; -} - -void XGameWorldSp::SetName(const QString& name) { - mName = name; -} - diff --git a/libs/xassets/xgameworldsp.h b/libs/xassets/xgameworldsp.h index e8981c0..dcac886 100644 --- a/libs/xassets/xgameworldsp.h +++ b/libs/xassets/xgameworldsp.h @@ -3,8 +3,7 @@ #include "xasset.h" #include "xpathdata.h" - -#include +#include "xstring.h" class XGameWorldSp : public XAsset { @@ -15,11 +14,8 @@ public: void ParseData(QDataStream *aStream) override; void Clear() override; - QString GetName() const; - void SetName(const QString& name); - private: - QString mName; + XString mName; XPathData mPath; };