[Scummvm-cvs-logs] SF.net SVN: scummvm:[44360] tools/branches/gsoc2009-gui/gui

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Fri Sep 25 18:47:43 CEST 2009


Revision: 44360
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44360&view=rev
Author:   fingolfin
Date:     2009-09-25 16:47:41 +0000 (Fri, 25 Sep 2009)

Log Message:
-----------
Fix whitespaces / code formatting

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/gui/main.cpp
    tools/branches/gsoc2009-gui/gui/pages.cpp
    tools/branches/gsoc2009-gui/gui/pages.h

Modified: tools/branches/gsoc2009-gui/gui/main.cpp
===================================================================
--- tools/branches/gsoc2009-gui/gui/main.cpp	2009-09-25 16:15:57 UTC (rev 44359)
+++ tools/branches/gsoc2009-gui/gui/main.cpp	2009-09-25 16:47:41 UTC (rev 44360)
@@ -80,7 +80,7 @@
 		Filename fn((const char *)wxString(argv[1]).mb_str());
 
 		wxArrayString ls = g_tools.getToolList(fn);
-		if(ls.size() == 1)
+		if (ls.size() == 1)
 			frame->switchPage(new ChooseOutPage(configuration));
 		else
 			frame->switchPage(new ChooseToolPage(configuration, ls));
@@ -252,7 +252,7 @@
 
 void ScummToolsFrame::switchPage(WizardPage *next, bool moveback) {
 	// Associate us with the new page
-	if(next)
+	if (next)
 		next->SetScummFrame(this);
 
 	// Find the old page

Modified: tools/branches/gsoc2009-gui/gui/pages.cpp
===================================================================
--- tools/branches/gsoc2009-gui/gui/pages.cpp	2009-09-25 16:15:57 UTC (rev 44359)
+++ tools/branches/gsoc2009-gui/gui/pages.cpp	2009-09-25 16:47:41 UTC (rev 44360)
@@ -327,21 +327,21 @@
 
 void ChooseIOPage::updateButtons(wxWindow *panel, WizardButtons *buttons) {
 	wxWindow *picker = NULL;
-	if(!picker)
+	if (!picker)
 		picker = panel->FindWindowByName(wxT("InputPicker"));
 	
 	const ToolGUI *tool = _configuration.selectedTool;
-	if(tool && !picker) {
-		for(size_t i = 1; i < tool->getInputList().size(); ++i) {
+	if (tool && !picker) {
+		for (size_t i = 1; i < tool->getInputList().size(); ++i) {
 			wxString name(wxT("InputPicker"));
 			name << i;
 			picker = panel->FindWindowByName(name);
-			if(picker)
+			if (picker)
 				break;
 		}
 	}
 
-	if(!picker)
+	if (!picker)
 		picker = panel->FindWindowByName(wxT("OutputPicker"));
 
 
@@ -390,7 +390,7 @@
 			wxFLP_USE_TEXTCTRL | wxFLP_OPEN, wxDefaultValidator, 
 			wxT("InputPicker"));
 	panel->Connect(wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEventHandler(ChooseIOPage::onSelectFile), NULL, this);
-	if(_configuration.inputFilePaths.size() > 0)
+	if (_configuration.inputFilePaths.size() > 0)
 		picker->SetPath(_configuration.inputFilePaths[0]);
 
 	pickersizer->Add(picker, wxSizerFlags(2).Expand());
@@ -448,7 +448,7 @@
 	} else {
 		wxArrayString ls = g_tools.getToolList(filename,
 			_configuration.compressing? TOOLTYPE_COMPRESSION : TOOLTYPE_EXTRACTION);
-		if(ls.size() == 1) {
+		if (ls.size() == 1) {
 			_configuration.selectedTool = g_tools.get(ls[0]);
 			if (_configuration.selectedTool->getInputList().size() == 1)
 				switchPage(new ChooseOutPage(_configuration));
@@ -509,7 +509,7 @@
 		windowName << i;
 
 		wxString inputFile;
-		if(_configuration.inputFilePaths.size() > (size_t)i)
+		if (_configuration.inputFilePaths.size() > (size_t)i)
 			inputFile = _configuration.inputFilePaths[i];
 
 		if (input.file) {
@@ -1241,7 +1241,7 @@
 		return false;
 	
 	// This function can be called recursively, by checking if lock is available, we avoid it
-	if(_output.mutex.TryLock() == wxMUTEX_BUSY)
+	if (_output.mutex.TryLock() == wxMUTEX_BUSY)
 		return false;
 	else
 		// Immedietly unlock

Modified: tools/branches/gsoc2009-gui/gui/pages.h
===================================================================
--- tools/branches/gsoc2009-gui/gui/pages.h	2009-09-25 16:15:57 UTC (rev 44359)
+++ tools/branches/gsoc2009-gui/gui/pages.h	2009-09-25 16:47:41 UTC (rev 44360)
@@ -509,4 +509,3 @@
 
 	void updateButtons(wxWindow *panel, WizardButtons *buttons);
 };
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list