mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Clean up build warnings and detab files

This commit is contained in:
sfraser%netscape.com 2002-07-01 04:54:28 +00:00
Родитель fb94c1dbf8
Коммит cf610ad653
8 изменённых файлов: 160 добавлений и 132 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

50
camino/BrowserWindowController.h
Просмотреть файл

@ -61,7 +61,7 @@ class nsIDOMNode;
{ {
NSTimer* mTimer; NSTimer* mTimer;
NSArray* mImages; NSArray* mImages;
int mFrame; unsigned int mFrame;
} }
// public // public
@ -75,45 +75,49 @@ class nsIDOMNode;
@end @end
@class BookmarksDataSource;
@class CHHistoryDataSource;
@class CHExtendedTabView;
@interface BrowserWindowController : NSWindowController<CHFind> @interface BrowserWindowController : NSWindowController<CHFind>
{ {
IBOutlet id mTabBrowser; IBOutlet CHExtendedTabView* mTabBrowser;
IBOutlet NSDrawer* mSidebarDrawer; IBOutlet NSDrawer* mSidebarDrawer;
IBOutlet id mSidebarTabView; IBOutlet NSTabView* mSidebarTabView;
IBOutlet id mSidebarSourceTabView; IBOutlet NSTabView* mSidebarSourceTabView;
IBOutlet id mLocationToolbarView; IBOutlet NSView* mLocationToolbarView;
IBOutlet NSTextField* mURLBar; IBOutlet NSTextField* mURLBar;
IBOutlet NSTextField* mStatus; IBOutlet NSTextField* mStatus;
IBOutlet NSProgressIndicator* mProgress; IBOutlet NSProgressIndicator* mProgress;
IBOutlet NSImageView* mLock; IBOutlet NSImageView* mLock;
IBOutlet id mLocationSheetWindow; IBOutlet NSWindow* mLocationSheetWindow;
IBOutlet id mLocationSheetURLField; IBOutlet NSTextField* mLocationSheetURLField;
IBOutlet NSView* mStatusBar; // contains the status text, progress bar, and lock IBOutlet NSView* mStatusBar; // contains the status text, progress bar, and lock
IBOutlet id mSidebarBrowserView; IBOutlet id mSidebarBrowserView; // currently unused
IBOutlet id mSidebarBookmarksDataSource; IBOutlet BookmarksDataSource* mSidebarBookmarksDataSource;
IBOutlet id mHistoryDataSource; IBOutlet CHHistoryDataSource* mHistoryDataSource;
IBOutlet CHBookmarksToolbar* mPersonalToolbar; IBOutlet CHBookmarksToolbar* mPersonalToolbar;
IBOutlet id mAddBookmarkSheetWindow; IBOutlet NSWindow* mAddBookmarkSheetWindow;
IBOutlet id mAddBookmarkTitleField; IBOutlet NSTextField* mAddBookmarkTitleField;
IBOutlet id mAddBookmarkFolderField; IBOutlet NSPopUpButton* mAddBookmarkFolderField;
IBOutlet id mAddBookmarkCheckbox; IBOutlet NSButton* mAddBookmarkCheckbox;
// Context menu outlets. // Context menu outlets.
IBOutlet id mPageMenu; IBOutlet NSMenu* mPageMenu;
IBOutlet id mImageMenu; IBOutlet NSMenu* mImageMenu;
IBOutlet id mInputMenu; IBOutlet NSMenu* mInputMenu;
IBOutlet id mLinkMenu; IBOutlet NSMenu* mLinkMenu;
IBOutlet id mImageLinkMenu; IBOutlet NSMenu* mImageLinkMenu;
// Context menu item outlets // Context menu item outlets
IBOutlet id mBackItem; IBOutlet NSMenuItem* mBackItem;
IBOutlet id mForwardItem; IBOutlet NSMenuItem* mForwardItem;
NSToolbarItem *mLocationToolbarItem; NSToolbarItem* mLocationToolbarItem;
NSToolbarItem *mSidebarToolbarItem; NSToolbarItem* mSidebarToolbarItem;
BOOL mInitialized; BOOL mInitialized;
NSString* mURL; NSString* mURL;

11
camino/BrowserWindowController.mm
Просмотреть файл

@ -36,9 +36,13 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
#import "BrowserWindowController.h" #import "BrowserWindowController.h"
#import "CHBrowserWrapper.h" #import "CHBrowserWrapper.h"
#import "CHIconTabViewItem.h" #import "CHIconTabViewItem.h"
#import "CHPreferenceManager.h" #import "CHPreferenceManager.h"
#import "BookmarksDataSource.h"
#import "CHHistoryDataSource.h"
#import "CHExtendedTabView.h"
#include "nsIWebNavigation.h" #include "nsIWebNavigation.h"
#include "nsIDOMElement.h" #include "nsIDOMElement.h"
@ -164,7 +168,9 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
NSTabViewItem* item = [mTabBrowser tabViewItemAtIndex: i]; NSTabViewItem* item = [mTabBrowser tabViewItemAtIndex: i];
[[item view] windowClosed]; [[item view] windowClosed];
} }
[mSidebarBrowserView windowClosed];
//if (mSidebarBrowserView)
// [mSidebarBrowserView windowClosed];
[mProgress release]; [mProgress release];
@ -584,9 +590,6 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
[newView setIsBookmarksImport: YES]; [newView setIsBookmarksImport: YES];
[[[self window] contentView] addSubview: newView]; [[[self window] contentView] addSubview: newView];
[[newView getBrowserView] loadURI:aURLSpec flags:NSLoadFlagsNone]; [[newView getBrowserView] loadURI:aURLSpec flags:NSLoadFlagsNone];
// XXX force reload
//[mSidebarBookmarksDataSource reloadDataForItem: nil reloadChildren: YES];
} }
- (IBAction)goToLocationFromToolbarURLField:(id)sender - (IBAction)goToLocationFromToolbarURLField:(id)sender

