[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50703] trunk/blender: code cleanup: warning and style
Campbell Barton
ideasman42 at gmail.com
Tue Sep 18 00:34:43 CEST 2012
Revision: 50703
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50703
Author: campbellbarton
Date: 2012-09-17 22:34:42 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
code cleanup: warning and style
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
trunk/blender/intern/ghost/test/multitest/EventToBuf.c
trunk/blender/intern/memutil/MEM_CacheLimiter.h
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_file/fsmenu.c
trunk/blender/source/blender/windowmanager/intern/wm_playanim.c
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2012-09-17 22:22:06 UTC (rev 50702)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2012-09-17 22:34:42 UTC (rev 50703)
@@ -355,16 +355,18 @@
/* alphanumerical or punctuation key that is remappable in int'l keyboards */
if ((recvChar >= 'A') && (recvChar <= 'Z')) {
return (GHOST_TKey) (recvChar - 'A' + GHOST_kKeyA);
- } else if ((recvChar >= 'a') && (recvChar <= 'z')) {
+ }
+ else if ((recvChar >= 'a') && (recvChar <= 'z')) {
return (GHOST_TKey) (recvChar - 'a' + GHOST_kKeyA);
- } else {
+ }
+ else {
#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
KeyboardLayoutRef keyLayout;
UCKeyboardLayout *uchrData;
KLGetCurrentKeyboardLayout(&keyLayout);
KLGetKeyboardLayoutProperty(keyLayout, kKLuchrData, (const void **)
- &uchrData);
+ &uchrData);
/*get actual character value of the "remappable" keys in int'l keyboards,
if keyboard layout is not correctly reported (e.g. some non Apple keyboards in Tiger),
then fallback on using the received charactersIgnoringModifiers */
@@ -870,29 +872,30 @@
// SetMouseCoalescingEnabled(false, NULL);
//TODO : implement timer ??
-
- /*do {
+#if 0
+ do {
GHOST_TimerManager* timerMgr = getTimerManager();
if (waitForEvent) {
- GHOST_TUns64 next = timerMgr->nextFireTime();
- double timeOut;
+ GHOST_TUns64 next = timerMgr->nextFireTime();
+ double timeOut;
- if (next == GHOST_kFireTimeNever) {
- timeOut = kEventDurationForever;
- } else {
- timeOut = (double)(next - getMilliSeconds())/1000.0;
- if (timeOut < 0.0)
- timeOut = 0.0;
- }
+ if (next == GHOST_kFireTimeNever) {
+ timeOut = kEventDurationForever;
+ }
+ else {
+ timeOut = (double)(next - getMilliSeconds())/1000.0;
+ if (timeOut < 0.0)
+ timeOut = 0.0;
+ }
- ::ReceiveNextEvent(0, NULL, timeOut, false, &event);
+ ::ReceiveNextEvent(0, NULL, timeOut, false, &event);
}
if (timerMgr->fireTimers(getMilliSeconds())) {
- anyProcessed = true;
+ anyProcessed = true;
}
- */
+#endif
do {
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@@ -963,7 +966,9 @@
[NSApp sendEvent:event];
[pool drain];
} while (event!= nil);
- //} while (waitForEvent && !anyProcessed); Needed only for timer implementation
+#if 0
+ } while (waitForEvent && !anyProcessed); // Needed only for timer implementation
+#endif
if (m_needDelayedApplicationBecomeActiveEventProcessing) handleApplicationBecomeActiveEvent();
@@ -1285,12 +1290,13 @@
if (m_windowManager->getAnyModifiedState())
{
int shouldQuit = NSRunAlertPanel(@"Exit Blender", @"Some changes have not been saved.\nDo you really want to quit ?",
- @"Cancel", @"Quit Anyway", nil);
+ @"Cancel", @"Quit Anyway", nil);
if (shouldQuit == NSAlertAlternateReturn)
{
pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventQuit, NULL) );
return GHOST_kExitNow;
- } else {
+ }
+ else {
//Give back focus to the blender window if user selected cancel quit
NSArray *windowsList = [NSApp orderedWindows];
if ([windowsList count]) {
@@ -1405,7 +1411,8 @@
ct.Active = GHOST_kTabletModeNone;
break;
}
- } else {
+ }
+ else {
// pointer is leaving - return to mouse
ct.Active = GHOST_kTabletModeNone;
}
@@ -1694,7 +1701,8 @@
if ([event type] == NSKeyDown) {
pushEvent( new GHOST_EventKey([event timestamp]*1000, GHOST_kEventKeyDown, window, keyCode, ascii, utf8_buf) );
//printf("Key down rawCode=0x%x charsIgnoringModifiers=%c keyCode=%u ascii=%i %c utf8=%s\n",[event keyCode],[charsIgnoringModifiers length]>0?[charsIgnoringModifiers characterAtIndex:0]:' ',keyCode,ascii,ascii, utf8_buf);
- } else {
+ }
+ else {
pushEvent( new GHOST_EventKey([event timestamp]*1000, GHOST_kEventKeyUp, window, keyCode, 0, '\0') );
//printf("Key up rawCode=0x%x charsIgnoringModifiers=%c keyCode=%u ascii=%i %c utf8=%s\n",[event keyCode],[charsIgnoringModifiers length]>0?[charsIgnoringModifiers characterAtIndex:0]:' ',keyCode,ascii,ascii, utf8_buf);
}
@@ -1780,7 +1788,8 @@
if(temp_buff) {
return temp_buff;
- } else {
+ }
+ else {
return NULL;
}
}
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm 2012-09-17 22:22:06 UTC (rev 50702)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm 2012-09-17 22:34:42 UTC (rev 50703)
@@ -670,7 +670,8 @@
[m_window setRepresentedFilename:@""];
}
- } else {
+ }
+ else {
[m_window setTitle:windowTitle];
[m_window setRepresentedFilename:@""];
}
@@ -1288,7 +1289,8 @@
if (cursor == GHOST_kStandardCursorCustom && m_customCursor) {
tmpCursor = m_customCursor;
- } else {
+ }
+ else {
switch (cursor) {
case GHOST_kStandardCursorDestroy:
tmpCursor = [NSCursor disappearingItemCursor];
Modified: trunk/blender/intern/ghost/test/multitest/EventToBuf.c
===================================================================
--- trunk/blender/intern/ghost/test/multitest/EventToBuf.c 2012-09-17 22:22:06 UTC (rev 50702)
+++ trunk/blender/intern/ghost/test/multitest/EventToBuf.c 2012-09-17 22:34:42 UTC (rev 50703)
@@ -208,7 +208,8 @@
char *s= GHOST_GetTitle(win);
pos += sprintf(pos, " - win: %s", s);
free(s);
- } else {
+ }
+ else {
pos+= sprintf(pos, " - sys evt");
}
switch (type) {
Modified: trunk/blender/intern/memutil/MEM_CacheLimiter.h
===================================================================
--- trunk/blender/intern/memutil/MEM_CacheLimiter.h 2012-09-17 22:22:06 UTC (rev 50702)
+++ trunk/blender/intern/memutil/MEM_CacheLimiter.h 2012-09-17 22:34:42 UTC (rev 50703)
@@ -179,9 +179,10 @@
return;
}
- if(getDataSize) {
+ if (getDataSize) {
mem_in_use = total_size();
- } else {
+ }
+ else {
mem_in_use = MEM_get_memory_in_use();
}
@@ -196,16 +197,18 @@
priority_queue.pop();
- if(getDataSize) {
+ if (getDataSize) {
cur_size = getDataSize(elem->get()->get_data());
- } else {
+ }
+ else {
cur_size = mem_in_use;
}
if (elem->destroy_if_possible()) {
if (getDataSize) {
mem_in_use -= cur_size;
- } else {
+ }
+ else {
mem_in_use -= cur_size - MEM_get_memory_in_use();
}
}
Modified: trunk/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_ops.c 2012-09-17 22:22:06 UTC (rev 50702)
+++ trunk/blender/source/blender/editors/space_file/file_ops.c 2012-09-17 22:34:42 UTC (rev 50703)
@@ -515,7 +515,7 @@
RNA_def_int(ot->srna, "index", -1, -1, 20000, "Index", "", -1, 20000);
}
-static int reset_recent_exec(bContext *C, wmOperator *op)
+static int reset_recent_exec(bContext *C, wmOperator *UNUSED(op))
{
ScrArea *sa = CTX_wm_area(C);
char name[FILE_MAX];
Modified: trunk/blender/source/blender/editors/space_file/fsmenu.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/fsmenu.c 2012-09-17 22:22:06 UTC (rev 50702)
+++ trunk/blender/source/blender/editors/space_file/fsmenu.c 2012-09-17 22:34:42 UTC (rev 50703)
@@ -206,7 +206,8 @@
if (flag & FS_INSERT_FIRST) {
fsm_iter->next = fsm_head;
fsmenu_set_category(fsmenu, category, fsm_iter);
- } else {
+ }
+ else {
fsm_iter->next = fsm_prev->next;
fsm_prev->next = fsm_iter;
}
Modified: trunk/blender/source/blender/windowmanager/intern/wm_playanim.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_playanim.c 2012-09-17 22:22:06 UTC (rev 50702)
+++ trunk/blender/source/blender/windowmanager/intern/wm_playanim.c 2012-09-17 22:34:42 UTC (rev 50703)
@@ -713,14 +713,6 @@
inital_state,
GHOST_kDrawingContextTypeOpenGL,
FALSE /* no stereo */, FALSE);
-
- //if (ghostwin) {
- //if (win) {
- // GHOST_SetWindowUserData(ghostwin, win);
- //} else {
- // GHOST_DisposeWindow(g_WS.ghost_system, ghostwin);
- //}
- //}
}
More information about the Bf-blender-cvs
mailing list