Index: src/libchcore/TSQLiteTransaction.cpp
===================================================================
diff -u -N -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -r8d3154738b885f2e01997071e6180da0c4b8cc7c
--- src/libchcore/TSQLiteTransaction.cpp	(.../TSQLiteTransaction.cpp)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
+++ src/libchcore/TSQLiteTransaction.cpp	(.../TSQLiteTransaction.cpp)	(revision 8d3154738b885f2e01997071e6180da0c4b8cc7c)
@@ -31,7 +31,7 @@
 			m_bTransactionStarted(false)
 		{
 			if (!m_spDatabase)
-				THROW_SQLITE_EXCEPTION(eErr_InvalidArgument, 0, _T("Invalid database provided"));
+				throw TSQLiteException(eErr_InvalidArgument, 0, _T("Invalid database provided"), LOCATION);
 			Begin();
 		}
 
@@ -53,11 +53,11 @@
 				return;
 
 			if (m_bTransactionStarted)
-				THROW_SQLITE_EXCEPTION(eErr_SQLiteCannotBeginTransaction, 0, _T("Transaction already started"));
+				throw TSQLiteException(eErr_SQLiteCannotBeginTransaction, 0, _T("Transaction already started"), LOCATION);
 
 			int iResult = sqlite3_exec((sqlite3*)m_spDatabase->GetHandle(), "BEGIN TRANSACTION", NULL, NULL, NULL);
 			if (iResult != SQLITE_OK)
-				THROW_SQLITE_EXCEPTION(eErr_SQLiteCannotBeginTransaction, iResult, _T("Cannot begin transaction"));
+				throw TSQLiteException(eErr_SQLiteCannotBeginTransaction, iResult, _T("Cannot begin transaction"), LOCATION);
 
 			m_spDatabase->SetInTransaction(true);
 			m_bTransactionStarted = true;
@@ -67,15 +67,15 @@
 		{
 			// no transactions whatsoever (even on database)
 			if (!m_bTransactionStarted && !m_spDatabase->GetInTransaction())
-				THROW_SQLITE_EXCEPTION(eErr_SQLiteCannotRollbackTransaction, 0, _T("Transaction not started"));
+				throw TSQLiteException(eErr_SQLiteCannotRollbackTransaction, 0, _T("Transaction not started"), LOCATION);
 
 			// database has transaction started, but not by this object
 			if (!m_bTransactionStarted)
 				return;
 
 			int iResult = sqlite3_exec((sqlite3*)m_spDatabase->GetHandle(), "ROLLBACK TRANSACTION;", NULL, NULL, NULL);
 			if (iResult != SQLITE_OK)
-				THROW_SQLITE_EXCEPTION(eErr_SQLiteCannotRollbackTransaction, iResult, _T("Cannot rollback transaction"));
+				throw TSQLiteException(eErr_SQLiteCannotRollbackTransaction, iResult, _T("Cannot rollback transaction"), LOCATION);
 			m_spDatabase->SetInTransaction(false);
 			m_bTransactionStarted = false;
 		}
@@ -84,15 +84,15 @@
 		{
 			// no transactions whatsoever (even on database)
 			if (!m_bTransactionStarted && !m_spDatabase->GetInTransaction())
-				THROW_SQLITE_EXCEPTION(eErr_SQLiteCannotRollbackTransaction, 0, _T("Transaction not started"));
+				throw TSQLiteException(eErr_SQLiteCannotRollbackTransaction, 0, _T("Transaction not started"), LOCATION);
 
 			// database has transaction started, but not by this object
 			if (!m_bTransactionStarted)
 				return;
 
 			int iResult = sqlite3_exec((sqlite3*)m_spDatabase->GetHandle(), "COMMIT TRANSACTION;", NULL, NULL, NULL);
 			if (iResult != SQLITE_OK)
-				THROW_SQLITE_EXCEPTION(eErr_SQLiteCannotCommitTransaction, iResult, _T("Cannot commit transaction"));
+				throw TSQLiteException(eErr_SQLiteCannotCommitTransaction, iResult, _T("Cannot commit transaction"), LOCATION);
 			m_spDatabase->SetInTransaction(false);
 			m_bTransactionStarted = false;
 		}