stella: revert Convert stringstream::view() to stringstream::str() for ventura builds

src/cheat/CheatManager.cxx

@@ -298,7 +298,7 @@ void CheatManager::saveCheats(string_view md5sum)
       cheats << ",";
   }
 
-  const bool changed = cheats.view() != myCurrentCheat;
+  const bool changed = cheats.str() != myCurrentCheat;
 
   // Only update the list if absolutely necessary
   if(changed)
@@ -310,8 +310,8 @@ void CheatManager::saveCheats(string_view md5sum)
       myCheatMap.erase(iter);
 
     // Add new entry only if there are any cheats defined
-    if(!cheats.view().empty())
-      myCheatMap.emplace(md5sum, cheats.view());
+    if(!cheats.str().empty())
+      myCheatMap.emplace(md5sum, cheats.str());
   }
 
   // Update the dirty flag

src/common/EventHandlerSDL2.cxx

@@ -33,7 +33,7 @@ EventHandlerSDL2::EventHandlerSDL2(OSystem& osystem)
     myQwertz = int{'y'} == static_cast<int>
       (SDL_GetKeyFromScancode(static_cast<SDL_Scancode>(KBDK_Z)));
     buf << "Keyboard: " << (myQwertz ? "QWERTZ" : "QWERTY");
-    Logger::debug(buf.view());
+    Logger::debug(buf.str());
   }
 #endif
 
@@ -43,7 +43,7 @@ EventHandlerSDL2::EventHandlerSDL2(OSystem& osystem)
     ostringstream buf;
     buf << "ERROR: Couldn't initialize SDL joystick support: "
         << SDL_GetError() << '\n';
-    Logger::error(buf.view());
+    Logger::error(buf.str());
   }
   Logger::debug("EventHandlerSDL2::EventHandlerSDL2 SDL_INIT_JOYSTICK");
 #endif

src/common/FBBackendSDL2.cxx

@@ -105,11 +105,11 @@ void FBBackendSDL2::queryHardware(vector<Common::Size>& fullscreenRes,
       SDL_GetDisplayMode(i, m, &mode);
       res << std::setw(4) << mode.w << "x" << std::setw(4) << mode.h;
 
-      if(lastRes != res.view())
+      if(lastRes != res.str())
       {
-        Logger::debug(s.view());
+        Logger::debug(s.str());
         s.str("");
-        lastRes = res.view();
+        lastRes = res.str();
         s << "  " << lastRes << ": ";
       }
       s << mode.refresh_rate << "Hz";
@@ -118,7 +118,7 @@ void FBBackendSDL2::queryHardware(vector<Common::Size>& fullscreenRes,
       else
         s << "  ";
     }
-    Logger::debug(s.view());
+    Logger::debug(s.str());
   }
 
   // Now get the maximum windowed desktop resolution
@@ -332,7 +332,7 @@ bool FBBackendSDL2::setVideoMode(const VideoModeHandler::Mode& mode,
 
       msg << "Display refresh rate changed to "
           << adaptedSdlMode.refresh_rate << " Hz " << "(" << adaptedSdlMode.w << "x" << adaptedSdlMode.h << ")";
-      Logger::info(msg.view());
+      Logger::info(msg.str());
 
       SDL_DisplayMode setSdlMode;
       SDL_GetWindowDisplayMode(myWindow, &setSdlMode);

src/common/HighScoresManager.cxx

@@ -413,7 +413,7 @@ string HighScoresManager::md5Props() const
 
   buf << specialAddress(jprops) << specialBCD(jprops) << specialZeroBased(jprops);
 
-  return MD5::hash(buf.view());
+  return MD5::hash(buf.str());
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -569,7 +569,7 @@ string HighScoresManager::hash(const ScoresData& data) const
       << data.scores[r].date;
   }
 
-  return MD5::hash(buf.view());
+  return MD5::hash(buf.str());
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -656,7 +656,7 @@ void HighScoresManager::loadHighScores(ScoresData& data)
     clearHighScores(data);
     buf << "Error: Invalid high scores data for variation " << data.variation << ".";
   }
-  myOSystem.frameBuffer().showTextMessage(buf.view());
+  myOSystem.frameBuffer().showTextMessage(buf.str());
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

src/common/JoyMap.cxx

