From 50facc2f8ff19a35ee654dc70b86c2ee9bf31f6a Mon Sep 17 00:00:00 2001 From: Sverre Rabbelier Date: Thu, 3 Apr 2008 11:35:25 +0200 Subject: [PATCH] Removed "Exception.h" references and replaced showShort with toString calls. --- src/Core/Editor.cpp | 1 - src/Core/EditorAccount.cpp | 1 - src/Core/EditorAccountLogin.cpp | 1 - src/Core/EditorArea.cpp | 3 +-- src/Core/EditorChunk.cpp | 3 +-- src/Core/EditorColour.cpp | 2 +- src/Core/EditorCommand.cpp | 3 +-- src/Core/EditorDetail.cpp | 1 - src/Core/EditorGrantGroup.cpp | 2 +- src/Core/EditorMobile.cpp | 2 +- src/Core/EditorNewCharacter.cpp | 1 - src/Core/EditorOOC.cpp | 1 - src/Core/EditorPermission.cpp | 3 +-- src/Core/EditorPlaying.cpp | 1 - src/Core/EditorRace.cpp | 2 +- src/Core/EditorRoom.cpp | 3 +-- 16 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/Core/Editor.cpp b/src/Core/Editor.cpp index dee3274..763a032 100644 --- a/src/Core/Editor.cpp +++ b/src/Core/Editor.cpp @@ -28,7 +28,6 @@ #include "CommandManager.h" #include "UBSocket.h" #include "Account.h" -#include "Exceptions.h" #include "Global.h" #include "StringUtilities.h" #include "Channel.h" diff --git a/src/Core/EditorAccount.cpp b/src/Core/EditorAccount.cpp index d8326e1..a829c5d 100644 --- a/src/Core/EditorAccount.cpp +++ b/src/Core/EditorAccount.cpp @@ -27,7 +27,6 @@ #include "UBSocket.h" #include "StringUtilities.h" -#include "Exceptions.h" #include "TableImpls.h" #include "Array.h" #include "FieldImpls.h" diff --git a/src/Core/EditorAccountLogin.cpp b/src/Core/EditorAccountLogin.cpp index 34d9a78..02c4199 100644 --- a/src/Core/EditorAccountLogin.cpp +++ b/src/Core/EditorAccountLogin.cpp @@ -29,7 +29,6 @@ #include "AccountManager.h" #include "Global.h" -#include "Exceptions.h" class DoCmd; diff --git a/src/Core/EditorArea.cpp b/src/Core/EditorArea.cpp index 48f584b..e5f3a60 100644 --- a/src/Core/EditorArea.cpp +++ b/src/Core/EditorArea.cpp @@ -27,7 +27,6 @@ #include "StringUtilities.h" #include "TableImpls.h" #include "Array.h" -#include "Exceptions.h" #include "Account.h" #include "Area.h" @@ -208,7 +207,7 @@ void EditorArea::editWidth(const std::string& argument) void EditorArea::showArea(const std::string& argument) { - m_sock->Send(String::Get()->box(m_area->Show(), "Area")); + m_sock->Send(m_area->toString()); } void EditorArea::saveArea(const std::string& argument) diff --git a/src/Core/EditorChunk.cpp b/src/Core/EditorChunk.cpp index 8e19ad8..68f430f 100644 --- a/src/Core/EditorChunk.cpp +++ b/src/Core/EditorChunk.cpp @@ -26,7 +26,6 @@ #include "UBSocket.h" #include "StringUtilities.h" -#include "Exceptions.h" #include "TableImpls.h" #include "Array.h" @@ -334,7 +333,7 @@ void EditorChunk::startDetails(const std::string& argument) void EditorChunk::showChunk(const std::string& argument) { - m_sock->Send(String::Get()->box(m_chunk->Show(), "Chunk")); + m_sock->Send(m_chunk->toString()); } void EditorChunk::saveChunk(const std::string& argument) diff --git a/src/Core/EditorColour.cpp b/src/Core/EditorColour.cpp index 614d78e..aa9acff 100644 --- a/src/Core/EditorColour.cpp +++ b/src/Core/EditorColour.cpp @@ -175,6 +175,6 @@ void EditorColour::saveColour(const std::string& argument) void EditorColour::showColour(const std::string& argument) { - m_sock->Send(String::Get()->box(m_colour->Show(), "Colour")); + m_sock->Send(m_colour->toString()); return; } diff --git a/src/Core/EditorCommand.cpp b/src/Core/EditorCommand.cpp index 00b8524..dbb3888 100644 --- a/src/Core/EditorCommand.cpp +++ b/src/Core/EditorCommand.cpp @@ -24,7 +24,6 @@ #include "UBSocket.h" #include "StringUtilities.h" -#include "Exceptions.h" #include "TableImpls.h" #include "Array.h" @@ -233,7 +232,7 @@ void EditorCommand::editLowForce(const std::string& argument) void EditorCommand::showCommand(const std::string& argument) { - m_sock->Send(String::Get()->box(m_command->Show(),"Command")); + m_sock->Send(m_command->toString()); return; } diff --git a/src/Core/EditorDetail.cpp b/src/Core/EditorDetail.cpp index 0dfa30b..2528616 100644 --- a/src/Core/EditorDetail.cpp +++ b/src/Core/EditorDetail.cpp @@ -29,7 +29,6 @@ #include "StringUtilities.h" #include "TableImpls.h" #include "UBSocket.h" -#include "Exceptions.h" #include "Account.h" #include "Detail.h" diff --git a/src/Core/EditorGrantGroup.cpp b/src/Core/EditorGrantGroup.cpp index 18e4ec5..9f5666f 100644 --- a/src/Core/EditorGrantGroup.cpp +++ b/src/Core/EditorGrantGroup.cpp @@ -165,7 +165,7 @@ void EditorGrantGroup::editImplication(const std::string& argument) void EditorGrantGroup::showGrantGroup(const std::string& argument) { - m_sock->Send(String::Get()->box(m_grantgroup->Show(),"GrantGroup")); + m_sock->Send(m_grantgroup->toString()); return; } diff --git a/src/Core/EditorMobile.cpp b/src/Core/EditorMobile.cpp index aa67274..4b67e0b 100644 --- a/src/Core/EditorMobile.cpp +++ b/src/Core/EditorMobile.cpp @@ -164,7 +164,7 @@ void EditorMobile::editDescription(const std::string& argument) void EditorMobile::showMobile(const std::string& argument) { - m_sock->Send(String::Get()->box(m_mobile->Show(), "Mobile")); + m_sock->Send(m_mobile->toString()); return; } diff --git a/src/Core/EditorNewCharacter.cpp b/src/Core/EditorNewCharacter.cpp index 0663eb1..1579fc7 100644 --- a/src/Core/EditorNewCharacter.cpp +++ b/src/Core/EditorNewCharacter.cpp @@ -28,7 +28,6 @@ #include "StringUtilities.h" #include "FieldImpls.h" -#include "Exceptions.h" #include "TableImpls.h" #include "DatabaseMgr.h" // for CountSavable diff --git a/src/Core/EditorOOC.cpp b/src/Core/EditorOOC.cpp index a867887..6323868 100644 --- a/src/Core/EditorOOC.cpp +++ b/src/Core/EditorOOC.cpp @@ -27,7 +27,6 @@ #include "Account.h" #include "Channel.h" #include "ChannelManager.h" -#include "Exceptions.h" #include "Array.h" typedef EditorOOC E; diff --git a/src/Core/EditorPermission.cpp b/src/Core/EditorPermission.cpp index bbae80f..68a499f 100644 --- a/src/Core/EditorPermission.cpp +++ b/src/Core/EditorPermission.cpp @@ -25,7 +25,6 @@ #include "Array.h" #include "StringUtilities.h" -#include "Exceptions.h" #include "TableImpls.h" #include "Account.h" @@ -230,5 +229,5 @@ void EditorPermission::savePermission(const std::string& argument) void EditorPermission::showPermission(const std::string& argument) { - m_sock->Send(String::Get()->box(m_permission->Show(), "Permission")); + m_sock->Send(m_permission->toString()); } diff --git a/src/Core/EditorPlaying.cpp b/src/Core/EditorPlaying.cpp index d91ebc0..4a6bd46 100644 --- a/src/Core/EditorPlaying.cpp +++ b/src/Core/EditorPlaying.cpp @@ -24,7 +24,6 @@ #include "Array.h" #include "Assert.h" -#include "Exceptions.h" #include "StringUtilities.h" #include "Account.h" diff --git a/src/Core/EditorRace.cpp b/src/Core/EditorRace.cpp index f2fb6bd..6de789b 100644 --- a/src/Core/EditorRace.cpp +++ b/src/Core/EditorRace.cpp @@ -150,7 +150,7 @@ void EditorRace::editName(const std::string& argument) void EditorRace::showRace(const std::string& argument) { - m_sock->Send(String::Get()->box(m_race->Show(), "Race")); + m_sock->Send(m_race->toString()); } void EditorRace::saveRace(const std::string& argument) diff --git a/src/Core/EditorRoom.cpp b/src/Core/EditorRoom.cpp index 26ec9ef..f64af26 100644 --- a/src/Core/EditorRoom.cpp +++ b/src/Core/EditorRoom.cpp @@ -29,7 +29,6 @@ #include "Array.h" #include "StringUtilities.h" -#include "Exceptions.h" #include "TableImpls.h" #include "Account.h" @@ -311,7 +310,7 @@ void EditorRoom::saveRoom(const std::string& argument) void EditorRoom::showRoom(const std::string& argument) { - m_sock->Send(String::Get()->box(m_room->Show(), "Room")); + m_sock->Send(m_room->toString()); } void EditorRoom::listAreas(const std::string& argument) -- 2.11.4.GIT