Skip to content

Commit

Permalink
Cleanup: Everything cannot be "logical"
Browse files Browse the repository at this point in the history
Removed an overused term. However, the client remains by far the worst
offender...
  • Loading branch information
skyjake committed Mar 30, 2016
1 parent 9c79f26 commit 245046a
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions doomsday/sdk/libcore/include/de/data/binarytree.h
Expand Up @@ -14,7 +14,7 @@
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
* General Public License for more details. You should have received a copy of
* the GNU Lesser General Public License along with this program; if not, see:
* http://www.gnu.org/licenses</small>
* http://www.gnu.org/licenses</small>
*/

#ifndef LIBDENG2_BINARYTREE_H
Expand Down Expand Up @@ -46,7 +46,7 @@ class BinaryTree
DENG2_ERROR(MissingChildError);

/**
* Logical child node identifiers.
* Child node identifiers.
*/
enum ChildId
{
Expand Down
2 changes: 1 addition & 1 deletion doomsday/sdk/libcore/include/de/libcore.h
Expand Up @@ -504,7 +504,7 @@ void applyFlagOperation(FlagsType &flags, FlagsCompatibleType const &newFlags, F
}

/**
* Logical clock-wise direction identifiers.
* Clock-wise direction identifiers.
*/
enum ClockDirection {
Anticlockwise = 0,
Expand Down
4 changes: 2 additions & 2 deletions doomsday/sdk/libcore/src/data/pathtreenode.cpp
Expand Up @@ -27,7 +27,7 @@ DENG2_PIMPL_NOREF(PathTree::Node)
/// PathTree which owns this node.
PathTree &tree;

/// Parent node in the user's logical hierarchy.
/// Parent node in the user's hierarchy.
PathTree::Node *parent;

/// @c NULL for leaves, index of children for branches.
Expand All @@ -36,7 +36,7 @@ DENG2_PIMPL_NOREF(PathTree::Node)
/// Unique identifier for the path fragment this node represents,
/// in the owning PathTree.
PathTree::SegmentId segmentId;

String const *segmentText = nullptr; // owned by the PathTree

Instance(PathTree &_tree, bool isLeaf, PathTree::SegmentId _segmentId,
Expand Down
4 changes: 2 additions & 2 deletions doomsday/sdk/libcore/src/data/stringpool.cpp
Expand Up @@ -14,7 +14,7 @@
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
* General Public License for more details. You should have received a copy of
* the GNU Lesser General Public License along with this program; if not, see:
* http://www.gnu.org/licenses</small>
* http://www.gnu.org/licenses</small>
*/

#include "de/StringPool"
Expand Down Expand Up @@ -244,7 +244,7 @@ DENG2_PIMPL_NOREF(StringPool)
}
str->setId(idx);

// We have one more logical string in the pool.
// We have one more string in the pool.
count++;
assertCount();

Expand Down
20 changes: 10 additions & 10 deletions doomsday/sdk/libgui/src/persistentcanvaswindow.cpp
Expand Up @@ -19,7 +19,7 @@
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
* General Public License for more details. You should have received a copy of
* the GNU Lesser General Public License along with this program; if not, see:
* http://www.gnu.org/licenses</small>
* http://www.gnu.org/licenses</small>
*/

#include "de/PersistentCanvasWindow"
Expand Down Expand Up @@ -80,7 +80,7 @@ static void notifyAboutModeChange()
DENG2_PIMPL(PersistentCanvasWindow)
{
/**
* Logical state of a window.
* State of a window.
*/
struct State
{
Expand Down Expand Up @@ -316,7 +316,7 @@ DENG2_PIMPL(PersistentCanvasWindow)

/**
* Checks all command line options that affect window geometry and
* applies them to this logical state.
* applies them to this State.
*/
void modifyAccordingToOptions()
{
Expand Down Expand Up @@ -454,7 +454,7 @@ DENG2_PIMPL(PersistentCanvasWindow)

String id;

// Logical state.
// Window state.
State state;
State savedState; // used by saveState(), restoreState()
bool neverShown;
Expand Down Expand Up @@ -550,7 +550,7 @@ DENG2_PIMPL(PersistentCanvasWindow)
state = widgetState();

// The new modified state.
State mod = state;
State mod = state;
mod.applyAttributes(attribs);

LOGDEV_GL_MSG("windowRect:%s fullSize:%s depth:%i flags:%x")
Expand All @@ -571,9 +571,9 @@ DENG2_PIMPL(PersistentCanvasWindow)
}

/**
* Apply a logical state to the concrete widget instance. All properties of
* the widget may not be updated instantly during this method. Particularly
* a display mode change will cause geometry changes to occur later.
* Apply a State to the concrete widget instance. All properties of the widget may
* not be updated instantly during this method. Particularly a display mode change
* will cause geometry changes to occur later.
*
* @param newState State to apply.
*/
Expand Down Expand Up @@ -839,7 +839,7 @@ Rectanglei PersistentCanvasWindow::windowRect() const
if(d->neverShown)
{
// If the window hasn't been shown yet, it doesn't have a valid
// normal geometry. Use the one defined in the logical state.
// normal geometry. Use the one defined in the State.
return d->state.windowRect;
}

Expand Down Expand Up @@ -950,7 +950,7 @@ void PersistentCanvasWindow::moveEvent(QMoveEvent *)
{
// Recenter.
setGeometry(centeredQRect(size()));
}
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion doomsday/tools/savegametool/src/id1translator.h
Expand Up @@ -31,7 +31,7 @@ class Id1Translator : public PackageFormatter
/// The game identity key of the source data is ambigous. @ingroup errors
DENG2_SUB_ERROR(ReadError, AmbigousGameIdError);

/// Logical identifiers for supported save formats.
/// Identifiers for supported save formats.
enum FormatId {
DoomV9,
HereticV13
Expand Down
2 changes: 1 addition & 1 deletion doomsday/tools/savegametool/src/nativetranslator.h
Expand Up @@ -31,7 +31,7 @@ class NativeTranslator : public PackageFormatter
/// The game ID of the source data is ambigous. @ingroup errors
DENG2_SUB_ERROR(ReadError, AmbigousGameIdError);

/// Logical identifiers for supported save formats.
/// Identifiers for supported save formats.
enum FormatId {
Doom,
Heretic,
Expand Down

0 comments on commit 245046a

Please sign in to comment.