From 04bc89a8b69da0644f8b6fc2de171fb78e861708 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 21 May 2012 09:00:35 +0000 Subject: [PATCH] code cleanup: remove some old comments --- .../blender/editors/space_view3d/view3d_fly.c | 2 +- .../blender/windowmanager/intern/wm_files.c | 13 +++---- source/creator/creator.c | 39 +++++++++---------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 2dab26e7781..06cae3585cd 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -580,7 +580,7 @@ static void flyEvent(FlyInfo *fly, wmEvent *event) fly->pan_view = TRUE; break; case FLY_MODAL_PAN_DISABLE: -//XXX2.5 warp_pointer(cent_orig[0], cent_orig[1]); +//XXX2.5 WM_cursor_warp(CTX_wm_window(C), cent_orig[0], cent_orig[1]); fly->pan_view = FALSE; break; diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 5c3027d72b1..3d1902409e8 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -333,8 +333,9 @@ static int wm_read_exotic(Scene *UNUSED(scene), const char *name) retval = BKE_READ_EXOTIC_OK_BLEND; } else { - //XXX waitcursor(1); #if 0 /* historic stuff - no longer used */ + WM_cursor_wait(TRUE); + if (is_foo_format(name)) { read_foo(name); retval = BKE_READ_EXOTIC_OK_OTHER; @@ -344,7 +345,9 @@ static int wm_read_exotic(Scene *UNUSED(scene), const char *name) { retval = BKE_READ_EXOTIC_FAIL_FORMAT; } - //XXX waitcursor(0); +#if 0 + WM_cursor_wait(FALSE); +#endif } } } @@ -393,8 +396,6 @@ void WM_read_file(bContext *C, const char *filepath, ReportList *reports) /* match the read WM with current WM */ wm_window_match_do(C, &wmbase); WM_check(C); /* opens window(s), checks keymaps */ - -// XXX mainwindow_set_filename_to_title(G.main->name); if (retval == BKE_READ_FILE_OK_USERPREFS) { /* in case a userdef is read from regular .blend */ @@ -453,7 +454,6 @@ void WM_read_file(bContext *C, const char *filepath, ReportList *reports) } #endif - // XXX undo_editmode_clear(); BKE_reset_undo(); BKE_write_undo(C, "original"); /* save current state */ } @@ -546,8 +546,7 @@ int WM_read_homefile(bContext *C, ReportList *UNUSED(reports), short from_memory /* XXX */ G.save_over = 0; // start with save preference untitled.blend G.fileflags &= ~G_FILE_AUTOPLAY; /* disable autoplay in startup.blend... */ -// mainwindow_set_filename_to_title(""); // empty string re-initializes title to "Blender" - + // refresh_interface_font(); // undo_editmode_clear(); diff --git a/source/creator/creator.c b/source/creator/creator.c index 1f0756b2c24..a21497b82fa 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -31,18 +31,18 @@ #if defined(__linux__) && defined(__GNUC__) -#define _GNU_SOURCE -#include +# define _GNU_SOURCE +# include #endif #if (defined(__APPLE__) && (defined(__i386__) || defined(__x86_64__))) -#define OSX_SSE_FPE -#include +# define OSX_SSE_FPE +# include #endif #ifdef WIN32 -#include -#include "utfconv.h" +# include +# include "utfconv.h" #endif #include @@ -105,30 +105,30 @@ #include "BLI_scanfill.h" /* for BLI_setErrorCallBack, TODO, move elsewhere */ #ifdef WITH_BUILDINFO_HEADER -#define BUILD_DATE +# define BUILD_DATE #endif /* for passing information between creator and gameengine */ #ifdef WITH_GAMEENGINE -#include "BL_System.h" +# include "BL_System.h" #else /* dummy */ -#define SYS_SystemHandle int +# define SYS_SystemHandle int #endif #include #ifdef __FreeBSD__ -# include -# include -# include +# include +# include +# include #endif #ifdef WITH_BINRELOC -#include "binreloc.h" +# include "binreloc.h" #endif #ifdef WITH_LIBMV -#include "libmv-capi.h" +# include "libmv-capi.h" #endif /* from buildinfo.c */ @@ -1178,15 +1178,14 @@ static void setupArguments(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle) #ifdef WITH_PYTHON_MODULE /* allow python module to call main */ -#define main main_python_enter +# define main main_python_enter static void *evil_C = NULL; -#ifdef __APPLE__ -/* environ is not available in mac shared libraries */ -#include +# ifdef __APPLE__ + /* environ is not available in mac shared libraries */ +# include char **environ = NULL; -#endif - +# endif #endif