From a4c58b49cd6578eb30faf9ec34dec24c14025a54 Mon Sep 17 00:00:00 2001 From: Richard Frith-MacDonald Date: Mon, 18 Sep 2006 12:57:33 +0000 Subject: [PATCH] Update copyright notice and conform to coding standards in templates git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@23548 72102866-910b-0410-8b05-ffd578937521 --- .../Resources/AppController.h | 22 ++++++------ .../Resources/AppController.m | 34 ++++++++++--------- Modules/ApplicationProject/Resources/main.m | 3 +- .../Resources/AppController.h | 5 +-- .../Resources/AppController.m | 7 ++-- Modules/RenaissanceProject/Resources/main.m | 15 ++++---- Modules/ToolProject/Resources/main.m | 3 +- 7 files changed, 49 insertions(+), 40 deletions(-) diff --git a/Modules/ApplicationProject/Resources/AppController.h b/Modules/ApplicationProject/Resources/AppController.h index 6f4afcb..a0f736d 100644 --- a/Modules/ApplicationProject/Resources/AppController.h +++ b/Modules/ApplicationProject/Resources/AppController.h @@ -21,7 +21,8 @@ You should have received a copy of the GNU General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02111 USA. */ #import @@ -30,18 +31,19 @@ { } -+ (void)initialize; ++ (void) initialize; -- (id)init; -- (void)dealloc; +- (id) init; +- (void) dealloc; -- (void)awakeFromNib; +- (void) awakeFromNib; -- (void)applicationDidFinishLaunching:(NSNotification *)aNotif; -- (BOOL)applicationShouldTerminate:(id)sender; -- (void)applicationWillTerminate:(NSNotification *)aNotif; -- (BOOL)application:(NSApplication *)application openFile:(NSString *)fileName; +- (void) applicationDidFinishLaunching: (NSNotification *)aNotif; +- (BOOL) applicationShouldTerminate: (id)sender; +- (void) applicationWillTerminate: (NSNotification *)aNotif; +- (BOOL) application: (NSApplication *)application + openFile: (NSString *)fileName; -- (void)showPrefPanel:(id)sender; +- (void) showPrefPanel: (id)sender; @end diff --git a/Modules/ApplicationProject/Resources/AppController.m b/Modules/ApplicationProject/Resources/AppController.m index 9e6e6c6..c394d37 100644 --- a/Modules/ApplicationProject/Resources/AppController.m +++ b/Modules/ApplicationProject/Resources/AppController.m @@ -1,11 +1,11 @@ /* - Project: $PROJECTNAME$ + Project: $PROJECTNAME$ Copyright (C) $YEAR$ Free Software Foundation - Author: $FULLUSERNAME$ + Author: $FULLUSERNAME$ - Created: $DATE$ by $USERNAME$ + Created: $DATE$ by $USERNAME$ Application Controller @@ -21,14 +21,15 @@ You should have received a copy of the GNU General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA */ #import "AppController.h" @implementation AppController -+ (void)initialize ++ (void) initialize { NSMutableDictionary *defaults = [NSMutableDictionary dictionary]; @@ -36,15 +37,15 @@ * Register your app's defaults here by adding objects to the * dictionary, eg * - * [defaults setObject:anObject forKey:keyForThatObject]; + * [defaults setObject: anObject forKey: keyForThatObject]; * */ - [[NSUserDefaults standardUserDefaults] registerDefaults:defaults]; + [[NSUserDefaults standardUserDefaults] registerDefaults: defaults]; [[NSUserDefaults standardUserDefaults] synchronize]; } -- (id)init +- (id) init { if ((self = [super init])) { @@ -52,34 +53,35 @@ return self; } -- (void)dealloc +- (void) dealloc { [super dealloc]; } -- (void)awakeFromNib +- (void) awakeFromNib { - [[NSApp mainMenu] setTitle:@"$PROJECTNAME$"]; + [[NSApp mainMenu] setTitle: @"$PROJECTNAME$"]; } -- (void)applicationDidFinishLaunching:(NSNotification *)aNotif +- (void) applicationDidFinishLaunching: (NSNotification *)aNotif { } -- (BOOL)applicationShouldTerminate:(id)sender +- (BOOL) applicationShouldTerminate: (id)sender { return YES; } -- (void)applicationWillTerminate:(NSNotification *)aNotif +- (void) applicationWillTerminate: (NSNotification *)aNotif { } -- (BOOL)application:(NSApplication *)application openFile:(NSString *)fileName +- (BOOL) application: (NSApplication *)application + openFile: (NSString *)fileName { } -- (void)showPrefPanel:(id)sender +- (void) showPrefPanel: (id)sender { } diff --git a/Modules/ApplicationProject/Resources/main.m b/Modules/ApplicationProject/Resources/main.m index 5c78cd3..7680a59 100644 --- a/Modules/ApplicationProject/Resources/main.m +++ b/Modules/ApplicationProject/Resources/main.m @@ -19,7 +19,8 @@ You should have received a copy of the GNU General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA */ #include diff --git a/Modules/RenaissanceProject/Resources/AppController.h b/Modules/RenaissanceProject/Resources/AppController.h index d2c46c5..42992e8 100644 --- a/Modules/RenaissanceProject/Resources/AppController.h +++ b/Modules/RenaissanceProject/Resources/AppController.h @@ -21,7 +21,8 @@ You should have received a copy of the GNU General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA */ #ifndef _APPCONTROLLER_H_ @@ -35,7 +36,7 @@ } -- (void) applicationDidFinishLaunching:(NSNotification *)aNotif; +- (void) applicationDidFinishLaunching: (NSNotification *)aNotif; @end diff --git a/Modules/RenaissanceProject/Resources/AppController.m b/Modules/RenaissanceProject/Resources/AppController.m index b4411c7..70298c5 100644 --- a/Modules/RenaissanceProject/Resources/AppController.m +++ b/Modules/RenaissanceProject/Resources/AppController.m @@ -21,16 +21,17 @@ You should have received a copy of the GNU General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA */ #include "AppController.h" @implementation AppController -- (void) applicationDidFinishLaunching:(NSNotification *)aNotif +- (void) applicationDidFinishLaunching: (NSNotification *)aNotif { - [NSBundle loadGSMarkupNamed:@"Main" owner:self]; + [NSBundle loadGSMarkupNamed: @"Main" owner: self]; } @end diff --git a/Modules/RenaissanceProject/Resources/main.m b/Modules/RenaissanceProject/Resources/main.m index e3ed068..d94b70d 100644 --- a/Modules/RenaissanceProject/Resources/main.m +++ b/Modules/RenaissanceProject/Resources/main.m @@ -19,7 +19,8 @@ You should have received a copy of the GNU General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA */ #include @@ -32,13 +33,13 @@ int main(int argc, const char *argv[]) { CREATE_AUTORELEASE_POOL (pool); [NSApplication sharedApplication]; - [NSApp setDelegate:[AppController new]]; + [NSApp setDelegate: [AppController new]]; - #ifdef GNUSTEP - [NSBundle loadGSMarkupNamed:@"MainMenu-GNUstep" owner:[NSApp delegate]]; - #else - [NSBundle loadGSMarkupNamed:@"MainMenu-OSX" owner:[NSApp delegate]]; - #endif +#ifdef GNUSTEP + [NSBundle loadGSMarkupNamed: @"MainMenu-GNUstep" owner: [NSApp delegate]]; +#else + [NSBundle loadGSMarkupNamed: @"MainMenu-OSX" owner: [NSApp delegate]]; +#endif RELEASE (pool); return NSApplicationMain (argc, argv); diff --git a/Modules/ToolProject/Resources/main.m b/Modules/ToolProject/Resources/main.m index 06eaf80..cb6117d 100644 --- a/Modules/ToolProject/Resources/main.m +++ b/Modules/ToolProject/Resources/main.m @@ -19,7 +19,8 @@ You should have received a copy of the GNU General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA */ #include