Initial removal of unnecessary rs_ prefixes from files.

[architektonas] / src / base / rs.h

diff --git a/src/base/rs.h b/src/base/rs.h
index 6d7424af77e0df9d4563121fda643c66b3a748b4..d0bfc411e7eba9cd451cc5d2aa79860b588bbcc8 100644 (file)
--- a/src/base/rs.h
+++ b/src/base/rs.h
@@ -1,5 +1,5 @@
-#ifndef RS_H
-#define RS_H
+#ifndef __RS_H__
+#define __RS_H__
 
 #include <QtGui>
 #include <QPrinter>
@@ -15,10 +15,10 @@
 #define RS_MINDOUBLE -1.0E+10
 
 /**
- * Class namespace for various enums along with some simple
- * wrapper methods for converting the enums to the Qt
- * counterparts.
+ * Class namespace for various enums along with some simple wrapper methods for
+ * converting the enums to the Qt counterparts.
  *
+ * @author James Hammons
  * @author Andrew Mustun
  */
 class RS2
@@ -559,52 +559,6 @@ public:
         RestrictVertical        /**< Restrict to 90,270 degrees */
     };
 
-#if 0
-enum Qt::ButtonState_enum
-Constant                       Value
-Qt::ShiftButton                Qt::ShiftModifier
-Qt::ControlButton      Qt::ControlModifier
-Qt::AltButton          Qt::AltModifier
-Qt::MetaButton         Qt::MetaModifier
-Qt::Keypad                     Qt::KeypadModifier
-Qt::KeyButtonMask      Qt::KeyboardModifierMask
-       /**
-        * Mouse button and keyboard state for mouse events.
-        */
-       enum ButtonState {
-               NoButton        = Qt::NoButton,
-               LeftButton      = Qt::LeftButton,
-               RightButton     = Qt::RightButton,
-               MidButton       = Qt::MidButton,
-               MouseButtonMask = Qt::MouseButtonMask,
-               ShiftButton     = Qt::ShiftModifier,
-               ControlButton   = Qt::ControlModifier,
-               AltButton       = Qt::AltModifier,
-               MetaButton      = Qt::MetaModifier,
-               KeyButtonMask   = Qt::KeyboardModifierMask,
-               Keypad          = Qt::KeypadModifier
-       };
-#endif
-
-//get rid of unnecessary shiaut like this:
-#if 0
-    /**
-     * Wrapper for Qt
-     */
-//    static Qt::ButtonState rsToQtButtonState(RS2::ButtonState t) {
-//        return (Qt::ButtonState)t;
-//    }
-    static int rsToQtButtonState(RS2::ButtonState t) { return t; }
-
-    /**
-     * Wrapper for Qt
-     */
-//    static RS2::ButtonState qtToRsButtonState(Qt::ButtonState t) {
-//        return (RS2::ButtonState)t;
-//    }
-    static RS2::ButtonState qtToRsButtonState(int t) { return (RS2::ButtonState)t; }
-#endif
-
     /**
      * Enum of line styles:
      */
@@ -1120,4 +1074,4 @@ Qt::KeyButtonMask Qt::KeyboardModifierMask
        }
 };
 
-#endif
+#endif // __RS_H__