Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ac4e005 authored by Samuel Tan's avatar Samuel Tan
Browse files

libutils: add String8 and String16 std_string utility methods 

Add utility methods that convert String16 and String8 into
std::string.

Also, remove a repeated include of <utils/Unicode.h> in
String16.h, since it is not used in that header file,
and is already included in String16.cpp.

BUG: 27200800
Change-Id: I5238aeb70689499763060a99dff9950fbb7adb3e
TEST: libutils builds successfully.
parent 95fd5270

include/utils/String16.h

+9 −1
Original line number Original line Diff line number Diff line
@@ -17,8 +17,10 @@ 
#ifndef ANDROID_STRING16_H

#ifndef ANDROID_STRING16_H

#define ANDROID_STRING16_H

#define ANDROID_STRING16_H





#include <string> // for std::string



#include <utils/Errors.h>

#include <utils/Errors.h>

#include <utils/Unicode.h>

#include <utils/String8.h>

#include <utils/TypeHelpers.h>

#include <utils/TypeHelpers.h>





// ---------------------------------------------------------------------------

// ---------------------------------------------------------------------------
@@ -65,6 +67,7 @@ public: 




    inline  const char16_t*     string() const;

    inline  const char16_t*     string() const;





    static inline std::string   std_string(const String16& str);

            size_t              size() const;

            size_t              size() const;

            void                setTo(const String16& other);

            void                setTo(const String16& other);

            status_t            setTo(const char16_t* other);

            status_t            setTo(const char16_t* other);
@@ -142,6 +145,11 @@ inline const char16_t* String16::string() const 
    return mString;

    return mString;

}

}





inline std::string String16::std_string(const String16& str)

{

    return std::string(String8(str).string());

}



inline String16& String16::operator=(const String16& other)

inline String16& String16::operator=(const String16& other)

{

{

    setTo(other);

    setTo(other);

include/utils/String8.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef ANDROID_STRING8_H

#ifndef ANDROID_STRING8_H

#define ANDROID_STRING8_H

#define ANDROID_STRING8_H





#include <string> // for std::string



#include <utils/Errors.h>

#include <utils/Errors.h>

#include <utils/Unicode.h>

#include <utils/Unicode.h>

#include <utils/TypeHelpers.h>

#include <utils/TypeHelpers.h>
@@ -63,6 +65,7 @@ public: 
    static String8              formatV(const char* fmt, va_list args);

    static String8              formatV(const char* fmt, va_list args);





    inline  const char*         string() const;

    inline  const char*         string() const;

    static inline std::string   std_string(const String8& str);

    inline  size_t              size() const;

    inline  size_t              size() const;

    inline  size_t              bytes() const;

    inline  size_t              bytes() const;

    inline  bool                isEmpty() const;

    inline  bool                isEmpty() const;
@@ -261,6 +264,11 @@ inline const char* String8::string() const 
    return mString;

    return mString;

}

}





inline std::string String8::std_string(const String8& str)

{

    return std::string(str.string());

}



inline size_t String8::size() const

inline size_t String8::size() const

{

{

    return length();

    return length();

libutils/String16.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 




#include <utils/Log.h>

#include <utils/Log.h>

#include <utils/Unicode.h>

#include <utils/Unicode.h>

#include <utils/String8.h>

#include <utils/threads.h>

#include <utils/threads.h>





#include <memory.h>

#include <memory.h>