Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: installer/src/installer-lib/interaction.h

Issue 5992177905696768: Issue #1186 - Rename symbols defined in 'installer-lib' (Closed)
Patch Set: fixed issues; rebased; new fixes from rebase Created June 19, 2015, 4:09 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « installer/src/installer-lib/installer-lib.h ('k') | installer/src/installer-lib/process.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /** 1 /**
2 * \file interaction.h User interaction classes. Message boxes and translations. 2 * \file interaction.h User interaction classes. Message boxes and translations.
3 */ 3 */
4 4
5 #ifndef INTERACTION_H 5 #ifndef INTERACTION_H
6 #define INTERACTION_H 6 #define INTERACTION_H
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "session.h" 10 #include "session.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 enum class DefaultButton : long 50 enum class DefaultButton : long
51 { 51 {
52 defaultButton = 0, ///< use the default button 52 defaultButton = 0, ///< use the default button
53 one = MB_DEFBUTTON1, 53 one = MB_DEFBUTTON1,
54 two = MB_DEFBUTTON2, 54 two = MB_DEFBUTTON2,
55 three = MB_DEFBUTTON3 55 three = MB_DEFBUTTON3
56 } ; 56 } ;
57 57
58 enum class Icon : long 58 enum class Icon : long
59 { 59 {
60 defaultIcon = 0, ///< use the default icon associated with the box_type 60 defaultIcon = 0, ///< use the default icon associated with the box type
61 warningIcon = MB_ICONWARNING, ///< exclamation point 61 warningIcon = MB_ICONWARNING, ///< exclamation point
62 informationIcon = MB_ICONINFORMATION, ///< lowercase letter "i" in a circl e 62 informationIcon = MB_ICONINFORMATION, ///< lowercase letter "i" in a circl e
63 errorIcon = MB_ICONERROR ///< stop sign 63 errorIcon = MB_ICONERROR ///< stop sign
64 } ; 64 } ;
65 65
66 /** 66 /**
67 * Ordinary constructor, wide string 67 * Ordinary constructor, wide string
68 */ 68 */
69 InstallerMessageBox( 69 InstallerMessageBox(
70 std::wstring message, 70 std::wstring message,
71 Box box = Box::user, 71 Box box = Box::user,
72 ButtonSet buttonset = ButtonSet::defaultButtonSet, 72 ButtonSet buttonset = ButtonSet::defaultButtonSet,
73 DefaultButton defaultButton = DefaultButton::defaultButton, 73 DefaultButton defaultButton = DefaultButton::defaultButton,
74 Icon icon = Icon::defaultIcon 74 Icon icon = Icon::defaultIcon
75 ) ; 75 ) ;
76 76
77 /** 77 /**
78 * Ordinary constructor, regular string 78 * Ordinary constructor, regular string
79 */ 79 */
80 InstallerMessageBox( 80 InstallerMessageBox(
81 std::string message, 81 std::string message,
82 Box box = Box::user, 82 Box box = Box::user,
83 ButtonSet buttonset = ButtonSet::defaultButtonSet, 83 ButtonSet buttonset = ButtonSet::defaultButtonSet,
84 DefaultButton defaultButton = DefaultButton::defaultButton, 84 DefaultButton defaultButton = DefaultButton::defaultButton,
85 Icon icon = Icon::defaultIcon 85 Icon icon = Icon::defaultIcon
86 ) ; 86 ) ;
87 } ; 87 } ;
88 88
89 /** 89 /**
90 * Error for any non-handled return value from Session.write_message(). 90 * Error for any non-handled return value from Session.WriteMessage().
91 */ 91 */
92 struct UnexpectedReturnValueFromMessageBox 92 struct UnexpectedReturnValueFromMessageBox
93 : std::logic_error 93 : std::logic_error
94 { 94 {
95 UnexpectedReturnValueFromMessageBox() 95 UnexpectedReturnValueFromMessageBox()
96 : std::logic_error( "Unexpected return value from message box." ) 96 : std::logic_error( "Unexpected return value from message box." )
97 {} 97 {}
98 } ; 98 } ;
99 99
100 #endif 100 #endif
OLDNEW
« no previous file with comments | « installer/src/installer-lib/installer-lib.h ('k') | installer/src/installer-lib/process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld