diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-04 16:46:41 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-04 18:01:38 +0000 |
commit | 8d7c97d428cdf89c3419a4e13b62a9849feefce9 (patch) | |
tree | 4b0b3f833f8654dc66975d126eb73cf22d4510a6 /src/printsupport/dialogs | |
parent | b6cf8cb794ae6e0f0f8c1c45e9f4c8d3910ff082 (diff) |
Remove remaining Q_DECL_NOEXCEPT/Q_DECL_NOTHROW usage
Change-Id: I91ac9e714a465cab226b211812aa46e8fe5ff2ab
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/printsupport/dialogs')
-rw-r--r-- | src/printsupport/dialogs/qprintdialog_unix.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index 9fb9d6c55e..6eaf24adf9 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -398,12 +398,12 @@ static const char *ppdOriginallySelectedChoiceProperty = "_q_ppd_originally_sele // Used to store the warning label pointer for each QComboBox that represents an advanced option static const char *warningLabelProperty = "_q_warning_label"; -static bool isBlacklistedGroup(const ppd_group_t *group) Q_DECL_NOTHROW +static bool isBlacklistedGroup(const ppd_group_t *group) noexcept { return qstrcmp(group->name, "InstallableOptions") == 0; }; -static bool isBlacklistedOption(const char *keyword) Q_DECL_NOTHROW +static bool isBlacklistedOption(const char *keyword) noexcept { // We already let the user set these options elsewhere const char *cupsOptionBlacklist[] = { @@ -734,7 +734,7 @@ void QPrintDialogPrivate::selectPrinter(const QPrinter::OutputFormat outputForma } #if QT_CONFIG(cups) -static std::vector<std::pair<int, int>> pageRangesFromString(const QString &pagesString) Q_DECL_NOTHROW +static std::vector<std::pair<int, int>> pageRangesFromString(const QString &pagesString) noexcept { std::vector<std::pair<int, int>> result; const QStringList items = pagesString.split(','); @@ -788,7 +788,7 @@ static std::vector<std::pair<int, int>> pageRangesFromString(const QString &page return result; } -static QString stringFromPageRanges(const std::vector<std::pair<int, int>> &pageRanges) Q_DECL_NOTHROW +static QString stringFromPageRanges(const std::vector<std::pair<int, int>> &pageRanges) noexcept { QString result; @@ -805,7 +805,7 @@ static QString stringFromPageRanges(const std::vector<std::pair<int, int>> &page return result; } -static bool isValidPagesString(const QString &pagesString) Q_DECL_NOTHROW +static bool isValidPagesString(const QString &pagesString) noexcept { if (pagesString.isEmpty()) return false; |