Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cpplint errors #818

Merged
merged 2 commits into from
Jan 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rviz_common/src/rviz_common/add_display_dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./add_display_dialog.hpp"
#include "add_display_dialog.hpp"

#include <algorithm>
#include <map>
Expand All @@ -52,7 +52,7 @@

#include "rcl/validate_topic_name.h"

#include "./display_factory.hpp"
#include "display_factory.hpp"
#include "rviz_common/load_resource.hpp"
#include "rviz_common/logging.hpp"
#include "rviz_common/ros_integration/ros_node_abstraction.hpp"
Expand Down
2 changes: 1 addition & 1 deletion rviz_common/src/rviz_common/display_factory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./display_factory.hpp"
#include "display_factory.hpp"

#include <string>

Expand Down
6 changes: 3 additions & 3 deletions rviz_common/src/rviz_common/displays_panel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./displays_panel.hpp"
#include "displays_panel.hpp"

#include <string>

Expand All @@ -41,9 +41,9 @@
#include <QTimer> // NOLINT: cpplint is unable to handle the include order here
#include <QVBoxLayout> // NOLINT: cpplint is unable to handle the include order here

#include "./display_factory.hpp"
#include "display_factory.hpp"
#include "rviz_common/display.hpp"
#include "./add_display_dialog.hpp"
#include "add_display_dialog.hpp"
#include "rviz_common/properties/property.hpp"
#include "rviz_common/properties/property_tree_widget.hpp"
#include "rviz_common/properties/property_tree_with_help.hpp"
Expand Down
2 changes: 1 addition & 1 deletion rviz_common/src/rviz_common/failed_display.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./failed_display.hpp"
#include "failed_display.hpp"

#include <QColor> // NOLINT: cpplint is unable to handle the include order here

Expand Down
2 changes: 1 addition & 1 deletion rviz_common/src/rviz_common/failed_panel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./failed_panel.hpp"
#include "failed_panel.hpp"

#include <cstdio>

Expand Down
2 changes: 1 addition & 1 deletion rviz_common/src/rviz_common/failed_tool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./failed_tool.hpp"
#include "failed_tool.hpp"

#include <QMessageBox>

Expand Down
2 changes: 1 addition & 1 deletion rviz_common/src/rviz_common/failed_view_controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./failed_view_controller.hpp"
#include "failed_view_controller.hpp"

#include <QMessageBox>

Expand Down
2 changes: 1 addition & 1 deletion rviz_common/src/rviz_common/help_panel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./help_panel.hpp"
#include "help_panel.hpp"

#include <string>

Expand Down
2 changes: 1 addition & 1 deletion rviz_common/src/rviz_common/loading_dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./loading_dialog.hpp"
#include "loading_dialog.hpp"

#include <QApplication>
#include <QLabel>
Expand Down
2 changes: 1 addition & 1 deletion rviz_common/src/rviz_common/new_object_dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./new_object_dialog.hpp"
#include "new_object_dialog.hpp"

#include <algorithm>
#include <map>
Expand Down
16 changes: 8 additions & 8 deletions rviz_common/src/rviz_common/panel_factory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./panel_factory.hpp"
#include "panel_factory.hpp"

#include <string>

#include "./displays_panel.hpp"
#include "./help_panel.hpp"
#include "./selection_panel.hpp"
#include "./time_panel.hpp"
#include "./tool_properties_panel.hpp"
#include "./transformation_panel.hpp"
#include "./views_panel.hpp"
#include "displays_panel.hpp"
#include "help_panel.hpp"
#include "selection_panel.hpp"
#include "time_panel.hpp"
#include "tool_properties_panel.hpp"
#include "transformation_panel.hpp"
#include "views_panel.hpp"
#include "rviz_common/visualization_manager.hpp"
#include "rviz_common/ros_integration/ros_node_abstraction_iface.hpp"

Expand Down
2 changes: 1 addition & 1 deletion rviz_common/src/rviz_common/scaled_image_widget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./scaled_image_widget.hpp"
#include "scaled_image_widget.hpp"

#include <QPainter>
#include <QWidget>
Expand Down
4 changes: 2 additions & 2 deletions rviz_common/src/rviz_common/screenshot_dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./screenshot_dialog.hpp"
#include "screenshot_dialog.hpp"

#include <utility>

Expand All @@ -47,7 +47,7 @@
#include <QVBoxLayout> // NOLINT: cpplint is unable to handle the include order here
#include <QWindow> // NOLINT: cpplint is unable to handle the include order here

#include "./scaled_image_widget.hpp"
#include "scaled_image_widget.hpp"

