Re: [Development] Qt 5.3 header diff: QtWidgets
Il 23/04/2014 01:44, Thiago Macieira ha scritto: Em ter 22 abr 2014, às 14:12:46, Thiago Macieira escreveu: --- a/src/widgets/widgets/qplaintextedit.h +++ b/src/widgets/widgets/qplaintextedit.h @@ -141,6 +145,9 @@ public: bool centerOnScroll() const; bool find(const QString exp, QTextDocument::FindFlags options = 0); +#ifndef QT_NO_REGEXP +bool find(const QRegExp exp, QTextDocument::FindFlags options = 0); +#endif Remove this new method. Add one with QRegularExpression. QRegExp is deprecated. --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -162,6 +162,9 @@ public: void setWordWrapMode(QTextOption::WrapMode policy); bool find(const QString exp, QTextDocument::FindFlags options = 0); +#ifndef QT_NO_REGEXP +bool find(const QRegExp exp, QTextDocument::FindFlags options = 0); +#endif Ditto. I'm fine with them as they're simple forwarders to for the corresponding QTextDocument functionality. On the other hand, QTextDocument is missing QRegularExpression search... -- Join us Oct 6-8 at BCC Berlin for Qt Developer Days 2014! Giuseppe D'Angelo | giuseppe.dang...@kdab.com | Software Engineer KDAB (UK) Ltd., a KDAB Group company Tel. UK +44-1738-450410, Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-independent software solutions smime.p7s Description: Firma crittografica S/MIME ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] Qt 5.3 header diff: QtWidgets
On 2014-04-22, Thiago Macieira thiago.macie...@intel.com wrote: --- a/src/widgets/widgets/qlcdnumber.h +++ b/src/widgets/widgets/qlcdnumber.h @@ -43,7 +43,6 @@ #define QLCDNUMBER_H #include QtWidgets/qframe.h -#include QtCore/qbitarray.h QT_BEGIN_NAMESPACE I guess this is theoretically a SiC change, but one that could also be ignored. /Sune ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] Qt 5.3 header diff: QtWidgets
Em ter 22 abr 2014, às 14:12:46, Thiago Macieira escreveu: --- a/src/widgets/widgets/qplaintextedit.h +++ b/src/widgets/widgets/qplaintextedit.h @@ -141,6 +145,9 @@ public: bool centerOnScroll() const; bool find(const QString exp, QTextDocument::FindFlags options = 0); +#ifndef QT_NO_REGEXP +bool find(const QRegExp exp, QTextDocument::FindFlags options = 0); +#endif Remove this new method. Add one with QRegularExpression. QRegExp is deprecated. --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -162,6 +162,9 @@ public: void setWordWrapMode(QTextOption::WrapMode policy); bool find(const QString exp, QTextDocument::FindFlags options = 0); +#ifndef QT_NO_REGEXP +bool find(const QRegExp exp, QTextDocument::FindFlags options = 0); +#endif Ditto. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
