summaryrefslogtreecommitdiff
path: root/codemaker/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-23 12:06:00 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-24 14:43:34 +0200
commit6f50961e69406a17d6ec998956a6b33208b1001b (patch)
tree413c83df969e73c5cba1e11ef3740afc748ee1f5 /codemaker/source
parent4e729de73f2947155248f8df5897380611b87917 (diff)
remove more rtl::OUString and OString prefixes
which seem to have snuck back in since the great rounds of removals. Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1 Reviewed-on: https://gerrit.libreoffice.org/62229 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'codemaker/source')
-rw-r--r--codemaker/source/codemaker/exceptiontree.cxx10
-rw-r--r--codemaker/source/codemaker/global.cxx10
-rw-r--r--codemaker/source/codemaker/options.cxx2
-rw-r--r--codemaker/source/cppumaker/cppuoptions.cxx2
-rw-r--r--codemaker/source/cppumaker/cpputype.hxx2
-rw-r--r--codemaker/source/cppumaker/dependencies.hxx6
-rw-r--r--codemaker/source/cppumaker/dumputils.cxx8
-rw-r--r--codemaker/source/javamaker/javatype.cxx2
-rw-r--r--codemaker/source/javamaker/javatype.hxx2
9 files changed, 20 insertions, 24 deletions
diff --git a/codemaker/source/codemaker/exceptiontree.cxx b/codemaker/source/codemaker/exceptiontree.cxx
index 8fa60ab6776f..b6c2aeee6f87 100644
--- a/codemaker/source/codemaker/exceptiontree.cxx
+++ b/codemaker/source/codemaker/exceptiontree.cxx
@@ -33,7 +33,7 @@
using codemaker::ExceptionTree;
using codemaker::ExceptionTreeNode;
-ExceptionTreeNode * ExceptionTreeNode::add(rtl::OString const & theName) {
+ExceptionTreeNode * ExceptionTreeNode::add(OString const & theName) {
std::unique_ptr< ExceptionTreeNode > node(new ExceptionTreeNode(theName));
children.push_back(std::move(node));
return children.back().get();
@@ -44,11 +44,11 @@ void ExceptionTreeNode::clearChildren() {
}
void ExceptionTree::add(
- rtl::OString const & name, rtl::Reference< TypeManager > const & manager)
+ OString const & name, rtl::Reference< TypeManager > const & manager)
{
- std::vector< rtl::OString > list;
+ std::vector< OString > list;
bool bRuntimeException = false;
- for (rtl::OString n(name); n != "com.sun.star.uno.Exception";) {
+ for (OString n(name); n != "com.sun.star.uno.Exception";) {
if (n == "com.sun.star.uno.RuntimeException") {
bRuntimeException = true;
break;
@@ -65,7 +65,7 @@ void ExceptionTree::add(
}
if (!bRuntimeException) {
ExceptionTreeNode * node = &m_root;
- for (std::vector< rtl::OString >::reverse_iterator i(list.rbegin());
+ for (std::vector< OString >::reverse_iterator i(list.rbegin());
!node->present; ++i)
{
if (i == list.rend()) {
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index 5b95332c1007..5005882bd765 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -333,30 +333,30 @@ FileStream &operator<<(FileStream& o, char const * s) {
osl_writeFile(o.m_file, s, strlen(s), &writtenBytes);
return o;
}
-FileStream &operator<<(FileStream& o, ::rtl::OString const * s) {
+FileStream &operator<<(FileStream& o, OString const * s) {
sal_uInt64 writtenBytes;
osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(sal_Char), &writtenBytes);
return o;
}
-FileStream &operator<<(FileStream& o, const ::rtl::OString& s) {
+FileStream &operator<<(FileStream& o, const OString& s) {
sal_uInt64 writtenBytes;
osl_writeFile(o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes);
return o;
}
-FileStream &operator<<(FileStream& o, ::rtl::OStringBuffer const * s) {
+FileStream &operator<<(FileStream& o, OStringBuffer const * s) {
sal_uInt64 writtenBytes;
osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(sal_Char), &writtenBytes);
return o;
}
-FileStream &operator<<(FileStream& o, const ::rtl::OStringBuffer& s) {
+FileStream &operator<<(FileStream& o, const OStringBuffer& s) {
sal_uInt64 writtenBytes;
osl_writeFile(
o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes);
return o;
}
-FileStream & operator <<(FileStream & out, rtl::OUString const & s) {
+FileStream & operator <<(FileStream & out, OUString const & s) {
return out << OUStringToOString(s, RTL_TEXTENCODING_UTF8);
}
diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx
index 7a94b0956b75..9b8dbf61f6bf 100644
--- a/codemaker/source/codemaker/options.cxx
+++ b/codemaker/source/codemaker/options.cxx
@@ -20,8 +20,6 @@
#include <codemaker/options.hxx>
-using ::rtl::OString;
-
Options::Options()
{
}
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx
index 54bfec3393f9..d9077dc43d7e 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -24,8 +24,6 @@
#include <osl/thread.h>
#include <osl/process.h>
-using ::rtl::OString;
-
#ifdef SAL_UNX
#define SEPARATOR '/'
#else
diff --git a/codemaker/source/cppumaker/cpputype.hxx b/codemaker/source/cppumaker/cpputype.hxx
index cde5c68d2f93..91226c0165e2 100644
--- a/codemaker/source/cppumaker/cpputype.hxx
+++ b/codemaker/source/cppumaker/cpputype.hxx
@@ -30,7 +30,7 @@ class CppuOptions;
class TypeManager;
void produce(
- rtl::OUString const & name, rtl::Reference< TypeManager > const & manager,
+ OUString const & name, rtl::Reference< TypeManager > const & manager,
codemaker::GeneratedTypeSet & generated, CppuOptions const & options);
#endif
diff --git a/codemaker/source/cppumaker/dependencies.hxx b/codemaker/source/cppumaker/dependencies.hxx
index 5e7adb442024..3143b4e40483 100644
--- a/codemaker/source/cppumaker/dependencies.hxx
+++ b/codemaker/source/cppumaker/dependencies.hxx
@@ -47,7 +47,7 @@ public:
*/
enum Kind { KIND_NORMAL, KIND_BASE, KIND_EXCEPTION };
- typedef std::map< rtl::OUString, Kind > Map;
+ typedef std::map< OUString, Kind > Map;
/**
Constructs the dependencies for a given entity.
@@ -62,7 +62,7 @@ public:
*/
Dependencies(
rtl::Reference< TypeManager > const & manager,
- rtl::OUString const & name);
+ OUString const & name);
~Dependencies();
@@ -101,7 +101,7 @@ public:
bool hasSequenceDependency() const { return m_sequenceDependency; }
private:
- void insert(rtl::OUString const & name, Kind kind);
+ void insert(OUString const & name, Kind kind);
rtl::Reference< TypeManager > m_manager;
Map m_map;
diff --git a/codemaker/source/cppumaker/dumputils.cxx b/codemaker/source/cppumaker/dumputils.cxx
index a540e782bbd7..ec4a586c4a17 100644
--- a/codemaker/source/cppumaker/dumputils.cxx
+++ b/codemaker/source/cppumaker/dumputils.cxx
@@ -29,12 +29,12 @@
namespace codemaker { namespace cppumaker {
bool dumpNamespaceOpen(
- FileStream & out, rtl::OUString const & entityName, bool fullModuleType)
+ FileStream & out, OUString const & entityName, bool fullModuleType)
{
bool bOutput = false;
bool bFirst = true;
for (sal_Int32 i = 0; i >= 0;) {
- rtl::OUString id(entityName.getToken(0, '.', i));
+ OUString id(entityName.getToken(0, '.', i));
if (fullModuleType || i >= 0) {
if (!bFirst) {
out << " ";
@@ -48,7 +48,7 @@ bool dumpNamespaceOpen(
}
bool dumpNamespaceClose(
- FileStream & out, rtl::OUString const & entityName, bool fullModuleType)
+ FileStream & out, OUString const & entityName, bool fullModuleType)
{
bool bOutput = false;
bool bFirst = true;
@@ -69,7 +69,7 @@ bool dumpNamespaceClose(
return bOutput;
}
-void dumpTypeIdentifier(FileStream & out, rtl::OUString const & entityName) {
+void dumpTypeIdentifier(FileStream & out, OUString const & entityName) {
out << entityName.copy(entityName.lastIndexOf('.') + 1);
}
diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index b5ece143572e..9d683a53ce08 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -861,7 +861,7 @@ sal_uInt16 addFieldInit(
OString name(codemaker::convertString(fieldName));
OUString nucleus;
sal_Int32 rank;
- std::vector< rtl::OUString > args;
+ std::vector< OUString > args;
rtl::Reference< unoidl::Entity > ent;
codemaker::UnoType::Sort sort = manager->decompose(
fieldType, true, &nucleus, &rank, &args, &ent);
diff --git a/codemaker/source/javamaker/javatype.hxx b/codemaker/source/javamaker/javatype.hxx
index 4aee28e9887c..9263ecee9676 100644
--- a/codemaker/source/javamaker/javatype.hxx
+++ b/codemaker/source/javamaker/javatype.hxx
@@ -30,7 +30,7 @@ class JavaOptions;
class TypeManager;
void produce(
- rtl::OUString const & name, rtl::Reference< TypeManager > const & manager,
+ OUString const & name, rtl::Reference< TypeManager > const & manager,
codemaker::GeneratedTypeSet & generated, JavaOptions const & options);
#endif