From 084944a96b79a822c670a389b53388996cf0548d Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Fri, 27 Nov 2020 20:21:20 +0200
Subject: [PATCH] Fix Qt Creator + Coco build

param name "interface" is causing Qt Creator build fail when integrating
Froglogic Coco tools with Qt Creator.

Fixes: QTCREATORBUG-25146
Change-Id: If3fa3d44e941089a882deb44ba12dec6d00ad73d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
(cherry picked from commit f30565873a067b29ccb62cf1b728b183afd4bf36)
---
 src/libs/sqlite/sqlitetransaction.h | 40 ++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/libs/sqlite/sqlitetransaction.h b/src/libs/sqlite/sqlitetransaction.h
index a21d4f94360..09a60446d26 100644
--- a/src/libs/sqlite/sqlitetransaction.h
+++ b/src/libs/sqlite/sqlitetransaction.h
@@ -74,8 +74,8 @@ public:
 
 protected:
     ~AbstractTransaction() = default;
-    AbstractTransaction(TransactionInterface &interface)
-        : m_interface(interface)
+    AbstractTransaction(TransactionInterface &transactionInterface)
+        : m_interface(transactionInterface)
     {
     }
 
@@ -112,8 +112,8 @@ public:
     }
 
 protected:
-    AbstractThrowingSessionTransaction(TransactionInterface &interface)
-        : m_interface(interface)
+    AbstractThrowingSessionTransaction(TransactionInterface &transactionInterface)
+        : m_interface(transactionInterface)
     {}
 
 protected:
@@ -140,8 +140,8 @@ public:
     }
 
 protected:
-    AbstractThrowingTransaction(TransactionInterface &interface)
-        : AbstractTransaction(interface)
+    AbstractThrowingTransaction(TransactionInterface &transactionInterface)
+        : AbstractTransaction(transactionInterface)
     {
     }
 };
@@ -161,8 +161,8 @@ public:
     }
 
 protected:
-    AbstractNonThrowingDestructorTransaction(TransactionInterface &interface)
-        : AbstractTransaction(interface)
+    AbstractNonThrowingDestructorTransaction(TransactionInterface &transactionInterface)
+        : AbstractTransaction(transactionInterface)
     {
     }
 };
@@ -171,10 +171,10 @@ template <typename BaseTransaction>
 class BasicDeferredTransaction final : public BaseTransaction
 {
 public:
-    BasicDeferredTransaction(TransactionInterface &interface)
-        : BaseTransaction(interface)
+    BasicDeferredTransaction(TransactionInterface &transactionInterface)
+        : BaseTransaction(transactionInterface)
     {
-        interface.deferredBegin();
+        transactionInterface.deferredBegin();
     }
 
     ~BasicDeferredTransaction()
@@ -190,10 +190,10 @@ template <typename BaseTransaction>
 class BasicImmediateTransaction final : public BaseTransaction
 {
 public:
-    BasicImmediateTransaction(TransactionInterface &interface)
-        : BaseTransaction(interface)
+    BasicImmediateTransaction(TransactionInterface &transactionInterface)
+        : BaseTransaction(transactionInterface)
     {
-        interface.immediateBegin();
+        transactionInterface.immediateBegin();
     }
 
     ~BasicImmediateTransaction()
@@ -209,10 +209,10 @@ template <typename BaseTransaction>
 class BasicExclusiveTransaction final : public BaseTransaction
 {
 public:
-    BasicExclusiveTransaction(TransactionInterface &interface)
-        : BaseTransaction(interface)
+    BasicExclusiveTransaction(TransactionInterface &transactionInterface)
+        : BaseTransaction(transactionInterface)
     {
-        interface.exclusiveBegin();
+        transactionInterface.exclusiveBegin();
     }
 
     ~BasicExclusiveTransaction()
@@ -228,10 +228,10 @@ using ExclusiveNonThrowingDestructorTransaction
 class ImmediateSessionTransaction final : public AbstractThrowingSessionTransaction
 {
 public:
-    ImmediateSessionTransaction(TransactionInterface &interface)
-        : AbstractThrowingSessionTransaction(interface)
+    ImmediateSessionTransaction(TransactionInterface &transactionInterface)
+        : AbstractThrowingSessionTransaction(transactionInterface)
     {
-        interface.immediateSessionBegin();
+        transactionInterface.immediateSessionBegin();
     }
 
     ~ImmediateSessionTransaction()