← Back to branch summary

~daschuer/mixxx/features_setlog

« back to all changes in this revision

Viewing changes to mixxx/src/widget/wpushbutton.cpp

  • Committer: daschuer at gmx
  • Date: 2011-10-04 20:29:10 UTC
  • mfrom: (2840.1.15 mixxx-trunk)
  • Revision ID: daschuer@gmx.de-20111004202910-8pktjwu7f51xl515
merged with lp:mixxx

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/widget/wpushbutton.cpp
87
87
        configKey.group = key.left(key.indexOf(","));
88
88
        configKey.item = key.mid(key.indexOf(",")+1);
89
89
 
90
 
        ControlPushButton* p =
91
 
                dynamic_cast<ControlPushButton*>(ControlObject::getControl(configKey));
92
 
 
93
 
        if (p == NULL) {
94
 
            qWarning() << "WPushButton for control " << key << "is null, skipping.";
95
 
            con = con.nextSibling();
96
 
            continue;
97
 
        }
98
 
 
99
90
        //Find out if we're a push button...
100
 
        if (node.nodeName()=="PushButton")
 
91
        if (node.nodeName() == "PushButton")
101
92
        {
 
93
            ControlPushButton* p = dynamic_cast<ControlPushButton*>(
 
94
                ControlObject::getControl(configKey));
 
95
 
 
96
            if (p == NULL) {
 
97
                // A NULL here either means that this control is not a
 
98
                // ControlPushButton or it does not exist. This logic is
 
99
                // specific to push-buttons, so skip it either way.
 
100
                con = con.nextSibling();
 
101
                continue;
 
102
            }
 
103
 
102
104
            bool isLeftButton = false;
103
105
            bool isRightButton = false;
104
106
            if (!selectNode(con, "ButtonState").isNull())