Core: ported headers cleanup from master branch

1 files changed, 2 insertions, 14 deletions

diff --git a/src/server/database/Database/QueryHolder.h b/src/server/database/Database/QueryHolder.h
index c3ebb33068c..123765b01a5 100644
--- a/src/server/database/Database/QueryHolder.h
+++ b/src/server/database/Database/QueryHolder.h
@@ -18,34 +18,22 @@
 #ifndef _QUERYHOLDER_H
 #define _QUERYHOLDER_H
 
-#include <future>
+#include "SQLOperation.h"
 
 class TC_DATABASE_API SQLQueryHolder
 {
     friend class SQLQueryHolderTask;
     private:
-        typedef std::pair<SQLElementData, SQLResultSetUnion> SQLResultPair;
-        std::vector<SQLResultPair> m_queries;
+        std::vector<std::pair<PreparedStatement*, PreparedQueryResult>> m_queries;
     public:
         SQLQueryHolder() { }
         virtual ~SQLQueryHolder();
-        bool SetQuery(size_t index, const char* sql);
-        template<typename Format, typename... Args>
-        bool SetPQuery(size_t index, Format&& sql, Args&&... args)
-        {
-            return SetQuery(index, Trinity::StringFormat(std::forward<Format>(sql), std::forward<Args>(args)...).c_str());
-        }
         bool SetPreparedQuery(size_t index, PreparedStatement* stmt);
         void SetSize(size_t size);
-        QueryResult GetResult(size_t index);
         PreparedQueryResult GetPreparedResult(size_t index);
-        void SetResult(size_t index, ResultSet* result);
         void SetPreparedResult(size_t index, PreparedResultSet* result);
 };
 
-typedef std::future<SQLQueryHolder*> QueryResultHolderFuture;
-typedef std::promise<SQLQueryHolder*> QueryResultHolderPromise;
-
 class TC_DATABASE_API SQLQueryHolderTask : public SQLOperation
 {
     private: