Kaydet (Commit) 389bc73b authored tarafından Julien Nabet's avatar Julien Nabet

Remove "using namespace ::rtl"

üst 933e2288
......@@ -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();
......
......@@ -28,8 +28,7 @@
#include <codemaker/options.hxx>
using namespace rtl;
using ::rtl::OString;
Options::Options()
{
}
......
......@@ -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();
......
......@@ -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;
......
......@@ -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 )
{
......
......@@ -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);
}
}
......
......@@ -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();
......
......@@ -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;
......
......@@ -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,
......
......@@ -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) {
......
......@@ -62,9 +62,6 @@
#define REG_GUARD(mutex) \
osl::Guard< osl::Mutex > aGuard( mutex );
// @@@ using namespace rtl;
// @@@ using namespace osl;
class ORegKey;
class RegistryTypeReader;
......
......@@ -42,7 +42,8 @@
using namespace std;
using namespace rtl;
using ::rtl::OUString;
sal_Int32 lValue1 = 123456789;
sal_Int32 lValue2 = 54321;
......
......@@ -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()
{
......
......@@ -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[] )
......
......@@ -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()
......
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