50
camino/src/browser/BrowserWindowController.h
Просмотреть файл

@ -61,7 +61,7 @@ class nsIDOMNode;
{ {
NSTimer* mTimer; NSTimer* mTimer;
NSArray* mImages; NSArray* mImages;
int mFrame; unsigned int mFrame;
} }
// public // public
@ -75,45 +75,49 @@ class nsIDOMNode;
@end @end
@class BookmarksDataSource;
@class CHHistoryDataSource;
@class CHExtendedTabView;
@interface BrowserWindowController : NSWindowController<CHFind> @interface BrowserWindowController : NSWindowController<CHFind>
{ {
IBOutlet id mTabBrowser; IBOutlet CHExtendedTabView* mTabBrowser;
IBOutlet NSDrawer* mSidebarDrawer; IBOutlet NSDrawer* mSidebarDrawer;
IBOutlet id mSidebarTabView; IBOutlet NSTabView* mSidebarTabView;
IBOutlet id mSidebarSourceTabView; IBOutlet NSTabView* mSidebarSourceTabView;
IBOutlet id mLocationToolbarView; IBOutlet NSView* mLocationToolbarView;
IBOutlet NSTextField* mURLBar; IBOutlet NSTextField* mURLBar;
IBOutlet NSTextField* mStatus; IBOutlet NSTextField* mStatus;
IBOutlet NSProgressIndicator* mProgress; IBOutlet NSProgressIndicator* mProgress;
IBOutlet NSImageView* mLock; IBOutlet NSImageView* mLock;
IBOutlet id mLocationSheetWindow; IBOutlet NSWindow* mLocationSheetWindow;
IBOutlet id mLocationSheetURLField; IBOutlet NSTextField* mLocationSheetURLField;
IBOutlet NSView* mStatusBar; // contains the status text, progress bar, and lock IBOutlet NSView* mStatusBar; // contains the status text, progress bar, and lock
IBOutlet id mSidebarBrowserView; IBOutlet id mSidebarBrowserView; // currently unused
IBOutlet id mSidebarBookmarksDataSource; IBOutlet BookmarksDataSource* mSidebarBookmarksDataSource;
IBOutlet id mHistoryDataSource; IBOutlet CHHistoryDataSource* mHistoryDataSource;
IBOutlet CHBookmarksToolbar* mPersonalToolbar; IBOutlet CHBookmarksToolbar* mPersonalToolbar;
IBOutlet id mAddBookmarkSheetWindow; IBOutlet NSWindow* mAddBookmarkSheetWindow;
IBOutlet id mAddBookmarkTitleField; IBOutlet NSTextField* mAddBookmarkTitleField;
IBOutlet id mAddBookmarkFolderField; IBOutlet NSPopUpButton* mAddBookmarkFolderField;
IBOutlet id mAddBookmarkCheckbox; IBOutlet NSButton* mAddBookmarkCheckbox;
// Context menu outlets. // Context menu outlets.
IBOutlet id mPageMenu; IBOutlet NSMenu* mPageMenu;
IBOutlet id mImageMenu; IBOutlet NSMenu* mImageMenu;
IBOutlet id mInputMenu; IBOutlet NSMenu* mInputMenu;
IBOutlet id mLinkMenu; IBOutlet NSMenu* mLinkMenu;
IBOutlet id mImageLinkMenu; IBOutlet NSMenu* mImageLinkMenu;
// Context menu item outlets // Context menu item outlets
IBOutlet id mBackItem; IBOutlet NSMenuItem* mBackItem;
IBOutlet id mForwardItem; IBOutlet NSMenuItem* mForwardItem;
NSToolbarItem *mLocationToolbarItem; NSToolbarItem* mLocationToolbarItem;
NSToolbarItem *mSidebarToolbarItem; NSToolbarItem* mSidebarToolbarItem;
BOOL mInitialized; BOOL mInitialized;
NSString* mURL; NSString* mURL;

11
camino/src/browser/BrowserWindowController.mm
Просмотреть файл

@ -36,9 +36,13 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
#import "BrowserWindowController.h" #import "BrowserWindowController.h"
#import "CHBrowserWrapper.h" #import "CHBrowserWrapper.h"
#import "CHIconTabViewItem.h" #import "CHIconTabViewItem.h"
#import "CHPreferenceManager.h" #import "CHPreferenceManager.h"
#import "BookmarksDataSource.h"
#import "CHHistoryDataSource.h"
#import "CHExtendedTabView.h"
#include "nsIWebNavigation.h" #include "nsIWebNavigation.h"
#include "nsIDOMElement.h" #include "nsIDOMElement.h"
@ -164,7 +168,9 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
NSTabViewItem* item = [mTabBrowser tabViewItemAtIndex: i]; NSTabViewItem* item = [mTabBrowser tabViewItemAtIndex: i];
[[item view] windowClosed]; [[item view] windowClosed];
} }
[mSidebarBrowserView windowClosed];
//if (mSidebarBrowserView)
// [mSidebarBrowserView windowClosed];
[mProgress release]; [mProgress release];
@ -584,9 +590,6 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
[newView setIsBookmarksImport: YES]; [newView setIsBookmarksImport: YES];
[[[self window] contentView] addSubview: newView]; [[[self window] contentView] addSubview: newView];
[[newView getBrowserView] loadURI:aURLSpec flags:NSLoadFlagsNone]; [[newView getBrowserView] loadURI:aURLSpec flags:NSLoadFlagsNone];
// XXX force reload
//[mSidebarBookmarksDataSource reloadDataForItem: nil reloadChildren: YES];
} }
- (IBAction)goToLocationFromToolbarURLField:(id)sender - (IBAction)goToLocationFromToolbarURLField:(id)sender

