From a9f9424d30f2f85b346dcdbb6eddc84fd2b8e937 Mon Sep 17 00:00:00 2001
From: spider <spider@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 1 May 1998 01:16:44 +0000
Subject: [PATCH] Code Cleanup...

git-svn-id: svn://10.0.0.236/trunk@961 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webshell/public/nsIShellInstance.h |  6 ------
 mozilla/webshell/src/makefile.win          |  1 -
 mozilla/webshell/src/nsShellInstance.cpp   | 17 +----------------
 mozilla/webshell/src/windows/makefile.win  |  2 +-
 mozilla/webshell/src/windows/winmain.cpp   |  2 +-
 5 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/mozilla/webshell/public/nsIShellInstance.h b/mozilla/webshell/public/nsIShellInstance.h
index 9ae53031ec0..93574a6bfcf 100644
--- a/mozilla/webshell/public/nsIShellInstance.h
+++ b/mozilla/webshell/public/nsIShellInstance.h
@@ -29,12 +29,6 @@
  { 0xbf88e640, 0xdf99, 0x11d1, \
    {0x92, 0x44, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6} }
 
-//c6efb6c0-df99-11d1-9244-00805f8a7ab6
-#define NS_ISHELLINSTANCE_CID      \
- { 0xc6efb6c0, 0xdf99, 0x11d1, \
-   {0x92, 0x44, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6} }
-
-
 // Interface to the application shell.
 class nsIShellInstance : public nsISupports {
 public:
diff --git a/mozilla/webshell/src/makefile.win b/mozilla/webshell/src/makefile.win
index abf3f8e83df..40794d23840 100644
--- a/mozilla/webshell/src/makefile.win
+++ b/mozilla/webshell/src/makefile.win
@@ -24,7 +24,6 @@ DEFINES=-D_IMPL_NS_WEB -DWIN32_LEAN_AND_MEAN
 MODULE=raptor 
 
 EXPORTS =			\
-	nsShellInstance.h		\
 	nsApplicationManager.h		\
 	$(NULL)
 
diff --git a/mozilla/webshell/src/nsShellInstance.cpp b/mozilla/webshell/src/nsShellInstance.cpp
index c5ec0a85ca4..4d46f83553f 100644
--- a/mozilla/webshell/src/nsShellInstance.cpp
+++ b/mozilla/webshell/src/nsShellInstance.cpp
@@ -31,9 +31,6 @@
 
 static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
-static NS_DEFINE_IID(kIShellInstanceIID, NS_ISHELLINSTANCE_IID);
-static NS_DEFINE_CID(kIShellInstanceCID, NS_ISHELLINSTANCE_CID);
-static NS_DEFINE_CID(kCShellInstanceIID, NS_ISHELLINSTANCE_CID);
 
 class nsShellInstanceFactory : public nsIFactory {
 
@@ -61,7 +58,7 @@ nsShellInstance::~nsShellInstance()
 
 NS_IMPL_ADDREF(nsShellInstance)
 NS_IMPL_RELEASE(nsShellInstance)
-NS_IMPL_QUERY_INTERFACE(nsShellInstance,NS_ISHELLINSTANCE_CID);
+NS_IMPL_QUERY_INTERFACE(nsShellInstance,NS_ISHELLINSTANCE_IID);
 
 nsresult nsShellInstance::Init()
 {
@@ -218,15 +215,3 @@ extern "C" NS_WEB nsresult NSGetFactory(const nsCID &aClass, nsIFactory **aFacto
 }
 
 
-NS_WEB nsresult NS_NewShellInstance(nsIShellInstance** aInstancePtrResult)
-{
-  NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
-  if (nsnull == aInstancePtrResult) {
-    return NS_ERROR_NULL_POINTER;
-  }
-  nsShellInstance* it = new nsShellInstance();
-  if (nsnull == it) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-  return it->QueryInterface(kIShellInstanceIID, (void **) aInstancePtrResult);
-}
diff --git a/mozilla/webshell/src/windows/makefile.win b/mozilla/webshell/src/windows/makefile.win
index 320de021c83..cd33695afad 100644
--- a/mozilla/webshell/src/windows/makefile.win
+++ b/mozilla/webshell/src/windows/makefile.win
@@ -30,7 +30,7 @@ CPP_OBJS=				\
  .\$(OBJDIR)\winmain.obj		\
  $(NULL)
 
-LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor -I$(XPDIST)\public\dom -I$(XPDIST)\public\js
+LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor -I$(XPDIST)\public\dom -I$(XPDIST)\public\js -I..
 
 MAKE_OBJ_TYPE = LIB
 
diff --git a/mozilla/webshell/src/windows/winmain.cpp b/mozilla/webshell/src/windows/winmain.cpp
index c9f2d097cc8..dce9cecf450 100644
--- a/mozilla/webshell/src/windows/winmain.cpp
+++ b/mozilla/webshell/src/windows/winmain.cpp
@@ -31,7 +31,7 @@ extern nsIID kIXPCOMApplicationShellCID ;
 
 static NS_DEFINE_IID(kIApplicationShellIID, NS_IAPPLICATIONSHELL_IID);
 static NS_DEFINE_IID(kCApplicationShellIID, NS_IAPPLICATIONSHELL_CID);
-static NS_DEFINE_IID(kCShellInstanceIID, NS_ISHELLINSTANCE_CID);
+static NS_DEFINE_IID(kCShellInstanceIID, NS_ISHELLINSTANCE_IID);
 
 int PASCAL WinMain(HANDLE instance, HANDLE prevInstance, LPSTR cmdParam, int nCmdShow)
 {