diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Button.cpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Button.cpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Button.cpp.deprecated 2017-11-20 14:34:29.495169281 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Button.cpp 2017-11-20 14:34:29.496169260 -0500
@@ -216,7 +216,7 @@ Button::reLayout()
void
Button::setChildImage(Child& child, XmlReader& reader)
{
- std::auto_ptr<Image> image(new Image());
+ std::unique_ptr<Image> image(new Image());
image->parse(reader);
resetChild(child, image.release());
}
@@ -224,7 +224,7 @@ Button::setChildImage(Child& child, XmlR
void
Button::setChildText(Child& child, XmlReader& reader)
{
- std::auto_ptr<Paragraph> paragraph(new Paragraph());
+ std::unique_ptr<Paragraph> paragraph(new Paragraph());
paragraph->parse(reader);
resetChild(child, paragraph.release());
}
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ComponentFactory.hpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ComponentFactory.hpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ComponentFactory.hpp.deprecated 2017-11-20 14:34:29.497169239 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ComponentFactory.hpp 2017-11-20 14:34:29.498169218 -0500
@@ -70,7 +70,7 @@ public:
\
virtual Component* createComponent(XmlReader& reader) \
{ \
- std::auto_ptr<CLASS> component (new CLASS()); \
+ std::unique_ptr<CLASS> component (new CLASS()); \
component->parse(reader); \
return component.release(); \
} \
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ComponentLoader.cpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ComponentLoader.cpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ComponentLoader.cpp.deprecated 2017-11-20 14:34:29.499169197 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ComponentLoader.cpp 2017-11-20 14:34:29.500169176 -0500
@@ -80,12 +80,12 @@ Component* loadGUIFile(const std::string
std::string componentName = (const char*) reader.getName();
if(componentName == "gui") {
- std::auto_ptr<Desktop> desktop (new Desktop());
+ std::unique_ptr<Desktop> desktop (new Desktop());
desktop->parse(reader);
return desktop.release();
}
- std::auto_ptr<Component> component (createComponent(componentName, reader));
+ std::unique_ptr<Component> component (createComponent(componentName, reader));
return component.release();
}
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Document.cpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Document.cpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Document.cpp.deprecated 2017-11-20 14:34:29.501169155 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Document.cpp 2017-11-20 14:34:29.503169112 -0500
@@ -71,7 +71,7 @@ Document::parse(XmlReader& reader)
if(reader.getNodeType() == XML_READER_TYPE_ELEMENT) {
std::string node = (const char*) reader.getName();
if(node == "p" || node=="Paragraph" || node == "li") {
- std::auto_ptr<Paragraph> paragraph (new Paragraph());
+ std::unique_ptr<Paragraph> paragraph (new Paragraph());
if(node != "li") {
paragraph->parse(reader, style);
} else {
@@ -81,7 +81,7 @@ Document::parse(XmlReader& reader)
makeCallback(*this, &Document::paragraphLinkClicked));
addChild(paragraph.release());
} else if(node == "img") {
- std::auto_ptr<DocumentImage> image (new DocumentImage());
+ std::unique_ptr<DocumentImage> image (new DocumentImage());
image->parse(reader, style);
addChild(image.release());
} else {
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Gradient.hpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Gradient.hpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Gradient.hpp.deprecated 2017-11-20 14:34:29.504169091 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Gradient.hpp 2017-11-20 14:34:29.505169070 -0500
@@ -51,7 +51,7 @@ private:
void draw_vertical_line(SDL_Surface* surface, int x1, int y1, int y2,
uint8_t r, uint8_t g, uint8_t b, uint8_t a);
- std::auto_ptr<Texture> texture;
+ std::unique_ptr<Texture> texture;
Color from, to;
enum Direction {
LEFT_RIGHT,
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ScrollBar.cpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ScrollBar.cpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ScrollBar.cpp.deprecated 2017-11-20 14:34:29.506169049 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ScrollBar.cpp 2017-11-20 14:34:29.507169028 -0500
@@ -81,15 +81,15 @@ ScrollBar::parse(XmlReader& reader)
if(reader.getNodeType() == XML_READER_TYPE_ELEMENT) {
std::string element = (const char*) reader.getName();
if(element == "button1") {
- std::auto_ptr<Button> button(new Button());
+ std::unique_ptr<Button> button(new Button());
button->parse(reader);
resetChild(button1(), button.release());
} else if(element == "button2") {
- std::auto_ptr<Button> button(new Button());
+ std::unique_ptr<Button> button(new Button());
button->parse(reader);
resetChild(button2(), button.release());
} else if(element == "scroller") {
- std::auto_ptr<Button> button(new Button());
+ std::unique_ptr<Button> button(new Button());
button->parse(reader);
resetChild(scroller(), button.release());
} else {
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ScrollView.cpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ScrollView.cpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ScrollView.cpp.deprecated 2017-11-20 14:34:29.508169007 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/ScrollView.cpp 2017-11-20 14:34:29.509168985 -0500
@@ -71,7 +71,7 @@ ScrollView::parse(XmlReader& reader)
std::string element = (const char*) reader.getName();
if(element == "scrollbar") {
- std::auto_ptr<ScrollBar> scrollbar (new ScrollBar());
+ std::unique_ptr<ScrollBar> scrollbar (new ScrollBar());
scrollbar->parse(reader);
resetChild(scrollBar(), scrollbar.release());
} else if(element == "contents") {
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/TooltipManager.cpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/TooltipManager.cpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/TooltipManager.cpp.deprecated 2017-11-20 14:34:29.510168964 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/TooltipManager.cpp 2017-11-20 14:34:29.511168943 -0500
@@ -99,8 +99,8 @@ TooltipManager::event(const Event& event
void
TooltipManager::showTooltip(const std::string& text, const Vector2& pos)
{
- std::auto_ptr<Document> d (new Document());
- std::auto_ptr<Paragraph> p (new Paragraph());
+ std::unique_ptr<Document> d (new Document());
+ std::unique_ptr<Paragraph> p (new Paragraph());
std::map<std::string, Style>::iterator s = styleRegistry.find("tooltip");
if(s == styleRegistry.end()) {
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Window.cpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Window.cpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Window.cpp.deprecated 2017-11-20 14:34:29.512168922 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/gui/Window.cpp 2017-11-20 14:34:29.514168880 -0500
@@ -104,7 +104,7 @@ Window::parse(XmlReader& reader)
if(element == "title") {
resetChild(title(), parseEmbeddedComponent(reader));
} else if(element == "closebutton") {
- std::auto_ptr<Button> button (new Button());
+ std::unique_ptr<Button> button (new Button());
button->parse(reader);
resetChild(closeButton(), button.release());
} else if(element == "contents") {
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/CheckButton.cpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/CheckButton.cpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/CheckButton.cpp.deprecated 2017-11-20 14:34:29.515168859 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/CheckButton.cpp 2017-11-20 14:34:29.517168817 -0500
@@ -236,7 +236,7 @@ CheckButton::parse(XmlReader& reader)
void
CheckButton::setChildImage(Child& child, XmlReader& reader)
{
- std::auto_ptr<Image> image(new Image());
+ std::unique_ptr<Image> image(new Image());
image->parse(reader);
resetChild(child, image.release());
}
@@ -244,7 +244,7 @@ CheckButton::setChildImage(Child& child,
void
CheckButton::setChildText(Child& child, XmlReader& reader)
{
- std::auto_ptr<Paragraph> paragraph(new Paragraph());
+ std::unique_ptr<Paragraph> paragraph(new Paragraph());
paragraph->parse(reader);
resetChild(child, paragraph.release());
}
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/Dialog.cpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/Dialog.cpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/Dialog.cpp.deprecated 2017-11-20 14:34:29.518168795 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/Dialog.cpp 2017-11-20 14:34:29.521168732 -0500
@@ -196,7 +196,7 @@ void Dialog::msgDialog( std::string mess
if( pos != std::string::npos ){
filename.replace( pos, 4 ,".xml");
}
- std::auto_ptr<Component> myDialogComponent (loadGUIFile( filename ));
+ std::unique_ptr<Component> myDialogComponent (loadGUIFile( filename ));
//set Extra-String
getParagraph( *myDialogComponent, "ExtraText" )->setText( extraString );
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/Game.hpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/Game.hpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/Game.hpp.deprecated 2017-11-20 14:34:29.523168690 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/Game.hpp 2017-11-20 14:34:29.524168669 -0500
@@ -38,7 +38,7 @@ public:
void showHelpWindow( std::string topic );
private:
- std::auto_ptr<Component> gui;
+ std::unique_ptr<Component> gui;
bool running;
MainState quitState;
@@ -46,7 +46,7 @@ private:
void testAllHelpFiles();
void quickLoad();
void quickSave();
- std::auto_ptr<HelpWindow> helpWindow;
+ std::unique_ptr<HelpWindow> helpWindow;
};
Game* getGame();
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/HelpWindow.cpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/HelpWindow.cpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/HelpWindow.cpp.deprecated 2017-11-20 14:34:29.525168647 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/HelpWindow.cpp 2017-11-20 14:34:29.527168605 -0500
@@ -66,7 +66,7 @@ HelpWindow::showTopic(const std::string&
}
// load new contents
std::string filename = getHelpFile(topic);
- std::auto_ptr<Component> contents (loadGUIFile(filename));
+ std::unique_ptr<Component> contents (loadGUIFile(filename));
Document* document = dynamic_cast<Document*> (contents.get());
if(document == 0)
throw std::runtime_error("Help Contents is not a Document");
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/main.cpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/main.cpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/main.cpp.deprecated 2017-11-20 14:34:29.528168584 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/main.cpp 2017-11-20 14:34:29.530168542 -0500
@@ -423,8 +423,8 @@ void flipScreenBuffer()
void mainLoop()
{
- std::auto_ptr<MainMenu> menu;
- std::auto_ptr<Game> game;
+ std::unique_ptr<MainMenu> menu;
+ std::unique_ptr<Game> game;
MainState state = MAINMENU;
MainState nextstate;
@@ -601,7 +601,7 @@ int main(int argc, char** argv)
}
initVideo(getConfig()->videoX, getConfig()->videoY);
initLincity();
- std::auto_ptr<Sound> sound;
+ std::unique_ptr<Sound> sound;
sound.reset(new Sound());
//set a function to call when music stops
Mix_HookMusicFinished(musicHalted);
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/MainMenu.hpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/MainMenu.hpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/MainMenu.hpp.deprecated 2017-11-20 14:34:29.532168499 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/MainMenu.hpp 2017-11-20 14:34:29.533168478 -0500
@@ -74,12 +74,12 @@ private:
void selectLoadSaveGameButtonClicked(CheckButton*,int, bool save );
void optionsMenuButtonClicked(CheckButton* button, int );
- std::auto_ptr<Component> mainMenu;
- std::auto_ptr<Component> newGameMenu;
- std::auto_ptr<Component> loadGameMenu;
- std::auto_ptr<Component> saveGameMenu;
- std::auto_ptr<Component> creditsMenu;
- std::auto_ptr<Component> optionsMenu;
+ std::unique_ptr<Component> mainMenu;
+ std::unique_ptr<Component> newGameMenu;
+ std::unique_ptr<Component> loadGameMenu;
+ std::unique_ptr<Component> saveGameMenu;
+ std::unique_ptr<Component> creditsMenu;
+ std::unique_ptr<Component> optionsMenu;
Desktop* currentMenu;
bool running;
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/MiniMap.hpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/MiniMap.hpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/MiniMap.hpp.deprecated 2017-11-20 14:34:29.538168372 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/MiniMap.hpp 2017-11-20 14:34:29.540168330 -0500
@@ -85,7 +85,7 @@ private:
int left, top; //Positioning of minimap
std::vector<CheckButton*> switchButtons;
- std::auto_ptr<Texture> mTexture;
+ std::unique_ptr<Texture> mTexture;
int mpsXOld, mpsYOld, mpsStyleOld;
diff -up lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/MiniMap.cpp.deprecated lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/MiniMap.cpp
--- lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/MiniMap.cpp.deprecated 2017-11-20 14:41:12.352651146 -0500
+++ lincity-ng-7f266b1a342e0ba4d34e734ee93029f33b97c69a/src/lincity-ng/MiniMap.cpp 2017-11-20 14:40:46.216203782 -0500
@@ -104,7 +104,7 @@ MiniMap* getMiniMap()
}
MiniMap::MiniMap()
- : mMode(NORMAL), tilesize(2), border(0), mTexture(0)
+ : mMode(NORMAL), tilesize(2), border(0), mTexture(nullptr)
{
assert( miniMapPtr == 0 );
miniMapPtr = this;
@@ -706,7 +706,7 @@ void MiniMap::draw(Painter &painter)
// simple and bad implementation
// FIXME: should be stored SDL_Surface and then blitted
- std::auto_ptr<Painter> mpainter
+ std::unique_ptr<Painter> mpainter
(painter.createTexturePainter(mTexture.get()));
Color white;
white.parse( "white" );