mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09

10 files changed, 79 insertions, 80 deletions

diff --git a/codemaker/inc/codemaker/codemaker.hxx b/codemaker/inc/codemaker/codemaker.hxx
index a1c3a14eea6c..9a821bea78ba 100644
--- a/codemaker/inc/codemaker/codemaker.hxx
+++ b/codemaker/inc/codemaker/codemaker.hxx
@@ -36,13 +36,13 @@ class TypeManager;
 
 namespace codemaker {
 
-rtl::OString convertString(rtl::OUString const & string);
+OString convertString(OUString const & string);
 
 codemaker::UnoType::Sort decomposeAndResolve(
-    rtl::Reference< TypeManager > const & manager, rtl::OString const & type,
+    rtl::Reference< TypeManager > const & manager, OString const & type,
     bool resolveTypedefs, bool allowVoid, bool allowExtraEntities,
-    RTTypeClass * typeClass, rtl::OString * name, sal_Int32 * rank,
-    std::vector< rtl::OString > * arguments);
+    RTTypeClass * typeClass, OString * name, sal_Int32 * rank,
+    std::vector< OString > * arguments);
 
 }
 
diff --git a/codemaker/inc/codemaker/commoncpp.hxx b/codemaker/inc/codemaker/commoncpp.hxx
index 3cfd7133c0f1..4f81f98fff23 100644
--- a/codemaker/inc/codemaker/commoncpp.hxx
+++ b/codemaker/inc/codemaker/commoncpp.hxx
@@ -33,11 +33,11 @@ namespace codemaker { namespace cpp {
     Use common namespace aliases instead of fully specified (nested)
     namespace. currently replaces com::sun::star with css.
  */
-rtl::OString scopedCppName(rtl::OString const & type, bool ns_alias=true);
+OString scopedCppName(OString const & type, bool ns_alias=true);
 
-rtl::OString translateUnoToCppType(
+OString translateUnoToCppType(
     codemaker::UnoType::Sort sort, RTTypeClass typeClass,
-    rtl::OString const & nucleus, bool shortname);
+    OString const & nucleus, bool shortname);
 
 enum IdentifierTranslationMode {
     ITM_GLOBAL,
@@ -45,10 +45,10 @@ enum IdentifierTranslationMode {
     ITM_KEYWORDSONLY
 };
 
-rtl::OString translateUnoToCppIdentifier(
-    rtl::OString const & identifier, rtl::OString const & prefix,
+OString translateUnoToCppIdentifier(
+    OString const & identifier, OString const & prefix,
     IdentifierTranslationMode transmode = ITM_GLOBAL,
-    rtl::OString const * forbidden = 0);
+    OString const * forbidden = 0);
 
 } }
 
diff --git a/codemaker/inc/codemaker/commonjava.hxx b/codemaker/inc/codemaker/commonjava.hxx
index 26c87e123fdb..f2e77ee9d1fa 100644
--- a/codemaker/inc/codemaker/commonjava.hxx
+++ b/codemaker/inc/codemaker/commonjava.hxx
@@ -24,12 +24,12 @@
 
 namespace codemaker { namespace java {
 
-rtl::OString translateUnoToJavaType(
+OString translateUnoToJavaType(
     codemaker::UnoType::Sort sort, RTTypeClass typeClass,
-    rtl::OString const & nucleus, bool referenceType);
+    OString const & nucleus, bool referenceType);
 
-rtl::OString translateUnoToJavaIdentifier(
-    rtl::OString const & identifier, rtl::OString const & prefix);
+OString translateUnoToJavaIdentifier(
+    OString const & identifier, OString const & prefix);
 
 } }
 
diff --git a/codemaker/inc/codemaker/dependencies.hxx b/codemaker/inc/codemaker/dependencies.hxx
index c45db676d667..47e5e249c48f 100644
--- a/codemaker/inc/codemaker/dependencies.hxx
+++ b/codemaker/inc/codemaker/dependencies.hxx
@@ -26,8 +26,8 @@
 
 #include "rtl/ref.hxx"
 #include "rtl/string.hxx"
+#include "rtl/ustring.hxx"
 
-namespace rtl { class OUString; }
 class TypeManager;
 
 /// @HTML
@@ -47,7 +47,7 @@ public:
      */
     enum Kind { KIND_NO_BASE, KIND_BASE };
 
-    typedef std::map< rtl::OString, Kind > Map;
+    typedef std::map< OString, Kind > Map;
 
     /**
        Constructs the dependencies for a given type.
@@ -63,7 +63,7 @@ public:
      */
     Dependencies(
         rtl::Reference< TypeManager > const & manager,
-        rtl::OString const & type);
+        OString const & type);
 
     ~Dependencies();
 