namespace rviz_common
{
Expand Down
4 changes: 2 additions & 2 deletions rviz_common/src/rviz_common/time_panel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "time_panel.hpp"

#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
Expand All @@ -41,8 +43,6 @@

#include "rviz_common/display_group.hpp"

#include "./time_panel.hpp"

namespace rviz_common
{

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./identity_frame_transformer.hpp"
#include "identity_frame_transformer.hpp"

#include <future>
#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion rviz_common/src/rviz_common/views_panel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./views_panel.hpp"
#include "views_panel.hpp"

#include <QComboBox>
#include <QHBoxLayout>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include <QEvent>

#include "./widget_geometry_change_detector.hpp"
#include "widget_geometry_change_detector.hpp"

namespace rviz_common
{
Expand Down
40 changes: 20 additions & 20 deletions rviz_rendering/src/rviz_rendering/mesh_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,34 +32,34 @@

#include <string>

#include <OgreHardwareBufferManager.h>
#include <OgreMaterial.h>
#include <OgreMaterialManager.h>
#include <OgreMeshManager.h>
#include <OgreMeshSerializer.h>
#include <OgrePass.h>
#include <OgreSubMesh.h>
#include <OgreTechnique.h>
#include <OgreTextureManager.h>
#include <OgreVector3.h>
#include "OgreHardwareBufferManager.h"
#include "OgreMaterial.h"
#include "OgreMaterialManager.h"
#include "OgreMeshManager.h"
#include "OgreMeshSerializer.h"
#include "OgrePass.h"
#include "OgreSubMesh.h"
#include "OgreTechnique.h"
#include "OgreTextureManager.h"
#include "OgreVector3.h"

#include <QDir> // NOLINT cpplint cannot handle include order here
#include <QFileInfo> // NOLINT cpplint cannot handle include order here
#include <QString> // NOLINT cpplint cannot handle include order here

#define ASSIMP_UNIFIED_HEADER_NAMES 1
#if defined(ASSIMP_UNIFIED_HEADER_NAMES)
#include <assimp/Importer.hpp>
#include <assimp/scene.h>
#include <assimp/postprocess.h>
#include <assimp/IOStream.hpp>
#include <assimp/IOSystem.hpp>
#include "assimp/Importer.hpp"
#include "assimp/scene.h"
#include "assimp/postprocess.h"
#include "assimp/IOStream.hpp"
#include "assimp/IOSystem.hpp"
#else
#include <assimp/assimp.hpp>
#include <assimp/aiScene.h>
#include <assimp/aiPostProcess.h>
#include <assimp/IOStream.h>
#include <assimp/IOSystem.h>
#include "assimp/assimp.hpp"
#include "assimp/aiScene.h"
#include "assimp/aiPostProcess.h"
#include "assimp/IOStream.h"
#include "assimp/IOSystem.h"
#endif

#include "resource_retriever/retriever.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@
#include <string>
#include <vector>

#include <OgreHardwareBufferManager.h>
#include <OgreMesh.h>
#include "OgreHardwareBufferManager.h"
#include "OgreMesh.h"

#include <QDir> // NOLINT cpplint cannot handle include order here
#include <QFileInfo> // NOLINT cpplint cannot handle include order here
#include <QString> // NOLINT cpplint cannot handle include order here

#define ASSIMP_UNIFIED_HEADER_NAMES 1
#if defined(ASSIMP_UNIFIED_HEADER_NAMES)
#include <assimp/Importer.hpp>
#include <assimp/scene.h>
#include "assimp/Importer.hpp"
#include "assimp/scene.h"
#else
#include <assimp/aiScene.h>
#include "assimp/aiScene.h"
#endif

#include "resource_retriever/retriever.hpp"
Expand Down
24 changes: 12 additions & 12 deletions rviz_rendering/src/rviz_rendering/ogre_render_window_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "./ogre_render_window_impl.hpp"
#include "ogre_render_window_impl.hpp"

#include <cstdlib>
#include <functional>

#include <OgreEntity.h>
#include <OgreCamera.h>
#include <OgreGpuProgramManager.h>
#include <OgreMaterialManager.h>
#include <OgreRenderWindow.h>
#include <OgreRoot.h>
#include <OgreSceneNode.h>
#include <OgreStringConverter.h>
#include <OgreTechnique.h>
#include <OgreTextureManager.h>
#include <OgreViewport.h>
#include "OgreEntity.h"
#include "OgreCamera.h"
#include "OgreGpuProgramManager.h"
#include "OgreMaterialManager.h"
#include "OgreRenderWindow.h"
#include "OgreRoot.h"
#include "OgreSceneNode.h"
#include "OgreStringConverter.h"
#include "OgreTechnique.h"
#include "OgreTextureManager.h"
#include "OgreViewport.h"

#include "rviz_rendering/orthographic.hpp"
#include "rviz_rendering/render_system.hpp"
Expand Down
8 changes: 4 additions & 4 deletions rviz_rendering/test/rviz_rendering/string_helper_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include <gtest/gtest.h>
#include <gmock/gmock.h>

#include <string>
#include <vector>

#include "../../src/rviz_rendering/string_helper.cpp"
#include "gtest/gtest.h"
#include "gmock/gmock.h"

#include "../../src/rviz_rendering/string_helper.cpp" // NOLINT (build/include)

using namespace ::testing; // NOLINT

Expand Down