← Back to branch summary

~ps-jenkins/compiz/latestsnapshot-10.9.9daily13.06.1913.04-0ubuntu1

« back to all changes in this revision

Viewing changes to plugins/decor/src/decor.cpp

  • Committer: MC Return
  • Date: 2012-12-01 17:07:09 UTC
  • mto: This revision was merged to the branch mainline in revision 3503.
  • Revision ID: mc.return@gmx.net-20121201170709-9us3w77m7b0cr4vu
Simplified declaration of int i by moving it into the for loop, where i is eventually used

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/decor/src/decor.cpp
1180
1180
                        unsigned int decorType)
1181
1181
{
1182
1182
    const unsigned int nTypeStates = 5;
1183
 
    unsigned int i;
1184
1183
    struct typestate {
1185
1184
        unsigned int compFlag;
1186
1185
        unsigned int decorFlag;
1193
1192
        { CompWindowTypeUtilMask, DECOR_WINDOW_TYPE_UTILITY}
1194
1193
    };
1195
1194
 
1196
 
    for (i = 0; i < nTypeStates; i++)
 
1195
    for (unsigned int i = 0; i < nTypeStates; i++)
1197
1196
    {
1198
1197
        if ((decorType & typeStates[i].decorFlag) && (w->type () & typeStates[i].compFlag))
1199
1198
            return true;
1218
1217
                         unsigned int decorState)
1219
1218
{
1220
1219
    const unsigned int nStateStates = 3;
1221
 
    unsigned int i;
1222
1220
    struct statestate {
1223
1221
        unsigned int compFlag;
1224
1222
        unsigned int decorFlag;
1233
1231
    if (screen->activeWindow () == w->id ())
1234
1232
        decorState &= ~(DECOR_WINDOW_STATE_FOCUS);
1235
1233
 
1236
 
    for (i = 0; i < nStateStates; i++)
 
1234
    for (unsigned int i = 0; i < nStateStates; i++)
1237
1235
    {
1238
1236
        if ((decorState & stateStates[i].decorFlag) && (w->state () & stateStates[i].compFlag))
1239
1237
            decorState &= ~(stateStates[i].decorFlag);
1254
1252
                           unsigned int decorActions)
1255
1253
{
1256
1254
    const unsigned int nActionStates =16;
1257
 
    unsigned int i;
1258
1255
    struct actionstate {
1259
1256
        unsigned int compFlag;
1260
1257
        unsigned int decorFlag;
1278
1275
        { DECOR_WINDOW_ACTION_BELOW, CompWindowActionBelowMask },
1279
1276
    };
1280
1277
 
1281
 
    for (i = 0; i < nActionStates; i++)
 
1278
    for (unsigned int i = 0; i < nActionStates; i++)
1282
1279
    {
1283
1280
        if ((decorActions & actionStates[i].decorFlag) && (w->type () & actionStates[i].compFlag))
1284
1281
            decorActions &= ~(actionStates[i].decorFlag);
2484
2481
                    }
2485
2482
                    else
2486
2483
                    {
2487
 
                        int i;
2488
 
 
2489
2484
                        /* A default decoration changed */
2490
 
                        for (i = 0; i < DECOR_NUM; i++)
 
2485
                        for (int i = 0; i < DECOR_NUM; i++)
2491
2486
                        {
2492
2487
                            if (event->xproperty.atom == decorAtom[i])
2493
2488
                            {