Index: mythcontrols/actionset.h
===================================================================
--- mythcontrols/actionset.h	(revision 11460)
+++ mythcontrols/actionset.h	(working copy)
@@ -55,7 +55,9 @@
     /**
      * @brief Create a new, empty set of action bindings.
      */
-    inline ActionSet() {};
+    inline ActionSet()
+    {
+    }
 
     /**
      * @brief Add an action.
@@ -67,7 +69,7 @@
      * If the action has already been added, it will not be added
      * again.  There are no duplicate actions in the action set.
      */
-    bool addAction(const ActionID &id, const QString & description,
+    bool AddAction(const ActionID &id, const QString & description,
                    const QString &keys);
 
     /**
@@ -76,14 +78,14 @@
      * @param key The symbolic name of the key.
      * @return true if the key was added otherwise, false.
      */
-    bool add(const ActionID &id, const QString &key);
+    bool Add(const ActionID &id, const QString &key);
 
     /**
      * @brief Remove a key from an action identifier.
      * @param id The action identifier to remove from.
      * @param key The key to remove.
      */
-    bool remove(const ActionID &id, const QString &key);
+    bool Remove(const ActionID &id, const QString &key);
 
     /**
      * @brief Replace a specific key in a specific action.
@@ -91,20 +93,20 @@
      * @param newkey The new key.
      * @param oldkey The key to be replaced.
      */
-    bool replace(const ActionID &id, const QString &newkey,
+    bool Replace(const ActionID &id, const QString &newkey,
                  const QString &oldkey);
 
     /**
      * @brief Get a list of all contexts in the action set.
      * @return A list of all contexts.
      */
-    QStringList * contextStrings(void) const;
+    QStringList * ContextStrings(void) const;
 
     /**
      * @brief Get a list of all action in the action set.
      * @return A list of all actions in the action set.
      */
-    QStringList * actionStrings(const QString & context_name) const;
+    QStringList * ActionStrings(const QString & context_name) const;
 
     /**
      * @brief Get a string containing all the keys in bound to an
@@ -112,49 +114,55 @@
      * @param id The action's identifier.
      * @return null if there is no such action, otherwise, the keys.
      */
-    QString keyString(const ActionID &id) const;
+    QString KeyString(const ActionID &id) const;
 
     /**
      * @brief Get the keys bound to an action by it's identifier.
      * @param id The action identifier.
      * @return The keys used by the action.
      */
-    QStringList getKeys(const ActionID &id) const;
+    QStringList GetKeys(const ActionID &id) const;
 
     /**
      * @brief Get the description of an action.
      * @param id The action identifier.
      * @return The action description.
      */
-    const QString & getDescription(const ActionID &id) const;
+    const QString & GetDescription(const ActionID &id) const;
 
     /**
      * @brief Get the actions bound to the specified key.
      * @param key The key.
      * @return The list of actions, which are bound to the key.
      */
-    const ActionList & getActions(const QString &key) const;
+    const ActionList & GetActions(const QString &key) const;
 
     /**
      * @brief Get the appropriate container of modified actions based on
      * context.
      * @return The appropriate container of modified actions.
      */
-    inline const ActionList & getModified(void) const { return _modified; }
+    inline const ActionList & GetModified(void) const
+    {
+        return m_Modified;
+    }
 
     /**
      * @brief Determine if the action set has been modified.
      * @return True if changes have been made, otherwise, false.
      */
-    inline bool hasModified(void) const { return !(_modified.isEmpty()); }
+    inline bool HasModified(void) const
+    {
+        return !(m_Modified.isEmpty());
+    }
 
     /**
      * @brief Mark an action as unmodified.
      * @return true if the action was modified, and is set to unmodified.
      */
-    inline bool unmodify(const ActionID & id)
+    inline bool Unmodify(const ActionID & id)
     {
-        return (_modified.remove(id) > 0);
+        return (m_Modified.remove(id) > 0);
     }
 
     /**
@@ -162,16 +170,16 @@
      * @param id The action identifier.
      * @return true if the action is modified, otherwise, false.
      */
-    inline bool isModified(const ActionID &id)const { return !unmodified(id); }
+    inline bool IsModified(const ActionID &id)const { return !Unmodified(id); }
 
     /**
      * @brief Determine if an action is still unmodified.
      * @param id The action identifier.
      * @return true if the action has not been modified, otherwise, false.
      */
-    inline bool unmodified(const ActionID &id) const
+    inline bool Unmodified(const ActionID &id) const
     {
-        return (getModified().contains(id) == 0);
+        return (GetModified().contains(id) == 0);
     }
 
 protected:
@@ -180,35 +188,36 @@
      * @brief Mark an action as modified.
      * @param id The actio identifier.
      */
-    inline void modify(const ActionID &id)
+    inline void Modify(const ActionID &id)
     {
-        if (unmodified(id)) _modified.push_back(id);
+        if (Unmodified(id))
+            m_Modified.push_back(id);
     }
 
     /**
      * @brief Get an action by its identifier.
      * @return A pointer to the action.
      */
-    inline Action * action(const ActionID &id) const
+    inline Action * GetAction(const ActionID &id) const
     {
-        return context(id.context()) ?
-            (*context(id.context()))[id.action()] : NULL;
+        return GetContext(id.Context()) ?
+            (*GetContext(id.Context()))[id.Action()] : NULL;
     }
 
     /**
      * @brief Get a context by its identifier.
      * @return A pointer to the context.
      */
-    inline Context * context(const QString & name) const
+    inline Context * GetContext(const QString & name) const
     {
-        return this->_contexts[name];
+        return this->m_Contexts[name];
     }
 
 private:
 
-    QMap<QString, ActionList> _keymap;
-    QDict<Context> _contexts;
-    ActionList _modified;
+    QMap<QString, ActionList> m_KeyMap;
+    QDict<Context> m_Contexts;
+    ActionList m_Modified;
 };
 
 #endif /* ACTIONSET_H */
Index: mythcontrols/actionid.h
===================================================================
--- mythcontrols/actionid.h	(revision 11460)
+++ mythcontrols/actionid.h	(working copy)
@@ -41,7 +41,9 @@
     /**
      * @brief Create an empty action
      */
-    inline ActionID() {}
+    inline ActionID()
+    {
+    }
 
     /**
      * @brief Create a new action identifier.
@@ -49,37 +51,45 @@
      * @param action The action's name
      */
     inline ActionID(const QString & context, const QString & action)
-        : _context(context), _action(action) {};
+        : m_Context(context), m_Action(action)
+    {
+    }
 
     /**
      * @brief Get the context name.
      * @return The context name.
      */
-    inline QString context(void) const { return this->_context; }
+    inline QString Context(void) const
+    {
+        return m_Context;
+    }
 
     /**
      * @brief Get the action name
      * @return The action name.
      */
-    inline QString action(void) const { return this->_action; }
+    inline QString Action(void) const
+    {
+        return m_Action;
+    }
 
     /**
      * @brief Determine if two actions identifiers have the same
      * context.
      * @return True if the actions have a common context.
      */
-    inline static bool sameContext(const ActionID &a, const ActionID &b)
+    inline static bool SameContext(const ActionID &a, const ActionID &b)
     {
-        return (a.context() == b.context());
+        return (a.Context() == b.Context());
     }
 
     /**
      * @brief Determine if two actions have the same action name.
      * @return True if the actions have the same action name.
      */
-    inline static bool sameAction(const ActionID &a, const ActionID &b)
+    inline static bool SameAction(const ActionID &a, const ActionID &b)
     {
-        return (a.action() == b.action());
+        return (a.Action() == b.Action());
     }
 
     /**
@@ -89,12 +99,12 @@
      */
     inline bool operator == (const ActionID &that) const
     {
-        return (sameAction(*this,that) && sameContext(*this,that));
+        return (SameAction(*this,that) && SameContext(*this,that));
     }
 
 private:
-    QString _context;
-    QString _action;
+    QString m_Context;
+    QString m_Action;
 };
 
 
Index: mythcontrols/action.h
===================================================================
--- mythcontrols/action.h	(revision 11460)
+++ mythcontrols/action.h	(working copy)
@@ -41,13 +41,17 @@
 public:
 
     /**
-     * @brief Create a new empty action.
+     * Create a new empty action.
+     *
      * @param description The actions description.
      */
-    inline Action(const QString & description) : _description(description) {}
+    inline Action(const QString & description) : m_Description(description)
+    {
+    }
 
     /**
-     * @brief Create a new action.
+     * Create a new action.
+     *
      * @param description The description of the action.
      * @param keys The key sequence (strings) that trigger the action.
      *
@@ -58,86 +62,91 @@
     Action(const QString & description, const QString & keys);
 
     /**
-     * @brief Get the action description.
+     * Get the action description.
+     *
      * @return The action description.
      */
-    inline const QString & getDescription() const { return this->_description; }
+    inline const QString & GetDescription() const
+    {
+        return this->m_Description;
+    }
 
     /**
-     * @brief Get the key sequence(s) that trigger this action.
+     * Get the key sequence(s) that trigger this action.
+     *
      * @return The key sequence(s) that trigger this action.
      */
-    inline const QStringList & getKeys() const { return this->_keys; }
+    inline const QStringList & GetKeys() const
+    {
+        return this->m_Keys;
+    }
 
     /**
-     * @brief Get the keys as a string.
+     * Get the keys as a string.
+     *
      * @return QString::null or a comma delimited string of keys.
      */
-    inline QString keyString() const { return _keys.join(","); }
+    inline QString KeyString() const
+    {
+        return m_Keys.join(",");
+    }
 
     /**
-     * @brief Add a key sequence to this action.
+     * Add a key sequence to this action.
+     *
      * @param key The key to add to the action.
      * @return true if the key was added otherwise, false.
      */
-    bool addKey(const QString & key);
+    bool AddKey(const QString & key);
 
     /**
-     * @brief Remove a key from this action.
+     * Remove a key from this action.
+     *
      * @param key The key to remove.
      * @return true if the key is removed, otherwise, false.
      */
-    inline bool removeKey(const QString & key) { return (keys().remove(key)>0); }
+    inline bool RemoveKey(const QString & key)
+    {
+        return (m_Keys.remove(key)>0);
+    }
 
     /**
-     * @brief Replace a key.
+     * Replace a key.
+     *
      * @param newkey The new key.
      * @param oldkey The old key, which is being replaced.
      */
-    bool replaceKey(const QString & newkey, const QString & oldkey);
+    bool ReplaceKey(const QString & newkey, const QString & oldkey);
 
     /**
-     * @brief Determine if the action already has a key.
+     * Determine if the action already has a key.
+     *
      * @param key The key to check for.
      * @return true if the key is already bound in this action,
      * otherwise, false is returned.
      */
-    bool hasKey(const QString & key) const;
+    bool HasKey(const QString & key) const;
 
     /**
-     * @brief Get the index of a key.
-     * @param key The string containing the key.
-     * @return The index of the key, which will be less than zero if the
-     * key does not exist.
-     */
-
-    /**
-     * @brief Determine if the action has any keys at all.
+     * Determine if the action has any keys at all.
+     *
      * @return true if the action has keys, otherwise, false.
      */
-    inline bool empty(void) const { return (_keys.size() > 0); }
+    inline bool IsEmpty(void) const
+    {
+        return (m_Keys.size() > 0);
+    }
 
-    /** @brief The maximum number of keys that can be bound to an action. */
+    /** The maximum number of keys that can be bound to an action. */
     static const unsigned short MAX_KEYS = 4;
 
-protected:
+private:
 
-    /**
-     * @brief Get a reference to the action description.
-     * @return A reference to the action description.
-     */
-    inline QString & description() { return this->_description; }
+    /** The actions description. */
+    QString m_Description;
 
-    /**
-     * @brief Get a reference to actions the key sequences.
-     * @return A reference to actions the key sequences.
-     */
-    inline QStringList & keys() { return this->_keys; }
-
-private:
-
-    QString _description;
-    QStringList _keys;
+    /** The keys bound to the action. */
+    QStringList m_Keys;
 };
 
 #endif /* ACTION_H */
Index: mythcontrols/keygrabber.h
===================================================================
--- mythcontrols/keygrabber.h	(revision 11460)
+++ mythcontrols/keygrabber.h	(working copy)
@@ -48,7 +48,10 @@
     /**
      * @brief Get the string containing the captured key event.
      */
-    inline QString getCapturedKey() { return this->captured_key_event; }
+    inline QString GetCapturedKey()
+    {
+        return this->m_CapturedKeyEvent;
+    }
 
 public slots:
 
@@ -58,14 +61,20 @@
      * The QString provided in the constructor will be set to the
      * captured key value.
      */
-    inline void acceptBinding(void) { done(1); }
+    inline void AcceptBinding(void)
+    {
+        done(1);
+    }
 
     /**
      * @brief Reject the captured key binding.
      *
      * The QString provided in the constructor will be set to NULL.
      */
-    inline void cancel(void) { done(0); }
+    inline void Cancel(void)
+    {
+        done(0);
+    }
 
 protected:
 
