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

Commit ddc8990f authored by Eric Holk's avatar Eric Holk
Browse files

[view-compiler] Better namespacing of util functions 

This moves some helper functions into our own namespace to avoid conflicting
with other util.h files.

Bug: 111895153
Change-Id: I2b4c77732a97b34a8528d69867c15ed802686703
parent abe06f91

startop/view_compiler/main.cc

+1 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ 
namespace {

namespace {





using namespace tinyxml2;

using namespace tinyxml2;

using namespace startop::util;

using std::string;

using std::string;





constexpr char kStdoutFilename[]{"stdout"};

constexpr char kStdoutFilename[]{"stdout"};

startop/view_compiler/util.cc

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




using std::string;

using std::string;





namespace startop {

namespace util {



// TODO: see if we can borrow this from somewhere else, like aapt2.

// TODO: see if we can borrow this from somewhere else, like aapt2.

string FindLayoutNameFromFilename(const string& filename) {

string FindLayoutNameFromFilename(const string& filename) {

  size_t start = filename.rfind("/");

  size_t start = filename.rfind("/");
@@ -30,3 +33,6 @@ string FindLayoutNameFromFilename(const string& filename) { 




  return filename.substr(start, end - start);

  return filename.substr(start, end - start);

}

}



}  // namespace util

}  // namespace startop

startop/view_compiler/util.h

+9 −3
Original line number Original line Diff line number Diff line
@@ -13,11 +13,17 @@ 
 * See the License for the specific language governing permissions and

 * See the License for the specific language governing permissions and

 * limitations under the License.

 * limitations under the License.

 */

 */

#ifndef UTIL_H_

#ifndef VIEW_COMPILER_UTIL_H_

#define UTIL_H_

#define VIEW_COMPILER_UTIL_H_





#include <string>

#include <string>





namespace startop {

namespace util {



std::string FindLayoutNameFromFilename(const std::string& filename);

std::string FindLayoutNameFromFilename(const std::string& filename);





#endif  // UTIL_H_
 
}  // namespace util

}  // namespace startop



#endif  // VIEW_COMPILER_UTIL_H_

startop/view_compiler/util_test.cc

+10 −4
Original line number Original line Diff line number Diff line
@@ -20,9 +20,15 @@ 




using std::string;

using std::string;





namespace startop {

namespace util {



TEST(UtilTest, FindLayoutNameFromFilename) {

TEST(UtilTest, FindLayoutNameFromFilename) {

  EXPECT_EQ("bar", ::FindLayoutNameFromFilename("foo/bar.xml"));

  EXPECT_EQ("bar", startop::util::FindLayoutNameFromFilename("foo/bar.xml"));

  EXPECT_EQ("bar", ::FindLayoutNameFromFilename("bar.xml"));

  EXPECT_EQ("bar", startop::util::FindLayoutNameFromFilename("bar.xml"));

  EXPECT_EQ("bar", ::FindLayoutNameFromFilename("./foo/bar.xml"));

  EXPECT_EQ("bar", startop::util::FindLayoutNameFromFilename("./foo/bar.xml"));

  EXPECT_EQ("bar", ::FindLayoutNameFromFilename("/foo/bar.xml"));

  EXPECT_EQ("bar", startop::util::FindLayoutNameFromFilename("/foo/bar.xml"));

}

}



}  // namespace util

}  // namespace startop