diff options
Diffstat (limited to 'qtools')
| -rw-r--r-- | qtools/qmap.h | 3 | ||||
| -rw-r--r-- | qtools/qregexp.cpp | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/qtools/qmap.h b/qtools/qmap.h index f384a3d..0031e0d 100644 --- a/qtools/qmap.h +++ b/qtools/qmap.h @@ -1,5 +1,5 @@ /**************************************************************************** -** +** ** ** Definition of QMap class ** @@ -102,6 +102,7 @@ class Q_EXPORT QMapIterator QMapIterator() : node( 0 ) {} QMapIterator( QMapNode<K,T>* p ) : node( p ) {} QMapIterator( const QMapIterator<K,T>& it ) : node( it.node ) {} + QMapIterator &operator=(const QMapIterator &it) = default; bool operator==( const QMapIterator<K,T>& it ) const { return node == it.node; } bool operator!=( const QMapIterator<K,T>& it ) const { return node != it.node; } diff --git a/qtools/qregexp.cpp b/qtools/qregexp.cpp index d958f0a..8709858 100644 --- a/qtools/qregexp.cpp +++ b/qtools/qregexp.cpp @@ -1,5 +1,5 @@ /**************************************************************************** -** +** ** ** Implementation of QRegExp class ** @@ -901,8 +901,6 @@ static uint *dump( uint *p ) #endif // DEBUG -static const int maxlen = 1024; // max length of regexp array -static uint rxarray[ maxlen ]; // tmp regexp array /*! \internal @@ -913,6 +911,9 @@ static uint rxarray[ maxlen ]; // tmp regexp array void QRegExp::compile() { + const int maxlen = 1024; // max length of regexp array + uint rxarray[ maxlen ]; // tmp regexp array + if ( rxdata ) { // delete old data delete [] rxdata; rxdata = 0; @@ -1006,7 +1007,7 @@ void QRegExp::compile() numFields++; } if ( d >= rxarray + maxlen ) { // pattern too long - error = PatOverflow; + error = PatOverflow; return; } if ( !pl ) { // At least ']' should be left |