Index: trunk/BNC/qwt/qwt_event_pattern.cpp
===================================================================
--- trunk/BNC/qwt/qwt_event_pattern.cpp	(revision 9383)
+++ trunk/BNC/qwt/qwt_event_pattern.cpp	(revision 11158)
@@ -1,3 +1,3 @@
-/* -*- mode: C++ ; c-file-style: "stroustrup" -*- *****************************
+/******************************************************************************
  * Qwt Widget Library
  * Copyright (C) 1997   Josef Wilgen
@@ -12,12 +12,12 @@
 
 /*!
-  Constructor
-
-  \sa MousePatternCode, KeyPatternCode
-*/
-
-QwtEventPattern::QwtEventPattern():
-    d_mousePattern( MousePatternCount ),
-    d_keyPattern( KeyPatternCount )
+   Constructor
+
+   \sa MousePatternCode, KeyPatternCode
+ */
+
+QwtEventPattern::QwtEventPattern()
+    : m_mousePattern( MousePatternCount )
+    , m_keyPattern( KeyPatternCount )
 {
     initKeyPattern();
@@ -31,12 +31,12 @@
 
 /*!
-  Set default mouse patterns, depending on the number of mouse buttons
-
-  \param numButtons Number of mouse buttons ( <= 3 )
-  \sa MousePatternCode
-*/
+   Set default mouse patterns, depending on the number of mouse buttons
+
+   \param numButtons Number of mouse buttons ( <= 3 )
+   \sa MousePatternCode
+ */
 void QwtEventPattern::initMousePattern( int numButtons )
 {
-    d_mousePattern.resize( MousePatternCount );
+    m_mousePattern.resize( MousePatternCount );
 
     switch ( numButtons )
@@ -60,26 +60,26 @@
             setMousePattern( MouseSelect1, Qt::LeftButton );
             setMousePattern( MouseSelect2, Qt::RightButton );
-            setMousePattern( MouseSelect3, Qt::MidButton );
+            setMousePattern( MouseSelect3, Qt::MiddleButton );
         }
     }
 
-    setMousePattern( MouseSelect4, d_mousePattern[MouseSelect1].button,
-        d_mousePattern[MouseSelect1].modifiers | Qt::ShiftModifier );
-
-    setMousePattern( MouseSelect5, d_mousePattern[MouseSelect2].button,
-        d_mousePattern[MouseSelect2].modifiers | Qt::ShiftModifier );
-
-    setMousePattern( MouseSelect6, d_mousePattern[MouseSelect3].button,
-        d_mousePattern[MouseSelect3].modifiers | Qt::ShiftModifier );
-}
-
-/*!
-  Set default mouse patterns.
-
-  \sa KeyPatternCode
-*/
+    setMousePattern( MouseSelect4, m_mousePattern[MouseSelect1].button,
+        m_mousePattern[MouseSelect1].modifiers | Qt::ShiftModifier );
+
+    setMousePattern( MouseSelect5, m_mousePattern[MouseSelect2].button,
+        m_mousePattern[MouseSelect2].modifiers | Qt::ShiftModifier );
+
+    setMousePattern( MouseSelect6, m_mousePattern[MouseSelect3].button,
+        m_mousePattern[MouseSelect3].modifiers | Qt::ShiftModifier );
+}
+
+/*!
+   Set default mouse patterns.
+
+   \sa KeyPatternCode
+ */
 void QwtEventPattern::initKeyPattern()
 {
-    d_keyPattern.resize( KeyPatternCount );
+    m_keyPattern.resize( KeyPatternCount );
 
     setKeyPattern( KeySelect1, Qt::Key_Return );
@@ -98,12 +98,12 @@
 
 /*!
-  Change one mouse pattern
-
-  \param pattern Index of the pattern
-  \param button Button
-  \param modifiers Keyboard modifiers
-
-  \sa QMouseEvent
-*/
+   Change one mouse pattern
+
+   \param pattern Index of the pattern
+   \param button Button
+   \param modifiers Keyboard modifiers
+
+   \sa QMouseEvent
+ */
 void QwtEventPattern::setMousePattern( MousePatternCode pattern,
     Qt::MouseButton button, Qt::KeyboardModifiers modifiers )
@@ -111,18 +111,18 @@
     if ( pattern >= 0 && pattern < MousePatternCount )
     {
-        d_mousePattern[ pattern ].button = button;
-        d_mousePattern[ pattern ].modifiers = modifiers;
+        m_mousePattern[ pattern ].button = button;
+        m_mousePattern[ pattern ].modifiers = modifiers;
     }
 }
 
 /*!
-  Change one key pattern
-
-  \param pattern Index of the pattern
-  \param key Key
-  \param modifiers Keyboard modifiers
-
-  \sa QKeyEvent
-*/
+   Change one key pattern
+
+   \param pattern Index of the pattern
+   \param key Key
+   \param modifiers Keyboard modifiers
+
+   \sa QKeyEvent
+ */
 void QwtEventPattern::setKeyPattern( KeyPatternCode pattern,
     int key, Qt::KeyboardModifiers modifiers )
@@ -130,65 +130,65 @@
     if ( pattern >= 0 && pattern < KeyPatternCount )
     {
-        d_keyPattern[ pattern ].key = key;
-        d_keyPattern[ pattern ].modifiers = modifiers;
+        m_keyPattern[ pattern ].key = key;
+        m_keyPattern[ pattern ].modifiers = modifiers;
     }
 }
 
 //! Change the mouse event patterns
