Skip to content

Commit 55055d4

Browse files
kovacsvkovacsv
committed
Rename EventHandlers to EventHandler.
1 parent 98fa076 commit 55055d4

18 files changed

Lines changed: 219 additions & 219 deletions

‎Sources/EmbeddingTutorial/main.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
#include "NUIE_NodeEditor.hpp"
33
#include "BI_BasicUINode.hpp"
44

5-
class MyEventHandlers : public NUIE::EventHandlers
5+
class MyEventHandler : public NUIE::EventHandler
66
{
77
public:
8-
MyEventHandlers () :
9-
NUIE::EventHandlers ()
8+
MyEventHandler () :
9+
NUIE::EventHandler ()
1010
{
1111

1212
}
@@ -79,7 +79,7 @@ class MyNodeUIEnvironment : public NUIE::NodeUIEnvironment
7979
stringConverter (NE::GetDefaultStringConverter ()),
8080
skinParams (NUIE::GetDefaultSkinParams ()),
8181
drawingContext (),
82-
eventHandlers (),
82+
eventHandler (),
8383
evaluationEnv (nullptr)
8484
{
8585

@@ -130,16 +130,16 @@ class MyNodeUIEnvironment : public NUIE::NodeUIEnvironment
130130

131131
}
132132

133-
virtual NUIE::EventHandlers& GetEventHandlers () override
133+
virtual NUIE::EventHandler& GetEventHandler () override
134134
{
135-
return eventHandlers;
135+
return eventHandler;
136136
}
137137

138138
private:
139139
NE::BasicStringConverter stringConverter;
140140
NUIE::BasicSkinParams skinParams;
141141
NUIE::NullDrawingContext drawingContext;
142-
MyEventHandlers eventHandlers;
142+
MyEventHandler eventHandler;
143143
NE::EvaluationEnv evaluationEnv;
144144
};
145145

‎Sources/NodeEngineTest/VisualTestFramework.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@ class MyCreateNodeCommand : public NUIE::SingleMenuCommand
108108
NUIE::Point position;
109109
};
110110

111-
TestEventHandlers::TestEventHandlers (NodeEditor* nodeEditor) :
111+
TestEventHandler::TestEventHandler (NodeEditor* nodeEditor) :
112112
nodeEditor (nodeEditor),
113113
commandToSelect (),
114114
paramSettingsHandler (nullptr)
115115
{
116116

117117
}
118118

