Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 275457 embedding/browser/qt should not use nsIPref r=zack

Browse Source
This commit is contained in:
cbiesinger%web.de 2004-12-21 19:02:22 +00:00
parent 2034d688d1
commit 622be6cb67
6 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
embedding/browser/qt/src/Makefile.in
View File

@ -22,7 +22,6 @@ REQUIRES = xpcom \
webbrwsr \
shistory \
embed_base \
pref \
windowwatcher \
profdirserviceprovider \
$(NULL)

1
embedding/browser/qt/src/QtPromptService.cpp
View File

@ -1,5 +1,4 @@
/*
*
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*

1
embedding/browser/qt/src/qgeckoembed.cpp
View File

@ -67,7 +67,6 @@
#include <nsProfileDirServiceProvider.h>
#include <nsIGenericFactory.h>
#include <nsIComponentRegistrar.h>
#include <nsIPref.h>
#include <nsVoidArray.h>
#include <nsIDOMDocument.h>
#include <nsIDOMBarProp.h>

1
embedding/browser/qt/src/qgeckoembed.h
View File

@ -50,7 +50,6 @@ class nsIDirectoryServiceProvider;
class nsIAppShell;
class nsVoidArray;
class nsProfileDirServiceProvider;
class nsIPref;
class nsISupports;
class EmbedWindow;
class EmbedEventListener;

14
embedding/browser/qt/src/qgeckoglobals.cpp
View File

@ -64,7 +64,6 @@
#include <nsProfileDirServiceProvider.h>
#include <nsIGenericFactory.h>
#include <nsIComponentRegistrar.h>
#include <nsIPref.h>
#include <nsVoidArray.h>
#include <nsIDOMBarProp.h>
#include <nsIDOMWindow.h>
@ -77,7 +76,6 @@ char *QGeckoGlobals::sCompPath = nsnull;
nsIAppShell *QGeckoGlobals::sAppShell = nsnull;
char *QGeckoGlobals::sProfileDir = nsnull;
char *QGeckoGlobals::sProfileName = nsnull;
nsIPref *QGeckoGlobals::sPrefs = nsnull;
nsVoidArray *QGeckoGlobals::sWindowList = nsnull;
nsIDirectoryServiceProvider *QGeckoGlobals::sAppFileLocProvider = nsnull;
nsProfileDirServiceProvider *QGeckoGlobals::sProfileDirServiceProvider = nsnull;
@ -243,14 +241,6 @@ QGeckoGlobals::startupProfile(void)
return rv;
// Keep a ref so we can shut it down.
NS_ADDREF(sProfileDirServiceProvider = locProvider);
// get prefs
nsCOMPtr<nsIPref> pref;
pref = do_GetService(NS_PREF_CONTRACTID);
if (!pref)
return NS_ERROR_FAILURE;
sPrefs = pref.get();
NS_ADDREF(sPrefs);
}
return NS_OK;
}
@ -264,10 +254,6 @@ QGeckoGlobals::shutdownProfile(void)
NS_RELEASE(sProfileDirServiceProvider);
sProfileDirServiceProvider = 0;
}
if (sPrefs) {
NS_RELEASE(sPrefs);
sPrefs = 0;
}
}
/* static */

2
embedding/browser/qt/src/qgeckoglobals.h
View File

@ -47,7 +47,6 @@ class nsModuleComponentInfo;
class nsIAppShell;
class nsVoidArray;
class nsProfileDirServiceProvider;
class nsIPref;
class nsIDirectoryServiceProvider;
class nsIWebBrowserChrome;
@ -86,7 +85,6 @@ private:
static char *sProfileName;
// for profiles
static nsProfileDirServiceProvider *sProfileDirServiceProvider;
static nsIPref *sPrefs;
static nsIDirectoryServiceProvider *sAppFileLocProvider;
// the list of all open windows