Bug 1102048 (Part 39, decoders/icon) - Make image/src files comply with the Mozilla Coding Style Guide. r=seth
authorGlenn Randers-Pehrson <glennrp+bmo@gmail.com>
Mon, 06 Apr 2015 19:12:00 -0700
changeset 238052 3888d638471522c96bfb27973a5a9f4bfbbbbdb6
parent 238051 ca348a8a0639662d4cbe1ea2e0b10544f0092a1f
child 238053 ca3ea8ca4399d4656aec703eac3e47cbbaa2a7bc
push id28554
push userryanvm@gmail.com
push dateWed, 08 Apr 2015 16:15:39 +0000
treeherdermozilla-central@256b307c35ce [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersseth
bugs1102048
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1102048 (Part 39, decoders/icon) - Make image/src files comply with the Mozilla Coding Style Guide. r=seth
image/decoders/icon/android/nsIconChannel.h
image/decoders/icon/gtk/nsIconChannel.h
image/decoders/icon/mac/nsIconChannel.h
image/decoders/icon/nsIconProtocolHandler.h
image/decoders/icon/nsIconURI.cpp
image/decoders/icon/nsIconURI.h
image/decoders/icon/qt/nsIconChannel.h
image/decoders/icon/win/nsIconChannel.h
--- a/image/decoders/icon/android/nsIconChannel.h
+++ b/image/decoders/icon/android/nsIconChannel.h
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
 
-#ifndef nsIconChannel_h_
-#define nsIconChannel_h_
+#ifndef mozilla_image_decoders_icon_android_nsIconChannel_h
+#define mozilla_image_decoders_icon_android_nsIconChannel_h
 
 #include "mozilla/Attributes.h"
 
 #include "nsIChannel.h"
 #include "nsIURI.h"
 #include "nsIIconURI.h"
 #include "nsCOMPtr.h"
 
@@ -38,9 +38,9 @@ class nsIconChannel final : public nsICh
 
     /**
      * The channel to the temp icon file (e.g. to /tmp/2qy9wjqw.html).
      * Will always be non-null after a successful Init.
      */
     nsCOMPtr<nsIChannel> mRealChannel;
 };
 
-#endif
+#endif // mozilla_image_decoders_icon_android_nsIconChannel_h
--- a/image/decoders/icon/gtk/nsIconChannel.h
+++ b/image/decoders/icon/gtk/nsIconChannel.h
@@ -1,14 +1,14 @@
 /* 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/. */
 
-#ifndef nsIconChannel_h_
-#define nsIconChannel_h_
+#ifndef mozilla_image_decoders_icon_gtk_nsIconChannel_h
+#define mozilla_image_decoders_icon_gtk_nsIconChannel_h
 
 #include "mozilla/Attributes.h"
 
 #include "nsIChannel.h"
 #include "nsIStreamListener.h"
 #include "nsIURI.h"
 #include "nsIIconURI.h"
 #include "nsCOMPtr.h"
@@ -35,9 +35,9 @@ class nsIconChannel final : public nsICh
     ~nsIconChannel() { }
     /// The channel to the temp icon file (e.g. to /tmp/2qy9wjqw.html).
     /// Will always be non-null after a successful Init.
     nsCOMPtr<nsIChannel> mRealChannel;
 
     nsresult InitWithGIO(nsIMozIconURI* aIconURI);
 };
 
-#endif
+#endif // mozilla_image_decoders_icon_gtk_nsIconChannel_h
--- a/image/decoders/icon/mac/nsIconChannel.h
+++ b/image/decoders/icon/mac/nsIconChannel.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * 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/. */
 
-#ifndef nsIconChannel_h___
-#define nsIconChannel_h___
+#ifndef mozilla_image_encoders_icon_mac_nsIconChannel_h
+#define mozilla_image_encoders_icon_mac_nsIconChannel_h
 
 #include "mozilla/Attributes.h"
 
 #include "nsCOMPtr.h"
 #include "nsXPIDLString.h"
 #include "nsIChannel.h"
 #include "nsILoadGroup.h"
 #include "nsILoadInfo.h"
@@ -51,9 +51,9 @@ protected:
   nsresult MakeInputStream(nsIInputStream** _retval, bool nonBlocking);
 
   nsresult ExtractIconInfoFromUrl(nsIFile** aLocalFile,
                                   uint32_t* aDesiredImageSize,
                                   nsACString& aContentType,
                                   nsACString& aFileExtension);
 };
 
-#endif /* nsIconChannel_h___ */
+#endif // mozilla_image_encoders_icon_mac_nsIconChannel_h
--- a/image/decoders/icon/nsIconProtocolHandler.h
+++ b/image/decoders/icon/nsIconProtocolHandler.h
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
 
-#ifndef nsIconProtocolHandler_h___
-#define nsIconProtocolHandler_h___
+#ifndef mozilla_image_decoders_icon_nsIconProtocolHandler_h
+#define mozilla_image_decoders_icon_nsIconProtocolHandler_h
 
 #include "nsWeakReference.h"
 #include "nsIProtocolHandler.h"
 
 class nsIconProtocolHandler : public nsIProtocolHandler,
                               public nsSupportsWeakReference
 {
 public:
@@ -18,9 +18,9 @@ public:
 
     // nsIconProtocolHandler methods:
     nsIconProtocolHandler();
 
 protected:
     virtual ~nsIconProtocolHandler();
 };
 