@@ -73,7 +73,7 @@ public:
 
        @param type a UNO type registry name
      */
-    void add(rtl::OString const & type) { insert(type, false); }
+    void add(OString const & type) { insert(type, false); }
 
     bool isValid() const { return m_valid; }
 
@@ -117,9 +117,9 @@ private:
     Dependencies(Dependencies &); // not implemented
     void operator =(Dependencies); // not implemented
 
-    void insert(rtl::OUString const & type, bool base);
+    void insert(OUString const & type, bool base);
 
-    void insert(rtl::OString const & type, bool base);
+    void insert(OString const & type, bool base);
 
     Map m_map;
     bool m_valid;
diff --git a/codemaker/inc/codemaker/exceptiontree.hxx b/codemaker/inc/codemaker/exceptiontree.hxx
index fed0e5b9e4d7..91a0cae3f839 100644
--- a/codemaker/inc/codemaker/exceptiontree.hxx
+++ b/codemaker/inc/codemaker/exceptiontree.hxx
@@ -37,7 +37,7 @@ struct ExceptionTreeNode {
     typedef std::vector< ExceptionTreeNode * > Children;
 
     // Internally used by ExceptionTree:
-    ExceptionTreeNode(rtl::OString const & theName):
+    ExceptionTreeNode(OString const & theName):
         name(theName), present(false) {}
 
     // Internally used by ExceptionTree:
@@ -47,9 +47,9 @@ struct ExceptionTreeNode {
     void setPresent() { present = true; clearChildren(); }
 
     // Internally used by ExceptionTree:
-    ExceptionTreeNode * add(rtl::OString const & theName);
+    ExceptionTreeNode * add(OString const & theName);
 
-    rtl::OString name;
+    OString name;
     bool present;
     Children children;
 
@@ -94,7 +94,7 @@ public:
        type managers
      */
     void add(
-        rtl::OString const & name,
+        OString const & name,
         rtl::Reference< TypeManager > const & manager)
         throw( CannotDumpException );
 
diff --git a/codemaker/inc/codemaker/generatedtypeset.hxx b/codemaker/inc/codemaker/generatedtypeset.hxx
index 2081fc715ddd..3d1a5615b0b1 100644
--- a/codemaker/inc/codemaker/generatedtypeset.hxx
+++ b/codemaker/inc/codemaker/generatedtypeset.hxx
@@ -47,7 +47,7 @@ public:
 
        @param type a UNO type registry name
      */
-    void add(rtl::OString const & type) { m_set.insert(type); }
+    void add(OString const & type) { m_set.insert(type); }
 
     /**
        Checks whether a given type has already been generated.
@@ -56,14 +56,14 @@ public:
 
        @return true iff the given type has already been generated
      */
-    bool contains(rtl::OString const & type) const
+    bool contains(OString const & type) const
     { return m_set.find(type) != m_set.end(); }
 
 private:
     GeneratedTypeSet(GeneratedTypeSet &); // not implemented
     void operator =(GeneratedTypeSet); // not implemented
 
-    boost::unordered_set< rtl::OString, rtl::OStringHash > m_set;
+    boost::unordered_set< OString, OStringHash > m_set;
 };
 
 }
