From 26b5e033ffde3d161382fc9addbfa99738379641 Mon Sep 17 00:00:00 2001 From: maximius Date: Sat, 17 Oct 2009 15:35:07 -0700 Subject: *Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand) *Fix a possible crash in Spell::DoAllEffectOnTarget --HG-- branch : trunk --- src/shared/Database/QueryResult.h | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/shared/Database/QueryResult.h') diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h index f9f1a009833..9d5bb57e4e9 100644 --- a/src/shared/Database/QueryResult.h +++ b/src/shared/Database/QueryResult.h @@ -17,52 +17,39 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #if !defined(QUERYRESULT_H) #define QUERYRESULT_H - class TRINITY_DLL_SPEC QueryResult { public: QueryResult(uint64 rowCount, uint32 fieldCount) : mFieldCount(fieldCount), mRowCount(rowCount) {} - virtual ~QueryResult() {} - virtual bool NextRow() = 0; - Field *Fetch() const { return mCurrentRow; } - const Field & operator [] (int index) const { return mCurrentRow[index]; } - uint32 GetFieldCount() const { return mFieldCount; } uint64 GetRowCount() const { return mRowCount; } - protected: Field *mCurrentRow; uint32 mFieldCount; uint64 mRowCount; }; - typedef std::vector QueryFieldNames; - class MANGOS_DLL_SPEC QueryNamedResult { public: explicit QueryNamedResult(QueryResult* query, QueryFieldNames const& names) : mQuery(query), mFieldNames(names) {} ~QueryNamedResult() { delete mQuery; } - // compatible interface with QueryResult bool NextRow() { return mQuery->NextRow(); } Field *Fetch() const { return mQuery->Fetch(); } uint32 GetFieldCount() const { return mQuery->GetFieldCount(); } uint64 GetRowCount() const { return mQuery->GetRowCount(); } Field const& operator[] (int index) const { return (*mQuery)[index]; } - // named access Field const& operator[] (const std::string &name) const { return mQuery->Fetch()[GetField_idx(name)]; } QueryFieldNames const& GetFieldNames() const { return mFieldNames; } - uint32 GetField_idx(const std::string &name) const { for(size_t idx = 0; idx < mFieldNames.size(); ++idx) @@ -73,11 +60,9 @@ class MANGOS_DLL_SPEC QueryNamedResult ASSERT(false && "unknown field name"); return uint32(-1); } - protected: QueryResult *mQuery; QueryFieldNames mFieldNames; }; - #endif -- cgit v1.2.3