Issue #1186 - Change names that appear in the custom action

installer/src/installer-lib/interaction.cpp

Index: installer/src/installer-lib/interaction.cpp
===================================================================
--- a/installer/src/installer-lib/interaction.cpp
+++ b/installer/src/installer-lib/interaction.cpp
@@ -1,29 +1,29 @@
 /**
-* \file interaction.cpp Implementations of user interaction classes.
-*/
+ * \file interaction.cpp Implementations of user interaction classes.
+ */
 
 #include "interaction.h"
 
 /*
-* The two constructors are identical except for the type of argument 'message'
-* They rely on overloads of the Message constructor
-*/
-Installer_Message_Box::Installer_Message_Box( 
+ * The two constructors are identical except for the type of argument 'message'
+ * They rely on overloads of the Message constructor
+ */
+InstallerMessageBox::InstallerMessageBox( 
   std::wstring message, 
-  box_type box,
-  buttonset_type buttonset, 
-  default_button_type default_button,
-  icon_type icon
+  Box box,
+  ButtonSet buttonSet, 
+  DefaultButton defaultButton,
+  Icon icon
   )
-  : Message( message, INSTALLMESSAGE( box | buttonset | default_button | icon ) )
+  : Message(message, INSTALLMESSAGE(long(box) | long(buttonSet) | long(defaultButton) | long(icon)))

[Felix Dahlke, 2015/01/30 14:53:24]

I've assumed this is not going to be committed along with the rename BTW. We
have a rule against using C-style casts:
https://adblockplus.org/en/coding-style#cpp

But assuming it's not actually introduced along with the renames, we can fix it
later.

 {}
 
-Installer_Message_Box::Installer_Message_Box( 
+InstallerMessageBox::InstallerMessageBox( 
   std::string message, 
-  box_type box, 
-  buttonset_type buttonset, 
-  default_button_type default_button,
-  icon_type icon
+  Box box, 
+  ButtonSet buttonSet, 
+  DefaultButton defaultButton,
+  Icon icon
   )
-  : Message( message, INSTALLMESSAGE( box | buttonset | default_button | icon ) )
+  : Message(message, INSTALLMESSAGE(long(box) | long(buttonSet) | long(defaultButton) | long(icon)))
 {}