diff options
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/WM_api.h | 10 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_dragdrop.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_jobs.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 90145251fc0..3a47e29f553 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -112,11 +112,11 @@ void WM_keyconfig_userdef(void); void WM_keymap_init (struct bContext *C); void WM_keymap_free (struct wmKeyMap *keymap); -wmKeyMapItem *WM_keymap_verify_item(struct wmKeyMap *keymap, char *idname, int type, +wmKeyMapItem *WM_keymap_verify_item(struct wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier); wmKeyMapItem *WM_keymap_add_item(struct wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier); -wmKeyMapItem *WM_keymap_add_menu(struct wmKeyMap *keymap, char *idname, int type, +wmKeyMapItem *WM_keymap_add_menu(struct wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier); void WM_keymap_remove_item(struct wmKeyMap *keymap, struct wmKeyMapItem *kmi); @@ -200,7 +200,7 @@ int WM_operator_props_dialog_popup (struct bContext *C, struct wmOperator *op, int WM_operator_redo_popup (struct bContext *C, struct wmOperator *op); int WM_operator_ui_popup (struct bContext *C, struct wmOperator *op, int width, int height); -int WM_operator_confirm_message(struct bContext *C, struct wmOperator *op, char *message); +int WM_operator_confirm_message(struct bContext *C, struct wmOperator *op, const char *message); /* operator api */ void WM_operator_free (struct wmOperator *op); @@ -296,7 +296,7 @@ void WM_event_drag_image(struct wmDrag *, struct ImBuf *, float scale, int sx struct wmDropBox *WM_dropbox_add(ListBase *lb, const char *idname, int (*poll)(struct bContext *, struct wmDrag *, struct wmEvent *event), void (*copy)(struct wmDrag *, struct wmDropBox *)); -ListBase *WM_dropboxmap_find(char *idname, int spaceid, int regionid); +ListBase *WM_dropboxmap_find(const char *idname, int spaceid, int regionid); /* Set a subwindow active in pixelspace view, with optional scissor subset */ void wmSubWindowSet (struct wmWindow *win, int swinid); @@ -316,7 +316,7 @@ int WM_framebuffer_to_index(unsigned int col); #define WM_JOB_EXCL_RENDER 2 #define WM_JOB_PROGRESS 4 -struct wmJob *WM_jobs_get(struct wmWindowManager *wm, struct wmWindow *win, void *owner, char *name, int flag); +struct wmJob *WM_jobs_get(struct wmWindowManager *wm, struct wmWindow *win, void *owner, const char *name, int flag); int WM_jobs_test(struct wmWindowManager *wm, void *owner); float WM_jobs_progress(struct wmWindowManager *wm, void *owner); diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c index 0b2d35eb8bb..6cf2c7a9a81 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.c +++ b/source/blender/windowmanager/intern/wm_dragdrop.c @@ -75,7 +75,7 @@ typedef struct wmDropBoxMap { } wmDropBoxMap; -ListBase *WM_dropboxmap_find(char *idname, int spaceid, int regionid) +ListBase *WM_dropboxmap_find(const char *idname, int spaceid, int regionid) { wmDropBoxMap *dm; @@ -256,7 +256,7 @@ static void wm_drop_operator_draw(char *name, int x, int y) UI_DrawString(x+4, y+4, name); } -static char *wm_drag_name(wmDrag *drag) +static const char *wm_drag_name(wmDrag *drag) { switch(drag->type) { case WM_DRAG_ID: diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 71e20e301b8..fbab146dc8e 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -129,7 +129,7 @@ struct wmJob { * 1st priority: job with same owner and name * 2nd priority: job with same owner */ -static wmJob *wm_job_find(wmWindowManager *wm, void *owner, char *name) +static wmJob *wm_job_find(wmWindowManager *wm, void *owner, const char *name) { wmJob *steve, *found=NULL; @@ -148,7 +148,7 @@ static wmJob *wm_job_find(wmWindowManager *wm, void *owner, char *name) /* returns current or adds new job, but doesnt run it */ /* every owner only gets a single job, adding a new one will stop running stop and when stopped it starts the new one */ -wmJob *WM_jobs_get(wmWindowManager *wm, wmWindow *win, void *owner, char *name, int flag) +wmJob *WM_jobs_get(wmWindowManager *wm, wmWindow *win, void *owner, const char *name, int flag) { wmJob *steve= wm_job_find(wm, owner, name); diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index a005da43a9a..24aeaae4a0e 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -197,7 +197,7 @@ static void keymap_event_set(wmKeyMapItem *kmi, short type, short val, int modif } /* if item was added, then bail out */ -wmKeyMapItem *WM_keymap_verify_item(wmKeyMap *keymap, char *idname, int type, int val, int modifier, int keymodifier) +wmKeyMapItem *WM_keymap_verify_item(wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier) { wmKeyMapItem *kmi; @@ -241,7 +241,7 @@ wmKeyMapItem *WM_keymap_add_item(wmKeyMap *keymap, const char *idname, int type, } /* menu wrapper for WM_keymap_add_item */ -wmKeyMapItem *WM_keymap_add_menu(wmKeyMap *keymap, char *idname, int type, int val, int modifier, int keymodifier) +wmKeyMapItem *WM_keymap_add_menu(wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier) { wmKeyMapItem *kmi= WM_keymap_add_item(keymap, "WM_OT_call_menu", type, val, modifier, keymodifier); RNA_string_set(kmi->ptr, "name", idname); diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index e9e2f702238..9f18f23bdd6 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -739,7 +739,7 @@ int WM_enum_search_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) } /* Can't be used as an invoke directly, needs message arg (can be NULL) */ -int WM_operator_confirm_message(bContext *C, wmOperator *op, char *message) +int WM_operator_confirm_message(bContext *C, wmOperator *op, const char *message) { uiPopupMenu *pup; uiLayout *layout; diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 315f7edf1ec..7ad7be54e96 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -298,7 +298,7 @@ void wm_window_title(wmWindowManager *wm, wmWindow *win) } /* belongs to below */ -static void wm_window_add_ghostwindow(bContext *C, char *title, wmWindow *win) +static void wm_window_add_ghostwindow(bContext *C, const char *title, wmWindow *win) { GHOST_WindowHandle ghostwin; int scr_w, scr_h, posy; |