More cleanups...

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@15083 72102866-910b-0410-8b05-ffd578937521

PCLib/PCBundleLoader.h

@@ -37,9 +37,9 @@
 
 #import <AppKit/AppKit.h>
 
-#import "PreferenceController.h"
-#import "ProjectEditor.h"
-#import "ProjectDebugger.h"
+@class PreferenceController;
+@class ProjectEditor;
+@class ProjectDebugger;
 
 @interface PCBundleLoader : NSObject
 {

PCLib/PCBundleLoader.m

@@ -26,6 +26,9 @@
 
 #import "PCBundleLoader.h"
 #import "PCDefines.h"
+#import "PreferenceController.h"
+#import "ProjectEditor.h"
+#import "ProjectDebugger.h"
 
 @interface PCBundleLoader (PrivateLoader)
 

PCLib/PCDefines.h

@@ -14,10 +14,7 @@
 #define PC_EXTERN       extern
 #define PRIVATE_EXTERN  __private_extern__
 
-//#define BUNDLE_PATH   @"/LocalDeveloper/ProjectCenter/Bundles"
-
 #define Editor                          @"Editor"
-#define Debugger                        @"Debugger"
 #define Compiler                        @"Compiler"
 #define PromptOnClean                   @"PromtOnClean"
 #define PromptOnQuit                    @"PromtOnQuit"

PCLib/PCEditorView+Highlighting.m

@@ -106,7 +106,6 @@ static NSFont *editorFont = nil;
 
 - (void)colouriseCharStrings
 {
-  NSRange tmpRange;
   BOOL foundRange;
   id aDict = [NSDictionary dictionaryWithObjectsAndKeys:
 			     cStringColor,NSForegroundColorAttributeName,
@@ -155,7 +154,6 @@ static NSFont *editorFont = nil;
 {
   NSRange tmpRange;
   BOOL foundRange;
-  id anObject;
   id aDict = [NSDictionary dictionaryWithObjectsAndKeys:
 			     commentColor,NSForegroundColorAttributeName,
 			   @"CommentCodeType", @"PCCodeTypeAttributeName", 
@@ -202,7 +200,6 @@ static NSFont *editorFont = nil;
 {
   NSRange tmpRange;
   BOOL foundRange;
-  id anObject;
   id aDict = [NSDictionary dictionaryWithObjectsAndKeys:
 			    cppCommentColor, NSForegroundColorAttributeName,
 			   @"CommentCodeType", @"PCCodeTypeAttributeName", nil ];
@@ -243,8 +240,6 @@ static NSFont *editorFont = nil;
 - (void)colouriseKeyword:(NSString *)keyword
 {
   NSRange tmpRange;
-  BOOL foundRange;
-  id anObject;
   
   id keywordDict = [NSDictionary dictionaryWithObjectsAndKeys:
 				   keywordColor,NSForegroundColorAttributeName,

PCLib/PCFileManager.m

@@ -29,6 +29,7 @@
 #import "PCProject.h"
 #import "PCServer.h"
 #import "FileCreator.h"
+
 #import <AppKit/AppKit.h>
 
 #if defined(GNUSTEP)
@@ -250,9 +251,6 @@ static PCFileManager *_mgr = nil;
   NSOpenPanel *openPanel;
   int retval;
   
-  NSMutableArray *validTypes = nil;
-  NSDictionary *categories = nil;
-
   PCProject *project = nil;
   NSString *key = nil;
   NSString *title = nil;

PCLib/PCProject+ComponentHandling.h

@@ -11,9 +11,10 @@
 #ifndef _PCPROJECT_COMPONENTHANDLING_H_
 #define _PCPROJECT_COMPONENTHANDLING_H_
 
+#import <Foundation/Foundation.h>
+
+// HACK!
 #import "PCProject.h"
-#import "ProjectComponent.h"
-#import "PCDefines.h"
 
 @interface PCProject (ComponentHandling)
 

PCLib/PCProject+ComponentHandling.m

@@ -9,9 +9,13 @@
  */
 
 #import "PCProject+ComponentHandling.h"
+#import "PCDefines.h"
+#import "PCProject.h"
+#import "ProjectComponent.h"
 #import "PCProjectBuilder.h"
 #import "PCProjectDebugger.h"
 #import "PCProjectEditor.h"
+#import "PCProjectManager.h"
 #import "PCEditor.h"
 
 @implementation PCProject (ComponentHandling)

PCLib/PCProject.h

@@ -29,8 +29,6 @@
 
 #import <AppKit/AppKit.h>
 
-#import "ProjectBuilder.h"
-
 #ifndef IMAGE
 #define IMAGE(X) [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForImageResource:(X)]] autorelease]
 #endif
@@ -118,6 +116,8 @@ static NSString * const PCBuildTool           = @"BUILDTOOL";
 @class PCProjectEditor;
 @class PCEditorController;
 
+@protocol ProjectBuilder;
+
 @interface PCProject : NSObject
 {
     id projectWindow;

PCLib/PCProject.m

@@ -25,9 +25,10 @@
 */
 
 #import "PCProject.h"
+#import "PCDefines.h"
+#import "ProjectBuilder.h"
 #import "PCBrowserController.h"
 #import "PCProject+ComponentHandling.h"
-
 #import "PCProjectBuilder.h"
 #import "PCProjectEditor.h"
 #import "PCProjectDebugger.h"
@@ -57,8 +58,6 @@
   NSMatrix* matrix;
   NSButtonCell* buttonCell = [[[NSButtonCell alloc] init] autorelease];
   id textField;
-  id textView;
-  id scrollView;
   id button;
   PCSplitView *split;
 
@@ -774,7 +773,6 @@
 - (BOOL)removeSelectedFilePermanently:(BOOL)yn
 {
     NSString *file = [browserController nameOfSelectedFile];
-    NSMutableArray *array;
     NSString *key;
     NSString *otherKey;
     NSString *ext;

PCLib/PCProjectBuilder.h

@@ -30,7 +30,7 @@
 #import <AppKit/AppKit.h>
 
 #ifndef GNUSTEP_BASE_VERSION
-#protocol ProjectComponent;
+@protocol ProjectComponent;
 #else
 #import <ProjectCenter/ProjectComponent.h>
 #endif

PCLib/PCProjectBuilder.m

@@ -25,6 +25,7 @@
 */
 
 #import "PCProjectBuilder.h"
+#import "PCDefines.h"
 #import "PCProject.h"
 #import "PCProject+ComponentHandling.h"
 #import "PCProjectManager.h"
@@ -307,7 +308,6 @@
 
 - (void)build:(id)sender
 {
-    NSString *tg = nil;
     NSTask *makeTask;
     NSMutableArray *args;
     NSPipe *logPipe;

PCLib/PCProjectDebugger.h

@@ -25,7 +25,12 @@
 */
 
 #import <AppKit/AppKit.h>
-#import "ProjectComponent.h"
+
+#ifndef GNUSTEP_BASE_VERSION
+@protocol ProjectComponent;
+#else
+#import <ProjectCenter/ProjectComponent.h>
+#endif
 
 @class PCProject;
 

PCLib/PCProjectDebugger.m

@@ -61,7 +61,6 @@ enum {
   NSRect _w_frame;
   NSButtonCell* buttonCell = [[[NSButtonCell alloc] init] autorelease];
   id button;
-  id textField;
   NSBox *box;
 
   componentView = [[NSBox alloc] initWithFrame:NSMakeRect(-1,-1,562,248)];

PCLib/PCProjectManager.h

@@ -29,8 +29,13 @@
 
 #import <AppKit/AppKit.h>
 
-#import "PCProject.h"
-#import "ProjectBuilder.h"
+@class PCProject;
+
+#ifndef GNUSTEP_BASE_VERSION
+@protocol ProjectBuilder;
+#else
+#import <ProjectCenter/ProjectBuilder.h>
+#endif
 
 @interface PCProjectManager : NSObject <ProjectBuilder>
 {

PCLib/PCProjectManager.m

@@ -32,6 +32,7 @@
 #import "ProjectComponent.h"
 #import "ProjectType.h"
 #import "PCProject+ComponentHandling.h"
+#import "ProjectBuilder.h"
 
 #if defined(GNUSTEP)
 #import <AppKit/IMLoading.h>
@@ -395,6 +396,8 @@ NSString *ActiveProjectDidChangeNotification = @"ActiveProjectDidChange";
     NSRunAlertPanel(@"Attention!",
                 @"This feature is not yet implemented!", 
 		@"OK",nil,nil);
+                
+    return YES;
 }
 
 - (void)inspectorPopupDidChange:(id)sender
@@ -454,10 +457,12 @@ NSString *ActiveProjectDidChangeNotification = @"ActiveProjectDidChange";
 
 - (BOOL)newSubproject
 {
+    return NO;
 }
 
 - (BOOL)addSubprojectAt:(NSString *)path
 {
+    return NO;
 }
 
 - (void)removeSubproject
@@ -597,7 +602,7 @@ NSString *ActiveProjectDidChangeNotification = @"ActiveProjectDidChange";
     if ([key isEqualToString:PCLibraries]) 
     {
 	[fn deleteCharactersInRange:NSMakeRange(1,3)];
-	fn = [fn stringByDeletingPathExtension];
+	fn = (NSMutableString *)[fn stringByDeletingPathExtension];
     }
   
     if ([[[activeProject projectDict] objectForKey:key] containsObject:fn]) 

PCLib/PCServer.h

@@ -30,13 +30,11 @@
 #import <AppKit/AppKit.h>
 
 #ifndef GNUSTEP_BASE_VERSION
-#protocol Server;
+@protocol Server;
 #else
 #import <ProjectCenter/Server.h>
 #endif
 
-@class PCProject;
-
 extern NSString *PCProjectWillOpenNotification;
 extern NSString *PCProjectDidOpenNotification;
 extern NSString *PCProjectWillCloseNotification;
@@ -69,6 +67,12 @@ extern NSString *PCProjectBuildDidSucceedNotification;
 extern NSString *PCProjectBuildDidFailNotification;
 extern NSString *PCProjectBuildDidStopNotification;
 
+@class PCProject;
+
+@protocol ProjectEditor;
+@protocol ProjectDebugger;
+@protocol PreferenceController;
+
 @interface PCServer : NSObject <Server>
 {
     NSMutableArray *clients;

PCLib/PCSplitView.h

@@ -11,7 +11,7 @@
 #ifndef _PCSPLITVIEW_H_
 #define _PCSPLITVIEW_H_
 
-#import <AppKit/AppKit.h>
+#import <AppKit/NSSplitView.h>
 
 @interface PCSplitView : NSSplitView
 {

PCLib/Server.h

@@ -29,10 +29,10 @@
 
 #import <AppKit/AppKit.h>
 
-#import "PCProject.h"
-#import "PreferenceController.h"
-#import "ProjectEditor.h"
-#import "ProjectDebugger.h"
+@class PCProject;
+@class PreferenceController;
+@class ProjectEditor;
+@class ProjectDebugger;
 
 @protocol Server