119-
MenuCommandPtr TestEventHandlers::OnContextMenu (const Point& position, const MenuCommandStructure& commands)
119+
MenuCommandPtr TestEventHandler::OnContextMenu (const Point& position, const MenuCommandStructure& commands)
120120
{
121121
NUIE::MenuCommandStructure actualCommands = commands;
122122
NUIE::GroupMenuCommandPtr createCommandGroup (new NUIE::GroupMenuCommand (L"Add Node"));
@@ -131,32 +131,32 @@ MenuCommandPtr TestEventHandlers::OnContextMenu (const Point& position, const Me
131131
return SelectCommandByName (actualCommands);
132132
}
133133

134-
MenuCommandPtr TestEventHandlers::OnContextMenu (const Point&, const UINodePtr&, const MenuCommandStructure& commands)
134+
MenuCommandPtr TestEventHandler::OnContextMenu (const Point&, const UINodePtr&, const MenuCommandStructure& commands)
135135
{
136136
return SelectCommandByName (commands);
137137
}
138138

139-
MenuCommandPtr TestEventHandlers::OnContextMenu (const Point&, const UIOutputSlotConstPtr&, const MenuCommandStructure& commands)
139+
MenuCommandPtr TestEventHandler::OnContextMenu (const Point&, const UIOutputSlotConstPtr&, const MenuCommandStructure& commands)
140140
{
141141
return SelectCommandByName (commands);
142142
}
143143

144-
MenuCommandPtr TestEventHandlers::OnContextMenu (const Point&, const UIInputSlotConstPtr&, const MenuCommandStructure& commands)
144+
MenuCommandPtr TestEventHandler::OnContextMenu (const Point&, const UIInputSlotConstPtr&, const MenuCommandStructure& commands)
145145
{
146146
return SelectCommandByName (commands);
147147
}
148148

149-
MenuCommandPtr TestEventHandlers::OnContextMenu (const Point&, const UINodeGroupPtr&, const MenuCommandStructure& commands)
149+
MenuCommandPtr TestEventHandler::OnContextMenu (const Point&, const UINodeGroupPtr&, const MenuCommandStructure& commands)
150150
{
151151
return SelectCommandByName (commands);
152152
}
153153

154-
void TestEventHandlers::OnDoubleClick (const Point&)
154+
void TestEventHandler::OnDoubleClick (const Point&)
155155
{
156156

157157
}
158158

159-
bool TestEventHandlers::OnParameterSettings (ParameterInterfacePtr paramInterface, const UINodePtr&)
159+
bool TestEventHandler::OnParameterSettings (ParameterInterfacePtr paramInterface, const UINodePtr&)
160160
{
161161
if (DBGERROR (paramSettingsHandler == nullptr)) {
162162
return false;
@@ -166,7 +166,7 @@ bool TestEventHandlers::OnParameterSettings (ParameterInterfacePtr paramInterfac
166166
return result;
167167
}
168168

169-
bool TestEventHandlers::OnParameterSettings (ParameterInterfacePtr paramInterface, const UINodeGroupPtr&)
169+
bool TestEventHandler::OnParameterSettings (ParameterInterfacePtr paramInterface, const UINodeGroupPtr&)
170170
{
171171
if (DBGERROR (paramSettingsHandler == nullptr)) {
172172
return false;
@@ -176,19 +176,19 @@ bool TestEventHandlers::OnParameterSettings (ParameterInterfacePtr paramInterfac
176176
return result;
177177
}
178178

179-
void TestEventHandlers::SetNextCommandName (const std::wstring& nextCommandName)
179+
void TestEventHandler::SetNextCommandName (const std::wstring& nextCommandName)
180180
{
181181
DBGASSERT (commandToSelect.empty ());
182182
commandToSelect = nextCommandName;
183183
}
184184

185-
void TestEventHandlers::SetNextCommandParameterSettings (const ParameterSettingsHandler& handler)
185+
void TestEventHandler::SetNextCommandParameterSettings (const ParameterSettingsHandler& handler)
186186
{
187187
SetNextCommandName (L"Node Settings");
188188
paramSettingsHandler = handler;
189189
}
190190

191-
MenuCommandPtr TestEventHandlers::SelectCommandByName (const MenuCommandStructure& commands)
191+
MenuCommandPtr TestEventHandler::SelectCommandByName (const MenuCommandStructure& commands)
192192
{
193193
DBGASSERT (!commandToSelect.empty ());
194194
MenuCommandPtr selectedCommand = nullptr;
@@ -202,7 +202,7 @@ MenuCommandPtr TestEventHandlers::SelectCommandByName (const MenuCommandStructur
202202
return selectedCommand;
203203
}
204204

205-
MenuCommandPtr TestEventHandlers::SelectCommandByName (const MenuCommandPtr& command)
205+
MenuCommandPtr TestEventHandler::SelectCommandByName (const MenuCommandPtr& command)
206206
{
207207
if (command->HasChildCommands ()) {
208208
MenuCommandPtr foundCommand = nullptr;
@@ -226,7 +226,7 @@ TestNodeUIEnvironment::TestNodeUIEnvironment (NodeEditor& nodeEditor, const Basi
226226
stringConverter (GetDefaultStringConverter ()),
227227
skinParams (skinParams),
228228
drawingContext (800, 600),
229-
eventHandlers (&nodeEditor),
229+
eventHandler (&nodeEditor),
230230
evaluationEnv (nullptr),
231231
windowScale (1.0)
232232
{
@@ -278,19 +278,19 @@ void TestNodeUIEnvironment::OnRedrawRequested ()
278278
nodeEditor.Draw ();
279279
}
280280

281-
EventHandlers& TestNodeUIEnvironment::GetEventHandlers ()
281+
EventHandler& TestNodeUIEnvironment::GetEventHandler ()
282282
{
283-
return eventHandlers;
283+
return eventHandler;
284284
}
285285

286286
void TestNodeUIEnvironment::SetNextCommandName (const std::wstring& nextCommandName)
287287
{
288-
eventHandlers.SetNextCommandName (nextCommandName);
288+
eventHandler.SetNextCommandName (nextCommandName);
289289
}
290290

291291
void TestNodeUIEnvironment::SetNextCommandParameterSettings (const ParameterSettingsHandler& handler)
292292
{
293-
eventHandlers.SetNextCommandParameterSettings (handler);
293+
eventHandler.SetNextCommandParameterSettings (handler);
294294
}
295295

296296
const SvgDrawingContext& TestNodeUIEnvironment::GetSvgDrawingContext () const

‎Sources/NodeEngineTest/VisualTestFramework.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "NE_StringConverter.hpp"
55
#include "NE_EvaluationEnv.hpp"
6-
#include "NUIE_EventHandlers.hpp"
6+
#include "NUIE_EventHandler.hpp"
77
#include "NUIE_NodeEditor.hpp"
88
#include "NUIE_SvgDrawingContext.hpp"
99

@@ -12,10 +12,10 @@ using namespace NUIE;
1212

1313
using ParameterSettingsHandler = std::function<bool (ParameterInterfacePtr)>;
1414

15-
class TestEventHandlers : public EventHandlers
15+
class TestEventHandler : public EventHandler
1616
{
1717
public:
18-
TestEventHandlers (NodeEditor* nodeEditor);
18+
TestEventHandler (NodeEditor* nodeEditor);
1919

2020
virtual MenuCommandPtr OnContextMenu (const Point&, const MenuCommandStructure&) override;
2121
virtual MenuCommandPtr OnContextMenu (const Point&, const UINodePtr&, const MenuCommandStructure&) override;
@@ -52,7 +52,7 @@ class TestNodeUIEnvironment : public NodeUIEnvironment
5252
virtual void OnEvaluationEnd () override;
5353
virtual void OnValuesRecalculated () override;
5454
virtual void OnRedrawRequested () override;
55-
virtual EventHandlers& GetEventHandlers () override;
55+
virtual EventHandler& GetEventHandler () override;
5656

5757
void SetNextCommandName (const std::wstring& nextCommandName);
5858
void SetNextCommandParameterSettings (const ParameterSettingsHandler& handler);
@@ -65,7 +65,7 @@ class TestNodeUIEnvironment : public NodeUIEnvironment
6565
BasicStringConverter stringConverter;
6666
BasicSkinParams skinParams;
6767
SvgDrawingContext drawingContext;
68-
TestEventHandlers eventHandlers;
68+
TestEventHandler eventHandler;
6969
EvaluationEnv evaluationEnv;
7070
double windowScale;
7171
};

‎Sources/NodeUIEngine/NUIE_EventHandler.cpp‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
#include "NUIE_EventHandler.hpp"
2+
3+
namespace NUIE
4+
{
5+
6+
EventHandler::EventHandler ()
7+
{
8+
9+
}
10+
11+
EventHandler::~EventHandler ()
12+
{
13+
14+
}
15+
16+
NullEventHandler::NullEventHandler ()
17+
{
18+
}
19+
20+
NullEventHandler::~NullEventHandler ()
21+
{
22+
}
23+
24+
NUIE::MenuCommandPtr NullEventHandler::OnContextMenu (const Point&, const MenuCommandStructure&)
25+
{
26+
return nullptr;
27+
}
28+
29+
NUIE::MenuCommandPtr NullEventHandler::OnContextMenu (const Point&, const UINodePtr&, const MenuCommandStructure&)
30+
{
31+
return nullptr;
32+
}
33+
34+
NUIE::MenuCommandPtr NullEventHandler::OnContextMenu (const Point&, const UIOutputSlotConstPtr&, const MenuCommandStructure&)
35+
{
36+
return nullptr;
37+
}
38+
39+
NUIE::MenuCommandPtr NullEventHandler::OnContextMenu (const Point&, const UIInputSlotConstPtr&, const MenuCommandStructure&)
40+
{
41+
return NUIE::MenuCommandPtr ();
42+
}
43+
44+
NUIE::MenuCommandPtr NullEventHandler::OnContextMenu (const Point&, const UINodeGroupPtr&, const MenuCommandStructure&)
45+
{
46+
return nullptr;
47+
}
48+
49+
void NullEventHandler::OnDoubleClick (const Point&)
50+
{
51+
52+
}
53+
54+
bool NullEventHandler::OnParameterSettings (ParameterInterfacePtr, const UINodePtr&)
55+
{
56+
return false;
57+
}
58+
59+
bool NullEventHandler::OnParameterSettings (ParameterInterfacePtr, const UINodeGroupPtr&)
60+
{
61+
return false;
62+
}
63+
64+
}

Sources/NodeUIEngine/NUIE_EventHandlers.hpp renamed to Sources/NodeUIEngine/NUIE_EventHandler.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef NUIE_EVENTHANDLERS_HPP
2-
#define NUIE_EVENTHANDLERS_HPP
1+
#ifndef NUIE_EVENTHANDLER_HPP
2+
#define NUIE_EVENTHANDLER_HPP
33

44
#include "NUIE_UINode.hpp"
55
#include "NUIE_UINodeGroup.hpp"
@@ -12,11 +12,11 @@ namespace NUIE
1212

1313
class NodeUIManager;
1414

15-
class EventHandlers
15+
class EventHandler
1616
{
1717
public:
18-
EventHandlers ();
19-
virtual ~EventHandlers ();
18+
EventHandler ();
19+
virtual ~EventHandler ();
2020

2121
virtual NUIE::MenuCommandPtr OnContextMenu (const Point& position, const MenuCommandStructure& commands) = 0;
2222
virtual NUIE::MenuCommandPtr OnContextMenu (const Point& position, const UINodePtr& uiNode, const MenuCommandStructure& commands) = 0;
@@ -28,14 +28,14 @@ class EventHandlers
2828
virtual bool OnParameterSettings (ParameterInterfacePtr paramAccessor, const UINodeGroupPtr& uiGroup) = 0;
2929
};
3030

31-
using EventHandlersPtr = std::shared_ptr<EventHandlers>;
32-
using EventHandlersConstPtr = std::shared_ptr<const EventHandlers>;
31+
using EventHandlerPtr = std::shared_ptr<EventHandler>;
32+
using EventHandlerConstPtr = std::shared_ptr<const EventHandler>;
3333

34-
class NullEventHandlers : public EventHandlers
34+
class NullEventHandler : public EventHandler
3535
{
3636
public:
37-
NullEventHandlers ();
38-
virtual ~NullEventHandlers ();
37+
NullEventHandler ();
38+
virtual ~NullEventHandler ();
3939

4040
virtual NUIE::MenuCommandPtr OnContextMenu (const Point& position, const MenuCommandStructure& commands) override;
4141
virtual NUIE::MenuCommandPtr OnContextMenu (const Point& position, const UINodePtr& uiNode, const MenuCommandStructure& commands) override;

‎Sources/NodeUIEngine/NUIE_EventHandlers.cpp‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)