- Timestamp:
- Jan 10, 2016, 1:54:11 PM (9 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/libraries/core/command/IOConsolePOSIX.cc
r9667 r11054 44 44 namespace orxonox 45 45 { 46 IOConsole* IOConsole::singletonPtr_s = NULL;46 IOConsole* IOConsole::singletonPtr_s = nullptr; 47 47 48 48 namespace EscapeMode … … 62 62 , promptString_("orxonox # ") 63 63 , bStatusPrinted_(false) 64 , originalTerminalSettings_( 0)64 , originalTerminalSettings_(nullptr) 65 65 { 66 66 this->setTerminalMode(); … … 326 326 tcsetattr(0, TCSANOW, IOConsole::singletonPtr_s->originalTerminalSettings_); 327 327 delete IOConsole::singletonPtr_s->originalTerminalSettings_; 328 IOConsole::singletonPtr_s->originalTerminalSettings_ = 0;328 IOConsole::singletonPtr_s->originalTerminalSettings_ = nullptr; 329 329 } 330 330 } … … 353 353 const char* s; 354 354 if (!this->terminalWidth_ && (s = getenv("COLUMNS"))) 355 this->terminalWidth_ = strtol(s, NULL, 10);355 this->terminalWidth_ = strtol(s, nullptr, 10); 356 356 if (!this->terminalWidth_) 357 357 this->terminalWidth_ = 80; 358 358 if (!this->terminalHeight_ && (s = getenv("LINES"))) 359 this->terminalHeight_ = strtol(s, NULL, 10);359 this->terminalHeight_ = strtol(s, nullptr, 10); 360 360 if (!this->terminalHeight_) 361 361 this->terminalHeight_ = 24;
Note: See TracChangeset
for help on using the changeset viewer.