diff --git a/codemaker/inc/codemaker/global.hxx b/codemaker/inc/codemaker/global.hxx
index 17f78a886b65..891ed4705e87 100644
--- a/codemaker/inc/codemaker/global.hxx
+++ b/codemaker/inc/codemaker/global.hxx
@@ -32,7 +32,7 @@
 
 struct EqualString
 {
-    sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const
+    sal_Bool operator()(const OString& str1, const OString& str2) const
     {
         return (str1 == str2);
     }
@@ -40,7 +40,7 @@ struct EqualString
 
 struct HashString
 {
-    size_t operator()(const ::rtl::OString& str) const
+    size_t operator()(const OString& str) const
     {
         return str.hashCode();
     }
@@ -48,15 +48,15 @@ struct HashString
 
 struct LessString
 {
-    sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const
+    sal_Bool operator()(const OString& str1, const OString& str2) const
     {
         return (str1 < str2);
     }
 };
 
-typedef ::std::list< ::rtl::OString >               StringList;
-typedef ::std::vector< ::rtl::OString >             StringVector;
-typedef ::std::set< ::rtl::OString, LessString >    StringSet;
+typedef ::std::list< OString >               StringList;
+typedef ::std::vector< OString >             StringVector;
+typedef ::std::set< OString, LessString >    StringSet;
 
 //*************************************************************************
 // FileStream
@@ -77,45 +77,45 @@ public:
 
     sal_Bool isValid();
 
-    void createTempFile(const ::rtl::OString& sPath);
+    void createTempFile(const OString& sPath);
     void close();
 
-    ::rtl::OString  getName() { return m_name; }
+    OString  getName() { return m_name; }
 
     bool write(void const * buffer, sal_uInt64 size);
 
     // friend functions
     friend FileStream &operator<<(FileStream& o, sal_uInt32 i);
     friend FileStream &operator<<(FileStream& o, char const * s);
-    friend FileStream &operator<<(FileStream& o, ::rtl::OString* s);
-    friend FileStream &operator<<(FileStream& o, const ::rtl::OString& s);
-    friend FileStream &operator<<(FileStream& o, ::rtl::OStringBuffer* s);
-    friend FileStream &operator<<(FileStream& o, const ::rtl::OStringBuffer& s);
+    friend FileStream &operator<<(FileStream& o, OString* s);
+    friend FileStream &operator<<(FileStream& o, const OString& s);
+    friend FileStream &operator<<(FileStream& o, OStringBuffer* s);
+    friend FileStream &operator<<(FileStream& o, const OStringBuffer& s);
 
 private:
     oslFileHandle m_file;
-    ::rtl::OString  m_name;
+    OString  m_name;
 };
 
 
 //*************************************************************************
 // Helper functions
 //*************************************************************************
-::rtl::OString getTempDir(const ::rtl::OString& sFileName);
+OString getTempDir(const OString& sFileName);
 
-::rtl::OString createFileNameFromType(const ::rtl::OString& destination,
-                                      const ::rtl::OString type,
-                                      const ::rtl::OString postfix,
+OString createFileNameFromType(const OString& destination,
+                                      const OString type,
+                                      const OString postfix,
                                       sal_Bool bLowerCase=sal_False,
-                                      const ::rtl::OString prefix="");
+                                      const OString prefix="");
 
-sal_Bool fileExists(const ::rtl::OString& fileName);
-sal_Bool makeValidTypeFile(const ::rtl::OString& targetFileName,
-                           const ::rtl::OString& tmpFileName,
+sal_Bool fileExists(const OString& fileName);
+sal_Bool makeValidTypeFile(const OString& targetFileName,
+                           const OString& tmpFileName,
                            sal_Bool bFileCheck);
-sal_Bool removeTypeFile(const ::rtl::OString& fileName);
+sal_Bool removeTypeFile(const OString& fileName);
 
-::rtl::OUString convertToFileUrl(const ::rtl::OString& fileName);
+OUString convertToFileUrl(const OString& fileName);
 
 //*************************************************************************
 // Global exception to signal problems when a type cannot be dumped
@@ -123,10 +123,10 @@ sal_Bool removeTypeFile(const ::rtl::OString& fileName);
 class CannotDumpException
 {
 public:
-    CannotDumpException(const ::rtl::OString& msg)
+    CannotDumpException(const OString& msg)
         : m_message(msg) {}
 
-    ::rtl::OString  m_message;
+    OString  m_message;
 };
 
 
diff --git a/codemaker/inc/codemaker/options.hxx b/codemaker/inc/codemaker/options.hxx
index 22b09ce00165..053cda9cf44b 100644
--- a/codemaker/inc/codemaker/options.hxx
+++ b/codemaker/inc/codemaker/options.hxx
@@ -26,8 +26,8 @@
 
 typedef ::boost::unordered_map
 <
-    ::rtl::OString,
-    ::rtl::OString,
+    OString,
+    OString,
     HashString,
     EqualString
 > OptionMap;
@@ -35,10 +35,10 @@ typedef ::boost::unordered_map
 class IllegalArgument
 {
 public:
-    IllegalArgument(const ::rtl::OString& msg)
+    IllegalArgument(const OString& msg)
         : m_message(msg) {}
 
-    ::rtl::OString  m_message;
+    OString  m_message;
 };
 
 class Options
@@ -50,11 +50,11 @@ public:
     virtual sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
         throw( IllegalArgument ) = 0;
 
-    virtual ::rtl::OString  prepareHelp() = 0;
+    virtual OString  prepareHelp() = 0;
 
-    const ::rtl::OString&   getProgramName() const;
-    sal_Bool                isValid(const ::rtl::OString& option);
-    const ::rtl::OString    getOption(const ::rtl::OString& option)
+    const OString&   getProgramName() const;
+    sal_Bool                isValid(const OString& option);
+    const OString    getOption(const OString& option)
         throw( IllegalArgument );
 
     const StringVector& getInputFiles();
@@ -64,7 +64,7 @@ public:
     inline const StringVector& getExtraInputFiles() const
         { return m_extra_input_files; }
 protected:
-    ::rtl::OString  m_program;
+    OString  m_program;
     StringVector    m_inputFiles;
     StringVector    m_extra_input_files;
     OptionMap       m_options;
diff --git a/codemaker/inc/codemaker/typemanager.hxx b/codemaker/inc/codemaker/typemanager.hxx
index 1b16115b85da..886aee54648c 100644
--- a/codemaker/inc/codemaker/typemanager.hxx
+++ b/codemaker/inc/codemaker/typemanager.hxx
@@ -37,7 +37,7 @@ typedef ::std::vector< KeyPair >    RegistryKeyList;
 
 typedef ::boost::unordered_map
 <
-    ::rtl::OString, // Typename
+    OString, // Typename
     RTTypeClass,    // TypeClass
     HashString,
     EqualString
@@ -50,38 +50,38 @@ public:
 
     sal_Bool init(const StringVector& regFiles, const StringVector& extraFiles = StringVector() );
 
-    ::rtl::OString getTypeName(RegistryKey& rTypeKey) const;
+    OString getTypeName(RegistryKey& rTypeKey) const;
 
-    sal_Bool    isValidType(const ::rtl::OString& name) const
+    sal_Bool    isValidType(const OString& name) const
         { return searchTypeKey(name, 0).isValid(); }
     RegistryKey getTypeKey(
-        const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const
+        const OString& name, sal_Bool * pIsExtraType = 0 ) const
         { return searchTypeKey(name, pIsExtraType); }
-    RegistryKeyList getTypeKeys(const ::rtl::OString& name) const;
+    RegistryKeyList getTypeKeys(const OString& name) const;
     typereg::Reader getTypeReader(
-        const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const;
+        const OString& name, sal_Bool * pIsExtraType = 0 ) const;
     typereg::Reader getTypeReader(RegistryKey& rTypeKey) const;
-    RTTypeClass getTypeClass(const ::rtl::OString& name) const;
+    RTTypeClass getTypeClass(const OString& name) const;
     RTTypeClass getTypeClass(RegistryKey& rTypeKey) const;
 
-    void setBase(const ::rtl::OString& base);
-    ::rtl::OString getBase() const { return m_base; }
+    void setBase(const OString& base);
+    OString getBase() const { return m_base; }
 
     sal_Int32 getSize() const { return m_t2TypeClass.size(); }
 
-    static sal_Bool isBaseType(const ::rtl::OString& name);
+    static sal_Bool isBaseType(const OString& name);
 
 private:
     virtual ~TypeManager();
 
     RegistryKey searchTypeKey(
-        const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const;
+        const OString& name, sal_Bool * pIsExtraType = 0 ) const;
     void        freeRegistries();
 
     mutable T2TypeClassMap m_t2TypeClass;
     RegistryList    m_registries;
     RegistryList    m_extra_registries;
-    ::rtl::OString  m_base;
+    OString  m_base;
 };
 
 #endif // INCLUDED_CODEMAKER_TYPEMANAGER_HXX
diff --git a/codemaker/inc/codemaker/unotype.hxx b/codemaker/inc/codemaker/unotype.hxx
index 23cf0668074e..ce22e62959dd 100644
--- a/codemaker/inc/codemaker/unotype.hxx
+++ b/codemaker/inc/codemaker/unotype.hxx
@@ -21,11 +21,10 @@
 #define INCLUDED_CODEMAKER_UNOTYPE_HXX
 
 #include "sal/types.h"
+#include <rtl/ustring.hxx>
 
 #include <vector>
 
-namespace rtl { class OString; }
-
 namespace codemaker {
 
 namespace UnoType {
@@ -64,7 +63,7 @@ namespace UnoType {
        is a UNO type registry name that denotes something other than a UNO type,
        SORT_COMPLEX is returned)
      */
-    Sort getSort(rtl::OString const & type);
+    Sort getSort(OString const & type);
 
     /**
        Determines whether a UNO type name or UNO type registry name denotes a
@@ -75,7 +74,7 @@ namespace UnoType {
        @return true iff the given type denotes a UNO sequence type; the
        detection is purely syntactical
      */
-    bool isSequenceType(rtl::OString const & type);
+    bool isSequenceType(OString const & type);
 
     /**
        Decomposes a UNO type name or UNO type registry name.
@@ -92,9 +91,9 @@ namespace UnoType {
 
        @return the base part of the given type
      */
-    rtl::OString decompose(
-        rtl::OString const & type, sal_Int32 * rank = 0,
-        std::vector< rtl::OString > * arguments = 0);
+    OString decompose(
+        OString const & type, sal_Int32 * rank = 0,
+        std::vector< OString > * arguments = 0);
 }
 
 }