Skip to content

Do not warn about noetic EOF in upstream post-noetic-release #1851

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 7, 2025
Merged

Do not warn about noetic EOF in upstream post-noetic-release #1851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/rviz/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ add_library(${PROJECT_NAME}
message_filter_display.h
mesh_loader.cpp
new_object_dialog.cpp
noetic_eol_dialog.cpp
add_display_dialog.cpp
ogre_helpers/apply_visibility_bits.cpp
ogre_helpers/arrow.cpp
Expand Down
20 changes: 0 additions & 20 deletions src/rviz/noetic_eol_dialog.cpp
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions src/rviz/noetic_eol_dialog.h
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/rviz/visualizer_app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
*/

#include <QApplication>
#include <QProcessEnvironment> // check env variables
#include <QTimer>

#include <boost/program_options.hpp>
Expand All @@ -55,7 +54,6 @@
#include <rviz/visualization_frame.h>
#include <rviz/visualization_manager.h>
#include <rviz/wait_for_master_dialog.h>
#include <rviz/noetic_eol_dialog.h>
#include <rviz/ogre_helpers/render_system.h>

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

// Notify users of ROS 1 EOL Date
// Get the environment variables
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
// If environment variable is not set
if(!env.contains("DISABLE_ROS1_EOL_WARNINGS"))
{
// Create a warning pop up
NoeticEOLDialog eol_dialog;
eol_dialog.exec();
}

#if CATCH_EXCEPTIONS
}
catch (std::exception& e)
Expand Down
Loading