followup to jag's bustage checkin saga - removing some unnecessary CID's and some crufty files. (there may have been a grand plan behind guids.h, but as it stands there's no point)

r=the tim dude at rit, aka riceman, aka sirLurxalot, sr=lumpy

embedding/browser/activex/src/control/MozillaBrowser.cpp

@@ -87,6 +87,7 @@ static HANDLE s_hHackedNonReentrancy = NULL;
 
 static NS_DEFINE_CID(kPromptServiceCID, NS_PROMPTSERVICE_CID);
 static NS_DEFINE_CID(kHelperAppLauncherDialogCID, NS_HELPERAPPLAUNCHERDIALOG_CID);
+static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
 
 class PrintListener : public nsIWebProgressListener
 {

embedding/browser/activex/src/control/StdAfx.h

@@ -65,14 +65,12 @@
 #include "plevent.h"
 #include "nsIComponentManager.h"
 #include "nsIServiceManager.h"
-#include "nsIEventQueueService.h"
 #include "nsWidgetsCID.h"
 #include "nsGfxCIID.h"
 #include "nsViewsCID.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
 #include "nsXPIDLString.h"
-#include "nsICookieService.h"
 
 #include "nsIHTTPChannel.h"
 
@@ -167,7 +165,6 @@ typedef long int32;
 #include "WindowCreator.h"
 #include "WebBrowserContainer.h"
 #include "DropTarget.h"
-#include "guids.h"
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Developer Studio will insert additional declarations immediately before the previous line.

embedding/browser/activex/src/control/guids.cpp

@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Adam Lock <adamlock@netscape.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 NPL, 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 NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#include "stdafx.h"
-#include "guids.h"
-
-// Class IDs
-NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
-NS_DEFINE_IID(kHTMLEditorCID, NS_HTMLEDITOR_CID);
-NS_DEFINE_CID(kCookieServiceCID, NS_COOKIESERVICE_CID);
-NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
-NS_DEFINE_CID(kWindowCID, NS_WINDOW_CID);
-

embedding/browser/activex/src/control/guids.h

@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Adam Lock <adamlock@netscape.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 NPL, 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 NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#ifndef GUIDS_H
-#define GUIDS_H
-
-#define NS_EXTERN_IID(_name) \
-    extern const nsIID _name;
-
-// Class IDs
-NS_EXTERN_IID(kEventQueueServiceCID);
-NS_EXTERN_IID(kHTMLEditorCID);
-NS_EXTERN_IID(kCookieServiceCID);
-NS_EXTERN_IID(kPrefCID);
-NS_EXTERN_IID(kWindowCID);
-
-
-#endif

embedding/browser/photon/src/PtMozilla.cpp

@@ -83,13 +83,7 @@ ph_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count);
 #define NS_TO_PH_RGB(ns) (ns & 0xff) << 16 | (ns & 0xff00) | ((ns >> 16) & 0xff)
 #define PH_TO_NS_RGB(ns) (ns & 0xff) << 16 | (ns & 0xff00) | ((ns >> 16) & 0xff)
 
-#define NS_EXTERN_IID(_name) \
-        extern const nsIID _name;
-
-        // Class IDs
-        NS_EXTERN_IID(kHTMLEditorCID);
-        NS_EXTERN_IID(kCookieServiceCID);
-        NS_EXTERN_IID(kWindowCID);
+// Class IDs
 static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
 
 #define NS_PROMPTSERVICE_CID \