-#endif /* nsIconProtocolHandler_h___ */
+#endif // mozilla_image_decoders_icon_nsIconProtocolHandler_h
--- a/image/decoders/icon/nsIconURI.cpp
+++ b/image/decoders/icon/nsIconURI.cpp
@@ -336,17 +336,17 @@ nsMozIconURI::GetHost(nsACString& aHost)
 
 NS_IMETHODIMP
 nsMozIconURI::SetHost(const nsACString& aHost)
 {
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetPort(int32_t *aPort)
+nsMozIconURI::GetPort(int32_t* aPort)
 {
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
 nsMozIconURI::SetPort(int32_t aPort)
 {
   return NS_ERROR_FAILURE;
@@ -374,17 +374,17 @@ nsMozIconURI::GetRef(nsACString& aRef)
 
 NS_IMETHODIMP
 nsMozIconURI::SetRef(const nsACString& aRef)
 {
   return NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::Equals(nsIURI *other, bool* result)
+nsMozIconURI::Equals(nsIURI* other, bool* result)
 {
   NS_ENSURE_ARG_POINTER(other);
   NS_PRECONDITION(result, "null pointer");
 
   nsAutoCString spec1;
   nsAutoCString spec2;
 
   other->GetSpec(spec2);
@@ -493,17 +493,17 @@ nsMozIconURI::GetIconURL(nsIURL** aFileU
 NS_IMETHODIMP
 nsMozIconURI::SetIconURL(nsIURL* aFileUrl)
 {
   // this isn't called anywhere, needs to go through SetSpec parsing
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
-nsMozIconURI::GetImageSize(uint32_t * aImageSize)
+nsMozIconURI::GetImageSize(uint32_t* aImageSize)
               // measured by # of pixels in a row. defaults to 16.
 {
   *aImageSize = mSize;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsMozIconURI::SetImageSize(uint32_t aImageSize)
--- a/image/decoders/icon/nsIconURI.h
+++ b/image/decoders/icon/nsIconURI.h
@@ -1,16 +1,16 @@
 /* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * 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/. */
 
-#ifndef nsMozIconURI_h__
-#define nsMozIconURI_h__
+#ifndef mozilla_image_decoders_icon_nsIconURI_h
+#define mozilla_image_decoders_icon_nsIconURI_h
 
 #include "nsIIconURI.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsIIPCSerializableURI.h"
 
 class nsMozIconURI final : public nsIMozIconURI
                          , public nsIIPCSerializableURI
@@ -35,9 +35,9 @@ protected:
                        // given a filename with an extension
   nsCString mStockIcon;
   int32_t mIconSize;   // -1 if not specified, otherwise index into
                        // kSizeStrings
   int32_t mIconState;  // -1 if not specified, otherwise index into
                        // kStateStrings
 };
 
-#endif // nsMozIconURI_h__
+#endif // mozilla_image_decoders_icon_nsIconURI_h
--- a/image/decoders/icon/qt/nsIconChannel.h
+++ b/image/decoders/icon/qt/nsIconChannel.h
@@ -1,15 +1,15 @@
 /* vim:set ts=2 sw=2 sts=2 cin et: */
 /* 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/. */
 
-#ifndef nsIconChannel_h_
-#define nsIconChannel_h_
+#ifndef mozilla_image_encoders_icon_qt_nsIconChannel_h
+#define mozilla_image_encoders_icon_qt_nsIconChannel_h
 
 #include "mozilla/Attributes.h"
 
 #include "nsIChannel.h"
 #include "nsIStreamListener.h"
 #include "nsIURI.h"
 #include "nsIIconURI.h"
 #include "nsCOMPtr.h"
@@ -32,9 +32,9 @@ class nsIconChannel final : public nsICh
   private:
     ~nsIconChannel() { };
 
     /// The channel to the temp icon file (e.g. to /tmp/2qy9wjqw.html).
     /// Will always be non-null after a successful Init.
     nsCOMPtr<nsIChannel> mRealChannel;
 };
 
-#endif
+#endif // mozilla_image_encoders_icon_qt_nsIconChannel_h
--- a/image/decoders/icon/win/nsIconChannel.h
+++ b/image/decoders/icon/win/nsIconChannel.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * 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/. */
 
-#ifndef nsIconChannel_h___
-#define nsIconChannel_h___
+#ifndef mozilla_image_encoders_icon_win_nsIconChannel_h
+#define mozilla_image_encoders_icon_win_nsIconChannel_h
 
 #include "mozilla/Attributes.h"
 
 #include "nsCOMPtr.h"
 #include "nsXPIDLString.h"
 #include "nsIChannel.h"
 #include "nsILoadGroup.h"
 #include "nsILoadInfo.h"
@@ -58,9 +58,9 @@ protected:
   nsresult GetHIconFromFile(HICON* hIcon);
   nsresult MakeInputStream(nsIInputStream** _retval, bool nonBlocking);
 
   // Functions specific to Vista and above
 protected:
   nsresult GetStockHIcon(nsIMozIconURI* aIconURI, HICON* hIcon);
 };
 
-#endif /* nsIconChannel_h___ */
+#endif // mozilla_image_encoders_icon_win_nsIconChannel_h