Add Windows prefix to ClipboardService, RegistryService, and Keyboa…

…rdService classes. #129 #134
end2endzone · Jan 27, 2024 · b5e478b · b5e478b
1 parent 95595c8
commit b5e478b
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 31 deletions.
diff --git a/src/shellextension/dllmain.cpp b/src/shellextension/dllmain.cpp
@@ -35,8 +35,8 @@
 #include "LoggerHelper.h"
 
 #include "GlogLoggerService.h"
-#include "RegistryService.h"
-#include "ClipboardService.h"
+#include "WindowsRegistryService.h"
+#include "WindowsClipboardService.h"
 #include "WindowsKeyboardService.h"
 
 #include "shellanything/version.h"
@@ -179,11 +179,11 @@ extern "C" int APIENTRY DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpRe
       app.SetLoggerService(logger_service);
 
       // Setup an active registry service in ShellAnything's core.
-      registry_service = new shellanything::RegistryService();
+      registry_service = new shellanything::WindowsRegistryService();
       app.SetRegistryService(registry_service);
 
       // Setup an active clipboard service in ShellAnything's core.
-      clipboard_service = new shellanything::ClipboardService();
+      clipboard_service = new shellanything::WindowsClipboardService();
       app.SetClipboardService(clipboard_service);
 
       // Setup an active keyboard service in ShellAnything's core.

diff --git a/src/tests/main.cpp b/src/tests/main.cpp
@@ -46,8 +46,8 @@
 #include "App.h"
 #include "LoggerHelper.h"
 #include "GlogLoggerService.h"
-#include "RegistryService.h"
-#include "ClipboardService.h"
+#include "WindowsRegistryService.h"
+#include "WindowsClipboardService.h"
 #include "TestKeyboardService.h"
 #include "ConfigManager.h"
 
@@ -131,11 +131,11 @@ int main(int argc, char** argv)
   app.SetLoggerService(logger_service);
 
   // Setup an active registry service in ShellAnything's core.
-  shellanything::IRegistryService* registry_service = new shellanything::RegistryService();
+  shellanything::IRegistryService* registry_service = new shellanything::WindowsRegistryService();
   app.SetRegistryService(registry_service);
 
   // Setup an active clipboard service in ShellAnything's core.
-  shellanything::IClipboardService* clipboard_service = new shellanything::ClipboardService();
+  shellanything::IClipboardService* clipboard_service = new shellanything::WindowsClipboardService();
   app.SetClipboardService(clipboard_service);
 
   // Setup an active clipboard service in ShellAnything's core.

diff --git a/src/windows/CMakeLists.txt b/src/windows/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_library(sa.windows SHARED
-  ClipboardService.cpp
-  ClipboardService.h
   dllmain.cpp
-  RegistryService.cpp
-  RegistryService.h
   Win32Clipboard.cpp
   Win32Clipboard.h
+  WindowsClipboardService.cpp
+  WindowsClipboardService.h
+  WindowsRegistryService.cpp
+  WindowsRegistryService.h
   WindowsKeyboardService.cpp
   WindowsKeyboardService.h
 )

diff --git a/src/windows/ClipboardService.cpp → src/windows/WindowsClipboardService.cpp b/src/windows/ClipboardService.cpp → src/windows/WindowsClipboardService.cpp
@@ -22,20 +22,20 @@
  * SOFTWARE.
  *********************************************************************************/
 
-#include "ClipboardService.h"
+#include "WindowsClipboardService.h"
 #include "Win32Clipboard.h"
 
 namespace shellanything
 {
-  ClipboardService::ClipboardService()
+  WindowsClipboardService::WindowsClipboardService()
   {
   }
 
-  ClipboardService::~ClipboardService()
+  WindowsClipboardService::~WindowsClipboardService()
   {
   }
 
-  bool ClipboardService::GetClipboardText(std::string& value)
+  bool WindowsClipboardService::GetClipboardText(std::string& value)
   {
     //get clipboard handler
     Win32Clipboard::Clipboard& clipboard = Win32Clipboard::Clipboard::GetInstance();
@@ -49,7 +49,7 @@ namespace shellanything
     return result;
   }
 
-  bool ClipboardService::SetClipboardText(const std::string& value)
+  bool WindowsClipboardService::SetClipboardText(const std::string& value)
   {
     //get clipboard handler
     Win32Clipboard::Clipboard& clipboard = Win32Clipboard::Clipboard::GetInstance();

diff --git a/src/windows/ClipboardService.h → src/windows/WindowsClipboardService.h b/src/windows/ClipboardService.h → src/windows/WindowsClipboardService.h
@@ -33,16 +33,16 @@ namespace shellanything
   /// <summary>
   /// Win32 implementation class of IClipboardService.
   /// </summary>
-  class SA_WINDOWS_EXPORT ClipboardService : public virtual IClipboardService
+  class SA_WINDOWS_EXPORT WindowsClipboardService : public virtual IClipboardService
   {
   public:
-    ClipboardService();
-    virtual ~ClipboardService();
+    WindowsClipboardService();
+    virtual ~WindowsClipboardService();
 
   private:
     // Disable and copy constructor, dtor and copy operator
-    ClipboardService(const ClipboardService&);
-    ClipboardService& operator=(const ClipboardService&);
+    WindowsClipboardService(const WindowsClipboardService&);
+    WindowsClipboardService& operator=(const WindowsClipboardService&);
   public:
 
     /// <summary>

diff --git a/src/windows/RegistryService.cpp → src/windows/WindowsRegistryService.cpp b/src/windows/RegistryService.cpp → src/windows/WindowsRegistryService.cpp
@@ -22,7 +22,7 @@
  * SOFTWARE.
  *********************************************************************************/
 
-#include "RegistryService.h"
+#include "WindowsRegistryService.h"
 #include "Win32Registry.h"
 
 #include "rapidassist/filesystem_utf8.h"
@@ -40,15 +40,15 @@ namespace shellanything
   }
 
 
-  RegistryService::RegistryService()
+  WindowsRegistryService::WindowsRegistryService()
   {
   }
 
-  RegistryService::~RegistryService()
+  WindowsRegistryService::~WindowsRegistryService()
   {
   }
 
-  bool RegistryService::GetRegistryKeyAsString(const std::string& path, std::string& value)
+  bool WindowsRegistryService::GetRegistryKeyAsString(const std::string& path, std::string& value)
   {
     Win32Registry::REGISTRY_TYPE key_type;
     Win32Registry::MemoryBuffer key_value;

diff --git a/src/windows/RegistryService.h → src/windows/WindowsRegistryService.h b/src/windows/RegistryService.h → src/windows/WindowsRegistryService.h
@@ -33,16 +33,16 @@ namespace shellanything
   /// <summary>
   /// Win32 implementation class of IRegistryService.
   /// </summary>
-  class SA_WINDOWS_EXPORT RegistryService : public virtual IRegistryService
+  class SA_WINDOWS_EXPORT WindowsRegistryService : public virtual IRegistryService
   {
   public:
-    RegistryService();
-    virtual ~RegistryService();
+    WindowsRegistryService();
+    virtual ~WindowsRegistryService();
 
   private:
     // Disable and copy constructor, dtor and copy operator
-    RegistryService(const RegistryService&);
-    RegistryService& operator=(const RegistryService&);
+    WindowsRegistryService(const WindowsRegistryService&);
+    WindowsRegistryService& operator=(const WindowsRegistryService&);
   public:
 
     /// <summary>