@@ -161,7 +161,7 @@ string JoyMap::getEventMappingDesc(int stick, Event::Type event,
   {
     if (_event == event && _mapping.mode == mode)
     {
-      if(!buf.view().empty())
+      if(!buf.str().empty())
         buf << ", ";
       buf << "C" << stick << getDesc(event, _mapping);
     }

src/common/KeyMap.cxx

@@ -195,7 +195,7 @@ string KeyMap::getEventMappingDesc(Event::Type event, EventMode mode) const
   {
     if (_event == event && _mapping.mode == mode)
     {
-      if(!buf.view().empty())
+      if(!buf.str().empty())
         buf << ", ";
       buf << getDesc(_mapping);
     }

src/common/MouseControl.cxx

@@ -107,7 +107,7 @@ MouseControl::MouseControl(Console& console, string_view mode)
     msg << ", Y-axis is ";
     MControlToController(yaxis, ytype, yid);
 
-    myModeList.emplace_back(xtype, xid, ytype, yid, msg.view());
+    myModeList.emplace_back(xtype, xid, ytype, yid, msg.str());
   }
 
   // Now consider the possible modes for the mouse based on the left
@@ -174,7 +174,7 @@ void MouseControl::addLeftControllerModes(bool noswap)
       msg << "Mouse is left " << myLeftController.name() << " controller";
       const Controller::Type type = myLeftController.type();
       const int id = noswap ? 0 : 1;
-      myModeList.emplace_back(type, id, type, id, msg.view());
+      myModeList.emplace_back(type, id, type, id, msg.str());
     }
   }
 }
@@ -195,7 +195,7 @@ void MouseControl::addRightControllerModes(bool noswap)
       msg << "Mouse is right " << myRightController.name() << " controller";
       const Controller::Type type = myRightController.type();
       const int id = noswap ? 1 : 0;
-      myModeList.emplace_back(type, id, type, id, msg.view());
+      myModeList.emplace_back(type, id, type, id, msg.str());
     }
   }
 }
@@ -206,11 +206,11 @@ void MouseControl::addPaddleModes(int lport, int rport, int lname, int rname)
   const Controller::Type type = Controller::Type::Paddles;
   ostringstream msg;
   msg << "Mouse is Paddle " << lname << " controller";
-  const MouseMode mode0(type, lport, type, lport, msg.view());
+  const MouseMode mode0(type, lport, type, lport, msg.str());
 
   msg.str("");
   msg << "Mouse is Paddle " << rname << " controller";
-  const MouseMode mode1(type, rport, type, rport, msg.view());
+  const MouseMode mode1(type, rport, type, rport, msg.str());
 
   if(BSPF::equalsIgnoreCase(myProps.get(PropType::Controller_SwapPaddles), "NO"))
   {

src/common/PJoystickHandler.cxx

@@ -117,7 +117,7 @@ int PhysicalJoystickHandler::add(const PhysicalJoystickPtr& stick)
     {
       ostringstream name;
       name << stick->name << " #" << count+1;
-      stick->name = name.view();
+      stick->name = name.str();
     }
     stick->type = PhysicalJoystick::Type::REGULAR;
   }
@@ -175,7 +175,7 @@ void PhysicalJoystickHandler::addToDatabase(const PhysicalJoystickPtr& stick)
   ostringstream buf;
   buf << "Added joystick " << stick->ID << ":\n"
     << "  " << stick->about() << '\n';
-  Logger::info(buf.view());
+  Logger::info(buf.str());
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -196,7 +196,7 @@ bool PhysicalJoystickHandler::remove(int id)
       ostringstream buf;
       buf << "Removed joystick " << mySticks[id]->ID << ":\n"
           << "  " << mySticks[id]->about() << '\n';
-      Logger::info(buf.view());
+      Logger::info(buf.str());
 
       // Remove joystick, but remember mapping
       it->second.mapping = stick->getMap();
@@ -264,7 +264,7 @@ bool PhysicalJoystickHandler::mapStelladaptors(string_view saport, int ID)
       ostringstream buf;
       buf << "Erased joystick " << _stick->ID << ":\n"
         << "  " << _stick->about() << '\n';
-      Logger::info(buf.view());
+      Logger::info(buf.str());
 
       _stick->name.erase(pos);
       erased = true;
@@ -808,7 +808,7 @@ string PhysicalJoystickHandler::getMappingDesc(Event::Type event, EventMode mode
       //Joystick mapping / labeling
       if(!_joyptr->joyMap.getEventMapping(event, evMode).empty())
       {
-        if(!buf.view().empty())
+        if(!buf.str().empty())
           buf << ", ";
         buf << _joyptr->joyMap.getEventMappingDesc(_id, event, evMode);
       }
@@ -1134,7 +1134,7 @@ void PhysicalJoystickHandler::changeDigitalDeadZone(int direction)
   ss << std::round(Controller::digitalDeadZoneValue(deadZone) * 100.F / 32768) << "%";
 
   myOSystem.frameBuffer().showGaugeMessage(
-    "Digital controller dead zone", ss.view(), deadZone,
+    "Digital controller dead zone", ss. str(), deadZone,
     Controller::MIN_DIGITAL_DEADZONE, Controller::MAX_DIGITAL_DEADZONE);
 }
 
