Skip to content

Commit

Permalink
libdeng2: Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Feb 26, 2013
1 parent 2fdbeca commit e60ecbf
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions doomsday/libdeng2/include/de/core/id.h
Expand Up @@ -39,7 +39,7 @@ class DENG2_PUBLIC Id : public ISerializable, public LogEntry::Arg::Base
typedef duint32 Type;

/// The special "no identifier".
enum { NONE = 0 };
enum { None = 0 };

public:
/**
Expand All @@ -65,7 +65,7 @@ class DENG2_PUBLIC Id : public ISerializable, public LogEntry::Arg::Base

bool operator != (Id const &other) const { return _id != other._id; }

operator bool () const { return _id != NONE; }
operator bool () const { return _id != None; }

operator Type () const { return _id; }

Expand Down
2 changes: 1 addition & 1 deletion doomsday/libdeng2/include/de/core/loop.h
Expand Up @@ -56,7 +56,7 @@ class Loop : public QObject
/**
* Sets the frequency for loop iteration (e.g., 35 Hz for a dedicated
* server). Not very accurate: the actual rate at which the function is
* called is likely less than this value.
* called is likely less than this value (but never more frequently).
*
* @param freqHz Frequency in Hz.
*/
Expand Down
4 changes: 2 additions & 2 deletions doomsday/libdeng2/src/core/id.cpp
Expand Up @@ -29,13 +29,13 @@ Id::Type Id::_generator = 1;

Id::Id() : _id(_generator++)
{
if(_id == NONE)
if(_id == None)
{
++_id;
}
}

Id::Id(String const &text) : _id(NONE)
Id::Id(String const &text) : _id(None)
{
if(text.beginsWith("{") && text.endsWith("}"))
{
Expand Down
2 changes: 1 addition & 1 deletion doomsday/libdeng2/src/core/loop.cpp
Expand Up @@ -67,7 +67,7 @@ void Loop::nextLoopIteration()
{
if(d->running)
{
d->schedule();
d->schedule();
DENG2_FOR_AUDIENCE(Iteration, i) i->loopIteration();
}
}
Expand Down

0 comments on commit e60ecbf

Please sign in to comment.