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.

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

fix deprecation warnings with new Qt #435

Merged
merged 2 commits into from
Aug 1, 2019
Merged

fix deprecation warnings with new Qt #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33b8549
fix deprecation warnings with new Qt
wjwwood Jul 31, 2019
ba509dc
Get QScreen from main window always
jacobperron Aug 1, 2019
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 rviz_common/src/rviz_common/loading_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ void LoadingDialog::showMessage(const QString & message)
label_->setText(message);
QApplication::processEvents();
QWidget::repaint();
QApplication::flush();
wjwwood marked this conversation as resolved.
Show resolved Hide resolved
}

} // namespace rviz_common
7 changes: 5 additions & 2 deletions rviz_common/src/rviz_common/screenshot_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@
#include <QMessageBox> // NOLINT: cpplint is unable to handle the include order here
// Included so we know that QPushButton inherits QAbstractButton
#include <QPushButton> // NOLINT: cpplint is unable to handle the include order here
#include <QScreen> // NOLINT: cpplint is unable to handle the include order here
#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 <QWindow> // NOLINT: cpplint is unable to handle the include order here

#include "./scaled_image_widget.hpp"

Expand Down Expand Up @@ -119,10 +121,11 @@ void ScreenshotDialog::onTimeout()

void ScreenshotDialog::takeScreenshotNow()
{
QScreen * screen = main_window_->windowHandle()->screen();
wjwwood marked this conversation as resolved.
Show resolved Hide resolved
if (save_full_window_) {
screenshot_ = QPixmap::grabWindow(main_window_->winId());
screenshot_ = screen->grabWindow(main_window_->winId());
} else {
screenshot_ = QPixmap::grabWindow(render_window_->winId());
screenshot_ = screen->grabWindow(render_window_->winId());
}
image_widget_->setImage(screenshot_);
}
Expand Down