@@ -1152,7 +1152,7 @@ void PhysicalJoystickHandler::changeAnalogPaddleDeadZone(int direction)
   ss << std::round(Controller::analogDeadZoneValue(deadZone) * 100.F / 32768) << "%";
 
   myOSystem.frameBuffer().showGaugeMessage(
-    "Analog controller dead zone", ss.view(), deadZone,
+    "Analog controller dead zone", ss.str(), deadZone,
     Controller::MIN_ANALOG_DEADZONE, Controller::MAX_ANALOG_DEADZONE);
 }
 
@@ -1170,7 +1170,7 @@ void PhysicalJoystickHandler::changeAnalogPaddleSensitivity(int direction)
   ss << std::round(Paddles::analogSensitivityValue(sense) * 100.F) << "%";
 
   myOSystem.frameBuffer().showGaugeMessage(
-    "Analog paddle sensitivity", ss.view(), sense,
+    "Analog paddle sensitivity", ss.str(), sense,
     Paddles::MIN_ANALOG_SENSE, Paddles::MAX_ANALOG_SENSE);
 }
 
@@ -1191,7 +1191,7 @@ void PhysicalJoystickHandler::changeAnalogPaddleLinearity(int direction)
     ss << "Off";
 
   myOSystem.frameBuffer().showGaugeMessage(
-    "Analog paddle linearity", ss.view(), linear,
+    "Analog paddle linearity", ss.str(), linear,
     Paddles::MIN_ANALOG_LINEARITY, Paddles::MAX_ANALOG_LINEARITY);
 }
 
@@ -1212,7 +1212,7 @@ void PhysicalJoystickHandler::changePaddleDejitterAveraging(int direction)
     ss << "Off";
 
   myOSystem.frameBuffer().showGaugeMessage(
-    "Analog paddle dejitter averaging", ss.view(), dejitter,
+    "Analog paddle dejitter averaging", ss.str(), dejitter,
     Paddles::MIN_DEJITTER, Paddles::MAX_DEJITTER);
 }
 
@@ -1233,7 +1233,7 @@ void PhysicalJoystickHandler::changePaddleDejitterReaction(int direction)
     ss << "Off";
 
   myOSystem.frameBuffer().showGaugeMessage(
-    "Analog paddle dejitter reaction", ss.view(), dejitter,
+    "Analog paddle dejitter reaction", ss.str(), dejitter,
     Paddles::MIN_DEJITTER, Paddles::MAX_DEJITTER);
 }
 
@@ -1254,7 +1254,7 @@ void PhysicalJoystickHandler::changeDigitalPaddleSensitivity(int direction)
     ss << "Off";
 
   myOSystem.frameBuffer().showGaugeMessage(
-    "Digital sensitivity", ss.view(), sense,
+    "Digital sensitivity", ss.str(), sense,
     Paddles::MIN_DIGITAL_SENSE, Paddles::MAX_DIGITAL_SENSE);
 }
 
@@ -1272,7 +1272,7 @@ void PhysicalJoystickHandler::changeMousePaddleSensitivity(int direction)
   ss << sense * 10 << "%";
 
   myOSystem.frameBuffer().showGaugeMessage(
-    "Mouse paddle sensitivity", ss.view(), sense,
+    "Mouse paddle sensitivity", ss.str(), sense,
     Controller::MIN_MOUSE_SENSE, Controller::MAX_MOUSE_SENSE);
 }
 
@@ -1290,7 +1290,7 @@ void PhysicalJoystickHandler::changeMouseTrackballSensitivity(int direction)
   ss << sense * 10 << "%";
 
   myOSystem.frameBuffer().showGaugeMessage(
-    "Mouse trackball sensitivity", ss.view(), sense,
+    "Mouse trackball sensitivity", ss.str(), sense,
     PointingDevice::MIN_SENSE, PointingDevice::MAX_SENSE);
 }
 
@@ -1308,7 +1308,7 @@ void PhysicalJoystickHandler::changeDrivingSensitivity(int direction)
   ss << sense * 10 << "%";
 
   myOSystem.frameBuffer().showGaugeMessage(
-    "Driving controller sensitivity", ss.view(), sense,
+    "Driving controller sensitivity", ss.str(), sense,
     Driving::MIN_SENSE, Driving::MAX_SENSE);
 }
 

src/common/PKeyboardHandler.cxx

@@ -613,7 +613,7 @@ void PhysicalKeyboardHandler::toggleModKeys(bool toggle)
   ostringstream ss;
   ss << "Modifier key combos ";
   ss << (modCombo ? "enabled" : "disabled");
-  myOSystem.frameBuffer().showTextMessage(ss.view());
+  myOSystem.frameBuffer().showTextMessage(ss.str());
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