50
chimera/BrowserWindowController.h
Просмотреть файл

@ -61,7 +61,7 @@ class nsIDOMNode;
{ {
NSTimer* mTimer; NSTimer* mTimer;
NSArray* mImages; NSArray* mImages;
int mFrame; unsigned int mFrame;
} }
// public // public
@ -75,45 +75,49 @@ class nsIDOMNode;
@end @end
@class BookmarksDataSource;
@class CHHistoryDataSource;
@class CHExtendedTabView;
@interface BrowserWindowController : NSWindowController<CHFind> @interface BrowserWindowController : NSWindowController<CHFind>
{ {
IBOutlet id mTabBrowser; IBOutlet CHExtendedTabView* mTabBrowser;
IBOutlet NSDrawer* mSidebarDrawer; IBOutlet NSDrawer* mSidebarDrawer;
IBOutlet id mSidebarTabView; IBOutlet NSTabView* mSidebarTabView;
IBOutlet id mSidebarSourceTabView; IBOutlet NSTabView* mSidebarSourceTabView;
IBOutlet id mLocationToolbarView; IBOutlet NSView* mLocationToolbarView;
IBOutlet NSTextField* mURLBar; IBOutlet NSTextField* mURLBar;
IBOutlet NSTextField* mStatus; IBOutlet NSTextField* mStatus;
IBOutlet NSProgressIndicator* mProgress; IBOutlet NSProgressIndicator* mProgress;
IBOutlet NSImageView* mLock; IBOutlet NSImageView* mLock;
IBOutlet id mLocationSheetWindow; IBOutlet NSWindow* mLocationSheetWindow;
IBOutlet id mLocationSheetURLField; IBOutlet NSTextField* mLocationSheetURLField;
IBOutlet NSView* mStatusBar; // contains the status text, progress bar, and lock IBOutlet NSView* mStatusBar; // contains the status text, progress bar, and lock
IBOutlet id mSidebarBrowserView; IBOutlet id mSidebarBrowserView; // currently unused
IBOutlet id mSidebarBookmarksDataSource; IBOutlet BookmarksDataSource* mSidebarBookmarksDataSource;
IBOutlet id mHistoryDataSource; IBOutlet CHHistoryDataSource* mHistoryDataSource;
IBOutlet CHBookmarksToolbar* mPersonalToolbar; IBOutlet CHBookmarksToolbar* mPersonalToolbar;
IBOutlet id mAddBookmarkSheetWindow; IBOutlet NSWindow* mAddBookmarkSheetWindow;
IBOutlet id mAddBookmarkTitleField; IBOutlet NSTextField* mAddBookmarkTitleField;
IBOutlet id mAddBookmarkFolderField; IBOutlet NSPopUpButton* mAddBookmarkFolderField;
IBOutlet id mAddBookmarkCheckbox; IBOutlet NSButton* mAddBookmarkCheckbox;
// Context menu outlets. // Context menu outlets.
IBOutlet id mPageMenu; IBOutlet NSMenu* mPageMenu;
IBOutlet id mImageMenu; IBOutlet NSMenu* mImageMenu;
IBOutlet id mInputMenu; IBOutlet NSMenu* mInputMenu;
IBOutlet id mLinkMenu; IBOutlet NSMenu* mLinkMenu;
IBOutlet id mImageLinkMenu; IBOutlet NSMenu* mImageLinkMenu;
// Context menu item outlets // Context menu item outlets
IBOutlet id mBackItem; IBOutlet NSMenuItem* mBackItem;
IBOutlet id mForwardItem; IBOutlet NSMenuItem* mForwardItem;
NSToolbarItem *mLocationToolbarItem; NSToolbarItem* mLocationToolbarItem;
NSToolbarItem *mSidebarToolbarItem; NSToolbarItem* mSidebarToolbarItem;
BOOL mInitialized; BOOL mInitialized;
NSString* mURL; NSString* mURL;

11
chimera/BrowserWindowController.mm
Просмотреть файл

@ -36,9 +36,13 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
#import "BrowserWindowController.h" #import "BrowserWindowController.h"
#import "CHBrowserWrapper.h" #import "CHBrowserWrapper.h"
#import "CHIconTabViewItem.h" #import "CHIconTabViewItem.h"
#import "CHPreferenceManager.h" #import "CHPreferenceManager.h"
#import "BookmarksDataSource.h"
#import "CHHistoryDataSource.h"
#import "CHExtendedTabView.h"
#include "nsIWebNavigation.h" #include "nsIWebNavigation.h"
#include "nsIDOMElement.h" #include "nsIDOMElement.h"
@ -164,7 +168,9 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
NSTabViewItem* item = [mTabBrowser tabViewItemAtIndex: i]; NSTabViewItem* item = [mTabBrowser tabViewItemAtIndex: i];
[[item view] windowClosed]; [[item view] windowClosed];
} }
[mSidebarBrowserView windowClosed];
//if (mSidebarBrowserView)
// [mSidebarBrowserView windowClosed];
[mProgress release]; [mProgress release];
@ -584,9 +590,6 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
[newView setIsBookmarksImport: YES]; [newView setIsBookmarksImport: YES];
[[[self window] contentView] addSubview: newView]; [[[self window] contentView] addSubview: newView];
[[newView getBrowserView] loadURI:aURLSpec flags:NSLoadFlagsNone]; [[newView getBrowserView] loadURI:aURLSpec flags:NSLoadFlagsNone];
// XXX force reload
//[mSidebarBookmarksDataSource reloadDataForItem: nil reloadChildren: YES];
} }
- (IBAction)goToLocationFromToolbarURLField:(id)sender - (IBAction)goToLocationFromToolbarURLField:(id)sender

