Skip to content

Commit ca81163

Browse files
authored
Revert "Warning Dialog for ROS 1 EOL (#1843)"
This reverts commit 8fe12bb. This made sense for the last Noetic release, but there is nothing wrong with ROS-O releases.
1 parent c4964de commit ca81163

File tree

4 files changed

+0
-51
lines changed

4 files changed

+0
-51
lines changed

src/rviz/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ add_library(${PROJECT_NAME}
4545
message_filter_display.h
4646
mesh_loader.cpp
4747
new_object_dialog.cpp
48-
noetic_eol_dialog.cpp
4948
add_display_dialog.cpp
5049
ogre_helpers/apply_visibility_bits.cpp
5150
ogre_helpers/arrow.cpp

src/rviz/noetic_eol_dialog.cpp

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/rviz/noetic_eol_dialog.h

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/rviz/visualizer_app.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
*/
2929

3030
#include <QApplication>
31-
#include <QProcessEnvironment> // check env variables
3231
#include <QTimer>
3332

3433
#include <boost/program_options.hpp>
@@ -55,7 +54,6 @@
5554
#include <rviz/visualization_frame.h>
5655
#include <rviz/visualization_manager.h>
5756
#include <rviz/wait_for_master_dialog.h>
58-
#include <rviz/noetic_eol_dialog.h>
5957
#include <rviz/ogre_helpers/render_system.h>
6058

6159
#include <rviz/visualizer_app.h>
@@ -233,17 +231,6 @@ bool VisualizerApp::init(int argc, char** argv)
233231
save_config_service_ =
234232
private_nh.advertiseService("save_config", &VisualizerApp::saveConfigCallback, this);
235233

236-
// Notify users of ROS 1 EOL Date
237-
// Get the environment variables
238-
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
239-
// If environment variable is not set
240-
if(!env.contains("DISABLE_ROS1_EOL_WARNINGS"))
241-
{
242-
// Create a warning pop up
243-
NoeticEOLDialog eol_dialog;
244-
eol_dialog.exec();
245-
}
246-
247234
#if CATCH_EXCEPTIONS
248235
}
249236
catch (std::exception& e)

0 commit comments

Comments
 (0)