From 3190f3e1a4f16051274df721faf06da18b620e8d Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Mon, 23 Sep 2013 13:23:56 -0400 Subject: [PATCH] Bug 918923 - Part 1: Fix the include-what-you-use pragmas in the string headers; r=bsmedberg --- xpcom/glue/nsStringGlue.h | 1 + xpcom/string/public/nsAString.h | 2 +- xpcom/string/public/nsReadableUtils.h | 2 +- xpcom/string/public/nsString.h | 1 - xpcom/string/public/nsTDependentSubstring.h | 2 +- xpcom/string/public/nsTString.h | 2 +- xpcom/string/public/nsTSubstring.h | 2 +- xpcom/string/public/nsTSubstringTuple.h | 2 +- xpcom/string/public/string-template-def-char.h | 2 +- xpcom/string/public/string-template-def-unichar.h | 2 +- xpcom/string/public/string-template-undef.h | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xpcom/glue/nsStringGlue.h b/xpcom/glue/nsStringGlue.h index 2cd7e0a4b88..42b62241b92 100644 --- a/xpcom/glue/nsStringGlue.h +++ b/xpcom/glue/nsStringGlue.h @@ -1,6 +1,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +// IWYU pragma: private, include "nsString.h" /** * @file nsStringGlue.h diff --git a/xpcom/string/public/nsAString.h b/xpcom/string/public/nsAString.h index 506d7bb1c23..46f008b8d5f 100644 --- a/xpcom/string/public/nsAString.h +++ b/xpcom/string/public/nsAString.h @@ -3,7 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// IWYU pragma: private, include "nsStringGlue.h" +// IWYU pragma: private, include "nsString.h" #ifndef nsAString_h___ #define nsAString_h___ diff --git a/xpcom/string/public/nsReadableUtils.h b/xpcom/string/public/nsReadableUtils.h index a222d8cc28d..981ba9b9e71 100644 --- a/xpcom/string/public/nsReadableUtils.h +++ b/xpcom/string/public/nsReadableUtils.h @@ -2,7 +2,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// IWYU pragma: private, include "nsStringGlue.h" +// IWYU pragma: private, include "nsString.h" #ifndef nsReadableUtils_h___ #define nsReadableUtils_h___ diff --git a/xpcom/string/public/nsString.h b/xpcom/string/public/nsString.h index 03e41e41f81..6d2f958a3bc 100644 --- a/xpcom/string/public/nsString.h +++ b/xpcom/string/public/nsString.h @@ -3,7 +3,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// IWYU pragma: private, include "nsStringGlue.h" #ifndef nsString_h___ #define nsString_h___ diff --git a/xpcom/string/public/nsTDependentSubstring.h b/xpcom/string/public/nsTDependentSubstring.h index 61c84c2f2d7..679cbfd9207 100644 --- a/xpcom/string/public/nsTDependentSubstring.h +++ b/xpcom/string/public/nsTDependentSubstring.h @@ -3,7 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// IWYU pragma: private, include "nsStringGlue.h" +// IWYU pragma: private, include "nsString.h" /** * nsTDependentSubstring_CharT diff --git a/xpcom/string/public/nsTString.h b/xpcom/string/public/nsTString.h index ca694736f26..e5ce802d373 100644 --- a/xpcom/string/public/nsTString.h +++ b/xpcom/string/public/nsTString.h @@ -3,7 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// IWYU pragma: private, include "nsStringGlue.h" +// IWYU pragma: private, include "nsString.h" /** * This is the canonical null-terminated string class. All subclasses diff --git a/xpcom/string/public/nsTSubstring.h b/xpcom/string/public/nsTSubstring.h index fa7099fd6f3..f480830d876 100644 --- a/xpcom/string/public/nsTSubstring.h +++ b/xpcom/string/public/nsTSubstring.h @@ -3,7 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// IWYU pragma: private, include "nsStringGlue.h" +// IWYU pragma: private, include "nsString.h" #include "mozilla/MemoryReporting.h" diff --git a/xpcom/string/public/nsTSubstringTuple.h b/xpcom/string/public/nsTSubstringTuple.h index 103d292528a..fb9bad67908 100644 --- a/xpcom/string/public/nsTSubstringTuple.h +++ b/xpcom/string/public/nsTSubstringTuple.h @@ -3,7 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// IWYU pragma: private, include "nsStringGlue.h" +// IWYU pragma: private, include "nsString.h" /** * nsTSubstringTuple_CharT diff --git a/xpcom/string/public/string-template-def-char.h b/xpcom/string/public/string-template-def-char.h index 2ca79228185..18cbae1eca1 100644 --- a/xpcom/string/public/string-template-def-char.h +++ b/xpcom/string/public/string-template-def-char.h @@ -3,7 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// IWYU pragma: private, include "nsStringGlue.h" +// IWYU pragma: private, include "nsString.h" #define CharT char #define CharT_is_char 1 diff --git a/xpcom/string/public/string-template-def-unichar.h b/xpcom/string/public/string-template-def-unichar.h index 70a8f40e3a9..5e1583a5d88 100644 --- a/xpcom/string/public/string-template-def-unichar.h +++ b/xpcom/string/public/string-template-def-unichar.h @@ -3,7 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// IWYU pragma: private, include "nsStringGlue.h" +// IWYU pragma: private, include "nsString.h" #define CharT PRUnichar #define CharT_is_PRUnichar 1 diff --git a/xpcom/string/public/string-template-undef.h b/xpcom/string/public/string-template-undef.h index ba558c2a619..6690b15aca4 100644 --- a/xpcom/string/public/string-template-undef.h +++ b/xpcom/string/public/string-template-undef.h @@ -3,7 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// IWYU pragma: private, include "nsStringGlue.h" +// IWYU pragma: private, include "nsString.h" #undef CharT #undef CharT_is_PRUnichar