Replace some PQuery/PExecute by more simple Query/Execute

Original patch by hunuza, extended to whole code
Closses issue 1446

--HG--
branch : trunk

9 files changed, 17 insertions, 17 deletions

diff --git a/src/game/AddonMgr.cpp b/src/game/AddonMgr.cpp
index f0b5ae40891..0dd331583ea 100644
--- a/src/game/AddonMgr.cpp
+++ b/src/game/AddonMgr.cpp
@@ -42,7 +42,7 @@ AddonMgr::~AddonMgr()
 
 void AddonMgr::LoadFromDB()
 {
-    QueryResult_AutoPtr result = CharacterDatabase.PQuery("SELECT name, crc FROM addons");
+    QueryResult_AutoPtr result = CharacterDatabase.Query("SELECT name, crc FROM addons");
     if (!result)
     {
         sLog.outErrorDb("The table `addons` is empty");
diff --git a/src/game/AuctionHouseBot.cpp b/src/game/AuctionHouseBot.cpp
index b2d7f80451c..ebbf48e6476 100644
--- a/src/game/AuctionHouseBot.cpp
+++ b/src/game/AuctionHouseBot.cpp
@@ -823,7 +823,7 @@ void AuctionHouseBot::Initialize()
     {
         QueryResult_AutoPtr results = QueryResult_AutoPtr(NULL);
         char npcQuery[] = "SELECT distinct item FROM npc_vendor";
-        results = WorldDatabase.PQuery(npcQuery);
+        results = WorldDatabase.Query(npcQuery);
         if (results != NULL)
         {
             do
@@ -849,7 +849,7 @@ void AuctionHouseBot::Initialize()
             "SELECT item FROM prospecting_loot_template UNION "
             "SELECT item FROM skinning_loot_template";
 
-        results = WorldDatabase.PQuery(lootQuery);
+        results = WorldDatabase.Query(lootQuery);
         if (results != NULL)
         {
             do
diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp
index 6c688ab316f..911b6d625af 100644
--- a/src/game/CreatureGroups.cpp
+++ b/src/game/CreatureGroups.cpp
@@ -78,7 +78,7 @@ void CreatureGroupManager::LoadCreatureFormations()
     CreatureGroupMap.clear();
 
     //Check Integrity of the table
-    QueryResult_AutoPtr result = WorldDatabase.PQuery("SELECT MAX(leaderGUID) FROM creature_formations");
+    QueryResult_AutoPtr result = WorldDatabase.Query("SELECT MAX(leaderGUID) FROM creature_formations");
 
     if (!result)
     {
@@ -87,7 +87,7 @@ void CreatureGroupManager::LoadCreatureFormations()
     }
 
     //Get group data
-    result = WorldDatabase.PQuery("SELECT leaderGUID, memberGUID, dist, angle, groupAI FROM creature_formations ORDER BY leaderGUID");
+    result = WorldDatabase.Query("SELECT leaderGUID, memberGUID, dist, angle, groupAI FROM creature_formations ORDER BY leaderGUID");
 
     if (!result)
     {
diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index 1b815999a98..28f20b619b6 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -2326,7 +2326,7 @@ bool ChatHandler::HandleWpAddCommand(const char* args)
             pathid = target->GetWaypointPath();
         else
         {
-            QueryResult_AutoPtr result = WorldDatabase.PQuery("SELECT MAX(id) FROM waypoint_data");
+            QueryResult_AutoPtr result = WorldDatabase.Query("SELECT MAX(id) FROM waypoint_data");
             uint32 maxpathid = result->Fetch()->GetInt32();
             pathid = maxpathid+1;
             sLog.outDebug("DEBUG: HandleWpAddCommand - New path started.");
@@ -2500,7 +2500,7 @@ bool ChatHandler::HandleWpEventCommand(const char* args)
         }
         else
         {
-            QueryResult_AutoPtr result = WorldDatabase.PQuery("SELECT MAX(guid) FROM waypoint_scripts");
+            QueryResult_AutoPtr result = WorldDatabase.Query("SELECT MAX(guid) FROM waypoint_scripts");
             id = result->Fetch()->GetUInt32();
             WorldDatabase.PExecute("INSERT INTO waypoint_scripts(guid)VALUES(%u)", id+1);
             PSendSysMessage("%s%s%u|r", "|cff00ff00","Wp Event: New waypoint event added: |r|cff00ffff", id+1);
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index 2ffbb930c36..d5b496082c6 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -7417,7 +7417,7 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args)
 bool ChatHandler::HandleListFreezeCommand(const char * /*args*/)
 {
     //Get names from DB
-    QueryResult_AutoPtr result = CharacterDatabase.PQuery("SELECT characters.name FROM characters LEFT JOIN character_aura ON (characters.guid = character_aura.guid) WHERE character_aura.spell = 9454");
+    QueryResult_AutoPtr result = CharacterDatabase.Query("SELECT characters.name FROM characters LEFT JOIN character_aura ON (characters.guid = character_aura.guid) WHERE character_aura.spell = 9454");
     if (!result)
     {
         SendSysMessage(LANG_COMMAND_NO_FROZEN_PLAYERS);
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index feea3b79c4c..bc4b5cac9ec 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -8943,7 +8943,7 @@ void ObjectMgr::LoadGMTickets()
 
     } while (result->NextRow());
 
-    result = CharacterDatabase.PQuery("SELECT MAX(guid) from gm_tickets");
+    result = CharacterDatabase.Query("SELECT MAX(guid) from gm_tickets");
 
     if (result)
     {
diff --git a/src/game/ScriptSystem.cpp b/src/game/ScriptSystem.cpp
index ffa2c6dd404..0037b100412 100644
--- a/src/game/ScriptSystem.cpp
+++ b/src/game/ScriptSystem.cpp
@@ -37,7 +37,7 @@ SystemMgr& SystemMgr::Instance()
 void SystemMgr::LoadVersion()
 {
     //Get Version information
-    QueryResult_AutoPtr Result = WorldDatabase.PQuery("SELECT script_version FROM version LIMIT 1");
+    QueryResult_AutoPtr Result = WorldDatabase.Query("SELECT script_version FROM version LIMIT 1");
 
     if (Result)
     {
@@ -58,7 +58,7 @@ void SystemMgr::LoadScriptTexts()
     outstring_log("TSCR: Loading Script Texts...");
     LoadTrinityStrings(WorldDatabase,"script_texts",TEXT_SOURCE_RANGE,1+(TEXT_SOURCE_RANGE*2));
 
-    QueryResult_AutoPtr Result = WorldDatabase.PQuery("SELECT entry, sound, type, language, emote FROM script_texts");
+    QueryResult_AutoPtr Result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM script_texts");
 
     outstring_log("TSCR: Loading Script Texts additional data...");
 
@@ -124,7 +124,7 @@ void SystemMgr::LoadScriptTextsCustom()
     outstring_log("TSCR: Loading Custom Texts...");
     LoadTrinityStrings(WorldDatabase,"custom_texts",TEXT_SOURCE_RANGE*2,1+(TEXT_SOURCE_RANGE*3));
 
-    QueryResult_AutoPtr Result = WorldDatabase.PQuery("SELECT entry, sound, type, language, emote FROM custom_texts");
+    QueryResult_AutoPtr Result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM custom_texts");
 
     outstring_log("TSCR: Loading Custom Texts additional data...");
 
@@ -193,13 +193,13 @@ void SystemMgr::LoadScriptWaypoints()
     uint64 uiCreatureCount = 0;
 
     // Load Waypoints
-    QueryResult_AutoPtr Result = WorldDatabase.PQuery("SELECT COUNT(entry) FROM script_waypoint GROUP BY entry");
+    QueryResult_AutoPtr Result = WorldDatabase.Query("SELECT COUNT(entry) FROM script_waypoint GROUP BY entry");
     if (Result)
         uiCreatureCount = Result->GetRowCount();
 
     outstring_log("TSCR: Loading Script Waypoints for %u creature(s)...", uiCreatureCount);
 
-    Result = WorldDatabase.PQuery("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid");
+    Result = WorldDatabase.Query("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid");
 
     if (Result)
     {
diff --git a/src/game/WaypointManager.cpp b/src/game/WaypointManager.cpp
index 814cc28609f..9077dfb36a8 100644
--- a/src/game/WaypointManager.cpp
+++ b/src/game/WaypointManager.cpp
@@ -34,7 +34,7 @@ void WaypointStore::Free()
 
 void WaypointStore::Load()
 {
-    QueryResult_AutoPtr result = WorldDatabase.PQuery("SELECT COUNT(id) FROM waypoint_data");
+    QueryResult_AutoPtr result = WorldDatabase.Query("SELECT COUNT(id) FROM waypoint_data");
     if (!result)
     {
         sLog.outError("an error occured while loading the table `waypoint_data` (maybe it doesn't exist ?)");
@@ -43,7 +43,7 @@ void WaypointStore::Load()
 
     records = (*result)[0].GetUInt32();
 
-    result = WorldDatabase.PQuery("SELECT id,point,position_x,position_y,position_z,move_flag,delay,action,action_chance FROM waypoint_data ORDER BY id, point");
+    result = WorldDatabase.Query("SELECT id,point,position_x,position_y,position_z,move_flag,delay,action,action_chance FROM waypoint_data ORDER BY id, point");
     if (!result)
     {
         sLog.outErrorDb("The table `waypoint_data` is empty or corrupted");
diff --git a/src/game/World.cpp b/src/game/World.cpp
index ef007d4ff59..9d00da68c95 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -1278,7 +1278,7 @@ void World::SetInitialWorldSettings()
     loginDatabase.PExecute("UPDATE realmlist SET icon = %u, timezone = %u WHERE id = '%d'", server_type, realm_zone, realmID);
 
     ///- Remove the bones after a restart
-    CharacterDatabase.PExecute("DELETE FROM corpse WHERE corpse_type = '0'");
+    CharacterDatabase.Execute("DELETE FROM corpse WHERE corpse_type = '0'");
 
     ///- Load the DBC files
     sLog.outString("Initialize data stores...");