Kaydet (Commit) 29337650 authored tarafından Noel Grandin's avatar Noel Grandin

boost::scoped_ptr -> std::unique_ptr in mysqlc

Change-Id: I4c8d25ed451ab03d2b5d0e9977ab74fd2ea1bb04
Reviewed-on: https://gerrit.libreoffice.org/33870Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 8a16f665
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "mysqlc_databasemetadata.hxx" #include "mysqlc_databasemetadata.hxx"
#include <boost/scoped_ptr.hpp> #include <memory>
#include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
...@@ -946,7 +946,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() ...@@ -946,7 +946,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs()
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
boost::scoped_ptr< sql::ResultSet> rset( meta->getCatalogs()); std::unique_ptr< sql::ResultSet> rset( meta->getCatalogs());
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -975,7 +975,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas() ...@@ -975,7 +975,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas()
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
boost::scoped_ptr< sql::ResultSet> rset( meta->getSchemas()); std::unique_ptr< sql::ResultSet> rset( meta->getSchemas());
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -1019,7 +1019,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( ...@@ -1019,7 +1019,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
cNamePattern(rtl::OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr()); cNamePattern(rtl::OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr());
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
boost::scoped_ptr< sql::ResultSet> rset( meta->getColumnPrivileges(cat, sch, tab, cNamePattern.compare("")? cNamePattern:wild)); std::unique_ptr< sql::ResultSet> rset( meta->getColumnPrivileges(cat, sch, tab, cNamePattern.compare("")? cNamePattern:wild));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
...@@ -1056,7 +1056,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( ...@@ -1056,7 +1056,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
cNamePattern(rtl::OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr()); cNamePattern(rtl::OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr());
try { try {
boost::scoped_ptr< sql::ResultSet> rset( meta->getColumns(cat, std::unique_ptr< sql::ResultSet> rset( meta->getColumns(cat,
sPattern.compare("")? sPattern:wild, sPattern.compare("")? sPattern:wild,
tNamePattern.compare("")? tNamePattern:wild, tNamePattern.compare("")? tNamePattern:wild,
cNamePattern.compare("")? cNamePattern:wild)); cNamePattern.compare("")? cNamePattern:wild));
...@@ -1109,7 +1109,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( ...@@ -1109,7 +1109,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
} }
try { try {
boost::scoped_ptr< sql::ResultSet> rset( meta->getTables(cat, std::unique_ptr< sql::ResultSet> rset( meta->getTables(cat,
sPattern.compare("")? sPattern:wild, sPattern.compare("")? sPattern:wild,
tNamePattern.compare("")? tNamePattern:wild, tNamePattern.compare("")? tNamePattern:wild,
tabTypes)); tabTypes));
...@@ -1167,7 +1167,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( ...@@ -1167,7 +1167,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
try { try {
boost::scoped_ptr< sql::ResultSet> rset( meta->getProcedures(cat, std::unique_ptr< sql::ResultSet> rset( meta->getProcedures(cat,
sPattern.compare("")? sPattern:wild, sPattern.compare("")? sPattern:wild,
procNamePattern.compare("")? procNamePattern:wild)); procNamePattern.compare("")? procNamePattern:wild));
...@@ -1217,7 +1217,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( ...@@ -1217,7 +1217,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
boost::scoped_ptr< sql::ResultSet> rset( meta->getExportedKeys(cat, sch, tab)); std::unique_ptr< sql::ResultSet> rset( meta->getExportedKeys(cat, sch, tab));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -1253,7 +1253,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( ...@@ -1253,7 +1253,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
boost::scoped_ptr< sql::ResultSet> rset( meta->getImportedKeys(cat, sch, tab)); std::unique_ptr< sql::ResultSet> rset( meta->getImportedKeys(cat, sch, tab));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -1289,7 +1289,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( ...@@ -1289,7 +1289,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
boost::scoped_ptr< sql::ResultSet> rset( meta->getPrimaryKeys(cat, sch, tab)); std::unique_ptr< sql::ResultSet> rset( meta->getPrimaryKeys(cat, sch, tab));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -1327,7 +1327,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( ...@@ -1327,7 +1327,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
boost::scoped_ptr< sql::ResultSet> rset( meta->getIndexInfo(cat, sch, tab, unique, approximate)); std::unique_ptr< sql::ResultSet> rset( meta->getIndexInfo(cat, sch, tab, unique, approximate));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -1365,7 +1365,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( ...@@ -1365,7 +1365,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
boost::scoped_ptr< sql::ResultSet> rset( meta->getBestRowIdentifier(cat, sch, tab, scope, nullable)); std::unique_ptr< sql::ResultSet> rset( meta->getBestRowIdentifier(cat, sch, tab, scope, nullable));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -1421,7 +1421,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( ...@@ -1421,7 +1421,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
} }
} else { } else {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
boost::scoped_ptr< sql::ResultSet> rset( meta->getTablePrivileges(cat, sPattern.compare("")? sPattern:wild, tPattern.compare("")? tPattern:wild)); std::unique_ptr< sql::ResultSet> rset( meta->getTablePrivileges(cat, sPattern.compare("")? sPattern:wild, tPattern.compare("")? tPattern:wild));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -1464,7 +1464,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( ...@@ -1464,7 +1464,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
boost::scoped_ptr< sql::ResultSet> rset( meta->getCrossReference(primaryCat, primarySchema, primaryTable, foreignCat, fSchema, fTable)); std::unique_ptr< sql::ResultSet> rset( meta->getCrossReference(primaryCat, primarySchema, primaryTable, foreignCat, fSchema, fTable));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment