summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-03-08 19:25:25 +0100
committerDavid Tardon <dtardon@redhat.com>2012-03-12 08:53:50 +0100
commit135e783db24e9468a69a1224567f54e4d7d3d4bd (patch)
treeb6b409bf771433802247aa9a5b85f5946a7f0c3a /connectivity
parent04c8f56627f51e7c2be926858e77f81623f7b4d2 (diff)
WaE: base class should be explicitly initialized
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/inc/ado/Aolewrap.hxx7
-rw-r--r--connectivity/source/inc/ado/Awrapado.hxx12
-rw-r--r--connectivity/source/inc/ado/Awrapadox.hxx6
-rw-r--r--connectivity/source/inc/ado/WrapCatalog.hxx2
-rw-r--r--connectivity/source/inc/ado/WrapColumn.hxx2
-rw-r--r--connectivity/source/inc/ado/WrapIndex.hxx2
-rw-r--r--connectivity/source/inc/ado/WrapKey.hxx2
-rw-r--r--connectivity/source/inc/ado/WrapTable.hxx2
8 files changed, 18 insertions, 17 deletions
diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx
index 06bcadc6df26..ad4897e2b37a 100644
--- a/connectivity/source/inc/ado/Aolewrap.hxx
+++ b/connectivity/source/inc/ado/Aolewrap.hxx
@@ -103,8 +103,9 @@ namespace connectivity
}
WpOLEBase(const WpOLEBase<T>& aWrapper)
+ : WpBase(aWrapper)
+ , pInterface(aWrapper.pInterface)
{
- operator=(aWrapper);
}
virtual ~WpOLEBase()
@@ -145,7 +146,7 @@ namespace connectivity
// Ctors, operator=
// They only call the superclass
WpOLECollection(Ts* pInt=NULL):WpOLEBase<Ts>(pInt){}
- WpOLECollection(const WpOLECollection& rhs){operator=(rhs);}
+ WpOLECollection(const WpOLECollection& rhs) : WpOLEBase<Ts>(rhs) {}
inline WpOLECollection& operator=(const WpOLECollection& rhs)
{WpOLEBase<Ts>::operator=(rhs); return *this;};
@@ -220,7 +221,7 @@ namespace connectivity
// They only call the superclass
using WpOLEBase<Ts>::pInterface;
WpOLEAppendCollection(Ts* pInt=NULL):WpOLECollection<Ts,T,WrapT>(pInt){}
- WpOLEAppendCollection(const WpOLEAppendCollection& rhs){ operator=(rhs); }
+ WpOLEAppendCollection(const WpOLEAppendCollection& rhs) : WpOLEAppendCollection<Ts, T, WrapT>(rhs) {}
inline WpOLEAppendCollection& operator=(const WpOLEAppendCollection& rhs)
{WpOLEBase<Ts>::operator=(rhs); return *this;};
//////////////////////////////////////////////////////////////////////
diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx
index 0cab36c5ae81..169429a44e8a 100644
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
@@ -63,7 +63,7 @@ namespace connectivity
WpADOConnection(ADOConnection* pInt) : WpOLEBase<ADOConnection>(pInt){}
- WpADOConnection(const WpADOConnection& rhs){operator=(rhs);}
+ WpADOConnection(const WpADOConnection& rhs) : WpOLEBase<ADOConnection>(rhs) {}
WpADOConnection& operator=(const WpADOConnection& rhs)
{WpOLEBase<ADOConnection>::operator=(rhs); return *this;}
@@ -156,7 +156,7 @@ namespace connectivity
// They only call the superclass
WpADOCommand(ADOCommand* pInt) : WpOLEBase<ADOCommand>(pInt){}
- WpADOCommand(const WpADOCommand& rhs){operator=(rhs);}
+ WpADOCommand(const WpADOCommand& rhs) : WpOLEBase<ADOCommand>(rhs) {}
WpADOCommand& operator=(const WpADOCommand& rhs)
{
@@ -195,7 +195,7 @@ namespace connectivity
// They only call the superclass
WpADOError(ADOError* pInt):WpOLEBase<ADOError>(pInt){}
- WpADOError(const WpADOError& rhs){operator=(rhs);}
+ WpADOError(const WpADOError& rhs) : WpOLEBase<ADOError>(rhs) {}
WpADOError& operator=(const WpADOError& rhs)
{WpOLEBase<ADOError>::operator=(rhs); return *this;}
@@ -220,7 +220,7 @@ namespace connectivity
// Ctors, operator=
// They only call the superclass
WpADOField(ADOField* pInt=NULL):WpOLEBase<ADOField>(pInt){}
- WpADOField(const WpADOField& rhs){operator=(rhs);}
+ WpADOField(const WpADOField& rhs) : WpOLEBase<ADOField>(rhs) {}
WpADOField& operator=(const WpADOField& rhs)
{WpOLEBase<ADOField>::operator=(rhs); return *this;}
@@ -268,7 +268,7 @@ namespace connectivity
// Ctors, operator=
// They only call the superclass
WpADOProperty(ADOProperty* pInt=NULL):WpOLEBase<ADOProperty>(pInt){}
- WpADOProperty(const WpADOProperty& rhs){operator=(rhs);}
+ WpADOProperty(const WpADOProperty& rhs) : WpOLEBase<ADOProperty>(rhs) {}
WpADOProperty& operator=(const WpADOProperty& rhs)
{WpOLEBase<ADOProperty>::operator=(rhs); return *this;}
//////////////////////////////////////////////////////////////////////
@@ -290,7 +290,7 @@ namespace connectivity
// Ctors, operator=
// They only call the superclass
WpADORecordset(ADORecordset* pInt=NULL):WpOLEBase<ADORecordset>(pInt){}
- WpADORecordset(const WpADORecordset& rhs){operator=(rhs);}
+ WpADORecordset(const WpADORecordset& rhs) : WpOLEBase<ADORecordset>() {operator=(rhs);}
WpADORecordset& operator=(const WpADORecordset& rhs)
{
WpOLEBase<ADORecordset>::operator=(rhs);
diff --git a/connectivity/source/inc/ado/Awrapadox.hxx b/connectivity/source/inc/ado/Awrapadox.hxx
index 614c139aecb5..2b457aaaaef7 100644
--- a/connectivity/source/inc/ado/Awrapadox.hxx
+++ b/connectivity/source/inc/ado/Awrapadox.hxx
@@ -86,7 +86,7 @@ namespace connectivity
{
public:
WpADOView(ADOView* pInt=NULL) : WpOLEBase<ADOView>(pInt){}
- WpADOView(const WpADOView& rhs){operator=(rhs);}
+ WpADOView(const WpADOView& rhs) : WpOLEBase<ADOView>(rhs) {}
inline WpADOView& operator=(const WpADOView& rhs)
{WpOLEBase<ADOView>::operator=(rhs); return *this;}
@@ -100,7 +100,7 @@ namespace connectivity
{
public:
WpADOGroup(ADOGroup* pInt=NULL) : WpOLEBase<ADOGroup>(pInt){}
- WpADOGroup(const WpADOGroup& rhs){operator=(rhs);}
+ WpADOGroup(const WpADOGroup& rhs) : WpOLEBase<ADOGroup>(rhs) {}
inline WpADOGroup& operator=(const WpADOGroup& rhs)
{WpOLEBase<ADOGroup>::operator=(rhs); return *this;}
@@ -124,7 +124,7 @@ namespace connectivity
{
public:
WpADOUser(_ADOUser* pInt=NULL) : WpOLEBase<_ADOUser>(pInt){}
- WpADOUser(const WpADOUser& rhs){operator=(rhs);}
+ WpADOUser(const WpADOUser& rhs) : WpOLEBase<_ADOUser>(rhs) {}
inline WpADOUser& operator=(const WpADOUser& rhs)
{WpOLEBase<_ADOUser>::operator=(rhs); return *this;}
diff --git a/connectivity/source/inc/ado/WrapCatalog.hxx b/connectivity/source/inc/ado/WrapCatalog.hxx
index 8ebbb6259c35..d028ee933fcf 100644
--- a/connectivity/source/inc/ado/WrapCatalog.hxx
+++ b/connectivity/source/inc/ado/WrapCatalog.hxx
@@ -38,7 +38,7 @@ namespace connectivity
{
public:
WpADOCatalog(_ADOCatalog* pInt = NULL) : WpOLEBase<_ADOCatalog>(pInt){}
- WpADOCatalog(const WpADOCatalog& rhs){operator=(rhs);}
+ WpADOCatalog(const WpADOCatalog& rhs) : WpOLEBase<_ADOCatalog>(rhs) {}
inline WpADOCatalog& operator=(const WpADOCatalog& rhs)
{WpOLEBase<_ADOCatalog>::operator=(rhs); return *this;}
diff --git a/connectivity/source/inc/ado/WrapColumn.hxx b/connectivity/source/inc/ado/WrapColumn.hxx
index e39474b5057b..e8111b39127d 100644
--- a/connectivity/source/inc/ado/WrapColumn.hxx
+++ b/connectivity/source/inc/ado/WrapColumn.hxx
@@ -42,7 +42,7 @@ namespace connectivity
{
public:
WpADOColumn(_ADOColumn* pInt=NULL) : WpOLEBase<_ADOColumn>(pInt){}
- WpADOColumn(const WpADOColumn& rhs){operator=(rhs);}
+ WpADOColumn(const WpADOColumn& rhs) : WpOLEBase<_ADOColumn>(rhs) {}
void Create();
diff --git a/connectivity/source/inc/ado/WrapIndex.hxx b/connectivity/source/inc/ado/WrapIndex.hxx
index bc350f72eb3d..a09568b0945a 100644
--- a/connectivity/source/inc/ado/WrapIndex.hxx
+++ b/connectivity/source/inc/ado/WrapIndex.hxx
@@ -38,7 +38,7 @@ namespace connectivity
{
public:
WpADOIndex(_ADOIndex* pInt=NULL) : WpOLEBase<_ADOIndex>(pInt){}
- WpADOIndex(const WpADOIndex& rhs){operator=(rhs);}
+ WpADOIndex(const WpADOIndex& rhs) : WpOLEBase<_ADOIndex>(rhs) {}
inline WpADOIndex& operator=(const WpADOIndex& rhs)
{WpOLEBase<_ADOIndex>::operator=(rhs); return *this;}
diff --git a/connectivity/source/inc/ado/WrapKey.hxx b/connectivity/source/inc/ado/WrapKey.hxx
index 3666338fd613..ebae37db4ef0 100644
--- a/connectivity/source/inc/ado/WrapKey.hxx
+++ b/connectivity/source/inc/ado/WrapKey.hxx
@@ -38,7 +38,7 @@ namespace connectivity
{
public:
WpADOKey(ADOKey* pInt=NULL) : WpOLEBase<ADOKey>(pInt){}
- WpADOKey(const WpADOKey& rhs){operator=(rhs);}
+ WpADOKey(const WpADOKey& rhs) : WpOLEBase<ADOKey>(rhs) {}
inline WpADOKey& operator=(const WpADOKey& rhs)
{WpOLEBase<ADOKey>::operator=(rhs); return *this;}
diff --git a/connectivity/source/inc/ado/WrapTable.hxx b/connectivity/source/inc/ado/WrapTable.hxx
index 646b26e333de..cfba44484f51 100644
--- a/connectivity/source/inc/ado/WrapTable.hxx
+++ b/connectivity/source/inc/ado/WrapTable.hxx
@@ -40,7 +40,7 @@ namespace connectivity
{
public:
WpADOTable(_ADOTable* pInt=NULL) : WpOLEBase<_ADOTable>(pInt){}
- WpADOTable(const WpADOTable& rhs){operator=(rhs);}
+ WpADOTable(const WpADOTable& rhs) : WpOLEBase<_ADOTable>(rhs) {}
inline WpADOTable& operator=(const WpADOTable& rhs)
{WpOLEBase<_ADOTable>::operator=(rhs); return *this;}