@@ -83,12 +92,12 @@
 
 private:
 
-    bool is_capturing;
-    bool has_captured;
-    QString captured_key_event;
-    QButton *ok_button;
-    QButton *cancel_button;
-    QLabel *key_label;
+    bool m_IsCapturing;
+    bool m_HasCaptured;
+    QString m_CapturedKeyEvent;
+    QButton *m_OkButton;
+    QButton *m_CancelButton;
+    QLabel *m_KeyLabel;
 };
 
 
@@ -120,13 +129,19 @@
     /**
      * @brief Execute the error popup
      */
-    inline int getOption(void) { return ExecPopup(this,SLOT(finish())); }
+    inline int GetOption(void)
+    {
+        return ExecPopup(this, SLOT(Finish()));
+    }
 
 protected slots:
     /**
      * @brief Close the popup.
      */
-    inline void finish(void) { done(0); }
+    inline void Finish(void)
+    {
+        done(0);
+    }
 };
 
 
@@ -151,20 +166,28 @@
     /**
      * @brief Execute the option popup.
      */
-    inline int getOption(void) { return ExecPopup(this,SLOT(cancel())); }
+    inline int GetOption(void)
+    {
+        return ExecPopup(this,SLOT(Cancel()));
+    }
 
 public slots:
 
     /**
      * @brief Slot to connect to when the save button is pressed.
      */
-    inline void save(void) { done(OptionsMenu::SAVE); }
+    inline void Save(void)
+    {
+        done(OptionsMenu::SAVE);
+    }
 
     /**
      * @brief Slot to connect to when the cancel button is pressed.
      */
-    inline void cancel(void) { done(OptionsMenu::CANCEL); }
-
+    inline void Cancel(void)
+    {
+        done(OptionsMenu::CANCEL);
+    }
 };
 
 
@@ -180,7 +203,11 @@
 
 public:
 
-    enum actions { SET, REMOVE, CANCEL };
+    enum actions {
+        SET,
+        REMOVE,
+        CANCEL
+    };
 
     /**
      * @brief Create a new action window.
@@ -190,24 +217,36 @@
     /**
      * @brief Execute the option popup.
      */
-    inline int getOption(void) { return ExecPopup(this,SLOT(cancel())); }
+    inline int GetOption(void)
+    {
+        return ExecPopup(this, SLOT(Cancel()));
+    }
 
 public slots:
 
     /**
      * @brief Slot to connect to when the set button is pressed.
      */
-    inline void set(void) { done(ActionMenu::SET); }
+    inline void Set(void)
+    {
+        done(ActionMenu::SET);
+    }
 
     /**
      * @brief Slot to connect to when the remove button is pressed.
      */
-    inline void remove(void) { done(ActionMenu::REMOVE); }
+    inline void Remove(void)
+    {
+        done(ActionMenu::REMOVE);
+    }
 
     /**
      * @brief Slot to connect to when the cancel button is pressed.
      */
-    inline void cancel(void) { done(ActionMenu::CANCEL); }
+    inline void Cancel(void)
+    {
+        done(ActionMenu::CANCEL);
+    }
 
 };
 
@@ -222,7 +261,11 @@
 
 public:
 
-    enum actions { SAVE, EXIT };
+    enum actions
+    {
+        SAVE,
+        EXIT
+    };
 
     /**
      * @brief Create a new action window.
@@ -232,20 +275,28 @@
     /**
      * @brief Execute the option popup.
      */
-    inline int getOption(void) { return ExecPopup(this,SLOT(cancel())); }
+    inline int GetOption(void)
+    {
+        return ExecPopup(this, SLOT(Cancel()));
+    }
 
 public slots:
 
     /**
      * @brief Slot to connect to when the save button is pressed.
      */
-    inline void save(void) { done(UnsavedMenu::SAVE); }
+    inline void Save(void)
+    {
+        done(UnsavedMenu::SAVE);
+    }
 
     /**
      * @brief Slot to connect to when the cancel button is pressed.
      */
-    inline void cancel(void) { done(UnsavedMenu::EXIT); }
-
+    inline void Cancel(void)
+    {
+        done(UnsavedMenu::EXIT);
+    }
 };
 
 /**
@@ -259,7 +310,11 @@
 
 public:
 
-    enum actions { CONFIRM, CANCEL };
+    enum actions
+    {
+        CONFIRM,
+        CANCEL
+    };
 
     /**
      * @brief Create a new action window.
@@ -269,18 +324,27 @@
     /**
      * @brief Execute the option popup.
      */
-    inline int getOption(void) { return ExecPopup(this,SLOT(cancel())); }
+    inline int GetOption(void)
+    {
+        return ExecPopup(this,SLOT(Cancel()));
+    }
 
 public slots:
 
     /**
      * @brief Slot to connect to when the save button is pressed.
      */
-    inline void confirm(void) { done(UnsavedMenu::SAVE); }
+    inline void Confirm(void)
+    {
+        done(UnsavedMenu::SAVE);
+    }
 
     /**
      * @brief Slot to connect to when the cancel button is pressed.
      */
-    inline void cancel(void) { done(UnsavedMenu::EXIT); }
+    inline void Cancel(void)
+    {
+        done(UnsavedMenu::EXIT);
+    }
 
 };
Index: mythcontrols/main.cpp
===================================================================
--- mythcontrols/main.cpp	(revision 11460)
+++ mythcontrols/main.cpp	(working copy)
@@ -38,8 +38,10 @@
 extern "C" int mythplugin_init(const char *libversion)
 {
     if (!gContext->TestPopupVersion("mythcontrols", libversion,
-                                    MYTH_BINARY_VERSION)) return -1;
-    else return 0;
+                                    MYTH_BINARY_VERSION))
+        return -1;
+    else
+        return 0;
 }
 
 
@@ -68,7 +70,6 @@
         MythPopupBox::showOkPopup(window, "Theme Error", "Could not load the "
                                   "keybinding plugin's theme.  Check the "
                                   "console for detailed output.");
-
         return -1;
     }
 }
@@ -79,7 +80,10 @@
  * @brief Configures the plugin.
  * @return zero.
  */
-extern "C" int mythplugin_config (void) { return 0; }
+extern "C" int mythplugin_config (void)
+{
+    return 0;
+}
 
 
 
Index: mythcontrols/mythcontrols.cpp
===================================================================
--- mythcontrols/mythcontrols.cpp	(revision 11460)
+++ mythcontrols/mythcontrols.cpp	(working copy)
@@ -67,28 +67,28 @@
     :MythThemedDialog(parent, "controls", "controls-", "controls")
 {
     /* Nullify keybindings so the deconstructor knows not to delete it */
-    this->key_bindings = NULL;
+    this->m_KeyBindings = NULL;
 
     /* delete the contents when we're done */
-    m_contexts.setAutoDelete(true);
+    m_Contexts.setAutoDelete(true);
     
     /* load up the ui components */
-    if ((ui_ok = loadUI()))
+    if ((ui_ok = LoadUI()))
     {
-        leftType = kContextList;
-        rightType = kActionList;
+        m_LeftType = kContextList;
+        m_RightType = kActionList;
 
         /* for starters, load this host */
-        loadHost(gContext->GetHostName());
+        LoadHost(gContext->GetHostName());
 
         /* update the information */
-        refreshKeyInformation();
+        RefreshKeyInformation();
 
         /* capture the signals we want */
-        connect(LeftList, SIGNAL(itemSelected(UIListBtnTypeItem*)),
-                this, SLOT(leftSelected(UIListBtnTypeItem*)));
-        connect(RightList, SIGNAL(itemSelected(UIListBtnTypeItem*)),
-                this, SLOT(rightSelected(UIListBtnTypeItem*)));
+        connect(m_LeftList, SIGNAL(itemSelected(UIListBtnTypeItem*)),
+                this, SLOT(LeftSelected(UIListBtnTypeItem*)));
+        connect(m_RightList, SIGNAL(itemSelected(UIListBtnTypeItem*)),
+                this, SLOT(RightSelected(UIListBtnTypeItem*)));
 
     }
 }
@@ -96,65 +96,76 @@
 
 
 /* comments in header */
-MythControls::~MythControls() { delete this->key_bindings; }
+MythControls::~MythControls()
+{
+    delete this->m_KeyBindings;
+}
 
 
 
 /* comments in header */
