From ad0806d01fc0daef35893ce0c7426a217e51bd13 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <wjp@usecode.org>
Date: Thu, 16 Nov 2017 18:18:38 +0100
Subject: [PATCH] COMMON: Rename String::printf to format to match ScummVM

---
 common/str.cpp | 2 +-
 common/str.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/str.cpp b/common/str.cpp
index d842ba76..f7d8e62f 100644
--- a/common/str.cpp
+++ b/common/str.cpp
@@ -433,7 +433,7 @@ uint String::hash() const {
 }
 
 // static
-String String::printf(const char *fmt, ...) {
+String String::format(const char *fmt, ...) {
 	String output;
 	assert(output.isStorageIntern());
 
diff --git a/common/str.h b/common/str.h
index e517bcba..382263f6 100644
--- a/common/str.h
+++ b/common/str.h
@@ -218,7 +218,7 @@ class String {
 	/**
 	 * Printf-like function. Returns a formatted String.
 	 */
-	static Common::String printf(const char *fmt, ...) GCC_PRINTF(1,2);
+	static Common::String format(const char *fmt, ...) GCC_PRINTF(1,2);
 
 public:
 	typedef char *        iterator;