From 2e4b1a8334d4de585e90637c070ba9832a0608f1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 16 Dec 2014 17:27:31 -0800 Subject: Remove Q_NO_USING_KEYWORD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's a lot of code now requiring it. Any compiler that doesn't support the keyword is too old for Qt now. The last time anyone asked about this macro was for QTBUG-27393 and we don't know which compiler that was. As a necessity, this patch contains a reversal of a0c3a57aed5cde37017733e7cf5e41cc6a1174aa [ChangeLog][Compiler Specific Changes] Qt 5.5 now unconditionally uses the "using" keyword. Compilers that do not support this keyword are deprecated and will not be able to build Qt. Previous versions of Qt may or may not compile, as no testing was done to ensure it worked. Change-Id: Ief042f34aba555a095d1f342a0ee7ee9feadf42d Reviewed-by: Lars Knoll Reviewed-by: Jędrzej Nowacki --- src/printsupport/dialogs/qpagesetupdialog.h | 6 ------ src/printsupport/dialogs/qprintdialog.h | 12 ------------ src/printsupport/dialogs/qprintpreviewdialog.h | 6 ------ 3 files changed, 24 deletions(-) (limited to 'src/printsupport') diff --git a/src/printsupport/dialogs/qpagesetupdialog.h b/src/printsupport/dialogs/qpagesetupdialog.h index 5952952623..96d26c6d44 100644 --- a/src/printsupport/dialogs/qpagesetupdialog.h +++ b/src/printsupport/dialogs/qpagesetupdialog.h @@ -60,13 +60,7 @@ public: #endif virtual int exec() Q_DECL_OVERRIDE; -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); void done(int result) Q_DECL_OVERRIDE; diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h index 768951ae17..c243121054 100644 --- a/src/printsupport/dialogs/qprintdialog.h +++ b/src/printsupport/dialogs/qprintdialog.h @@ -72,26 +72,14 @@ public: void setVisible(bool visible) Q_DECL_OVERRIDE; #endif -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); #ifdef Q_QDOC QPrinter *printer(); #endif -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void accepted() { QDialog::accepted(); } -#endif -#else using QDialog::accepted; -#endif Q_SIGNALS: void accepted(QPrinter *printer); diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h index 83d0fe15a6..3ec462b901 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.h +++ b/src/printsupport/dialogs/qprintpreviewdialog.h @@ -56,13 +56,7 @@ public: explicit QPrintPreviewDialog(QPrinter *printer, QWidget *parent = 0, Qt::WindowFlags flags = 0); ~QPrintPreviewDialog(); -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); QPrinter *printer(); -- cgit v1.2.3