Skip to content

Commit c0bb810

Browse files
authored
Rename the entry point (#78)
Previously, the entry point file was named EntryPoint.hpp/.cpp. If other projects used that same name, there could be a conflict in intermediate files. In fact, this is pretty much the default. In order to prevent that conflict, the files are renamed to maxGUIEntryPoint.hpp/.cpp. This is far less likely to cause a conflict.
1 parent f7b87ca commit c0bb810

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

Code/maxGUI/maxGUI.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <maxGUI/Button.hpp>
99
#include <maxGUI/CheckBox.hpp>
1010
#include <maxGUI/DropDownBox.hpp>
11-
#include <maxGUI/EntryPoint.hpp>
11+
#include <maxGUI/maxGUIEntryPoint.hpp>
1212
#include <maxGUI/FormAllocatorConcept.hpp>
1313
#include <maxGUI/FormAllocatorModel.hpp>
1414
#include <maxGUI/FormConcept.hpp>

Code/maxGUI/EntryPoint.cpp renamed to Code/maxGUI/maxGUIEntryPoint.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include <maxGUI/EntryPoint.hpp>
5+
#include <maxGUI/maxGUIEntryPoint.hpp>
66

77
#if defined(MAX_PLATFORM_LINUX)
88
#include <QApplication>

Code/maxGUI/EntryPoint.hpp renamed to Code/maxGUI/maxGUIEntryPoint.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef MAXGUI_ENTRYPOINT_HPP
6-
#define MAXGUI_ENTRYPOINT_HPP
5+
#ifndef MAXGUI_MAXGUIENTRYPOINT_HPP
6+
#define MAXGUI_MAXGUIENTRYPOINT_HPP
77

88
#include <max/Compiling/Configuration.hpp>
99
#include <maxGUI/FormContainer.hpp>
@@ -46,4 +46,4 @@ namespace maxGUI {
4646

4747
} // namespace maxGUI
4848

49-
#endif // #ifndef MAXGUI_ENTRYPOINT_HPP
49+
#endif // #ifndef MAXGUI_MAXGUIENTRYPOINT_HPP

Projects/Make/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ CXX_SRCS = \
66
../../Code/maxGUI/ControlImplementation.cpp \
77
../../Code/maxGUI/ControlWithText.cpp \
88
../../Code/maxGUI/ControlWithTextImplementation.cpp \
9-
../../Code/maxGUI/EntryPoint.cpp \
109
../../Code/maxGUI/FormAllocatorConcept.cpp \
1110
../../Code/maxGUI/FormConcept.cpp \
1211
../../Code/maxGUI/FormContainer.cpp \
12+
../../Code/maxGUI/maxGUIEntryPoint.cpp \
1313
../../Code/maxGUI/MultilineTextBoxImplementation.cpp
1414
#../../Code/maxGUI/CheckBoxImplementation.cpp \
1515
#../../Code/maxGUI/ControlWithList.cpp \

Projects/VisualStudio/maxGUI/maxGUI.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<ClCompile Include="..\..\..\Code\maxGUI\ControlWithText.cpp" />
5858
<ClCompile Include="..\..\..\Code\maxGUI\ControlWithTextImplementation.cpp" />
5959
<ClCompile Include="..\..\..\Code\maxGUI\DropDownBoxImplementation.cpp" />
60-
<ClCompile Include="..\..\..\Code\maxGUI\EntryPoint.cpp" />
60+
<ClCompile Include="..\..\..\Code\maxGUI\maxGUIEntryPoint.cpp" />
6161
<ClCompile Include="..\..\..\Code\maxGUI\FormAllocatorConcept.cpp" />
6262
<ClCompile Include="..\..\..\Code\maxGUI\FormConcept.cpp" />
6363
<ClCompile Include="..\..\..\Code\maxGUI\FormContainer.cpp" />
@@ -82,7 +82,7 @@
8282
<ClInclude Include="..\..\..\Code\maxGUI\ControlWithTextImplementation.hpp" />
8383
<ClInclude Include="..\..\..\Code\maxGUI\DropDownBoxImplementation.hpp" />
8484
<ClInclude Include="..\..\..\Code\maxGUI\DropDownBox.hpp" />
85-
<ClInclude Include="..\..\..\Code\maxGUI\EntryPoint.hpp" />
85+
<ClInclude Include="..\..\..\Code\maxGUI\maxGUIEntryPoint.hpp" />
8686
<ClInclude Include="..\..\..\Code\maxGUI\FormAllocatorConcept.hpp" />
8787
<ClInclude Include="..\..\..\Code\maxGUI\FormAllocatorModel.hpp" />
8888
<ClInclude Include="..\..\..\Code\maxGUI\FormConcept.hpp" />

Projects/VisualStudio/maxGUI/maxGUI.vcxproj.filters

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
</Xml>
127127
</ItemGroup>
128128
<ItemGroup>
129-
<ClCompile Include="..\..\..\Code\maxGUI\EntryPoint.cpp">
129+
<ClCompile Include="..\..\..\Code\maxGUI\maxGUIEntryPoint.cpp">
130130
<Filter>Code</Filter>
131131
</ClCompile>
132132
<ClCompile Include="..\..\..\Code\maxGUI\Control.cpp">
@@ -194,7 +194,7 @@
194194
</ClCompile>
195195
</ItemGroup>
196196
<ItemGroup>
197-
<ClInclude Include="..\..\..\Code\maxGUI\EntryPoint.hpp">
197+
<ClInclude Include="..\..\..\Code\maxGUI\maxGUIEntryPoint.hpp">
198198
<Filter>Code</Filter>
199199
</ClInclude>
200200
<ClInclude Include="..\..\..\Code\maxGUI\Button.hpp">

0 commit comments

Comments
 (0)