← Back to branch summary

~ctwm/ctwm/trunk

« back to all changes in this revision

Viewing changes to workmgr.c

  • Committer: Matthew Fuller
  • Date: 2016-06-10 11:49:43 UTC
  • mto: This revision was merged to the branch mainline in revision 495.
  • Revision ID: fullermd@over-yonder.net-20160610114943-pv9au9ojwdq4eq32
Mechanical replacement of inline "(sometype *)0" constructs with NULL,
like pointers should be.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workmgr.c
126
126
        Scr->workSpaceMgr.occupyWindow->icon_name = "Occupy Window Icon";
127
127
        Scr->workSpaceMgr.occupyWindow->geometry  = NULL;
128
128
        Scr->workSpaceMgr.occupyWindow->columns   = 0;
129
 
        Scr->workSpaceMgr.occupyWindow->twm_win   = (TwmWindow *) 0;
 
129
        Scr->workSpaceMgr.occupyWindow->twm_win   = NULL;
130
130
        Scr->workSpaceMgr.occupyWindow->vspace    = Scr->WMgrVertButtonIndent;
131
131
        Scr->workSpaceMgr.occupyWindow->hspace    = Scr->WMgrHorizButtonIndent;
132
132
 
614
614
                        twmWin->iconmanagerlist = wl;
615
615
                }
616
616
        }
617
 
        wl = (WList *)0;
 
617
        wl = NULL;
618
618
        for(iconmgr = newws->iconmgr; iconmgr; iconmgr = iconmgr->next) {
619
619
                if(iconmgr->first) {
620
620
                        wl = iconmgr->first;
710
710
                action = Scr->ChangeWorkspaceFunction.item ?
711
711
                         Scr->ChangeWorkspaceFunction.item->action : NULL;
712
712
                ExecuteFunction(Scr->ChangeWorkspaceFunction.func, action,
713
 
                                (Window) 0, (TwmWindow *) 0, &event, C_ROOT, FALSE);
 
713
                                (Window) 0, NULL, &event, C_ROOT, FALSE);
714
714
        }
715
715
 
716
716
        /* If SaveWorkspaceFocus is on, try to restore the focus to the last
1097
1097
/*
1098
1098
 * The window whose occupation is being manipulated.
1099
1099
 */
1100
 
static TwmWindow *occupyWin = (TwmWindow *) 0;
 
1100
static TwmWindow *occupyWin = NULL;
1101
1101
 
1102
1102
static int CanChangeOccupation(TwmWindow **twm_winp)
1103
1103
{
1212
1212
        if(! Scr->workSpaceManagerActive) {
1213
1213
                return;
1214
1214
        }
1215
 
        if(occupyWin == (TwmWindow *) 0) {
 
1215
        if(occupyWin == NULL) {
1216
1216
                return;
1217
1217
        }
1218
1218
 
1252
1252
                XUnmapWindow(dpy, occupyW->twm_win->frame);
1253
1253
                occupyW->twm_win->mapped = false;
1254
1254
                occupyW->twm_win->occupation = 0;
1255
 
                occupyWin = (TwmWindow *) 0;
 
1255
                occupyWin = NULL;
1256
1256
                XSync(dpy, 0);
1257
1257
        }
1258
1258
        else if(buttonW == occupyW->cancel) {
1259
1259
                XUnmapWindow(dpy, occupyW->twm_win->frame);
1260
1260
                occupyW->twm_win->mapped = false;
1261
1261
                occupyW->twm_win->occupation = 0;
1262
 
                occupyWin = (TwmWindow *) 0;
 
1262
                occupyWin = NULL;
1263
1263
                XSync(dpy, 0);
1264
1264
        }
1265
1265
        else if(buttonW == occupyW->allworkspc) {
2700
2700
                XUnmapWindow(dpy, occwin->twm_win->frame);
2701
2701
                occwin->twm_win->mapped = false;
2702
2702
                occwin->twm_win->occupation = 0;
2703
 
                occupyWin = (TwmWindow *) 0;
 
2703
                occupyWin = NULL;
2704
2704
        }
2705
2705
}
2706
2706