forked from qt-creator/qt-creator
Fix Qt Creator + Coco build
param name "interface" is causing Qt Creator build fail when integrating Froglogic Coco tools with Qt Creator. Change-Id: If3fa3d44e941089a882deb44ba12dec6d00ad73d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
@@ -74,8 +74,8 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
~AbstractTransaction() = default;
|
~AbstractTransaction() = default;
|
||||||
AbstractTransaction(TransactionInterface &interface)
|
AbstractTransaction(TransactionInterface &transactionInterface)
|
||||||
: m_interface(interface)
|
: m_interface(transactionInterface)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -112,8 +112,8 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
AbstractThrowingSessionTransaction(TransactionInterface &interface)
|
AbstractThrowingSessionTransaction(TransactionInterface &transactionInterface)
|
||||||
: m_interface(interface)
|
: m_interface(transactionInterface)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@@ -140,8 +140,8 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
AbstractThrowingTransaction(TransactionInterface &interface)
|
AbstractThrowingTransaction(TransactionInterface &transactionInterface)
|
||||||
: AbstractTransaction(interface)
|
: AbstractTransaction(transactionInterface)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -161,8 +161,8 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
AbstractNonThrowingDestructorTransaction(TransactionInterface &interface)
|
AbstractNonThrowingDestructorTransaction(TransactionInterface &transactionInterface)
|
||||||
: AbstractTransaction(interface)
|
: AbstractTransaction(transactionInterface)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -171,10 +171,10 @@ template <typename BaseTransaction>
|
|||||||
class BasicDeferredTransaction final : public BaseTransaction
|
class BasicDeferredTransaction final : public BaseTransaction
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
BasicDeferredTransaction(TransactionInterface &interface)
|
BasicDeferredTransaction(TransactionInterface &transactionInterface)
|
||||||
: BaseTransaction(interface)
|
: BaseTransaction(transactionInterface)
|
||||||
{
|
{
|
||||||
interface.deferredBegin();
|
transactionInterface.deferredBegin();
|
||||||
}
|
}
|
||||||
|
|
||||||
~BasicDeferredTransaction()
|
~BasicDeferredTransaction()
|
||||||
@@ -190,10 +190,10 @@ template <typename BaseTransaction>
|
|||||||
class BasicImmediateTransaction final : public BaseTransaction
|
class BasicImmediateTransaction final : public BaseTransaction
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
BasicImmediateTransaction(TransactionInterface &interface)
|
BasicImmediateTransaction(TransactionInterface &transactionInterface)
|
||||||
: BaseTransaction(interface)
|
: BaseTransaction(transactionInterface)
|
||||||
{
|
{
|
||||||
interface.immediateBegin();
|
transactionInterface.immediateBegin();
|
||||||
}
|
}
|
||||||
|
|
||||||
~BasicImmediateTransaction()
|
~BasicImmediateTransaction()
|
||||||
@@ -209,10 +209,10 @@ template <typename BaseTransaction>
|
|||||||
class BasicExclusiveTransaction final : public BaseTransaction
|
class BasicExclusiveTransaction final : public BaseTransaction
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
BasicExclusiveTransaction(TransactionInterface &interface)
|
BasicExclusiveTransaction(TransactionInterface &transactionInterface)
|
||||||
: BaseTransaction(interface)
|
: BaseTransaction(transactionInterface)
|
||||||
{
|
{
|
||||||
interface.exclusiveBegin();
|
transactionInterface.exclusiveBegin();
|
||||||
}
|
}
|
||||||
|
|
||||||
~BasicExclusiveTransaction()
|
~BasicExclusiveTransaction()
|
||||||
@@ -228,10 +228,10 @@ using ExclusiveNonThrowingDestructorTransaction
|
|||||||
class ImmediateSessionTransaction final : public AbstractThrowingSessionTransaction
|
class ImmediateSessionTransaction final : public AbstractThrowingSessionTransaction
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ImmediateSessionTransaction(TransactionInterface &interface)
|
ImmediateSessionTransaction(TransactionInterface &transactionInterface)
|
||||||
: AbstractThrowingSessionTransaction(interface)
|
: AbstractThrowingSessionTransaction(transactionInterface)
|
||||||
{
|
{
|
||||||
interface.immediateSessionBegin();
|
transactionInterface.immediateSessionBegin();
|
||||||
}
|
}
|
||||||
|
|
||||||
~ImmediateSessionTransaction()
|
~ImmediateSessionTransaction()
|
||||||
|
Reference in New Issue
Block a user