-bool MythControls::loadUI()
+bool MythControls::LoadUI()
 {
     /* the return value of the method */
     bool retval = true;
 
     /* Get the UI widgets that we need to work with */
-    if ((description = getUITextType("description")) == NULL)
+    if ((m_Description = getUITextType("description")) == NULL)
     {
         VERBOSE(VB_IMPORTANT, "MythControls: Unable to load action_description");
         retval = false;
     }
 
-    if ((container = getContainer("controls")) == NULL) {
+    if ((m_Container = getContainer("controls")) == NULL)
+    {
         VERBOSE(VB_IMPORTANT, "MythControls:  No controls container in theme");
         retval = false;
     }
-    else if ((LeftList = getUIListBtnType("leftlist")) == NULL) {
+    else if ((m_LeftList = getUIListBtnType("leftlist")) == NULL)
+    {
         VERBOSE(VB_IMPORTANT, "MythControls:  No leftlist in theme");
         retval = false;
     }
-    else if ((RightList = getUIListBtnType("rightlist")) == NULL) {
+    else if ((m_RightList = getUIListBtnType("rightlist")) == NULL)
+    {
         VERBOSE(VB_IMPORTANT, "MythControls:  No rightList in theme");
         retval = false;
     }
-    else {
-        LeftDesc = getUITextType("leftdesc");
-        RightDesc = getUITextType("rightdesc");
+    else
+    {
+        m_LeftDesc = getUITextType("leftdesc");
+        m_RightDesc = getUITextType("rightdesc");
         /* focus the context list by default */
-        focused = LeftList;
-        LeftList->calculateScreenArea();
-        LeftList->SetActive(true);
-        RightList->calculateScreenArea();
-        RightList->SetActive(false);
+        m_Focused = m_LeftList;
+        m_LeftList->calculateScreenArea();
+        m_LeftList->SetActive(true);
+        m_RightList->calculateScreenArea();
+        m_RightList->SetActive(false);
     }
 
     /* Check that all the buttons are there */
-    if ((ActionButtons[0] = getUITextButtonType("action_one")) == NULL)
+    if ((m_ActionButtons[0] = getUITextButtonType("action_one")) == NULL)
     {
-        VERBOSE(VB_IMPORTANT, "MythControls: Unable to load first action button");
+        VERBOSE(VB_IMPORTANT,
+                "MythControls: Unable to load first action button");
         retval = false;
     }
-    else if ((ActionButtons[1] = getUITextButtonType("action_two")) == NULL)
+    else if ((m_ActionButtons[1] = getUITextButtonType("action_two")) == NULL)
     {
-        VERBOSE(VB_IMPORTANT, "MythControls: Unable to load second action button");
+        VERBOSE(VB_IMPORTANT,
+                "MythControls: Unable to load second action button");
         retval = false;
     }
-    else if ((ActionButtons[2] = getUITextButtonType("action_three")) == NULL)
+    else if ((m_ActionButtons[2] = getUITextButtonType("action_three")) == NULL)
     {
-        VERBOSE(VB_IMPORTANT, "MythControls: Unable to load thrid action button");
+        VERBOSE(VB_IMPORTANT,
+                "MythControls: Unable to load thrid action button");
         retval = false;
     }
-    else if ((ActionButtons[3] = getUITextButtonType("action_four")) == NULL)
+    else if ((m_ActionButtons[3] = getUITextButtonType("action_four")) == NULL)
     {
-        VERBOSE(VB_IMPORTANT, "MythControls: Unable to load fourth action button");
+        VERBOSE(VB_IMPORTANT,
+                "MythControls: Unable to load fourth action button");
         retval = false;
     }
 
@@ -164,38 +175,39 @@
 
 
 /* comments in header */
-size_t MythControls::focusedButton(void) const
+size_t MythControls::FocusedButton(void) const
 {
     for (size_t i = 0; i < Action::MAX_KEYS; i++)
-        if (focused == ActionButtons[i]) return i;
+        if (m_Focused == m_ActionButtons[i]) return i;
 
     return Action::MAX_KEYS;
 }
 
 
-void MythControls::focusButton(int direction)
+void MythControls::FocusButton(int direction)
 {
-    if (leftType != kContextList || rightType != kActionList)
+    if (m_LeftType != kContextList || m_RightType != kActionList)
         return;
     if (direction == 0)
     {
-        focused = ActionButtons[0];
-        ActionButtons[0]->takeFocus();
-        RightList->looseFocus();
-        RightList->SetActive(false);
+        m_Focused = m_ActionButtons[0];
+        m_ActionButtons[0]->takeFocus();
+        m_RightList->looseFocus();
+        m_RightList->SetActive(false);
     }
     else
     {
-
         /* change focus by at most one in either direction */
-        if (direction > 0) direction = 1;
-        else direction = -1;
+        if (direction > 0)
+            direction = 1;
+        else
+            direction = -1;
 
         /* figure out which button is focused */
         int current = 0;
-        if (focused == ActionButtons[1]) current=1;
-        else if (focused == ActionButtons[2]) current = 2;
-        else if (focused == ActionButtons[3]) current = 3;
+        if (m_Focused == m_ActionButtons[1]) current=1;
+        else if (m_Focused == m_ActionButtons[2]) current = 2;
+        else if (m_Focused == m_ActionButtons[3]) current = 3;
 
         /* determine the new focused button index */
         int newb = current + direction;
@@ -203,26 +215,26 @@
         /* focus an existing button */
         if ((newb >= 0) && (newb < Action::MAX_KEYS))
         {
-            focused->looseFocus();
-            focused = ActionButtons[newb];
-            focused->takeFocus();
+            m_Focused->looseFocus();
+            m_Focused = m_ActionButtons[newb];
+            m_Focused->takeFocus();
         }
     }
 }
 
 
 
-void MythControls::switchListFocus(UIListBtnType *focus, UIListBtnType *unfocus)
+void MythControls::SwitchListFocus(UIListBtnType *focus, UIListBtnType *unfocus)
 {
     /* unfocus a list (setactive(false)) or a button (focused->looseFocus) */
     if (unfocus)
         unfocus->SetActive(false);
 
-    focused->looseFocus();
-    focused = focus;
+    m_Focused->looseFocus();
+    m_Focused = focus;
     focus->SetActive(true);
     focus->takeFocus();
-    refreshKeyInformation();
+    RefreshKeyInformation();
 }
 
 void MythControls::keyPressEvent(QKeyEvent *e)
@@ -239,140 +251,151 @@
 
         if (action == "MENU" || action == "INFO")
         {
-            focused->looseFocus();
+            m_Focused->looseFocus();
             OptionsMenu popup(gContext->GetMainWindow());
-            int a = (int)popup.getOption();
-            switch (a) {
+            int a = (int)popup.GetOption();
+            switch (a)
+            {
                 case (int)OptionsMenu::SAVE:
-                    save();
+                    Save();
                     break;
             }
-            focused->takeFocus();
-//            if (popup.getOption() == OptionsMenu::SAVE) save();
+            m_Focused->takeFocus();
         }
         else if (action == "SELECT")
         {
-            if (focused == LeftList)
-                switchListFocus(RightList, LeftList);
-            else if (focused == RightList)
-                focusButton(0);
-            else {
-                QString key = getCurrentKey();
+            if (m_Focused == m_LeftList)
+                SwitchListFocus(m_RightList, m_LeftList);
+            else if (m_Focused == m_RightList)
+                FocusButton(0);
+            else
+            {
+                QString key = GetCurrentKey();
                 if (!key.isEmpty())
                 {
                     ActionMenu popup(gContext->GetMainWindow());
-                    int result = popup.getOption();
-                    if (result == ActionMenu::SET) addKeyToAction();
-                    else if (result == ActionMenu::REMOVE) deleteKey();
-                } else // for blank keys, no reason to ask what to do
-                    addKeyToAction();
+                    int result = popup.GetOption();
+                    if (result == ActionMenu::SET)
+                        AddKeyToAction();
+                    else if (result == ActionMenu::REMOVE)
+                        DeleteKey();
+                }
+                else // for blank keys, no reason to ask what to do
+                    AddKeyToAction();
             }
         }
         else if (action == "ESCAPE")
         {
             escape = true;
-            if (focused == LeftList)
+            if (m_Focused == m_LeftList)
             {
                 handled = false;
-                if (key_bindings->hasChanges())
+                if (m_KeyBindings->HasChanges())
                 {
                     /* prompt user to save changes */
                     UnsavedMenu popup(gContext->GetMainWindow());
-                    if (popup.getOption() == UnsavedMenu::SAVE)
-                    {
-                        save();
-                    }
+                    if (popup.GetOption() == UnsavedMenu::SAVE)
+                        Save();
                 }
             }
-            else if (focused == RightList)
-                switchListFocus(LeftList, RightList);
+            else if (m_Focused == m_RightList)
+                SwitchListFocus(m_LeftList, m_RightList);
             else
-                switchListFocus(RightList, NULL);
+                SwitchListFocus(m_RightList, NULL);
         }
         else if (action == "UP")
         {
-            if (focused == LeftList)
-                LeftList->MoveUp();
-            else if (focused == RightList)
-                RightList->MoveUp();
+            if (m_Focused == m_LeftList)
+                m_LeftList->MoveUp();
+            else if (m_Focused == m_RightList)
+                m_RightList->MoveUp();
         }
         else if (action == "DOWN")
         {
-            if (focused == LeftList)
-                LeftList->MoveDown();
-            else if (focused == RightList)
-                RightList->MoveDown();
+            if (m_Focused == m_LeftList)
+                m_LeftList->MoveDown();
+            else if (m_Focused == m_RightList)
+                m_RightList->MoveDown();
         }
         else if (action == "LEFT")
         {
-            if (focused==RightList)
-                switchListFocus(LeftList, RightList);
-            else if (focused != LeftList)
-                focusButton(-1);
+            if (m_Focused==m_RightList)
+                SwitchListFocus(m_LeftList, m_RightList);
+            else if (m_Focused != m_LeftList)
+                FocusButton(-1);
         }
         else if (action == "RIGHT")
         {
-            if (focused == LeftList)
-                switchListFocus(RightList, LeftList);
-            else if (focused != RightList)
-                focusButton(1);
+            if (m_Focused == m_LeftList)
+                SwitchListFocus(m_RightList, m_LeftList);
+            else if (m_Focused != m_RightList)
+                FocusButton(1);
         }
         else if (action == "PAGEUP")
         {
-            if (focused == LeftList)
-                LeftList->MoveUp(UIListBtnType::MovePage);
-            else if (focused == RightList)
-                RightList->MoveUp(UIListBtnType::MovePage);
+            if (m_Focused == m_LeftList)
+                m_LeftList->MoveUp(UIListBtnType::MovePage);
+            else if (m_Focused == m_RightList)
+                m_RightList->MoveUp(UIListBtnType::MovePage);
         }
         else if (action == "PAGEDOWN")
         {
-            if (focused == LeftList)
-                LeftList->MoveDown(UIListBtnType::MovePage);
-            else if (focused == RightList)
-                RightList->MoveDown(UIListBtnType::MovePage);
+            if (m_Focused == m_LeftList)
+                m_LeftList->MoveDown(UIListBtnType::MovePage);
+            else if (m_Focused == m_RightList)
+                m_RightList->MoveDown(UIListBtnType::MovePage);
         }
         else if (action == "1")
         {
-            if (leftType != kContextList || rightType != kActionList)
+            if (m_LeftType != kContextList || m_RightType != kActionList)
             {
-                leftType = kContextList;
-                rightType = kActionList;
-                updateLists();
-                if (focused != LeftList)
-                    switchListFocus(LeftList,
-                                    (focused == RightList) ? RightList : NULL);
-            } else handled = false;
+                m_LeftType = kContextList;
+                m_RightType = kActionList;
+                UpdateLists();
+                if (m_Focused != m_LeftList)
+                    SwitchListFocus(m_LeftList, (m_Focused == m_RightList) ?
+                                    m_RightList : NULL);
+            }
+            else
+                handled = false;
         }
         else if (action == "2")
         {
-            if (leftType != kContextList || rightType != kKeyList)
+            if (m_LeftType != kContextList || m_RightType != kKeyList)
             {
-                leftType = kContextList;
-                rightType = kKeyList;
-                updateLists();
-                if (focused != LeftList)
-                    switchListFocus(LeftList,
-                                    (focused == RightList) ? RightList : NULL);
-            } else handled = false;
+                m_LeftType = kContextList;
+                m_RightType = kKeyList;
+                UpdateLists();
+                if (m_Focused != m_LeftList)
+                    SwitchListFocus(m_LeftList, (m_Focused == m_RightList) ?
+                                    m_RightList : NULL);
+            }
+            else
+                handled = false;
         }
         else if (action == "3")
         {
-            if (leftType != kKeyList || rightType != kContextList)
+            if (m_LeftType != kKeyList || m_RightType != kContextList)
             {
-                leftType = kKeyList;
-                rightType = kContextList;
-                updateLists();
-                if (focused != LeftList)
-                    switchListFocus(LeftList,
-                                    (focused == RightList) ? RightList : NULL);
-            } else handled = false;
+                m_LeftType = kKeyList;
+                m_RightType = kContextList;
+                UpdateLists();
+                if (m_Focused != m_LeftList)
+                    SwitchListFocus(m_LeftList, (m_Focused == m_RightList) ?
+                                    m_RightList : NULL);
+            }
+            else
+                handled = false;
         }
-        else handled = false;
+        else
+            handled = false;
     }
 
-    if (handled) return;
+    if (handled)
+        return;
 
-    if (!escape && JumpTo(e)) handled = true;
+    if (!escape && JumpTo(e))
+        handled = true;
 
     if (!handled)
         MythThemedDialog::keyPressEvent(e);
@@ -381,36 +404,57 @@
 bool MythControls::JumpTo(QKeyEvent *e)
 {
     UIListBtnType *list = NULL;
-    if (focused == LeftList && leftType == kKeyList) list = LeftList;
-    if (focused == RightList && rightType == kKeyList) list = RightList;
-    if (!list) return false;
 
+    if (m_Focused == m_LeftList && m_LeftType == kKeyList)
+        list = m_LeftList;
+
+    if (m_Focused == m_RightList && m_RightType == kKeyList)
+        list = m_RightList;
+
+    if (!list)
+        return false;
+
     QString key = e->text();
-    if (key.left(6) == "remote") {
+    if (key.left(6) == "remote")
+    {
         key = KeyToDisplay(key);
-    } else {
+    }
+    else
+    {
         key = QString(QKeySequence(e->key()));
-        if (key.isEmpty()) return false;
+
+        if (key.isEmpty())
+            return false;
+
         QString modifiers = "";
-        if (e->state()&Qt::ShiftButton) modifiers+="Shift+";
-        if (e->state()&Qt::ControlButton) modifiers+="Ctrl+";
-        if (e->state()&Qt::AltButton) modifiers+="Alt+";
-        if (e->state()&Qt::MetaButton) modifiers+="Meta+";
+
+        if (e->state()&Qt::ShiftButton)
+            modifiers+="Shift+";
+        if (e->state()&Qt::ControlButton)
+            modifiers+="Ctrl+";
+        if (e->state()&Qt::AltButton)
+            modifiers+="Alt+";
+        if (e->state()&Qt::MetaButton)
+            modifiers+="Meta+";
+
         key = modifiers + key;
     }
 
     UIListBtnTypeItem *b;
     uint len = 1024; // infinity
-    if (list == RightList)
+    if (list == m_RightList)
     {
         key = key + " ";
         len = key.length();
     }
 
     for (b = list->GetItemFirst(); b; b = list->GetItemNext(b))
-        if (b->text().left(len) == key) break;
-    if (!b) return false;
+        if (b->text().left(len) == key)
+            break;
 
+    if (!b)
+        return false;
+
     int curpos = list->GetItemPos(list->GetItemCurrent());
     int newpos = list->GetItemPos(b);
 
@@ -422,349 +466,390 @@
 }
 
 
-void MythControls::leftSelected(UIListBtnTypeItem*)
+void MythControls::LeftSelected(UIListBtnTypeItem*)
 {
-    LeftList->refresh();
-    RightList->blockSignals(true);
-    refreshRightList();
-    RightList->blockSignals(false);
-    RightList->refresh();
+    m_LeftList->refresh();
+    m_RightList->blockSignals(true);
+    RefreshRightList();
+    m_RightList->blockSignals(false);
+    m_RightList->refresh();
 }
 
-void MythControls::rightSelected(UIListBtnTypeItem*)
+void MythControls::RightSelected(UIListBtnTypeItem*)
 {
-    RightList->refresh();
-    refreshKeyInformation();
+    m_RightList->refresh();
+    RefreshKeyInformation();
 }
 
 
 
 /* method description in header */
-void MythControls::refreshRightList()
+void MythControls::RefreshRightList()
 {
-    RightList->Reset();
+    m_RightList->Reset();
 
-    if (LeftList->GetItemCurrent() == NULL)
+    if (m_LeftList->GetItemCurrent() == NULL)
         return;
 
-    if (leftType == kContextList)
+    if (m_LeftType == kContextList)
     {
-        if (rightType == kActionList)
+        if (m_RightType == kActionList)
         {
             /* add all of the actions to the context list */
-            QString context = LeftList->GetItemCurrent()->text();
-            QStringList *actions = m_contexts[context];
+            QString context = m_LeftList->GetItemCurrent()->text();
+            QStringList *actions = m_Contexts[context];
             if (actions == NULL)
             {
-                VERBOSE(VB_IMPORTANT, QString("MythControls: Unable to find actions for context %1").arg(context));
+                VERBOSE(VB_IMPORTANT,
+                        QString("MythControls: Unable to find actions for "
+                                "context %1").arg(context));
                 return;
             }
             UIListBtnTypeItem *item;
+
             for (size_t i = 0; i < actions->size(); i++)
-                item = new UIListBtnTypeItem(RightList, (*actions)[i]);
+                item = new UIListBtnTypeItem(m_RightList, (*actions)[i]);
         }
-        else if (rightType == kKeyList)
+        else if (m_RightType == kKeyList)
         {
             /* add all of the actions to the context list */
-            QString context = LeftList->GetItemCurrent()->text();
-            BindingList *list = contextKeys[context];
+            QString context = m_LeftList->GetItemCurrent()->text();
+            BindingList *list = m_ContextKeys[context];
             if (list == NULL)
             {
-                VERBOSE(VB_IMPORTANT, QString("MythControls: Unable to find keys for context %1").arg(context));
+                VERBOSE(VB_IMPORTANT, QString("MythControls: Unable to find keys"
+                                              " for context %1").arg(context));
                 return;
             }
             UIListBtnTypeItem *item;
-            for (BindingList::iterator it = list->begin(); it != list->end(); ++it)
+            for (BindingList::iterator it = list->begin(); it != list->end();
+                 ++it)
             {
                 binding_t *b = *it;
-                item = new UIListBtnTypeItem(RightList, KeyToDisplay(b->key) + " => " + b->action);
+                item = new UIListBtnTypeItem(m_RightList, KeyToDisplay(b->key) +
+                                             " => " + b->action);
             }
         }
-    } else if (leftType == kKeyList && rightType == kContextList)
+    }
+    else if (m_LeftType == kKeyList && m_RightType == kContextList)
     {
-        QString key = DisplayToKey(LeftList->GetItemCurrent()->text());
-        BindingList *list = keyActions[key];
+        QString key = DisplayToKey(m_LeftList->GetItemCurrent()->text());
+        BindingList *list = m_KeyActions[key];
         if (list == NULL)
         {
-            VERBOSE(VB_IMPORTANT, QString("MythControls: Unable to find actions for key %1").arg(key));
+            VERBOSE(VB_IMPORTANT, QString("MythControls: Unable to find actions "
+                                          "for key %1").arg(key));
             return;
         }
         UIListBtnTypeItem *item;
         BindingList::iterator it = list->begin();
         binding_t *b = *it;
-        for (size_t i = 0; i < contexts.size(); i++)
+        for (size_t i = 0; i < m_SortedContexts.size(); i++)
         {
-            QString context = contexts[i];
+            QString context = m_SortedContexts[i];
             QString action = "<none>";
             if (b && b->context == context)
             {
                 action = b->action;
                 ++it;
-                if (it != list->end()) b = *it;
-                else b = NULL;
+                b = (it != list->end()) ? *it : NULL;
             }
-            item = new UIListBtnTypeItem(RightList, context + " => " + action);
+            item = new UIListBtnTypeItem(m_RightList, context + " => " + action);
         }
     }
 }
 
 
 /* comments in header */
-void MythControls::refreshKeyInformation()
+void MythControls::RefreshKeyInformation()
 {
     /* get the description of the current action */
     QString desc;
 
-    if (focused == LeftList)
+    if (m_Focused == m_LeftList)
     {
         /* blank all keys on the context */
         for (size_t i = 0; i < Action::MAX_KEYS; i++)
-            ActionButtons[i]->setText("");
+            m_ActionButtons[i]->setText("");
     }
-    else if (leftType == kKeyList || rightType == kKeyList)
+    else if (m_LeftType == kKeyList || m_RightType == kKeyList)
     { // Should show appropriate description 
-        QString action = getCurrentAction();
-        QString context = getCurrentContext();
+        QString action = GetCurrentAction();
+        QString context = GetCurrentContext();
         /* blank all keys on the context */
         for (size_t i = 0; i < Action::MAX_KEYS; i++)
-            ActionButtons[i]->setText("");
+            m_ActionButtons[i]->setText("");
         if (!action.isEmpty())
-            {
+        {
     
-            desc = key_bindings->getActionDescription(context, action);
+            desc = m_KeyBindings->GetActionDescription(context, action);
     
             BindingList *list = NULL;
-            if (leftType == kKeyList && rightType == kContextList)
+            if (m_LeftType == kKeyList && m_RightType == kContextList)
             {
-                QString key = getCurrentKey();
-                list = keyActions[DisplayToKey(key)];
+                QString key = GetCurrentKey();
+                list = m_KeyActions[DisplayToKey(key)];
             }
-            else if (leftType == kContextList && rightType == kKeyList)
-                list = contextKeys[context];
+            else if (m_LeftType == kContextList && m_RightType == kKeyList)
+                list = m_ContextKeys[context];
             if (list)
             {
                 QString searchKey;
-                if (rightType == kContextList)
+                if (m_RightType == kContextList)
                     searchKey = context;
-                else if (rightType == kActionList)
+                else if (m_RightType == kActionList)
                     searchKey = action;
-                else if (rightType == kKeyList)
-                    searchKey = DisplayToKey(getCurrentKey());
+                else if (m_RightType == kKeyList)
+                    searchKey = DisplayToKey(GetCurrentKey());
                 binding_t *binding = NULL;
-                for (BindingList::iterator it = list->begin(); it != list->end(); ++it)
+                for (BindingList::iterator it = list->begin();
+                     it != list->end(); ++it)
                 {
                     binding_t *b = *it;
-                    switch (rightType)
+                    switch (m_RightType)
                     {
                         case kContextList:
-                            if (b->context == searchKey) binding = b;
+                            if (b->context == searchKey)
+                                binding = b;
                             break;
                         case kActionList:
-                            if (b->action == searchKey) binding = b;
+                            if (b->action == searchKey)
+                                binding = b;
                             break;
                         case kKeyList:
-                            if (b->key == searchKey) binding = b;
+                            if (b->key == searchKey)
+                                binding = b;
                             break;
                     }
-                    if (binding) break;
+                    if (binding)
+                        break;
                 }
     
                 if (binding)
                 {
                     if (desc.isEmpty() && context != binding->contextFrom)
-                        desc = key_bindings->getActionDescription(binding->contextFrom, action);
+                        desc = m_KeyBindings->GetActionDescription(
+                            binding->contextFrom, action);
+
                     desc += "\n" + tr("Binding comes from %1 context")
-                            .arg(binding->contextFrom);
+                        .arg(binding->contextFrom);
                 }
             }
         }
-    } else {
-        QString context = getCurrentContext();
-        QString action = getCurrentAction();
+    }
+    else
+    {
+        QString context = GetCurrentContext();
+        QString action = GetCurrentAction();
         /* set the description */
-        desc = key_bindings->getActionDescription(getCurrentContext(),
-                                                  getCurrentAction());
+        desc = m_KeyBindings->GetActionDescription(GetCurrentContext(),
+                                                   GetCurrentAction());
 
         /* get the bindings of the current action */
-        QStringList keys = key_bindings->getActionKeys(getCurrentContext(),
-                                                       getCurrentAction());
+        QStringList keys = m_KeyBindings->GetActionKeys(GetCurrentContext(),
+                                                        GetCurrentAction());
 
         size_t i;
 
         /* fill existing keys */
         for (i = 0; i < keys.count(); i++)
-            ActionButtons[i]->setText(KeyToDisplay(keys[i]));
+            m_ActionButtons[i]->setText(KeyToDisplay(keys[i]));
 
         /* blank the other ones */
         for (; i < Action::MAX_KEYS; i++)
-            ActionButtons[i]->setText("");
+            m_ActionButtons[i]->setText("");
     }
 
     /* set the information */
-    description->SetText(desc);
+    m_Description->SetText(desc);
 }
 
 
 
 /* comments in header */
-QString MythControls::getCurrentContext(void) const
+QString MythControls::GetCurrentContext(void) const
 {
-    if (leftType == kContextList)
-        return LeftList->GetItemCurrent()->text();
-    if (focused == LeftList) return "";
+    if (m_LeftType == kContextList)
+        return m_LeftList->GetItemCurrent()->text();
+    if (m_Focused == m_LeftList)
+        return "";
 
-    QString desc = RightList->GetItemCurrent()->text();
+    QString desc = m_RightList->GetItemCurrent()->text();
     int loc = desc.find(" => ");
-    if (loc == -1) return ""; // Should not happen
-    if (rightType == kContextList) return desc.left(loc);
-    else return desc.mid(loc+4);
+    if (loc == -1)
+        return ""; // Should not happen
+
+    if (m_RightType == kContextList)
+        return desc.left(loc);
+    else
+        return desc.mid(loc+4);
 }
 
 /* comments in header */
-QString MythControls::getCurrentAction(void) const
+QString MythControls::GetCurrentAction(void) const
 {
-    if (leftType == kActionList)
-        return LeftList->GetItemCurrent()->text();
-    if (focused == LeftList) return "";
+    if (m_LeftType == kActionList)
+        return m_LeftList->GetItemCurrent()->text();
+    if (m_Focused == m_LeftList)
+        return "";
 
-    QString desc = RightList->GetItemCurrent()->text();
-    if (leftType == kContextList && rightType == kActionList)
+    QString desc = m_RightList->GetItemCurrent()->text();
+    if (m_LeftType == kContextList && m_RightType == kActionList)
         return desc;
     int loc = desc.find(" => ");
-    if (loc == -1) return ""; // Should not happen
-    if (rightType == kActionList) return desc.left(loc);
+    if (loc == -1)
+        return ""; // Should not happen
+    if (m_RightType == kActionList)
+        return desc.left(loc);
     else
     {
         QString rv = desc.mid(loc+4);
-        if (rv == "<none>") return "";
-        else return rv;
+        if (rv == "<none>")
+            return "";
+        else
+            return rv;
     }
 }
 
 /* comments in header */
-QString MythControls::getCurrentKey(void) const
+QString MythControls::GetCurrentKey(void) const
 {
-    if (leftType == kKeyList)
-        return LeftList->GetItemCurrent()->text();
-    if (focused == LeftList) return "";
+    if (m_LeftType == kKeyList)
+        return m_LeftList->GetItemCurrent()->text();
+    if (m_Focused == m_LeftList)
+        return "";
 
-    if (leftType == kContextList && rightType == kActionList)
+    if (m_LeftType == kContextList && m_RightType == kActionList)
     {
-        QString context = getCurrentContext();
-        QString action = getCurrentAction();
-        size_t b = focusedButton();
-        QStringList keys = key_bindings->getActionKeys(context, action);
-        if (b < keys.count()) return keys[b];
-        else return "";
+        QString context = GetCurrentContext();
+        QString action = GetCurrentAction();
+        size_t b = FocusedButton();
+        QStringList keys = m_KeyBindings->GetActionKeys(context, action);
+
+        if (b < keys.count())
+            return keys[b];
+        else
+            return "";
     }
 
-    QString desc = RightList->GetItemCurrent()->text();
+    QString desc = m_RightList->GetItemCurrent()->text();
     int loc = desc.find(" => ");
-    if (loc == -1) return ""; // Should not happen
-    if (rightType == kKeyList) return desc.left(loc);
-    else return desc.mid(loc+4);
+    if (loc == -1)
+        return ""; // Should not happen
+    if (m_RightType == kKeyList)
+        return desc.left(loc);
+    else
+        return desc.mid(loc+4);
 }
 
 
 /* comments in header */
-void MythControls::loadHost(const QString & hostname) {
-
+void MythControls::LoadHost(const QString & hostname)
+{
     /* create the key bindings and the tree */
-    key_bindings = new KeyBindings(hostname);
-    contexts = *key_bindings->getContexts();
+    m_KeyBindings = new KeyBindings(hostname);
+    m_SortedContexts = *m_KeyBindings->GetContexts();
 
     keys.clear();
 
     /* Alphabetic order, but jump and global at the top  */
-    contexts.sort();
-    contexts.remove(JUMP_CONTEXT);
-    contexts.remove(GLOBAL_CONTEXT);
-    contexts.insert(contexts.begin(), 1, GLOBAL_CONTEXT);
-    contexts.insert(contexts.begin(), 1, JUMP_CONTEXT);
+    m_SortedContexts.sort();
+    m_SortedContexts.remove(JUMP_CONTEXT);
+    m_SortedContexts.remove(GLOBAL_CONTEXT);
+    m_SortedContexts.insert(m_SortedContexts.begin(), 1, GLOBAL_CONTEXT);
+    m_SortedContexts.insert(m_SortedContexts.begin(), 1, JUMP_CONTEXT);
 
     QStringList *actions;
-    for (size_t i = 0; i < contexts.size(); i++)
+    for (size_t i = 0; i < m_SortedContexts.size(); i++)
     {
-        actions = key_bindings->getActions(contexts[i]);
+        actions = m_KeyBindings->GetActions(m_SortedContexts[i]);
         actions->sort();
-        m_contexts.insert(contexts[i], actions);
+        m_Contexts.insert(m_SortedContexts[i], actions);
     }
 
-    refreshKeyBindings();
-    updateLists();
+    RefreshKeyBindings();
+    UpdateLists();
 }
 
 
 
 /* comments in header */
-void MythControls::deleteKey()
+void MythControls::DeleteKey()
 {
     // This code needs work to support deleteKey in any mode exc. Context/Action
-    QString context = getCurrentContext();
-    QString key = getCurrentKey();
-    QString action = getCurrentAction();
+    QString context = GetCurrentContext();
+    QString key = GetCurrentKey();
+    QString action = GetCurrentAction();
     if (context.isEmpty() || key.isEmpty() || action.isEmpty())
     {
         InvalidBindingPopup popup(gContext->GetMainWindow());
-        popup.getOption();
+        popup.GetOption();
         return;
     }
 
-    BindingList *list = keyActions[key];
+    BindingList *list = m_KeyActions[key];
     binding_t *binding = NULL;
+
     for (BindingList::iterator it = list->begin(); it != list->end(); ++it)
     {
         binding_t *b = *it;
-        if (b->context == context) binding = b;
+        if (b->context == context)
+            binding = b;
     }
+
     if (!binding)
     {
         InvalidBindingPopup popup(gContext->GetMainWindow());
-        popup.getOption();
+        popup.GetOption();
         return;
     }
 
     if (binding->contextFrom != context)
     {
-        ConfirmMenu popup(gContext->GetMainWindow(), tr("Delete this key binding from context %1?").arg(binding->contextFrom));
-        if (popup.getOption() != ConfirmMenu::CONFIRM) return;
-    } else {
+        ConfirmMenu popup(gContext->GetMainWindow(),
+                          tr("Delete this key binding from context %1?")
+                          .arg(binding->contextFrom));
+        if (popup.GetOption() != ConfirmMenu::CONFIRM)
+            return;
+    }
+    else
+    {
         ConfirmMenu popup(gContext->GetMainWindow(), tr("Delete this binding?"));
-        if (popup.getOption() != ConfirmMenu::CONFIRM) return;
+        if (popup.GetOption() != ConfirmMenu::CONFIRM)
+            return;
     }
 
-    if (!key_bindings->removeActionKey(binding->contextFrom, action, key))
+    if (!m_KeyBindings->RemoveActionKey(binding->contextFrom, action, key))
     {
         InvalidBindingPopup popup(gContext->GetMainWindow());
-        popup.getOption();
+        popup.GetOption();
         return;
     }
 
     // refreshing everything is overkill.  I tried incrementally updating, but the
     // code was ugly.  Since this is quick in my experience, overkill away!
-    refreshKeyBindings();
-    refreshKeyInformation();
+    RefreshKeyBindings();
+    RefreshKeyInformation();
 }
 
 /* method description in header */
-bool MythControls::resolveConflict(ActionID *conflict, int level)
+bool MythControls::ResolveConflict(ActionID *conflict, int level)
 {
     MythMainWindow *window = gContext->GetMainWindow();
 
     /* prevent a fatal binding */
     if (level == KeyBindings::Error)
     {
-        InvalidBindingPopup popup(gContext->GetMainWindow(),
-                                  conflict->action(),
-                                  conflict->context());
-        popup.getOption();
+        InvalidBindingPopup popup(gContext->GetMainWindow(), conflict->Action(),
+                                  conflict->Context());
+        popup.GetOption();
         return false;
     }
     else
     {
         /* warn the user that this could conflict */
         QString message = "This kebinding may conflict with ";
-        message += conflict->action() + " in the " + conflict->context();
+        message += conflict->Action() + " in the " + conflict->Context();
         message += " context.  Do you want to bind it anyways?";
 
         if (MythPopupBox::show2ButtonPopup(window, "Conflict Warning",
@@ -778,61 +863,64 @@
 
 
 /* method description in header */
-void MythControls::addKeyToAction(void)
+void MythControls::AddKeyToAction(void)
 {
     // This code needs work to support deleteKey in any mode exc. Context/Action
     /* grab a key from the user */
     KeyGrabPopupBox *kg = new KeyGrabPopupBox(gContext->GetMainWindow());
-    int result = kg->ExecPopup(kg,SLOT(cancel()));
-    QString key = kg->getCapturedKey();
+    int result = kg->ExecPopup(kg,SLOT(Cancel()));
+    QString key = kg->GetCapturedKey();
     delete kg;
 
     /* go no further if canceled */
-    if (result == 0) return;
+    if (result == 0)
+        return;
 
     /* get the keys for the selected action */
-    size_t b = focusedButton();
-    QString action = getCurrentAction(), context = getCurrentContext();
-    QStringList keys = key_bindings->getActionKeys(context, action);
+    size_t b = FocusedButton();
+    QString action = GetCurrentAction(), context = GetCurrentContext();
+    QStringList keys = m_KeyBindings->GetActionKeys(context, action);
 
     /* dont bother rebinding the same key */
-    if (keys[b] == key) return;
+    if (keys[b] == key)
+        return;
 
     bool bind = true;
     int level;
 
     /* get the potential conflict */
     ActionID *conflict = NULL;
-    if ((conflict = key_bindings->conflicts(context, key, level)))
-        bind = resolveConflict(conflict, level);
+    if ((conflict = m_KeyBindings->Conflicts(context, key, level)))
+        bind = ResolveConflict(conflict, level);
 
     delete conflict;
 
     /* dont bind if we shouldn't bind */
-    if (!bind) return;
+    if (!bind)
+        return;
 
     /* finally bind or rebind a key to the action */
     if (b < keys.count())
-        key_bindings->replaceActionKey(context,action, key, keys[b]);
+        m_KeyBindings->ReplaceActionKey(context,action, key, keys[b]);
     else
-        key_bindings->addActionKey(context, action, key);
+        m_KeyBindings->AddActionKey(context, action, key);
 
-    refreshKeyBindings();
-    refreshKeyInformation();
+    RefreshKeyBindings();
+    RefreshKeyInformation();
 }
 
 
 
-void MythControls::addBindings(QDict<binding_t> &bindings,
+void MythControls::AddBindings(QDict<binding_t> &bindings,
                                const QString &context,
                                const QString &contextParent, int bindlevel)
 {
-    QStringList *actions = key_bindings->getActions(context);
+    QStringList *actions = m_KeyBindings->GetActions(context);
 
     for (size_t i = 0; i < actions->size(); i++)
     {
         QString action = (*actions)[i];
-        QStringList keys = key_bindings->getActionKeys(context, action);
+        QStringList keys = m_KeyBindings->GetActionKeys(context, action);
 
         for (size_t j = 0; j < keys.size(); j++)
         {
@@ -857,14 +945,14 @@
     }
 }
 
-BindingList *MythControls::getKeyBindings(const QString &context)
+BindingList *MythControls::GetKeyBindings(const QString &context)
 {
     QStringList keys;
     QDict<binding_t> bindings;
     bindings.clear();
 
-    for (size_t i = 0; i < contexts.size(); i++)
-        addBindings(bindings, contexts[i], context, i);
+    for (size_t i = 0; i < m_SortedContexts.size(); i++)
+        AddBindings(bindings, m_SortedContexts[i], context, i);
 
 
     for (QDictIterator<binding_t> it(bindings); it.current(); ++it)
@@ -873,7 +961,7 @@
         keys.append(key);
     }
 
-    sortKeyList(keys);
+    SortKeyList(keys);
 
     BindingList *retval = new BindingList;
     retval->clear();
@@ -887,49 +975,45 @@
     return retval;
 }
 
-void MythControls::refreshKeyBindings()
+void MythControls::RefreshKeyBindings()
 {
-    contextKeys.clear();
-    keyActions.clear();
-    for (size_t i = 0; i < contexts.size(); i++)
+    m_ContextKeys.clear();
+    m_KeyActions.clear();
+    for (size_t i = 0; i < m_SortedContexts.size(); i++)
     {
-        QString context = contexts[i];
-        BindingList *list = getKeyBindings(context);
-        contextKeys.insert(context, list);
+        QString context = m_SortedContexts[i];
+        BindingList *list = GetKeyBindings(context);
+        m_ContextKeys.insert(context, list);
         for (BindingList::iterator it = list->begin(); it != list->end(); ++it)
         {
             binding_t *b = *it;
-            BindingList *list = keyActions.find(b->key);
+            BindingList *list = m_KeyActions.find(b->key);
             if (!list)
             {
                 list = new BindingList;
                 list->clear();
-                keyActions.insert(b->key, list);
+                m_KeyActions.insert(b->key, list);
             }
             keys.append(b->key);
             list->append(b);
         }
     }
-    contextKeys.setAutoDelete(true);
-    keyActions.setAutoDelete(true);
+    m_ContextKeys.setAutoDelete(true);
+    m_KeyActions.setAutoDelete(true);
 
-    sortKeyList(keys);
+    SortKeyList(keys);
 }
 
-void MythControls::sortKeyList(QStringList &keys)
+void MythControls::SortKeyList(QStringList &keys)
 {
     QStringList t;
     t.clear();
 
     for ( QStringList::Iterator it = keys.begin(); it != keys.end(); ++it )
     {
-        QString key = *it;
-
-        QString keydesc = "3 ";
+        QString key = *it, keydesc = "3 ";
         if (key.left(6) == "remote")
-        {
             keydesc = "0 ";
-        }
         else if (key.length() == 1)
         {
             switch (key[0].category())
@@ -966,7 +1050,7 @@
     }
 }
 
-QString MythControls::getTypeDesc(ListType type)
+QString MythControls::GetTypeDesc(ListType type)
 {
     switch (type)
     {
@@ -984,39 +1068,40 @@
     }
 }
 
-void MythControls::updateLists()
+void MythControls::UpdateLists()
 {
-    RightList->blockSignals(true);
-    LeftList->blockSignals(true);
-    LeftList->Reset();
-    if (leftType == kContextList)
+    m_RightList->blockSignals(true);
+    m_LeftList->blockSignals(true);
+    m_LeftList->Reset();
+    if (m_LeftType == kContextList)
     {
         UIListBtnTypeItem *item;
-        for (size_t i = 0; i < contexts.size(); i++)
+        for (size_t i = 0; i < m_SortedContexts.size(); i++)
         {
-            item = new UIListBtnTypeItem(LeftList, contexts[i]);
+            item = new UIListBtnTypeItem(m_LeftList, m_SortedContexts[i]);
             item->setDrawArrow(true);
         }
-    } else if (leftType == kKeyList)
+    }
+    else if (m_LeftType == kKeyList)
     {
         UIListBtnTypeItem *item;
         for (size_t i = 0; i < keys.size(); i++)
         {
             QString key = KeyToDisplay(keys[i]);
-            item = new UIListBtnTypeItem(LeftList, key);
+            item = new UIListBtnTypeItem(m_LeftList, key);
             item->setDrawArrow(true);
         }
     }
-    refreshRightList();
-    RightList->blockSignals(false);
-    LeftList->blockSignals(false);
-    LeftList->refresh();
-    RightList->refresh();
+    RefreshRightList();
+    m_RightList->blockSignals(false);
+    m_LeftList->blockSignals(false);
+    m_LeftList->refresh();
+    m_RightList->refresh();
 
-    if (LeftDesc != NULL)
-        LeftDesc->SetText(getTypeDesc(leftType));
-    if (RightDesc != NULL)
-        RightDesc->SetText(getTypeDesc(rightType));
+    if (m_LeftDesc != NULL)
+        m_LeftDesc->SetText(GetTypeDesc(m_LeftType));
+    if (m_RightDesc != NULL)
+        m_RightDesc->SetText(GetTypeDesc(m_RightType));
 }
 
 
Index: mythcontrols/keybindings.cpp
===================================================================
--- mythcontrols/keybindings.cpp	(revision 11460)
+++ mythcontrols/keybindings.cpp	(working copy)
@@ -41,19 +41,19 @@
 
 KeyBindings::KeyBindings(const QString & hostname)
 {
-    this->hostname() = hostname;
-    loadManditoryBindings();
+    m_Hostname = hostname;
+    LoadMandatoryBindings();
 
-    retrieveContexts();
-    retrieveJumppoints();
+    RetrieveContexts();
+    RetrieveJumppoints();
 }
 
 
 
-ActionID * KeyBindings::conflicts(const QString & context_name,
+ActionID * KeyBindings::Conflicts(const QString & context_name,
                                   const QString & key, int &level) const
 {
-    const ActionList &ids = actionset.getActions(key);
+    const ActionList &ids = m_ActionSet.GetActions(key);
 
     /* trying to bind a jumppoint to an already bound key */
     if ((context_name == JUMP_CONTEXT) && (ids.count() > 0))
@@ -63,15 +63,18 @@
     for (size_t i = 0; i < ids.count(); i++)
     {
         /* jump points, then global, then the same context */
-        if (ids[i].context() == JUMP_CONTEXT) {
+        if (ids[i].Context() == JUMP_CONTEXT)
+        {
             level = KeyBindings::Error;
             return new ActionID(ids[i]);
         }
-        else if (ids[i].context() == context_name) {
+        else if (ids[i].Context() == context_name)
+        {
             level = KeyBindings::Error;
             return new ActionID(ids[i]);
         }
-        else if (ids[i].context()==GLOBAL_CONTEXT) {
+        else if (ids[i].Context()==GLOBAL_CONTEXT)
+        {
             level = KeyBindings::Warning;
             return new ActionID(ids[i]);
         }
@@ -84,7 +87,7 @@
 
 
 /* method description in header */
-bool KeyBindings::removeActionKey(const QString & context_name,
+bool KeyBindings::RemoveActionKey(const QString & context_name,
                                   const QString & action_name,
                                   const QString & key)
 {
@@ -92,16 +95,17 @@
     ActionID id(context_name, action_name);
 
     /* dont remove the last manditory binding */
-    if (getManditoryBindings().contains(id)&&(actionset.getKeys(id).count()<2))
+    if (GetMandatoryBindings().contains(id) &&
+        (m_ActionSet.GetKeys(id).count()<2))
         return false;
     else
-        return this->actionset.remove(id,key);
+        return this->m_ActionSet.Remove(id,key);
 }
 
 
 
 /* method description in header */
-void KeyBindings::commitAction(const ActionID & id)
+void KeyBindings::CommitAction(const ActionID & id)
 {
 
     MSqlQuery query(MSqlQuery::InitCon());
@@ -112,26 +116,27 @@
 
     if (query.isConnected())
     {
-        QString keys = actionset.keyString(id);
-        query.bindValue(":HOSTNAME", this->getHostname());
-        query.bindValue(":CONTEXT", id.context());
-        query.bindValue(":ACTION", id.action());
+        QString keys = m_ActionSet.KeyString(id);
+        query.bindValue(":HOSTNAME", this->GetHostname());
+        query.bindValue(":CONTEXT", id.Context());
+        query.bindValue(":ACTION", id.Action());
         query.bindValue(":KEYLIST", keys);
 
         if (query.exec() && query.isActive())
         {
             /* remove the current bindings */
-            gContext->GetMainWindow()->ClearKey(id.context(),id.action());
+            gContext->GetMainWindow()->ClearKey(id.Context(),id.Action());
 
             /* make the settings take effect */
-            gContext->GetMainWindow()->BindKey(id.context(), id.action(),keys);
+            gContext->GetMainWindow()->BindKey(id.Context(),
+                                               id.Action(), keys);
         }
     }
 }
 
 
 
-void KeyBindings::commitJumppoint(const ActionID &id)
+void KeyBindings::CommitJumppoint(const ActionID &id)
 {
 
     MSqlQuery query(MSqlQuery::InitCon());
@@ -142,39 +147,41 @@
 
     if (query.isConnected())
     {
-        QString keys = actionset.keyString(id);
-        query.bindValue(":HOSTNAME", this->getHostname());
-        query.bindValue(":DESTINATION", id.action());
+        QString keys = m_ActionSet.KeyString(id);
+        query.bindValue(":HOSTNAME", this->m_Hostname);
+        query.bindValue(":DESTINATION", id.Action());
         query.bindValue(":KEYLIST", keys);
 
         /* tell the user to restart for settings to take effect */
-        if (query.exec() && query.isActive()) {
-
+        if (query.exec() && query.isActive())
+        {
             /* clear bindings to the jumppoint */
-            gContext->GetMainWindow()->ClearJump(id.action());
+            gContext->GetMainWindow()->ClearJump(id.Action());
 
             /* make the bindings take effect */
-            gContext->GetMainWindow()->BindJump(id.action(),keys);
+            gContext->GetMainWindow()->BindJump(id.Action(), keys);
         }
     }
 }
 
 
 
-void KeyBindings::commitChanges(void)
+void KeyBindings::CommitChanges(void)
 {
-    ActionList modified = actionset.getModified();
+    ActionList modified = m_ActionSet.GetModified();
 
     while (modified.size() > 0)
     {
         ActionID id = modified.front();
 
         /* commit either a jumppoint or an action */
-        if (id.context() == JUMP_CONTEXT) commitJumppoint(id);
-        else commitAction(id);
+        if (id.Context() == JUMP_CONTEXT)
+            CommitJumppoint(id);
+        else
+            CommitAction(id);
 
         /* tell the action set that the action is no longer modified */
-        actionset.unmodify(id);
+        m_ActionSet.Unmodify(id);
 
         modified.pop_front();
     }
@@ -182,7 +189,7 @@
 
 
 
-void KeyBindings::retrieveJumppoints()
+void KeyBindings::RetrieveJumppoints()
 {
     MSqlQuery query(MSqlQuery::InitCon());
 
@@ -192,7 +199,7 @@
                       "FROM jumppoints "
                       "WHERE hostname = :HOSTNAME "
                       "ORDER BY destination ;");
-        query.bindValue(":HOSTNAME", this->getHostname());
+        query.bindValue(":HOSTNAME", m_Hostname);
     }
 
     query.exec();
@@ -202,18 +209,17 @@
         ActionID id(JUMP_CONTEXT, query.value(0).toString());
 
         if (query.value(1).toString().isEmpty())
-        {
-            actionset.addAction(id, query.value(0).toString(),
-                                query.value(2).toString());
-        }
-        else actionset.addAction(id,query.value(1).toString(),
-                                 query.value(2).toString());
+            m_ActionSet.AddAction(id, query.value(0).toString(),
+                                  query.value(2).toString());
+        else
+            m_ActionSet.AddAction(id,query.value(1).toString(),
+                                  query.value(2).toString());
     }
 }
 
 
 
-void KeyBindings::retrieveContexts()
+void KeyBindings::RetrieveContexts()
 {
 
     MSqlQuery query(MSqlQuery::InitCon());
@@ -225,7 +231,7 @@
                       "WHERE hostname = :HOSTNAME "
                       "ORDER BY context,action ;");
 
-        query.bindValue(":HOSTNAME", this->getHostname());
+        query.bindValue(":HOSTNAME", m_Hostname);
     }
 
     query.exec();
@@ -233,45 +239,45 @@
     for (query.next(); query.isValid(); query.next())
     {
         ActionID id(query.value(0).toString(), query.value(1).toString());
-        this->actionset.addAction(id, query.value(2).toString(),
-                                  query.value(3).toString());
+        m_ActionSet.AddAction(id, query.value(2).toString(),
+                              query.value(3).toString());
     }
 }
 
 
 
-void KeyBindings::loadManditoryBindings(void)
+void KeyBindings::LoadMandatoryBindings(void)
 {
-    if (getManditoryBindings().empty())
+    if (GetMandatoryBindings().empty())
     {
-        manditoryBindings().append(ActionID(GLOBAL_CONTEXT, "DOWN"));
-        defaultKeys().append("Down");
+        MandatoryBindings().append(ActionID(GLOBAL_CONTEXT, "DOWN"));
+        DefaultKeys().append("Down");
 
-        manditoryBindings().append(ActionID(GLOBAL_CONTEXT, "UP"));
-        defaultKeys().append("Up");
+        MandatoryBindings().append(ActionID(GLOBAL_CONTEXT, "UP"));
+        DefaultKeys().append("Up");
 
-        manditoryBindings().append(ActionID(GLOBAL_CONTEXT, "LEFT"));
-        defaultKeys().append("Left");
+        MandatoryBindings().append(ActionID(GLOBAL_CONTEXT, "LEFT"));
+        DefaultKeys().append("Left");
 
-        manditoryBindings().append(ActionID(GLOBAL_CONTEXT, "RIGHT"));
-        defaultKeys().append("Right");
+        MandatoryBindings().append(ActionID(GLOBAL_CONTEXT, "RIGHT"));
+        DefaultKeys().append("Right");
 
-        manditoryBindings().append(ActionID(GLOBAL_CONTEXT, "ESCAPE"));
-        defaultKeys().append("Esc");
+        MandatoryBindings().append(ActionID(GLOBAL_CONTEXT, "ESCAPE"));
+        DefaultKeys().append("Esc");
 
-        manditoryBindings().append(ActionID(GLOBAL_CONTEXT, "SELECT"));
-        defaultKeys().append("Return,Enter,Space");
+        MandatoryBindings().append(ActionID(GLOBAL_CONTEXT, "SELECT"));
+        DefaultKeys().append("Return,Enter,Space");
     }
 }
 
 
 
-bool KeyBindings::hasManditoryBindings(void) const
+bool KeyBindings::HasMandatoryBindings(void) const
 {
-    ActionList manlist = getManditoryBindings();
+    ActionList manlist = GetMandatoryBindings();
     for (size_t i = 0; i < manlist.count(); i++)
     {
-        if (actionset.getKeys(manlist[i]).isEmpty())
+        if (m_ActionSet.GetKeys(manlist[i]).isEmpty())
             return false;
     }
 
Index: mythcontrols/actionset.cpp
===================================================================
--- mythcontrols/actionset.cpp	(revision 11460)
+++ mythcontrols/actionset.cpp	(working copy)
@@ -36,21 +36,21 @@
 
 
 /* method description in header */
-bool ActionSet::add(const ActionID &id, const QString &key)
+bool ActionSet::Add(const ActionID &id, const QString &key)
 {
     Action *a;
 
     /* get the action; make sure it exists before doing anything */
-    if ((a = this->action(id)))
+    if ((a = this->GetAction(id)))
     {
 
         /* if the key was added, mark this action as modified, and
            update the key map */
-        if (a->addKey(key))
+        if (a->AddKey(key))
         {
-            ActionList &ids = _keymap[key];
+            ActionList &ids = m_KeyMap[key];
             ids.push_back(id);
-            this->modify(id);	
+            this->Modify(id);	
             return true;
         }
     }
@@ -61,23 +61,23 @@
 
 
 /* method description in header */
-bool ActionSet::remove(const ActionID &id, const QString & key)
+bool ActionSet::Remove(const ActionID &id, const QString & key)
 {
 
     Action *a;
 
     /* make sure an action exists before removing */
-    if ((a = this->action(id)))
+    if ((a = this->GetAction(id)))
     {
         /* if the key was removed from the action, then remove it from
          * the key list, and mark the action id as modified */
-        if (a->removeKey(key))
+        if (a->RemoveKey(key))
         {
             /* remove the action from the key map */
-            this->_keymap[key].remove(id);
+            this->m_KeyMap[key].remove(id);
 
             /* mark the action as modified */
-            this->modify(id);
+            this->Modify(id);
 
             return true;	    
         }
@@ -90,26 +90,26 @@
 
 
 /* method description in header */
-bool ActionSet::replace(const ActionID &id, const QString &newkey,
+bool ActionSet::Replace(const ActionID &id, const QString &newkey,
                         const QString &oldkey)
 {
     Action *a;
 
     /* make sure an action exists before replacing */
-    if ((a = this->action(id)))
+    if ((a = this->GetAction(id)))
     {
 
         /* make sure the key was actually replaced before modifying */
-        if (a->replaceKey(newkey, oldkey))
+        if (a->ReplaceKey(newkey, oldkey))
         {
             /* remove the action from the old key */
-            this->_keymap[oldkey].remove(id);
+            this->m_KeyMap[oldkey].remove(id);
 
             /* add the action to the new key */
-            this->_keymap[newkey].push_back(id);
+            this->m_KeyMap[newkey].push_back(id);
 
             /* mark the action as modified */
-            this->modify(id);
+            this->Modify(id);
 
             /* the job is done, return true */
             return true;	    
@@ -123,10 +123,10 @@
 
 
 /* method description in header */
-QStringList * ActionSet::contextStrings(void) const
+QStringList * ActionSet::ContextStrings(void) const
 {
     QStringList *context_strings = new QStringList();
-    QDictIterator<Context> it(_contexts);
+    QDictIterator<Context> it(m_Contexts);
 
     for (; it.current(); ++it)
         context_strings->append(it.currentKey());
@@ -137,15 +137,16 @@
 
 
 /* method description in header */
-QStringList * ActionSet::actionStrings(const QString &context_name) const
+QStringList * ActionSet::ActionStrings(const QString &context_name) const
 {
-    Context *c = _contexts[context_name];
+    Context *c = m_Contexts[context_name];
 
-    if (c == NULL) return NULL;
+    if (c == NULL)
+        return NULL;
     else
     {
         QStringList *action_strings = new QStringList();
-        QDictIterator<Action> it(*(_contexts[context_name]));
+        QDictIterator<Action> it(*(m_Contexts[context_name]));
 
         for (; it.current(); ++it)
             action_strings->append(it.currentKey());
@@ -157,29 +158,30 @@
 
 
 /* method description in header */
-bool ActionSet::addAction(const ActionID &id, const QString &description,
+bool ActionSet::AddAction(const ActionID &id, const QString &description,
                           const QString &keys)
 {
-    if (!_contexts[id.context()]) _contexts.insert(id.context(),
-                                                   new Context());
+    if (!m_Contexts[id.Context()]) m_Contexts.insert(id.Context(),
+                                                     new Context());
 
     /* return false if the action already exists */
-    if ((*_contexts[id.context()])[id.action()]) return false;
+    if ((*m_Contexts[id.Context()])[id.Action()])
+        return false;
     else
     {
         /* create the action */
         Action *a = new Action(description, keys);
 
         /* add the action into the dict */
-        _contexts[id.context()]->insert(id.action(), a);
+        m_Contexts[id.Context()]->insert(id.Action(), a);
 
         /* get the actions keys */
-        const QStringList &keys = a->getKeys();
+        const QStringList &keys = a->GetKeys();
         for (size_t i = 0; i < keys.count(); i++)
         {
             /* get the action list (of actions bound to keys[i])
-               if there is no key, keys[i], in the map, it will be added now */
-            ActionList &ids = _keymap[keys[i]];
+               if there is no key, keys[i], in the map, it will be added now*/
+            ActionList &ids = m_KeyMap[keys[i]];
 
             /* add this action id to the list of actions bound to this key */
             ids.push_back(id);
@@ -193,15 +195,15 @@
 
 
 
-QString ActionSet::keyString(const ActionID &id) const
+QString ActionSet::KeyString(const ActionID &id) const
 {
     Context *c;
-    if ((c = _contexts[id.context()]))
+    if ((c = m_Contexts[id.Context()]))
     {
         Action *a;
-        if ((a = (*c)[id.action()]))
+        if ((a = (*c)[id.Action()]))
         {
-            return a->keyString();
+            return a->KeyString();
         }
     }
     return QString::null;
@@ -209,15 +211,15 @@
 
 
 
-QStringList ActionSet::getKeys(const ActionID &id) const
+QStringList ActionSet::GetKeys(const ActionID &id) const
 {
     Context *c;
-    if ((c = _contexts[id.context()]))
+    if ((c = m_Contexts[id.Context()]))
     {
         Action *a;
-        if ((a = (*c)[id.action()]))
+        if ((a = (*c)[id.Action()]))
         {
-            return a->getKeys();
+            return a->GetKeys();
         }
     }
 
@@ -226,15 +228,15 @@
 
 
 
-const QString & ActionSet::getDescription(const ActionID &id) const
+const QString & ActionSet::GetDescription(const ActionID &id) const
 {
     Context *c;
-    if ((c = _contexts[id.context()]))
+    if ((c = m_Contexts[id.Context()]))
     {
         Action *a;
-        if ((a = (*c)[id.action()]))
+        if ((a = (*c)[id.Action()]))
         {
-            return a->getDescription();
+            return a->GetDescription();
         }
     }
 
@@ -243,9 +245,9 @@
 
 
 
-const ActionList & ActionSet::getActions(const QString &key) const
+const ActionList & ActionSet::GetActions(const QString &key) const
 {
-    return _keymap[key];
+    return m_KeyMap[key];
 }
 
 
Index: mythcontrols/mythcontrols.h
===================================================================
--- mythcontrols/mythcontrols.h	(revision 11460)
+++ mythcontrols/mythcontrols.h	(working copy)
@@ -71,7 +71,7 @@
      *
      * If no context is selected, an empty string is returned.
      */
-    QString getCurrentContext(void) const;
+    QString GetCurrentContext(void) const;
 
     /**
      * @brief Get the currently selected action string.
@@ -79,7 +79,7 @@
      *
      * If no action is selected, an empty string is returned.
      */
-    QString getCurrentAction(void) const;
+    QString GetCurrentAction(void) const;
 
     /**
      * @brief Get the currently selected key string
@@ -87,10 +87,8 @@
      *
      * If no context is selected, an empty string is returned.
      */
-    QString getCurrentKey(void) const;
-
+    QString GetCurrentKey(void) const;
     
-    
 protected:
 
     /**
@@ -102,7 +100,7 @@
      * mythcontrols.  If this method returns false, the plugin should
      * exit since it will probably just core dump.
      */
-    bool loadUI();
+    bool LoadUI();
 
     /**
      * @brief The key press handler.
@@ -116,32 +114,32 @@
      * Updates the list of keys that are shown and the description of
      * the action.
      */
-    void refreshKeyInformation();
+    void RefreshKeyInformation();
 
     /**
      * @brief Load the appropriate actions into the action list.
      * @param context The context, from which actions will be
      * displayed.
      */
-    void refreshRightList(void);
+    void RefreshRightList(void);
 
     /**
      * @brief Redisplay both the left and right lists and fix focus
      */
-    void updateLists(void);
+    void UpdateLists(void);
 
     /**
      * @brief Load the settings for a particular host.
      * @param hostname The host to load settings for.
      */
-    void loadHost(const QString & hostname);
+    void LoadHost(const QString & hostname);
 
     /**
      * @brief Focus a button in a particular direction.
      * @param direction Positave values focus to the right, negatives
      * to the left.  A value of zero focuses the first button.
      */
-    void focusButton(int direction);
+    void FocusButton(int direction);
 
     /**
      * @brief Determine which button is focused.
@@ -150,21 +148,21 @@
      *
      * @sa Action::MAX_KEYS
      */
-    size_t focusedButton(void) const;
+    size_t FocusedButton(void) const;
 
     /**
      * @brief Resolve a potential conflict.
      * @return true if the conflict should be bound, otherwise, false
      * is returned.
      */
-    bool resolveConflict(ActionID *conflict, int level);
+    bool ResolveConflict(ActionID *conflict, int level);
 
     /**
      * @brief Focus a new list and take focus away from the old.
      * @param focus The list to gain focus
      * @param unfocus The list to loose focus
      */
-    void switchListFocus(UIListBtnType *focus, UIListBtnType *unfocus);
+    void SwitchListFocus(UIListBtnType *focus, UIListBtnType *unfocus);
 
     /**
      * @brief Add bindings to QDict<binding_t> for specified context
@@ -173,55 +171,59 @@
      * @param contextParent the context whose keybindings are being calculated
      * @param bindlevel the bind level associated with this context
      */
-    void addBindings(QDict<binding_t> &bindings, const QString &context, const QString &contextParent, int bindlevel);
+    void AddBindings(QDict<binding_t> &bindings, const QString &context,
+                     const QString &contextParent, int bindlevel);
 
     /**
      * @brief Create a BindingList for the specified context
      * @param context the context for which a BindingList should be created
      */
-    BindingList *getKeyBindings(const QString &context);
+    BindingList *GetKeyBindings(const QString &context);
 
 private slots:
 
-/**
- * @brief Add a key to the currently selected action.
- */
-void addKeyToAction(void);
+    /**
+     * @brief Add a key to the currently selected action.
+     */
+    void AddKeyToAction(void);
 
     /**
      * @brief Delete the currently active key.
      */
-    void deleteKey();
+    void DeleteKey();
 
     /**
      * @brief Save the settings.
      */
-    inline void save(void) { key_bindings->commitChanges(); }
+    inline void Save(void)
+    {
+        m_KeyBindings->CommitChanges();
+    }
 
     /**
      * @brief Recieves a signal when an item in the left list is
      * selected.
      * @param item The selected item.
      */
-    void leftSelected(UIListBtnTypeItem *item);
+    void LeftSelected(UIListBtnTypeItem *item);
 
     /**
      * @brief Recieves a signal when an item in the right list is
      * selected.
      * @param item The selected item.
      */
-    void rightSelected(UIListBtnTypeItem *item);
+    void RightSelected(UIListBtnTypeItem *item);
 
     /**
      * @brief Sort a list of keys, removing duplicates
      * @param keys the list of keys to sort
      */
-    void sortKeyList(QStringList &keys);
+    void SortKeyList(QStringList &keys);
 
     /**
      * @brief Refresh binding information
      */
-    void refreshKeyBindings();
+    void RefreshKeyBindings();
 
     /**
      * @brief Jump to a particular key binding
@@ -231,26 +233,31 @@
 
 private:
 
-    UIType *focused;
-    UIListBtnType *LeftList;
-    UIListBtnType *RightList;
-    UITextType *description, *LeftDesc, *RightDesc;
-    UITextButtonType * ActionButtons[Action::MAX_KEYS];
-    KeyBindings *key_bindings;
-    LayerSet *container;
+    UIType *m_Focused;
+    UIListBtnType *m_LeftList;
+    UIListBtnType *m_RightList;
+    UITextType *m_Description, *m_LeftDesc, *m_RightDesc;
+    UITextButtonType * m_ActionButtons[Action::MAX_KEYS];
+    KeyBindings *m_KeyBindings;
+    LayerSet *m_Container;
 
-    QStringList contexts; ///< sorted list of contexts
+    QStringList m_SortedContexts; ///< sorted list of contexts
     QStringList keys; ///< sorted list of keys
 
-    QDict<QStringList> m_contexts; ///< actions for a given context
-    QDict<BindingList> contextKeys; ///< key bindings for a given context
-    QDict<BindingList> keyActions; ///< actions in each context for a given key
+    QDict<QStringList> m_Contexts; ///< actions for a given context
+    QDict<BindingList> m_ContextKeys; ///< key bindings for a given context
+    QDict<BindingList> m_KeyActions; ///< actions in each context for a given key
 
-    typedef enum { kContextList, kKeyList, kActionList } ListType;
-    ListType leftType, rightType;
+    typedef enum {
+        kContextList,
+        kKeyList,
+        kActionList
+    } ListType;
 
-    QString getTypeDesc(ListType type);
+    ListType m_LeftType, m_RightType;
 
+    QString GetTypeDesc(ListType type);
+
 };
 
 
Index: mythcontrols/keybindings.h
===================================================================
--- mythcontrols/keybindings.h	(revision 11460)
+++ mythcontrols/keybindings.h	(working copy)
@@ -60,7 +60,10 @@
      * @brief Get the hostname these keybindings are from.
      * @return The hostname these keybindings are from.
      */
-    inline const QString & getHostname() const { return this->_hostname; }
+    inline const QString & GetHostname() const
+    {
+        return this->m_Hostname;
+    }
 
     /**
      * @brief Get a list of the context names.
@@ -68,9 +71,9 @@
      * @note The returned list is a copy and can be modified without
      * side-effects.
      */
-    inline QStringList * getContexts() const
+    inline QStringList * GetContexts() const
     {
-        return actionset.contextStrings();
+        return m_ActionSet.ContextStrings();
     }
 
     /**
@@ -80,9 +83,9 @@
      * @note Store this instead of calling repeatedly.  Every time you
      * do, ActionSet has to iterate over all contexts and actions.
      */
-    inline QStringList * getActions(const QString & context) const
+    inline QStringList * GetActions(const QString & context) const
     {
-        return actionset.actionStrings(context);
+        return m_ActionSet.ActionStrings(context);
     }
 
     /**
@@ -92,9 +95,9 @@
      * @note Store this instead of calling repeatedly.  Every time you
      * do, ActionSet has to iterate over all contexts and actions.
      */
-    inline void getKeyActions(const QString &key, ActionList &list) const
+    inline void GetKeyActions(const QString &key, ActionList &list) const
     {
-        list = actionset.getActions(key);
+        list = m_ActionSet.GetActions(key);
     }
 
     /**
@@ -103,10 +106,10 @@
      * @param action_name The name of the action.
      * @return The keys bound to the specified context's action
      */
-    inline QStringList getActionKeys(const QString & context_name,
+    inline QStringList GetActionKeys(const QString & context_name,
                                      const QString & action_name) const
     {
-        return actionset.getKeys(ActionID(context_name, action_name));
+        return m_ActionSet.GetKeys(ActionID(context_name, action_name));
     }
 
     /**
@@ -115,10 +118,11 @@
      * @param action_name The name of the action.
      * @return The description of the specified context's action
      */
-    inline QString getActionDescription(const QString & context_name,
+    inline QString GetActionDescription(const QString & context_name,
                                         const QString & action_name) const
     {
-        return actionset.getDescription(ActionID(context_name, action_name));
+        return m_ActionSet.GetDescription(ActionID(context_name,
+                                                   action_name));
     }
 
     /**
@@ -131,11 +135,11 @@
      * This does not take effect until the commitChanges function is
      * called.
      */
-    inline void addActionKey(const QString & context_name,
+    inline void AddActionKey(const QString & context_name,
                              const QString & action_name,
                              const QString & key)
     {
-        this->actionset.add(ActionID(context_name, action_name), key);
+        this->m_ActionSet.Add(ActionID(context_name, action_name), key);
     }
 
     /**
@@ -157,7 +161,7 @@
      * errors should be prevented no matter what.  If they dont like it,
      * they can learn SQL.
      */
-    ActionID * conflicts(const QString & context_name,
+    ActionID * Conflicts(const QString & context_name,
                          const QString & key, int &level) const;
 
     /**
@@ -171,12 +175,12 @@
      * This does not take effect until the commitChanges function is
      * called.
      */
-    inline void replaceActionKey(const QString & context_name,
+    inline void ReplaceActionKey(const QString & context_name,
                                  const QString & action_name,
                                  const QString & newkey,
                                  const QString & oldkey)
     {
-        this->actionset.replace(ActionID(context_name, action_name),
+        this->m_ActionSet.Replace(ActionID(context_name, action_name),
                                 newkey, oldkey);
     }
 
@@ -187,23 +191,26 @@
      * @param key The key to remove.
      * @return true if the key was removed, or false if it was not.
      *
-     * Unless the action is manditory there is only one key in the
+     * Unless the action is Mandatory there is only one key in the
      * action, this method should return true.
      */
-    bool removeActionKey(const QString & context_name,
+    bool RemoveActionKey(const QString & context_name,
                          const QString & action_name,
                          const QString & key);
 
     /**
-     * @brief Set the manditory bindings to their defaults.
+     * @brief Set the Mandatory bindings to their defaults.
      */
-    void defaultManditoryBindings(void);
+    void DefaultMandatoryBindings(void);
 
     /**
      * @brief Determine if there are changes to the keybindings.
      * @return True if keys have been changed, otherwise, false.
      */
-    inline bool hasChanges(void) const { return actionset.hasModified(); }
+    inline bool HasChanges(void) const
+    {
+        return m_ActionSet.HasModified();
+    }
 
     /**
      * @brief Commit all changes made to the keybindings.
@@ -212,49 +219,43 @@
      * current bindings for those actions that changed, and setup the
      * new bindings.
      */
-    void commitChanges(void);
+    void CommitChanges(void);
 
     /**
-     * @brief Get a list of the manditory key bindings.
-     * @return A list of the manditory bindings.
+     * @brief Get a list of the Mandatory key bindings.
+     * @return A list of the Mandatory bindings.
      */
-    inline const ActionList& getManditoryBindings(void) const
+    inline const ActionList& GetMandatoryBindings(void) const
     {
-        return this->_manditory_bindings;
+        return this->m_MandatoryBindings;
     }
 
     /**
-     * @brief Determine if all manditory bindings are satisfied.
-     * @return true if all manditory bindings are satisfied, otherwise, false.
+     * @brief Determine if all Mandatory bindings are satisfied.
+     * @return true if all mandatory bindings are satisfied, otherwise, false.
      */
-    bool hasManditoryBindings(void) const;
+    bool HasMandatoryBindings(void) const;
 
 protected:
 
     /**
-     * @brief Get a reference to the hostname.
-     * @return A reference to the hostname.
-     */
-    inline QString & hostname() { return this->_hostname; }
-
-    /**
      * @brief Commit a jumppoint to the database.
      *
      * This (currently) does not reload the jumppoint.
      */
-    void commitJumppoint(const ActionID &id);
+    void CommitJumppoint(const ActionID &id);
 
     /**
      * @brief Commit an action to the database, and reload its keybindings.
      */
-    void commitAction(const ActionID & id);
+    void CommitAction(const ActionID & id);
 
     /**
      * @brief Load the jumppoints from the database.
      *
      * This method will load the keybindings for jump points.
      */
-    void retrieveJumppoints(void);
+    void RetrieveJumppoints(void);
 
     /**
      * @brief Load the keybindings from the database.
@@ -262,31 +263,37 @@
      * This will load the keybindings which apply to the hostname
      * specified to the constructor.
      */
-    void retrieveContexts(void);
+    void RetrieveContexts(void);
 
     /**
-     * @brief Load the manditory bindings.
+     * @brief Load the mandatory bindings.
      */
-    void loadManditoryBindings(void);
+    void LoadMandatoryBindings(void);
 
     /**
-     * @brief Get a reference to the list of the manditory key bindings.
-     * @return A reference to the list of the manditory bindings.
+     * @brief Get a reference to the list of the mandatory key bindings.
+     * @return A reference to the list of the mandatory bindings.
      */
-    inline ActionList & manditoryBindings(void) { return _manditory_bindings; }
+    inline ActionList & MandatoryBindings(void)
+    {
+        return m_MandatoryBindings;
+    }
 
     /**
      * @brief Get the default keys.
      * @return A list of the default keys.
      */
-    inline QStringList & defaultKeys() { return _default_keys; }
+    inline QStringList & DefaultKeys()
+    {
+        return m_DefaultKeys;
+    }
 
 private:
 
-    QString _hostname;
-    ActionList _manditory_bindings;
-    QStringList _default_keys;
-    ActionSet actionset;
+    QString m_Hostname;
+    ActionList m_MandatoryBindings;
+    QStringList m_DefaultKeys;
+    ActionSet m_ActionSet;
 };
 
 #endif /* KEYBINDINGS_H */
Index: mythcontrols/action.cpp
===================================================================
--- mythcontrols/action.cpp	(revision 11460)
+++ mythcontrols/action.cpp	(working copy)
@@ -34,18 +34,19 @@
 
 Action::Action(const QString & description, const QString & keys)
 {
-    this->description() = description;
-    this->keys() = QStringList::split(", ", QString(QKeySequence(keys)));
+    m_Description = description;
+    m_Keys = QStringList::split(", ", QString(QKeySequence(keys)));
 }
 
 
 
-bool Action::hasKey(const QString & key) const
+bool Action::HasKey(const QString & key) const
 {
     /* check the keys */
-    for (size_t i = 0; i < getKeys().count(); i++)
+    for (size_t i = 0; i < GetKeys().count(); i++)
     {
-        if (getKeys()[i] == key) return true;
+        if (GetKeys()[i] == key)
+            return true;
     }
 
     /* the key was not found, so return false */
@@ -54,33 +55,33 @@
 
 
 
-bool Action::addKey(const QString & key)
+bool Action::AddKey(const QString & key)
 {
 
     /* dont add empty keys and dont add too many, or duplicates  */
     if ((key.length() == 0) ||
-        (getKeys().size() >= MAX_KEYS) ||
-        (getKeys().contains(key)))
+        (GetKeys().size() >= MAX_KEYS) ||
+        (GetKeys().contains(key)))
         return false;
 
     /* add the key */
-    this->keys().push_back(key);
+    m_Keys.push_back(key);
     return true;
 }
 
 
 
 /* comments in header */
-bool Action::replaceKey(const QString & newkey, const QString &oldkey)
+bool Action::ReplaceKey(const QString & newkey, const QString &oldkey)
 {
     /* make sure that the key list doesn't already have the new key */
-    if (getKeys().contains(newkey) == 0)
+    if (GetKeys().contains(newkey) == 0)
     {
-        for (size_t i = 0; i < getKeys().size(); i++)
+        for (size_t i = 0; i < GetKeys().size(); i++)
         {
-            if (getKeys()[i] == oldkey)
+            if (GetKeys()[i] == oldkey)
             {
-                keys()[i] = newkey;
+                m_Keys[i] = newkey;
                 return true;
             }
         }
Index: mythcontrols/keygrabber.cpp
===================================================================
--- mythcontrols/keygrabber.cpp	(revision 11460)
+++ mythcontrols/keygrabber.cpp	(working copy)
@@ -22,8 +22,6 @@
  * 02111-1307, USA
  */
 
-#include <iostream>
-
 using namespace std;
 
 #include "keygrabber.h"
@@ -34,13 +32,13 @@
 KeyGrabPopupBox::KeyGrabPopupBox(MythMainWindow *window)
     : MythPopupBox(window, "keygrabber")
 {
-    this->is_capturing = false;
-    this->has_captured = false;
+    m_IsCapturing = false;
+    m_HasCaptured = false;
     addLabel("Press A Key", Large, false);
-    key_label = addLabel("Waiting for key press", Small, false);
+    m_KeyLabel = addLabel("Waiting for key press", Small, false);
 
-    ok_button = this->addButton(tr("OK"), this, SLOT(acceptBinding()));
-    cancel_button = this->addButton(tr("Cancel"), this, SLOT(cancel()));
+    m_OkButton = this->addButton(tr("OK"), this, SLOT(AcceptBinding()));
+    m_CancelButton = this->addButton(tr("Cancel"), this, SLOT(Cancel()));
 
     this->grabKeyboard();
 }
@@ -49,11 +47,12 @@
 
 void KeyGrabPopupBox::keyReleaseEvent(QKeyEvent *e)
 {
-    if (!this->is_capturing) return;
+    if (!this->m_IsCapturing)
+        return;
 
     /* now we have an event, so we are not capturing */
-    this->has_captured = true;
-    this->is_capturing = false;
+    this->m_HasCaptured = true;
+    this->m_IsCapturing = false;
 
     /* get the base name of the qkeysequence */
     QString key_name = QString(QKeySequence(e->key()));
@@ -64,25 +63,29 @@
         QString modifiers;
 
         /* key modifier strings as defined by the QT docs */
-        if (e->state()&Qt::ShiftButton) modifiers+="Shift+";
-        if (e->state()&Qt::ControlButton) modifiers+="Ctrl+";
-        if (e->state()&Qt::AltButton) modifiers+="Alt+";
-        if (e->state()&Qt::MetaButton) modifiers+="Meta+";
+        if (e->state()&Qt::ShiftButton)
+            modifiers+="Shift+";
+        if (e->state()&Qt::ControlButton)
+            modifiers+="Ctrl+";
+        if (e->state()&Qt::AltButton)
+            modifiers+="Alt+";
+        if (e->state()&Qt::MetaButton)
+            modifiers+="Meta+";
         key_name = modifiers + key_name;
     }
 
     /* keys without a name are no good to us */
     if (key_name.isEmpty())
     {
-        key_label->setText(tr("Pressed key not recognized"));
-        ok_button->setDisabled(true);
-        cancel_button->setFocus();
+        m_KeyLabel->setText(tr("Pressed key not recognized"));
+        m_OkButton->setDisabled(true);
+        m_CancelButton->setFocus();
     }
     else
     {
-        captured_key_event = key_name;
-        key_label->setText(tr("Add key '%1'?").arg(key_name));
-        ok_button->setFocus();
+        m_CapturedKeyEvent = key_name;
+        m_KeyLabel->setText(tr("Add key '%1'?").arg(key_name));
+        m_OkButton->setFocus();
     }
 
     releaseKeyboard();
@@ -92,13 +95,15 @@
 
 void KeyGrabPopupBox::keyPressEvent(QKeyEvent *e)
 {
-
     /* if no capturing has occured yet, then start */
-    if (!has_captured) this->is_capturing = true;
+    if (!m_HasCaptured)
+        this->m_IsCapturing = true;
 
     /* accept events while we are capturing */
-    if (this->is_capturing) e->accept();
-    else MythPopupBox::keyPressEvent(e);
+    if (this->m_IsCapturing)
+        e->accept();
+    else
+        MythPopupBox::keyPressEvent(e);
 }
 
 InvalidBindingPopup::InvalidBindingPopup(MythMainWindow *window)
@@ -131,8 +136,8 @@
     : MythPopupBox(window, "optionmenu")
 {
     addLabel(tr("Options"), Large, false);
-    addButton(tr("Save"), this, SLOT(save()));
-    addButton(tr("Cancel"), this, SLOT(cancel()))->setFocus();
+    addButton(tr("Save"), this, SLOT(Save()));
+    addButton(tr("Cancel"), this, SLOT(Cancel()))->setFocus();
 }
     
 
@@ -140,9 +145,9 @@
     : MythPopupBox(window, "actionmenu")
 {
     addLabel(tr("Modify Action"), Large, false);
-    addButton(tr("Set Binding"), this, SLOT(set()));
-    addButton(tr("Remove Binding"), this, SLOT(remove()));
-    addButton(tr("Cancel"), this, SLOT(cancel()))->setFocus();
+    addButton(tr("Set Binding"), this, SLOT(Set()));
+    addButton(tr("Remove Binding"), this, SLOT(Remove()));
+    addButton(tr("Cancel"), this, SLOT(Cancel()))->setFocus();
 }
 
 UnsavedMenu::UnsavedMenu(MythMainWindow *window)
@@ -150,8 +155,8 @@
 {
     addLabel(tr("Unsaved Changes"), Large, false);
     addLabel(tr("Exiting...") + "\n\n" + tr("Save Changes?"));
-    addButton(tr("Yes"), this, SLOT(save()))->setFocus();
-    addButton(tr("No"), this, SLOT(cancel()));
+    addButton(tr("Yes"), this, SLOT(Save()))->setFocus();
+    addButton(tr("No"), this, SLOT(Cancel()));
 }
 
 ConfirmMenu::ConfirmMenu(MythMainWindow *window, QString msg)
@@ -159,6 +164,6 @@
 {
     addLabel(tr("Confirm"), Large, false);
     addLabel(msg);
-    addButton(tr("Confirm"), this, SLOT(confirm()))->setFocus();
-    addButton(tr("Cancel"), this, SLOT(cancel()));
+    addButton(tr("Confirm"), this, SLOT(Confirm()))->setFocus();
+    addButton(tr("Cancel"), this, SLOT(Cancel()));
 }