50
chimera/src/browser/BrowserWindowController.h
Просмотреть файл

@ -61,7 +61,7 @@ class nsIDOMNode;
{ {
NSTimer* mTimer; NSTimer* mTimer;
NSArray* mImages; NSArray* mImages;
int mFrame; unsigned int mFrame;
} }
// public // public
@ -75,45 +75,49 @@ class nsIDOMNode;
@end @end
@class BookmarksDataSource;
@class CHHistoryDataSource;
@class CHExtendedTabView;
@interface BrowserWindowController : NSWindowController<CHFind> @interface BrowserWindowController : NSWindowController<CHFind>
{ {
IBOutlet id mTabBrowser; IBOutlet CHExtendedTabView* mTabBrowser;
IBOutlet NSDrawer* mSidebarDrawer; IBOutlet NSDrawer* mSidebarDrawer;
IBOutlet id mSidebarTabView; IBOutlet NSTabView* mSidebarTabView;
IBOutlet id mSidebarSourceTabView; IBOutlet NSTabView* mSidebarSourceTabView;
IBOutlet id mLocationToolbarView; IBOutlet NSView* mLocationToolbarView;
IBOutlet NSTextField* mURLBar; IBOutlet NSTextField* mURLBar;
IBOutlet NSTextField* mStatus; IBOutlet NSTextField* mStatus;
IBOutlet NSProgressIndicator* mProgress; IBOutlet NSProgressIndicator* mProgress;
IBOutlet NSImageView* mLock; IBOutlet NSImageView* mLock;
IBOutlet id mLocationSheetWindow; IBOutlet NSWindow* mLocationSheetWindow;
IBOutlet id mLocationSheetURLField; IBOutlet NSTextField* mLocationSheetURLField;
IBOutlet NSView* mStatusBar; // contains the status text, progress bar, and lock IBOutlet NSView* mStatusBar; // contains the status text, progress bar, and lock
IBOutlet id mSidebarBrowserView; IBOutlet id mSidebarBrowserView; // currently unused
IBOutlet id mSidebarBookmarksDataSource; IBOutlet BookmarksDataSource* mSidebarBookmarksDataSource;
IBOutlet id mHistoryDataSource; IBOutlet CHHistoryDataSource* mHistoryDataSource;
IBOutlet CHBookmarksToolbar* mPersonalToolbar; IBOutlet CHBookmarksToolbar* mPersonalToolbar;
IBOutlet id mAddBookmarkSheetWindow; IBOutlet NSWindow* mAddBookmarkSheetWindow;
IBOutlet id mAddBookmarkTitleField; IBOutlet NSTextField* mAddBookmarkTitleField;
IBOutlet id mAddBookmarkFolderField; IBOutlet NSPopUpButton* mAddBookmarkFolderField;
IBOutlet id mAddBookmarkCheckbox; IBOutlet NSButton* mAddBookmarkCheckbox;
// Context menu outlets. // Context menu outlets.
IBOutlet id mPageMenu; IBOutlet NSMenu* mPageMenu;
IBOutlet id mImageMenu; IBOutlet NSMenu* mImageMenu;
IBOutlet id mInputMenu; IBOutlet NSMenu* mInputMenu;
IBOutlet id mLinkMenu; IBOutlet NSMenu* mLinkMenu;
IBOutlet id mImageLinkMenu; IBOutlet NSMenu* mImageLinkMenu;
// Context menu item outlets // Context menu item outlets
IBOutlet id mBackItem; IBOutlet NSMenuItem* mBackItem;
IBOutlet id mForwardItem; IBOutlet NSMenuItem* mForwardItem;
NSToolbarItem *mLocationToolbarItem; NSToolbarItem* mLocationToolbarItem;
NSToolbarItem *mSidebarToolbarItem; NSToolbarItem* mSidebarToolbarItem;
BOOL mInitialized; BOOL mInitialized;
NSString* mURL; NSString* mURL;

11
chimera/src/browser/BrowserWindowController.mm
Просмотреть файл

@ -36,9 +36,13 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
#import "BrowserWindowController.h" #import "BrowserWindowController.h"
#import "CHBrowserWrapper.h" #import "CHBrowserWrapper.h"
#import "CHIconTabViewItem.h" #import "CHIconTabViewItem.h"
#import "CHPreferenceManager.h" #import "CHPreferenceManager.h"
#import "BookmarksDataSource.h"
#import "CHHistoryDataSource.h"
#import "CHExtendedTabView.h"
#include "nsIWebNavigation.h" #include "nsIWebNavigation.h"
#include "nsIDOMElement.h" #include "nsIDOMElement.h"
@ -164,7 +168,9 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
NSTabViewItem* item = [mTabBrowser tabViewItemAtIndex: i]; NSTabViewItem* item = [mTabBrowser tabViewItemAtIndex: i];
[[item view] windowClosed]; [[item view] windowClosed];
} }
[mSidebarBrowserView windowClosed];
//if (mSidebarBrowserView)
// [mSidebarBrowserView windowClosed];
[mProgress release]; [mProgress release];
@ -584,9 +590,6 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item";
[newView setIsBookmarksImport: YES]; [newView setIsBookmarksImport: YES];
[[[self window] contentView] addSubview: newView]; [[[self window] contentView] addSubview: newView];
[[newView getBrowserView] loadURI:aURLSpec flags:NSLoadFlagsNone]; [[newView getBrowserView] loadURI:aURLSpec flags:NSLoadFlagsNone];
// XXX force reload
//[mSidebarBookmarksDataSource reloadDataForItem: nil reloadChildren: YES];
} }
- (IBAction)goToLocationFromToolbarURLField:(id)sender - (IBAction)goToLocationFromToolbarURLField:(id)sender