src/common/PNGLibrary.cxx

@@ -273,7 +273,7 @@ void PNGLibrary::toggleContinuousSnapshots(bool perFrame)
       buf << "Enabling snapshots in " << interval << " second intervals";
       interval *= static_cast<uInt32>(myOSystem.frameRate());
     }
-    myOSystem.frameBuffer().showTextMessage(buf.view());
+    myOSystem.frameBuffer().showTextMessage(buf.str());
     setContinuousSnapInterval(interval);
   }
   else
@@ -282,7 +282,7 @@ void PNGLibrary::toggleContinuousSnapshots(bool perFrame)
     buf << "Disabling snapshots, generated "
       << (mySnapCounter / mySnapInterval)
       << " files";
-    myOSystem.frameBuffer().showTextMessage(buf.view());
+    myOSystem.frameBuffer().showTextMessage(buf.str());
     setContinuousSnapInterval(0);
   }
 }
@@ -313,7 +313,7 @@ void PNGLibrary::takeSnapshot(uInt32 number)
     ostringstream buf;
     buf << sspath << "_" << std::hex << std::setw(8) << std::setfill('0')
         << number << ".png";
-    filename = buf.view();
+    filename = buf.str();
   }
   else if(!myOSystem.settings().getBool("sssingle"))
   {
@@ -328,11 +328,11 @@ void PNGLibrary::takeSnapshot(uInt32 number)
       {
         buf.str("");
         buf << sspath << "_" << i << ".png";
-        const FSNode next(buf.view());
+        const FSNode next(buf.str());
         if(!next.exists())
           break;
       }
-      filename = buf.view();
+      filename = buf.str();
     }
   }
   else
@@ -344,7 +344,7 @@ void PNGLibrary::takeSnapshot(uInt32 number)
   VarList::push_back(metaData, "Title", "Snapshot");
   version << "Stella " << STELLA_VERSION << " (Build " << STELLA_BUILD << ") ["
           << BSPF::ARCH << "]";
-  VarList::push_back(metaData, "Software", version.view());
+  VarList::push_back(metaData, "Software", version.str());
   const string& name = (myOSystem.settings().getString("snapname") == "int")
       ? myOSystem.console().properties().get(PropType::Cart_Name)
       : myOSystem.romFile().getName();

src/common/PaletteHandler.cxx

@@ -112,7 +112,7 @@ void PaletteHandler::showAdjustableMessage()
         myOSystem.console().timing() == ConsoleTiming::pal ? myPhasePAL : myPhaseNTSC;
     buf << std::fixed << std::setprecision(1) << value << DEGREE;
     myOSystem.frameBuffer().showGaugeMessage(
-        "Palette phase shift", buf.view(), value,
+        "Palette phase shift", buf.str(), value,
         (isNTSC ? DEF_NTSC_SHIFT : DEF_PAL_SHIFT) - MAX_PHASE_SHIFT,
         (isNTSC ? DEF_NTSC_SHIFT : DEF_PAL_SHIFT) + MAX_PHASE_SHIFT);
   }
@@ -122,7 +122,7 @@ void PaletteHandler::showAdjustableMessage()
 
     buf << std::fixed << std::setprecision(1) << value << DEGREE;
     myOSystem.frameBuffer().showGaugeMessage(
-      msg.view(), buf.view(), value, -MAX_RGB_SHIFT, +MAX_RGB_SHIFT);
+      msg.str(), buf.str(), value, -MAX_RGB_SHIFT, +MAX_RGB_SHIFT);
   }
   else
   {
@@ -131,7 +131,7 @@ void PaletteHandler::showAdjustableMessage()
       : scaleTo100(*myAdjustables[myCurrentAdjustable].value);
     buf << value << "%";
     myOSystem.frameBuffer().showGaugeMessage(
-      msg.view(), buf.view(), value);
+      msg.str(), buf.str(), value);
   }
 }
 

src/common/RewindManager.cxx

@@ -239,7 +239,7 @@ string RewindManager::saveAllStates()
       << myOSystem.console().properties().get(PropType::Cart_Name)
       << ".sta";
 
-    Serializer out(buf.view(), Serializer::Mode::ReadWriteTrunc);
+    Serializer out(buf.str(), Serializer::Mode::ReadWriteTrunc);
     if (!out)
       return "Can't save to all states file";
 
@@ -296,7 +296,7 @@ string RewindManager::loadAllStates()
       << ".sta";
 
     // Make sure the file can be opened for reading
-    const Serializer in(buf.view(), Serializer::Mode::ReadOnly);
+    const Serializer in(buf.str(), Serializer::Mode::ReadOnly);
     if (!in)
       return "Can't load from all states file";