[Libreoffice-commits] .: rdbmaker/source registry/source registry/test registry/workben
Julien Nabet
serval2412 at kemper.freedesktop.org
Wed Mar 2 13:15:19 PST 2011
rdbmaker/source/codemaker/dependency.cxx | 4 +-
rdbmaker/source/codemaker/options.cxx | 3 --
rdbmaker/source/codemaker/typemanager.cxx | 5 ++-
rdbmaker/source/rdbmaker/rdbmaker.cxx | 7 ++++
rdbmaker/source/rdbmaker/rdboptions.cxx | 3 --
rdbmaker/source/rdbmaker/rdbtype.cxx | 35 ++----------------------
rdbmaker/source/rdbmaker/specialtypemanager.cxx | 3 --
rdbmaker/source/rdbmaker/typeblop.cxx | 3 +-
registry/source/reflwrit.cxx | 4 +-
registry/source/regimpl.cxx | 6 +++-
registry/source/regimpl.hxx | 3 --
registry/test/testmerge.cxx | 3 +-
registry/test/testregcpp.cxx | 5 ++-
registry/workben/regspeed.cxx | 3 +-
registry/workben/regtest.cxx | 4 ++
15 files changed, 37 insertions(+), 54 deletions(-)
New commits:
commit dacdec747470cbe80a4bc7d5951e16a35d13df9c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Wed Mar 2 22:15:02 2011 +0100
Remove "using namespace ::rtl"
diff --git a/rdbmaker/source/codemaker/dependency.cxx b/rdbmaker/source/codemaker/dependency.cxx
index cf31c5f..b1c6032 100644
--- a/rdbmaker/source/codemaker/dependency.cxx
+++ b/rdbmaker/source/codemaker/dependency.cxx
@@ -30,8 +30,8 @@
#include <rtl/alloc.h>
#include <codemaker/dependency.hxx>
-using namespace rtl;
-
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
TypeDependency::TypeDependency()
{
m_pImpl = new TypeDependencyImpl();
diff --git a/rdbmaker/source/codemaker/options.cxx b/rdbmaker/source/codemaker/options.cxx
index 587dcf3..c302f27 100644
--- a/rdbmaker/source/codemaker/options.cxx
+++ b/rdbmaker/source/codemaker/options.cxx
@@ -28,8 +28,7 @@
#include <codemaker/options.hxx>
-using namespace rtl;
-
+using ::rtl::OString;
Options::Options()
{
}
diff --git a/rdbmaker/source/codemaker/typemanager.cxx b/rdbmaker/source/codemaker/typemanager.cxx
index 60ced47..1c4c511 100644
--- a/rdbmaker/source/codemaker/typemanager.cxx
+++ b/rdbmaker/source/codemaker/typemanager.cxx
@@ -30,8 +30,9 @@
#include <osl/file.hxx>
#include <codemaker/typemanager.hxx>
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
TypeManager::TypeManager()
{
m_pImpl = new TypeManagerImpl();
diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index ed708c7..d6b1c8d 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -53,9 +53,14 @@
#define PATH_DELEMITTER '/'
-using namespace rtl;
using namespace osl;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
+
FileStream listFile;
RegistryKey rootKey;
Registry regFile;
diff --git a/rdbmaker/source/rdbmaker/rdboptions.cxx b/rdbmaker/source/rdbmaker/rdboptions.cxx
index b451b7b..0ad473e 100644
--- a/rdbmaker/source/rdbmaker/rdboptions.cxx
+++ b/rdbmaker/source/rdbmaker/rdboptions.cxx
@@ -30,8 +30,7 @@
#include "rdboptions.hxx"
-using namespace rtl;
-
+using ::rtl::OString;
sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
throw( IllegalArgument )
{
diff --git a/rdbmaker/source/rdbmaker/rdbtype.cxx b/rdbmaker/source/rdbmaker/rdbtype.cxx
index 8910731..01f0388 100644
--- a/rdbmaker/source/rdbmaker/rdbtype.cxx
+++ b/rdbmaker/source/rdbmaker/rdbtype.cxx
@@ -34,8 +34,9 @@
#include "rdbtype.hxx"
#include "rdboptions.hxx"
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
sal_Bool isBaseType(const OString& type)
{
if ( type.equals("long") ||
@@ -119,12 +120,6 @@ sal_Bool produceType(const OString& typeName,
{
if (typeDependencies.isGenerated(typeName) )
return sal_True;
-/*
- RegistryKey typeKey = typeMgr.getTypeKey(typeName);
-
- if (!typeKey.isValid())
- return sal_False;
-*/
if( !checkTypeDependencies(typeMgr, typeDependencies, typeName, bDepend))
return sal_False;
@@ -135,26 +130,6 @@ sal_Bool produceType(const OString& typeName,
o << typeName.getStr() << "\n";
} else
{
-/*
- RegValueType valueType;
- sal_uInt32 valueSize;
-
- if (typeKey.getValueInfo(OUString(), &valueType, &valueSize))
- {
- if (typeName.equals("/"))
- return sal_True;
- else
- return sal_False;
- }
-
- sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
-
- if (typeKey.getValue(OUString(), pBuffer))
- {
- rtl_freeMemory(pBuffer);
- return sal_False;
- }
-*/
TypeReader reader = typeMgr.getTypeReader(typeName);
if (!reader.isValid())
@@ -170,18 +145,14 @@ sal_Bool produceType(const OString& typeName,
RegistryKey typeKey;
if ( regKey.createKey( OStringToOUString(typeName, RTL_TEXTENCODING_UTF8), typeKey) )
{
-// rtl_freeMemory(pBuffer);
return sal_False;
}
if ( typeKey.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)reader.getBlop(), reader.getBlopSize()) )
-// if ( typeKey.setValue(OUString(), valueType, pBuffer, valueSize) )
{
-// rtl_freeMemory(pBuffer);
return sal_False;
}
-// rtl_freeMemory(pBuffer);
}
}
diff --git a/rdbmaker/source/rdbmaker/specialtypemanager.cxx b/rdbmaker/source/rdbmaker/specialtypemanager.cxx
index 90bcb35..3d2acea 100644
--- a/rdbmaker/source/rdbmaker/specialtypemanager.cxx
+++ b/rdbmaker/source/rdbmaker/specialtypemanager.cxx
@@ -36,8 +36,7 @@ sal_Bool SAL_CALL initTypeMapper( const sal_Char* pRegName );
sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop);
}
-using namespace rtl;
-
+using ::rtl::OString;
SpecialTypeManager::SpecialTypeManager()
{
m_pImpl = new SpecialTypeManagerImpl();
diff --git a/rdbmaker/source/rdbmaker/typeblop.cxx b/rdbmaker/source/rdbmaker/typeblop.cxx
index 7676118..505de92 100644
--- a/rdbmaker/source/rdbmaker/typeblop.cxx
+++ b/rdbmaker/source/rdbmaker/typeblop.cxx
@@ -50,7 +50,8 @@ using namespace com::sun::star::reflection;
using namespace com::sun::star::lang;
using namespace com::sun::star::container;
using namespace cppu;
-using namespace rtl;
+
+using ::rtl::OUString;
static Reference< XHierarchicalNameAccess > xNameAccess;
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 3e54ff6..99f084a 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -43,11 +43,11 @@
#include "reflcnst.hxx"
-using namespace rtl;
+using ::rtl::OString;
+
namespace {
-// Throws std::bad_alloc:
inline rtl::OString toByteString(rtl_uString const * str) {
return rtl::OString(
str->buffer, str->length, RTL_TEXTENCODING_UTF8,
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index a21f9ea..c210d7b 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -61,10 +61,14 @@
#include <rtl/ustrbuf.hxx>
#include <osl/file.hxx>
-using namespace rtl;
using namespace osl;
using namespace store;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
+
namespace {
void printString(rtl::OUString const & s) {
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index 050158b..0259ca5 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -62,9 +62,6 @@
#define REG_GUARD(mutex) \
osl::Guard< osl::Mutex > aGuard( mutex );
-// @@@ using namespace rtl;
-// @@@ using namespace osl;
-
class ORegKey;
class RegistryTypeReader;
diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx
index 2ea6d73..96387f4 100644
--- a/registry/test/testmerge.cxx
+++ b/registry/test/testmerge.cxx
@@ -42,7 +42,8 @@
using namespace std;
-using namespace rtl;
+
+using ::rtl::OUString;
sal_Int32 lValue1 = 123456789;
sal_Int32 lValue2 = 54321;
diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx
index 4fcc4bd..f012a45 100644
--- a/registry/test/testregcpp.cxx
+++ b/registry/test/testregcpp.cxx
@@ -41,7 +41,10 @@
#include <rtl/ustring.hxx>
using namespace std;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
void test_coreReflection()
{
diff --git a/registry/workben/regspeed.cxx b/registry/workben/regspeed.cxx
index e52685e..85c76ac 100644
--- a/registry/workben/regspeed.cxx
+++ b/registry/workben/regspeed.cxx
@@ -103,7 +103,8 @@ protected:
};
#endif
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
#if (defined UNX) || (defined OS2)
int main( int argc, char * argv[] )
diff --git a/registry/workben/regtest.cxx b/registry/workben/regtest.cxx
index 2c2025c..97711e7 100644
--- a/registry/workben/regtest.cxx
+++ b/registry/workben/regtest.cxx
@@ -37,7 +37,9 @@
#include <rtl/alloc.h>
using namespace std;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
#if (defined UNX) || (defined OS2)
int main()
More information about the Libreoffice-commits
mailing list