diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-21 16:01:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-07 17:08:45 +0000 |
| commit | 93ca852dbf00e93c07269e8cca389bc1222130d3 (patch) | |
| tree | 62b541249b8908d717f877c9adb811930bd78a24 /src/core/printing_message_filter_qt.cpp | |
| parent | a24df8f8e4ef0f99dbf5a6b09451bb39becaf66a (diff) | |
Basic adaptation to Chromium 49
Converts types, callbacks and headers to match Chromium 49.
Task-number: QTBUG-51173
Change-Id: I544ef46e187105e250fea1b48b72d2c81a906640
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/printing_message_filter_qt.cpp')
| -rw-r--r-- | src/core/printing_message_filter_qt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/printing_message_filter_qt.cpp b/src/core/printing_message_filter_qt.cpp index b9955fbb4..fd6dc0fc2 100644 --- a/src/core/printing_message_filter_qt.cpp +++ b/src/core/printing_message_filter_qt.cpp @@ -217,7 +217,7 @@ void PrintingMessageFilterQt::OnUpdatePrintSettings( printer_query = queue_->CreatePrinterQuery(host_id, routing_id); } printer_query->SetSettings( - new_settings.Pass(), + std::move(new_settings), base::Bind(&PrintingMessageFilterQt::OnUpdatePrintSettingsReply, this, printer_query, reply_msg)); } @@ -251,7 +251,7 @@ void PrintingMessageFilterQt::OnUpdatePrintSettingsReply( } } -void PrintingMessageFilterQt::OnCheckForCancel(int32 preview_ui_id, +void PrintingMessageFilterQt::OnCheckForCancel(int32_t preview_ui_id, int preview_request_id, bool* cancel) { *cancel = false; |