Skip to content

Commit 35a43d4

Browse files
committed
naming updates
1 parent 09fd568 commit 35a43d4

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

inc/playground_organizer.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,15 @@ namespace colorconsole {
155155
{
156156
if ((color & fg_blue))
157157
{
158-
puts(BLUE);
158+
printf("%s", BLUE);
159159
}
160160
else if ((color & fg_green))
161161
{
162-
puts(GREEN);
162+
printf("%s", GREEN);
163163
}
164164
else if ((color & fg_red))
165165
{
166-
puts(RED);
166+
printf("%s", RED);
167167
}
168168
else
169169
{
@@ -174,15 +174,15 @@ namespace colorconsole {
174174
{
175175
if ((color & fg_blue))
176176
{
177-
puts(BOLDBLUE);
177+
printf("%s", BOLDBLUE);
178178
}
179179
else if ((color & fg_green))
180180
{
181-
puts(BOLDGREEN);
181+
printf("%s", BOLDGREEN);
182182
}
183183
else if ((color & fg_red))
184184
{
185-
puts(BOLDRED);
185+
printf("%s", BOLDRED);
186186
}
187187
else
188188
{
@@ -192,7 +192,7 @@ namespace colorconsole {
192192
return true;
193193
}
194194
void Default() {
195-
puts(RESET);
195+
printf("%s", RESET);
196196
}
197197
};
198198
#endif
@@ -328,7 +328,7 @@ namespace CppOrganizer
328328
// Add helper without using macro
329329
//template <class ClassName, typename ...Args>
330330
//std::shared_ptr<ClassName> Add(Args&&... args) {
331-
// // ctor'da debug edebilmek için
331+
// // ctor'da debug edebilmek i�in
332332
// return std::shared_ptr<ClassName>(new ClassName(std::forward<Args>(args)...));
333333
// //return std::make_shared<ClassName, Args...>(std::forward<Args>(args)...);
334334
//}

src/1-Inheritance/diamond_problem.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace diamondproblem {
3131

3232
class Object {
3333
public:
34-
explicit Object(const char *name = "STM Object") : _name(name) {
34+
explicit Object(const char *name = "Object") : _name(name) {
3535
STMFrameworkObjectManager::getInstance().RegisterObject(this);
3636
}
3737
virtual ~Object() {
@@ -57,11 +57,11 @@ namespace diamondproblem {
5757
namespace problem {
5858

5959
class ComponentA : public Object {
60-
public: ComponentA() : Object("STM ComponentA") { }
60+
public: ComponentA() : Object("ComponentA") { }
6161
};
6262

6363
class ComponentB : public Object {
64-
public: ComponentB() : Object("STM ComponentB") { }
64+
public: ComponentB() : Object("ComponentB") { }
6565
};
6666
#ifdef _WIN32
6767
#pragma warning( push )
@@ -71,7 +71,7 @@ namespace diamondproblem {
7171
#pragma GCC diagnostic ignored "-Winaccessible-base"
7272
#endif
7373
class CompositeComponent : public Object, public ComponentA {
74-
public: CompositeComponent() : Object("STM CompositeComponent") { }
74+
public: CompositeComponent() : Object("CompositeComponent") { }
7575
};
7676
#ifdef _WIN32
7777
#pragma warning( pop )
@@ -84,15 +84,15 @@ namespace diamondproblem {
8484
namespace solution {
8585

8686
class ComponentA : virtual public Object {
87-
public: ComponentA() : Object("STM ComponentA") { }
87+
public: ComponentA() : Object("ComponentA") { }
8888
};
8989

9090
class ComponentB : virtual public Object {
91-
public: ComponentB() : Object("STM ComponentB") { }
91+
public: ComponentB() : Object("ComponentB") { }
9292
};
9393

9494
class CompositeComponent : public ComponentB, public ComponentA {
95-
public: CompositeComponent() : Object("STM CompositeComponent") { }
95+
public: CompositeComponent() : Object("CompositeComponent") { }
9696
};
9797

9898
} // namespace problem

src/6-Exceptions/exception_usage.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ namespace exceptions {
6767
{
6868
std::ostringstream exceptionStream;
6969
exceptionStream
70-
<< "STM Exception: "
70+
<< "Custom Exception: "
7171
<< "\nin line: " << line
7272
<< "\nfile: " << file;
7373
if (message)

0 commit comments

Comments
 (0)