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

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

This commit is contained in:
cbiesinger%web.de 2004-12-21 19:02:22 +00:00
Родитель 68c0c9c383
Коммит e80d16e685
6 изменённых файлов: 0 добавлений и 114 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
embedding/browser/qt/src/Makefile.in
Просмотреть файл

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

1
embedding/browser/qt/src/QtPromptService.cpp
Просмотреть файл

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

1
embedding/browser/qt/src/qgeckoembed.cpp
Просмотреть файл

@ -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
Просмотреть файл

@ -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
Просмотреть файл

@ -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 */

96
embedding/browser/qt/src/qgeckoglobals.h
Просмотреть файл

@ -1,96 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* ***** 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 mozilla.org code.
*
* The Initial Developer of the Original Code is
* Zack Rusin <zack@kde.org>.
* Portions created by the Initial Developer are Copyright (C) 2004
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Zack Rusin <zack@kde.org>
*
* 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 ***** */
#ifndef QECKOGLOBALS_H
#define QECKOGLOBALS_H
#include "prenv.h"
class nsModuleComponentInfo;
class nsIDirectoryServiceProvider;
class nsModuleComponentInfo;
class nsIAppShell;
class nsVoidArray;
class nsProfileDirServiceProvider;
class nsIPref;
class nsIDirectoryServiceProvider;
class nsIWebBrowserChrome;
class QGeckoGlobals
{
friend class QGeckoEmbed;
public:
static void initializeGlobalObjects();
static void pushStartup();
static void popStartup();
static void setCompPath(const char *aPath);
static void setAppComponents(const nsModuleComponentInfo *aComps,
int aNumComponents);
static void setProfilePath(const char *aDir, const char *aName);
static void setDirectoryServiceProvider(nsIDirectoryServiceProvider
*appFileLocProvider);
static int startupProfile(void);
static void shutdownProfile(void);
static int registerAppComponents();
static void addEngine(QGeckoEmbed *embed);
static void removeEngine(QGeckoEmbed *embed);
static QGeckoEmbed *findPrivateForBrowser(nsIWebBrowserChrome *aBrowser);
private:
static PRUint32 sWidgetCount;
// the path to components
static char *sCompPath;
// the list of application-specific components to register
static const nsModuleComponentInfo *sAppComps;
static int sNumAppComps;
// the appshell we have created
static nsIAppShell *sAppShell;
// what is our profile path?
static char *sProfileDir;
static char *sProfileName;
// for profiles
static nsProfileDirServiceProvider *sProfileDirServiceProvider;
static nsIPref *sPrefs;
static nsIDirectoryServiceProvider *sAppFileLocProvider;
// the list of all open windows
static nsVoidArray *sWindowList;
};
#endif