[IE] Replace ATL::CRect

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMimeFilterClient.h"
 #include "PluginClient.h"
@@ skipping 31 matching lines @@
 CComAutoCriticalSection CPluginClass::s_criticalSectionLocal;
 CComAutoCriticalSection CPluginClass::s_criticalSectionBrowser;
 CComAutoCriticalSection CPluginClass::s_criticalSectionWindow;
 
 CComQIPtr<IWebBrowser2> CPluginClass::s_asyncWebBrowser2;
 
 #ifdef SUPPORT_WHITELIST
 std::map<UINT,CString> CPluginClass::s_menuDomains;
 #endif
 
-namespace
-{
-  // Without an extra namespace within the anonymous one, the identifier "Rectangle" is ambiguous
-  // See http://msdn.microsoft.com/en-us/library/windows/desktop/dd162898(v=vs.85).aspx
-  namespace AdblockPlus
-  {
-    /**
-     * Replacement for ATL type CRect.
-     */
-    class Rectangle
-      : public RECT
-    {
-    public:
-      // C++11 noexcept
-      int Height() const
-      {
-        return bottom - top;
-      }
-
-      // C++11 noexcept
-      int Width() const
-      {
-        return right - left;
-      }
-    };
-  }
+/*
+ * Without namespace declaration, the identifier "Rectangle" is ambiguous
+ * See http://msdn.microsoft.com/en-us/library/windows/desktop/dd162898(v=vs.85).aspx
+ */
+namespace AdblockPlus

[Felix Dahlke, 2014/07/24 07:24:17]

This would normally be an anonymous namespace, so I'm not sure if we should have
it clash with the namespace used by libadblockplus. I still think the most
pragmatic way would be to just give the class a name that won't clash with
globals, i.e. "Rect".

+{
+  /**
+    * Replacement for ATL type CRect.
+    */
+  class Rectangle
+    : public RECT
+  {
+  public:
+    int Height() const
+    {
+      return bottom - top;
+    }
+
+    int Width() const
+    {
+      return right - left;
+    }
+  };
 }
 
 CPluginClass::CPluginClass()
 {
   //Use this line to debug memory leaks
   //    _CrtDumpMemoryLeaks();
 
   m_isAdviced = false;
   m_nConnectionID = 0;
   m_hTabWnd = NULL;
@@ skipping 1659 matching lines @@
         if (hIcon)
         {
           ::DrawIconEx(hDC, offx, (rcClient.Height() - 16)/2 + 2, hIcon, 16, 16, NULL, NULL, DI_NORMAL);
           offx += 22;
         }
 #ifdef _DEBUG
         // Display version
         HFONT hFont = (HFONT)::SendMessage(pClass->m_hStatusBarWnd, WM_GETFONT, 0, 0);
         HGDIOBJ hOldFont = ::SelectObject(hDC,hFont);
 
-        Local::Rectangle rcText = rcClient;

[sergei, 2014/07/23 13:34:49]

Should Local be renamed to AdblockPlus?

[Eric, 2014/07/23 16:34:14]

That's what I get for compiling in Release configuration.
Done.

+        AdblockPlus::Rectangle rcText = rcClient;
         rcText.left += offx;
         ::SetBkMode(hDC, TRANSPARENT);
         ::DrawTextW(hDC, IEPLUGIN_VERSION, -1, &rcText, DT_WORD_ELLIPSIS|DT_LEFT|DT_SINGLELINE|DT_VCENTER);
 
         ::SelectObject(hDC, hOldFont);
 #endif // _DEBUG
       }
 
       // Done!
       EndPaint(hWnd, &ps);
@@ skipping 229 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }