summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/setupitem.h2
-rw-r--r--src/gui/widgets/setuptabscroll.cpp10
-rw-r--r--src/gui/widgets/setuptabscroll.h2
-rw-r--r--src/utils/paths.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/setupitem.h b/src/gui/setupitem.h
index 686f8a2a7..81f85b0da 100644
--- a/src/gui/setupitem.h
+++ b/src/gui/setupitem.h
@@ -53,7 +53,7 @@ class SetupItem : public gcn::ActionListener
public:
enum
{
- VBOOL,
+ VBOOL = 0,
VSTR,
VINT
};
diff --git a/src/gui/widgets/setuptabscroll.cpp b/src/gui/widgets/setuptabscroll.cpp
index ece4fef8f..c3fd4dee8 100644
--- a/src/gui/widgets/setuptabscroll.cpp
+++ b/src/gui/widgets/setuptabscroll.cpp
@@ -61,7 +61,7 @@ SetupTabScroll::~SetupTabScroll()
void SetupTabScroll::addControl(SetupItem *widget)
{
- std::map<std::string,SetupItem*>::iterator iter
+ std::map<std::string, SetupItem*>::iterator iter
= mItems.find(widget->getActionEventId());
if (iter != mItems.end())
{
@@ -74,7 +74,7 @@ void SetupTabScroll::addControl(SetupItem *widget)
void SetupTabScroll::addControl(SetupItem *widget, std::string event)
{
- std::map<std::string,SetupItem*>::iterator iter
+ std::map<std::string, SetupItem*>::iterator iter
= mItems.find(event);
if (iter != mItems.end())
{
@@ -87,21 +87,21 @@ void SetupTabScroll::addControl(SetupItem *widget, std::string event)
void SetupTabScroll::apply()
{
- std::map<std::string,SetupItem*>::iterator iter;
+ std::map<std::string, SetupItem*>::iterator iter;
for (iter = mItems.begin(); iter != mItems.end(); ++ iter)
(*iter).second->apply((*iter).first);
}
void SetupTabScroll::cancel()
{
- std::map<std::string,SetupItem*>::iterator iter;
+ std::map<std::string, SetupItem*>::iterator iter;
for (iter = mItems.begin(); iter != mItems.end(); ++ iter)
(*iter).second->cancel((*iter).first);
}
void SetupTabScroll::externalUpdated()
{
- std::map<std::string,SetupItem*>::iterator iter;
+ std::map<std::string, SetupItem*>::iterator iter;
for (iter = mItems.begin(); iter != mItems.end(); ++ iter)
{
SetupItem *widget = (*iter).second;
diff --git a/src/gui/widgets/setuptabscroll.h b/src/gui/widgets/setuptabscroll.h
index 119756969..78391f29b 100644
--- a/src/gui/widgets/setuptabscroll.h
+++ b/src/gui/widgets/setuptabscroll.h
@@ -62,7 +62,7 @@ class SetupTabScroll : public SetupTab
protected:
VertContainer *mContainer;
ScrollArea *mScroll;
- std::map<std::string,SetupItem*> mItems;
+ std::map<std::string, SetupItem*> mItems;
std::set<SetupItem*> mAllItems;
};
diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp
index cae2d1837..8882808fa 100644
--- a/src/utils/paths.cpp
+++ b/src/utils/paths.cpp
@@ -27,7 +27,7 @@
#include <stdlib.h>
#ifdef WIN32
-#define realpath(N,R) _fullpath((R),(N),_MAX_PATH)
+#define realpath(N, R) _fullpath((R), (N), _MAX_PATH)
#endif
#include "debug.h"