Issue #39:

Renamed glog_utils.h to GlogUtils.h
Renamed win32_utils.h to Win32Utils.h
Renamed win32_registry.h to Win32Registry.h

Author: end2endzone

src/CMakeLists.txt

@@ -85,15 +85,15 @@ add_library(shellext SHARED
   ${CMAKE_SOURCE_DIR}/src/version.rc.in
   BitmapCache.cpp
   BitmapCache.h
-  glog_utils.cpp
-  glog_utils.h
+  GlogUtils.cpp
+  GlogUtils.h
   shellext.cpp
   shellext.h
   shellext.def
-  win32_utils.cpp
-  win32_utils.h
-  win32_registry.cpp
-  win32_registry.h
+  Win32Utils.cpp
+  Win32Utils.h
+  Win32Registry.cpp
+  Win32Registry.h
 )
 
 # Group external files as filter for Visual Studio

src/glog_utils.cpp src/GlogUtils.cppsrc/glog_utils.cpp renamed to src/GlogUtils.cpp

@@ -1,4 +1,4 @@
-#include "glog_utils.h"
+#include "GlogUtils.h"
 #include "Platform.h"
 
 #define WIN32_LEAN_AND_MEAN 1

src/glog_utils.h src/GlogUtils.hsrc/glog_utils.h renamed to src/GlogUtils.h

@@ -24,7 +24,7 @@
 
 #include "shellanything/Icon.h"
 #include "PropertyManager.h"
-#include "win32_registry.h"
+#include "Win32Registry.h"
 
 #pragma warning( push )
 #pragma warning( disable: 4355 ) // glog\install_dir\include\glog/logging.h(1167): warning C4355: 'this' : used in base member initializer list
@@ -75,8 +75,8 @@ namespace shellanything
     if (!file_extension.empty())
     {
       //try to find the path to the icon module for the given file extension.
-      win32_registry::REGISTRY_ICON resolved_icon = win32_registry::GetFileTypeIcon(file_extension.c_str());
-      if (!resolved_icon.path.empty() && resolved_icon.index != win32_registry::INVALID_ICON_INDEX)
+      Win32Registry::REGISTRY_ICON resolved_icon = Win32Registry::GetFileTypeIcon(file_extension.c_str());
+      if (!resolved_icon.path.empty() && resolved_icon.index != Win32Registry::INVALID_ICON_INDEX)
       {
         //found the icon for the file extension
         //replace this menu's icon with the new information
@@ -89,7 +89,7 @@ namespace shellanything
       {
         //failed to find a valid icon.
         //using the default "unknown" icon
-        win32_registry::REGISTRY_ICON unknown_file_icon = win32_registry::GetUnknownFileTypeIcon();
+        Win32Registry::REGISTRY_ICON unknown_file_icon = Win32Registry::GetUnknownFileTypeIcon();
         LOG(WARNING) << "Failed to find icon for file extension '" << file_extension << "'. Resolving icon with default icon for unknown file type '" << unknown_file_icon.path << "' with index '" << unknown_file_icon.index << "'";
         mPath = unknown_file_icon.path;
         mIndex = unknown_file_icon.index;

src/Icon.cpp

@@ -22,7 +22,7 @@
  * SOFTWARE.
  *********************************************************************************/
 
-#include "win32_registry.h"
+#include "Win32Registry.h"
 
 //#define WIN32_LEAN_AND_MEAN 1
 #include <windows.h>
@@ -40,7 +40,7 @@
 #include <assert.h>
 #include <algorithm>
 
-namespace win32_registry
+namespace Win32Registry
 {
   bool IsIconEquals(const REGISTRY_ICON & a, const REGISTRY_ICON & b)
   {
@@ -257,7 +257,7 @@ namespace win32_registry
     //set default value
     if (iDefaultValue)
     {
-      if (!win32_registry::SetValue(iKeyPath, "", iDefaultValue))
+      if (!Win32Registry::SetValue(iKeyPath, "", iDefaultValue))
         return false;
     }
 
@@ -955,7 +955,7 @@ namespace win32_registry
         entries.push_back(entry);
       }
 
-      //process root key acronyms for win32_registry functions
+      //process root key acronyms for Win32Registry functions
       else if (line == "HKCR")
         previous_key_name = "HKEY_CLASSES_ROOT";
       else if (line == "HKCU")
@@ -1054,7 +1054,7 @@ namespace win32_registry
 
     for(size_t i=0; i<entries.size(); i++)
     {
-      const win32_registry::RGS_ENTRY & entry = entries[i];
+      const Win32Registry::RGS_ENTRY & entry = entries[i];
       if (entry.isKey)
       {
         //std::string debug_message;
@@ -1104,7 +1104,7 @@ namespace win32_registry
 
     for(size_t i=0; i<entries.size(); i++)
     {
-      const win32_registry::RGS_ENTRY & entry = entries[i];
+      const Win32Registry::RGS_ENTRY & entry = entries[i];
       if (entry.isNoRemove)
         continue;
 
@@ -1150,4 +1150,4 @@ namespace win32_registry
     return icon;
   }
 
-} //namespace win32_registry
+} //namespace Win32Registry

src/win32_registry.cpp src/Win32Registry.cppsrc/win32_registry.cpp renamed to src/Win32Registry.cpp

@@ -29,7 +29,7 @@
 #include <vector>
 #include <string>
 
-namespace win32_registry
+namespace Win32Registry
 {
   enum REGISTRY_TYPE
   {
@@ -90,6 +90,6 @@ namespace win32_registry
   REGISTRY_ICON GetFileTypeIcon(const char * iFileExtention);
   REGISTRY_ICON GetUnknownFileTypeIcon();
 
-} //namespace win32_registry
+} //namespace Win32Registry
 
 #endif //WIN32_REGISTRY_H

src/win32_registry.h src/Win32Registry.hsrc/win32_registry.h renamed to src/Win32Registry.h

@@ -1,5 +1,5 @@
 //#define WIN32_LEAN_AND_MEAN 1
-#include "win32_utils.h"
+#include "Win32Utils.h"
 #undef GetEnvironmentVariable
 #undef DeleteFile
 #undef CreateDirectory
@@ -11,7 +11,7 @@
 #include <string>
 #include <assert.h>
 
-namespace win32_utils
+namespace Win32Utils
 {
   static const size_t BITS_PER_PIXEL = 32;
   static const size_t BYTES_PER_PIXEL = BITS_PER_PIXEL/8;
@@ -556,4 +556,4 @@ namespace win32_utils
     return output;
   }
 
-} //namespace win32_utils
+} //namespace Win32Utils

src/win32_utils.cpp src/Win32Utils.cppsrc/win32_utils.cpp renamed to src/Win32Utils.cpp

@@ -28,7 +28,7 @@
 #include <Windows.h>
 #include <string>
 
-namespace win32_utils
+namespace Win32Utils
 {
   SIZE GetIconSize(HICON hIcon);
   HICON GetBestIconForMenu(HICON hIconLarge, HICON hIconSmall);
@@ -42,6 +42,6 @@ namespace win32_utils
   BOOL IsFullyTransparent(const std::string & buffer);
   std::string GetMenuItemDetails(HMENU hMenu, UINT pos);
   std::string GetMenuTree(HMENU hMenu, int indent);
-} //namespace win32_utils
+} //namespace Win32Utils
 
 #endif //WIN32_UTILS_H