From 0c20db8d108c4123fcc3ecb343759e68567a4d4e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 26 Nov 2018 00:51:57 +0300 Subject: Remove extra ; from different code. --- src/progs/dyecmd/client.cpp | 16 +++++------ src/progs/manaplus/actions/actions.cpp | 2 +- src/progs/manaplus/actions/statusbar.cpp | 2 +- src/progs/manaplus/client.cpp | 46 ++++++++++++++++---------------- src/progs/manaplus/gui/viewport.cpp | 2 +- 5 files changed, 34 insertions(+), 34 deletions(-) (limited to 'src/progs') diff --git a/src/progs/dyecmd/client.cpp b/src/progs/dyecmd/client.cpp index a905c326b..f31f2524a 100644 --- a/src/progs/dyecmd/client.cpp +++ b/src/progs/dyecmd/client.cpp @@ -443,15 +443,15 @@ void Client::gameClear() stopTimers(); - delete2(ipc); + delete2(ipc) if (logger != nullptr) logger->log1("Quitting2"); - delete2(mCurrentDialog); - delete2(popupManager); - delete2(dialogsManager); - delete2(gui); + delete2(mCurrentDialog) + delete2(popupManager) + delete2(dialogsManager) + delete2(gui) if (logger != nullptr) logger->log1("Quitting3"); @@ -484,7 +484,7 @@ void Client::gameClear() if (logger != nullptr) logger->log1("Quitting9"); - delete2(joystick); + delete2(joystick) keyboard.deinit(); @@ -521,7 +521,7 @@ void Client::gameClear() if (logger != nullptr) logger->log1("Quitting12"); -// delete2(chatLogger); +// delete2(chatLogger) TranslationManager::close(); VirtFs::deinit(); } @@ -646,7 +646,7 @@ int Client::gameExec() mOldState = mState; // Get rid of the dialog of the previous state - delete2(mCurrentDialog); + delete2(mCurrentDialog) // State has changed, while the quitDialog was active, it might // not be correct anymore diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp index 452f0c368..785eed7ca 100644 --- a/src/progs/manaplus/actions/actions.cpp +++ b/src/progs/manaplus/actions/actions.cpp @@ -184,7 +184,7 @@ static int uploadUpdate(void *ptr, } } } -// delete2(info->upload); +// delete2(info->upload) info->upload = nullptr; delete info; return 0; diff --git a/src/progs/manaplus/actions/statusbar.cpp b/src/progs/manaplus/actions/statusbar.cpp index e15694902..52d5a0e51 100644 --- a/src/progs/manaplus/actions/statusbar.cpp +++ b/src/progs/manaplus/actions/statusbar.cpp @@ -55,7 +55,7 @@ namespace Actions impHandler0(switchQuickDrop) { - callYellowBarCond(changeQuickDropCounter) + callYellowBarCond(changeQuickDropCounter); } impHandler0(changeCrazyMove) diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp index dabfe293b..fb239ba7f 100644 --- a/src/progs/manaplus/client.cpp +++ b/src/progs/manaplus/client.cpp @@ -651,7 +651,7 @@ void Client::gameClear() isTerminate = true; config.removeListeners(this); - delete2(assertListener); + delete2(assertListener) IPC::stop(); eventsManager.shutdown(); @@ -671,10 +671,10 @@ void Client::gameClear() if (charServerHandler != nullptr) charServerHandler->clear(); - delete2(ipc); + delete2(ipc) #ifdef USE_MUMBLE - delete2(mumbleManager); + delete2(mumbleManager) #endif // USE_MUMBLE PlayerInfo::deinit(); @@ -682,18 +682,18 @@ void Client::gameClear() // Before config.write() since it writes the shortcuts to the config for (unsigned f = 0; f < SHORTCUT_TABS; f ++) delete2(itemShortcut[f]) - delete2(emoteShortcut); - delete2(dropShortcut); + delete2(emoteShortcut) + delete2(dropShortcut) playerRelations.store(); if (logger != nullptr) logger->log1("Quitting2"); - delete2(mCurrentDialog); - delete2(popupManager); - delete2(dialogsManager); - delete2(gui); + delete2(mCurrentDialog) + delete2(popupManager) + delete2(dialogsManager) + delete2(gui) if (inventoryHandler != nullptr) inventoryHandler->clear(); @@ -735,7 +735,7 @@ void Client::gameClear() if (logger != nullptr) logger->log1("Quitting9"); - delete2(joystick); + delete2(joystick) keyboard.deinit(); @@ -772,7 +772,7 @@ void Client::gameClear() if (logger != nullptr) logger->log1("Quitting12"); - delete2(chatLogger); + delete2(chatLogger) TranslationManager::close(); } @@ -1049,7 +1049,7 @@ int Client::gameExec() if (mOldState == State::GAME) { - delete2(mGame); + delete2(mGame) assertListener = new AssertListener; Game::clearInstance(); ResourceManager::cleanOrphans(false); @@ -1081,7 +1081,7 @@ int Client::gameExec() mOldState = mState; // Get rid of the dialog of the previous state - delete2(mCurrentDialog); + delete2(mCurrentDialog) // State has changed, while the quitDialog was active, it might // not be correct anymore @@ -1395,16 +1395,16 @@ int Client::gameExec() chatLogger->setServerName(settings.serverName); #ifdef ANDROID - delete2(mCloseButton); + delete2(mCloseButton) #endif // ANDROID - delete2(mSetupButton); - delete2(mVideoButton); - delete2(mThemesButton); - delete2(mAboutButton); - delete2(mHelpButton); - delete2(mPerfomanceButton); - delete2(desktop); + delete2(mSetupButton) + delete2(mVideoButton) + delete2(mThemesButton) + delete2(mAboutButton) + delete2(mHelpButton) + delete2(mPerfomanceButton) + delete2(desktop) mCurrentDialog = nullptr; @@ -1846,7 +1846,7 @@ void Client::initTradeFilter() else { reportAlways("Error opening file for writing: %s", - tradeListName.c_str()); + tradeListName.c_str()) } tradeFile.close(); } @@ -2075,7 +2075,7 @@ void Client::runValidate() WindowManager::deleteValidateWindows(); unloadData(); - delete2(client); + delete2(client) VirtFs::deinit(); exit(0); } diff --git a/src/progs/manaplus/gui/viewport.cpp b/src/progs/manaplus/gui/viewport.cpp index d3ed684e2..83ddef480 100644 --- a/src/progs/manaplus/gui/viewport.cpp +++ b/src/progs/manaplus/gui/viewport.cpp @@ -504,7 +504,7 @@ bool Viewport::leftMouseAction() case ActorType::Avatar: default: reportAlways("Left click on unknown actor type: %d", - CAST_S32(type)); + CAST_S32(type)) break; } } -- cgit v1.2.3-60-g2f50