Camino only - Bug 195565: Convert #import to @class in headers where possible. r/sr=mento

camino/PreferencePanes/WebFeatures/WebFeatures.h

@@ -41,7 +41,8 @@
 #import <Cocoa/Cocoa.h>
 #import <PreferencePanes/NSPreferencePane.h>
 #import "PreferencePaneBase.h"
-#import "ExtendedTableView.h"
+
+@class ExtendedTableView;
 
 class nsIPref;
 class nsIPermissionManager;

camino/PreferencePanes/WebFeatures/WebFeatures.mm

@@ -40,6 +40,7 @@
 
 #import "WebFeatures.h"
 #import "NSString+Utils.h"
+#import "ExtendedTableView.h"
 
 #include "nsCOMPtr.h"
 #include "nsServiceManagerUtils.h"

camino/src/browser/AutoCompleteDataSource.h

@@ -39,7 +39,6 @@
 
 #import <AppKit/AppKit.h>
 
-@class AutoCompleteTextField;
 class nsIAutoCompleteResults;
 
 @interface AutoCompleteDataSource : NSObject

camino/src/browser/AutoCompleteTextField.h

@@ -40,12 +40,11 @@
 
 #import <AppKit/AppKit.h>
 
-#import "AutoCompleteDataSource.h"
-
 class nsIAutoCompleteSession;
 class nsIAutoCompleteResults;
 class nsIAutoCompleteListener;
 
+@class AutoCompleteDataSource;
 @class ClickMenuImageView;
 @class PageProxyIcon;
 

camino/src/browser/AutoCompleteTextField.mm

@@ -42,6 +42,7 @@
 #import "NSString+Utils.h"
 
 #import "AutoCompleteTextField.h"
+#import "AutoCompleteDataSource.h"
 #import "BrowserWindowController.h"
 #import "PageProxyIcon.h"
 #import "CHBrowserService.h"

camino/src/browser/BrowserTabBarView.h

@@ -38,8 +38,10 @@
  * ***** END LICENSE BLOCK ***** */
 
 #import <Cocoa/Cocoa.h>
-#import "BrowserTabView.h"
-#import "TabButtonCell.h"
+
+@class BrowserTabView;
+@class BrowserTabViewItem;
+@class TabButtonCell;
 
 @interface BrowserTabBarView : NSView 
 {

camino/src/browser/BrowserTabBarView.mm

@@ -40,6 +40,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #import "BrowserTabBarView.h"
+#import "BrowserTabView.h"
 #import "BrowserTabViewItem.h"
 #import "TabButtonCell.h"
 #import "ImageAdditions.h"

camino/src/browser/BrowserTabView.h

@@ -39,7 +39,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "BrowserTabViewItem.h"
+@class BrowserTabViewItem;
 @class BrowserTabBarView;
 
 // notification sent when someone double-clicks on the background of the tab bar.

camino/src/browser/BrowserTabView.mm

@@ -42,6 +42,7 @@
 #import "PreferenceManager.h"
 
 #import "BrowserTabView.h"
+#import "BrowserTabViewItem.h"
 #import "BrowserWrapper.h"
 #import "BookmarkFolder.h"
 #import "Bookmark.h"

camino/src/browser/ContentClickListener.h

@@ -42,7 +42,8 @@
 #include <Cocoa/Cocoa.h>
 
 #include "nsIDOMMouseListener.h"
-#import "BrowserWindowController.h"
+
+@class BrowserWindowController;
 
 class ContentClickListener :  public nsIDOMMouseListener
 {

camino/src/browser/ContentClickListener.mm

@@ -51,10 +51,11 @@
 #include "GeckoUtils.h"
 
 #import "NSString+Utils.h"
-#import "PreferenceManager.h"
-#import "CHBrowserView.h"
 
 #import "ContentClickListener.h"
+#import "PreferenceManager.h"
+#import "CHBrowserView.h"
+#import "BrowserWindowController.h"
 
 NS_IMPL_ISUPPORTS2(ContentClickListener, nsIDOMMouseListener, nsIDOMEventListener)
 

camino/src/download/ProgressDlgController.h

@@ -68,9 +68,10 @@
 */
 
 #import "CHDownloadProgressDisplay.h"
-#import "ProgressViewController.h"
 #import "FileChangeWatcher.h"
 
+@class ProgressViewController;
+
 //
 // interface ProgressDlgController
 //

camino/src/download/ProgressDlgController.mm

@@ -47,6 +47,7 @@
 #import "ProgressDlgController.h"
 
 #import "PreferenceManager.h"
+#import "ProgressViewController.h"
 #import "ProgressView.h"
 
 static NSString* const kProgressWindowFrameSaveName = @"ProgressWindow";

camino/src/download/ProgressView.h

@@ -38,7 +38,8 @@
 
 
 #import <AppKit/AppKit.h>
-#import "ProgressViewController.h"
+
+@class ProgressViewController;
 
 extern NSString* const kDownloadInstanceSelectedNotificationName;
 extern NSString* const kDownloadInstanceOpenedNotificationName;

camino/src/download/ProgressView.mm

@@ -39,6 +39,7 @@
 
 #import "ProgressView.h"
 
+#import "ProgressViewController.h"
 
 NSString* const kDownloadInstanceSelectedNotificationName = @"DownloadInstanceSelected";
 NSString* const kDownloadInstanceOpenedNotificationName   = @"DownloadInstanceOpened";

camino/src/extensions/TabButtonCell.h

@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is tab UI for Camino.
- *
- * The Initial Developer of the Original Code is
- * Geoff Beier.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Geoff Beier <me@mollyandgeoff.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#import <Cocoa/Cocoa.h>
-#import "RolloverTrackingCell.h"
-#import "BrowserTabViewItem.h"
-
-@class RolloverImageButton;
-
-@interface TabButtonCell : RolloverTrackingCell
-{
-  BrowserTabViewItem*   mTabViewItem;
-  BOOL                  mNeedsDivider;
-  RolloverImageButton*  mCloseButton;
-}
-
--(id)initFromTabViewItem:(BrowserTabViewItem*)tabViewItem;
--(BOOL)isSelected;
--(BrowserTabViewItem*)tabViewItem;
--(BOOL)willTrackMouse:(NSEvent*)theEvent inRect:(NSRect)cellFrame ofView:(NSView*)controlView;
--(void)hideCloseButton;
--(void)setDrawDivider:(BOOL)willDraw;
--(void)updateHoverState:(BOOL)isHovered;
-
-@end

camino/src/extensions/TabButtonCell.mm

@@ -40,6 +40,7 @@
 #import "NSBezierPath+Utils.h"
 
 #import "TabButtonCell.h"
+#import "BrowserTabViewItem.h"
 #import "RolloverImageButton.h"
 #import "TruncatingTextAndImageCell.h"