-void QwtEventPattern::setMousePattern( const QVector<MousePattern> &pattern )
-{
-    d_mousePattern = pattern;
+void QwtEventPattern::setMousePattern( const QVector< MousePattern >& pattern )
+{
+    m_mousePattern = pattern;
 }
 
 //! Change the key event patterns
-void QwtEventPattern::setKeyPattern( const QVector<KeyPattern> &pattern )
-{
-    d_keyPattern = pattern;
+void QwtEventPattern::setKeyPattern( const QVector< KeyPattern >& pattern )
+{
+    m_keyPattern = pattern;
 }
 
 //! \return Mouse pattern
-const QVector<QwtEventPattern::MousePattern> &
+const QVector< QwtEventPattern::MousePattern >&
 QwtEventPattern::mousePattern() const
 {
-    return d_mousePattern;
+    return m_mousePattern;
 }
 
 //! \return Key pattern
-const QVector<QwtEventPattern::KeyPattern> &
+const QVector< QwtEventPattern::KeyPattern >&
 QwtEventPattern::keyPattern() const
 {
-    return d_keyPattern;
+    return m_keyPattern;
 }
 
 //! \return Mouse pattern
-QVector<QwtEventPattern::MousePattern> &QwtEventPattern::mousePattern()
-{
-    return d_mousePattern;
+QVector< QwtEventPattern::MousePattern >& QwtEventPattern::mousePattern()
+{
+    return m_mousePattern;
 }
 
 //! \return Key pattern
-QVector<QwtEventPattern::KeyPattern> &QwtEventPattern::keyPattern()
-{
-    return d_keyPattern;
-}
-
-/*!
-  \brief Compare a mouse event with an event pattern.
-
-  A mouse event matches the pattern when both have the same button
-  value and in the state value the same key flags(Qt::KeyButtonMask)
-  are set.
-
-  \param code Index of the event pattern
-  \param event Mouse event
-  \return true if matches
-
-  \sa keyMatch()
-*/
+QVector< QwtEventPattern::KeyPattern >& QwtEventPattern::keyPattern()
+{
+    return m_keyPattern;
+}
+
+/*!
+   \brief Compare a mouse event with an event pattern.
+
+   A mouse event matches the pattern when both have the same button
+   value and in the state value the same key flags(Qt::KeyButtonMask)
+   are set.
+
+   \param code Index of the event pattern
+   \param event Mouse event
+   \return true if matches
+
+   \sa keyMatch()
+ */
 bool QwtEventPattern::mouseMatch( MousePatternCode code,
-    const QMouseEvent *event ) const
+    const QMouseEvent* event ) const
 {
     if ( code >= 0 && code < MousePatternCount )
-        return mouseMatch( d_mousePattern[ code ], event );
+        return mouseMatch( m_mousePattern[ code ], event );
 
     return false;
@@ -196,19 +196,19 @@
 
 /*!
-  \brief Compare a mouse event with an event pattern.
-
-  A mouse event matches the pattern when both have the same button
-  value and in the state value the same key flags(Qt::KeyButtonMask)
-  are set.
-
-  \param pattern Mouse event pattern
-  \param event Mouse event
-  \return true if matches
-
-  \sa keyMatch()
-*/
-
-bool QwtEventPattern::mouseMatch( const MousePattern &pattern,
-    const QMouseEvent *event ) const
+   \brief Compare a mouse event with an event pattern.
+
+   A mouse event matches the pattern when both have the same button
+   value and in the state value the same key flags(Qt::KeyButtonMask)
+   are set.
+
+   \param pattern Mouse event pattern
+   \param event Mouse event
+   \return true if matches
+
+   \sa keyMatch()
+ */
+
+bool QwtEventPattern::mouseMatch( const MousePattern& pattern,
+    const QMouseEvent* event ) const
 {
     if ( event == NULL )
@@ -220,21 +220,21 @@
 
 /*!
-  \brief Compare a key event with an event pattern.
-
-  A key event matches the pattern when both have the same key
-  value and in the state value the same key flags (Qt::KeyButtonMask)
-  are set.
-
-  \param code Index of the event pattern
-  \param event Key event
-  \return true if matches
-
-  \sa mouseMatch()
-*/
+   \brief Compare a key event with an event pattern.
+
+   A key event matches the pattern when both have the same key
+   value and in the state value the same key flags (Qt::KeyButtonMask)
+   are set.
+
+   \param code Index of the event pattern
+   \param event Key event
+   \return true if matches
+
+   \sa mouseMatch()
+ */
 bool QwtEventPattern::keyMatch( KeyPatternCode code,
-    const QKeyEvent *event ) const
+    const QKeyEvent* event ) const
 {
     if ( code >= 0 && code < KeyPatternCount )
-        return keyMatch( d_keyPattern[ code ], event );
+        return keyMatch( m_keyPattern[ code ], event );
 
     return false;
@@ -242,19 +242,19 @@
 
 /*!
-  \brief Compare a key event with an event pattern.
-
-  A key event matches the pattern when both have the same key
-  value and in the state value the same key flags (Qt::KeyButtonMask)
-  are set.
-
-  \param pattern Key event pattern
-  \param event Key event
-  \return true if matches
-
-  \sa mouseMatch()
-*/
+   \brief Compare a key event with an event pattern.
+
+   A key event matches the pattern when both have the same key
+   value and in the state value the same key flags (Qt::KeyButtonMask)
+   are set.
+
+   \param pattern Key event pattern
+   \param event Key event
+   \return true if matches
+
+   \sa mouseMatch()
+ */
 
 bool QwtEventPattern::keyMatch(
-    const KeyPattern &pattern, const QKeyEvent *event ) const
+    const KeyPattern& pattern, const QKeyEvent* event ) const
 {
     if ( event == NULL )
