From 55f7ee692f7993536ed8f13546f0245d2bfcb60a Mon Sep 17 00:00:00 2001 From: dnk-88 Date: Sat, 30 Jul 2011 21:52:26 +0300 Subject: [PATCH] Changed: #1301 Fix typos in comments/code. --HG-- branch : gsoc2011-worldeditorqt --- .../landscape_editor/builder_zone_region.cpp | 7 +++---- .../landscape_editor/builder_zone_region.h | 3 +-- .../landscape_editor_constants.h | 18 +++++++++--------- .../landscape_editor/landscape_scene.cpp | 4 ++-- .../landscape_editor/list_zones_model.h | 2 +- .../plugins/landscape_editor/pixmap_database.h | 2 +- 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_region.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_region.cpp index b294ce97b..3f787e6b0 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_region.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_region.cpp @@ -1,6 +1,5 @@ // Object Viewer Qt - MMORPG Framework // Copyright (C) 2010 Winch Gate Property Limited -// Copyright (C) 2011 Dzmitry Kamiahin // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as @@ -168,12 +167,12 @@ public: return m_elements[m].y; } - BuilderZoneRegion* getBuilderZoneRegion(uint32 m) + BuilderZoneRegion *getBuilderZoneRegion(uint32 m) { return m_elements[m].builderZoneRegion; } - const std::string& getMat (uint32 m) + const std::string &getMat (uint32 m) { return m_elements[m].matPut; } @@ -804,7 +803,7 @@ void BuilderZoneRegion::addTransition (sint32 x, sint32 y, uint8 rot, uint8 flip } } -void BuilderZoneRegion::addToUpdateAndCreate(BuilderZoneRegion* builderZoneRegion, sint32 sharePos, sint32 x, sint32 y, const std::string &newMat, void *pInt1, void *pInt2) +void BuilderZoneRegion::addToUpdateAndCreate(BuilderZoneRegion *builderZoneRegion, sint32 sharePos, sint32 x, sint32 y, const std::string &newMat, void *pInt1, void *pInt2) { const NLLIGO::CZoneRegion &zoneRegion = m_zoneBuilder->zoneRegion(m_regionId)->ligoZoneRegion(); ToUpdate *ptCreate = reinterpret_cast(pInt1); diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_region.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_region.h index 63656d643..6de45da50 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_region.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone_region.h @@ -1,6 +1,5 @@ // Object Viewer Qt - MMORPG Framework // Copyright (C) 2010 Winch Gate Property Limited -// Copyright (C) 2011 Dzmitry Kamiahin // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as @@ -70,7 +69,7 @@ private: void addTransition(sint32 x, sint32 y, uint8 rot, uint8 flip, NLLIGO::CZoneBankElement *zoneBankElement); - void addToUpdateAndCreate(BuilderZoneRegion* builderZoneRegion, sint32 sharePos, sint32 x, sint32 y, const std::string &newMat, void *pInt1, void *pInt2); + void addToUpdateAndCreate(BuilderZoneRegion *builderZoneRegion, sint32 sharePos, sint32 x, sint32 y, const std::string &newMat, void *pInt1, void *pInt2); void putTransitions(sint32 x, sint32 y, const NLLIGO::SPiece &mask, const std::string &matName, void *pInternal); void updateTrans(sint32 x, sint32 y, NLLIGO::CZoneBankElement *zoneBankElement = NULL); diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_constants.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_constants.h index 0cdf6d3cd..76b91dad5 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_constants.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_editor_constants.h @@ -22,19 +22,19 @@ namespace LandscapeEditor { namespace Constants { -const char * const LANDSCAPE_EDITOR_PLUGIN = "LandscapeEditor"; +const char *const LANDSCAPE_EDITOR_PLUGIN = "LandscapeEditor"; //settings -const char * const LANDSCAPE_EDITOR_SECTION = "LandscapeEditor"; -const char * const LANDSCAPE_WINDOW_STATE = "LandscapeWindowState"; -const char * const LANDSCAPE_WINDOW_GEOMETRY = "LandscapeWindowGeometry"; -const char * const LANDSCAPE_DATA_DIRECTORY = "LandscapeDataDirectory"; -const char * const LANDSCAPE_USE_OPENGL = "LandscapeUseOpenGL"; +const char *const LANDSCAPE_EDITOR_SECTION = "LandscapeEditor"; +const char *const LANDSCAPE_WINDOW_STATE = "LandscapeWindowState"; +const char *const LANDSCAPE_WINDOW_GEOMETRY = "LandscapeWindowGeometry"; +const char *const LANDSCAPE_DATA_DIRECTORY = "LandscapeDataDirectory"; +const char *const LANDSCAPE_USE_OPENGL = "LandscapeUseOpenGL"; //resources -const char * const ICON_LANDSCAPE_ITEM = ":/icons/ic_nel_landscape_item.png"; -const char * const ICON_ZONE_ITEM = ":/icons/ic_nel_zone.png"; -const char * const ICON_LANDSCAPE_ZONES = ":/icons/ic_nel_zones.png"; +const char *const ICON_LANDSCAPE_ITEM = ":/icons/ic_nel_landscape_item.png"; +const char *const ICON_ZONE_ITEM = ":/icons/ic_nel_zone.png"; +const char *const ICON_LANDSCAPE_ZONES = ":/icons/ic_nel_zones.png"; } // namespace Constants diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_scene.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_scene.cpp index 67485158d..bdbe54f8c 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_scene.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/landscape_scene.cpp @@ -35,7 +35,7 @@ static const int ZONE_NAME = 0; static const int LAYER_ZONES = 2; static const int LAYER_EMPTY_ZONES = 3; static const int LAYER_BLACKOUT = 4; -const char * const LAYER_BLACKOUT_NAME = "blackout"; +const char *const LAYER_BLACKOUT_NAME = "blackout"; const int MAX_SCENE_WIDTH = 256; const int MAX_SCENE_HEIGHT = 256; @@ -323,7 +323,7 @@ void LandscapeScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent) QGraphicsScene::mousePressEvent(mouseEvent); } -void LandscapeScene::mouseMoveEvent(QGraphicsSceneMouseEvent * mouseEvent) +void LandscapeScene::mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent) { qreal x = mouseEvent->scenePos().x(); qreal y = mouseEvent->scenePos().y(); diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_model.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_model.h index 475416887..6c53ab4bc 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_model.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_model.h @@ -70,7 +70,7 @@ private: QPixmap *getPixmap(const QString &zoneName) const; int m_scaleRatio; - QMap m_pixmapMap; + QMap m_pixmapMap; QStringList m_listNames; }; diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/pixmap_database.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/pixmap_database.h index fc90fe180..85b0f180e 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/pixmap_database.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/pixmap_database.h @@ -61,7 +61,7 @@ public: private: int m_textureSize; - QMap m_pixmapMap; + QMap m_pixmapMap; }; } /* namespace LandscapeEditor */