From a41e99223e1dfe707afd0fa8004bcb6f267f0f04 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Sat, 11 Sep 2010 21:10:54 +0200 Subject: Core/DBLayer: * Rename QueryResult class to ResultSet * Rename QueryResult_AutoPtr to QueryResult * Declare ACE refcounted auto pointer for PreparedResultSet class --HG-- branch : trunk --- src/server/game/Scripting/ScriptSystem.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/game/Scripting/ScriptSystem.cpp') diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp index f2c83d199b4..856981553c2 100644 --- a/src/server/game/Scripting/ScriptSystem.cpp +++ b/src/server/game/Scripting/ScriptSystem.cpp @@ -37,7 +37,7 @@ SystemMgr& SystemMgr::Instance() void SystemMgr::LoadVersion() { //Get Version information - QueryResult_AutoPtr Result = WorldDatabase.Query("SELECT script_version FROM version LIMIT 1"); + QueryResult Result = WorldDatabase.Query("SELECT script_version FROM version LIMIT 1"); if (Result) { @@ -58,7 +58,7 @@ void SystemMgr::LoadScriptTexts() sLog.outString("TSCR: Loading Script Texts..."); LoadTrinityStrings("script_texts",TEXT_SOURCE_RANGE,1+(TEXT_SOURCE_RANGE*2)); - QueryResult_AutoPtr Result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM script_texts"); + QueryResult Result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM script_texts"); sLog.outString("TSCR: Loading Script Texts additional data..."); @@ -124,7 +124,7 @@ void SystemMgr::LoadScriptTextsCustom() sLog.outString("TSCR: Loading Custom Texts..."); LoadTrinityStrings("custom_texts",TEXT_SOURCE_RANGE*2,1+(TEXT_SOURCE_RANGE*3)); - QueryResult_AutoPtr Result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM custom_texts"); + QueryResult Result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM custom_texts"); sLog.outString("TSCR: Loading Custom Texts additional data..."); @@ -193,7 +193,7 @@ void SystemMgr::LoadScriptWaypoints() uint64 uiCreatureCount = 0; // Load Waypoints - QueryResult_AutoPtr Result = WorldDatabase.Query("SELECT COUNT(entry) FROM script_waypoint GROUP BY entry"); + QueryResult Result = WorldDatabase.Query("SELECT COUNT(entry) FROM script_waypoint GROUP BY entry"); if (Result) uiCreatureCount = Result->GetRowCount(); -- cgit v1.2.3