зеркало из https://github.com/mozilla/gecko-dev.git
Bug 758992 - Make the classes which use the XPCOM nsISupports implementation macros final, to avoid the warning about deleting using a pointer to a base class with virtual functions and no virtual dtor (gnome parts); blanket-r=bzbarsky
--HG-- extra : rebase_source : 54d5440012e3c8b1c2f84c176bf02e5f8a0ed604
This commit is contained in:
Родитель
a8f7a07eaf
Коммит
4e23a5cb51
|
@ -8,8 +8,9 @@
|
|||
|
||||
#include "nsIShellService.h"
|
||||
#include "nsStringAPI.h"
|
||||
#include "mozilla/Attributes.h"
|
||||
|
||||
class nsGNOMEShellService : public nsIShellService
|
||||
class nsGNOMEShellService MOZ_FINAL : public nsIShellService
|
||||
{
|
||||
public:
|
||||
nsGNOMEShellService() : mCheckedThisSession(false), mAppIsInPath(false) { }
|
||||
|
|
|
@ -32,6 +32,7 @@ extern "C" {
|
|||
#include "prtime.h"
|
||||
#include "prprf.h"
|
||||
#include "plstr.h"
|
||||
#include "mozilla/Attributes.h"
|
||||
|
||||
#define MOZ_GNOMEVFS_SCHEME "moz-gnomevfs"
|
||||
#define MOZ_GNOMEVFS_SUPPORTED_PROTOCOLS "network.gnomevfs.supported-protocols"
|
||||
|
@ -308,7 +309,7 @@ FileInfoComparator(gconstpointer a, gconstpointer b)
|
|||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class nsGnomeVFSInputStream : public nsIInputStream
|
||||
class nsGnomeVFSInputStream MOZ_FINAL : public nsIInputStream
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
|
@ -732,8 +733,8 @@ nsGnomeVFSInputStream::IsNonBlocking(bool *aResult)
|
|||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class nsGnomeVFSProtocolHandler : public nsIProtocolHandler
|
||||
, public nsIObserver
|
||||
class nsGnomeVFSProtocolHandler MOZ_FINAL : public nsIProtocolHandler
|
||||
, public nsIObserver
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
|
|
|
@ -8,11 +8,12 @@
|
|||
|
||||
#include "nsIGConfService.h"
|
||||
#include "gconf/gconf-client.h"
|
||||
#include "mozilla/Attributes.h"
|
||||
|
||||
#define NS_GCONFSERVICE_CID \
|
||||
{0xd96d5985, 0xa13a, 0x4bdc, {0x93, 0x86, 0xef, 0x34, 0x8d, 0x7a, 0x97, 0xa1}}
|
||||
|
||||
class nsGConfService : public nsIGConfService
|
||||
class nsGConfService MOZ_FINAL : public nsIGConfService
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
|
|
|
@ -16,7 +16,7 @@ extern "C" {
|
|||
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
|
||||
}
|
||||
|
||||
class nsGnomeVFSMimeApp : public nsIGnomeVFSMimeApp
|
||||
class nsGnomeVFSMimeApp MOZ_FINAL : public nsIGnomeVFSMimeApp
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
|
@ -86,7 +86,7 @@ nsGnomeVFSMimeApp::Launch(const nsACString &aUri)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
class UTF8StringEnumerator : public nsIUTF8StringEnumerator
|
||||
class UTF8StringEnumerator MOZ_FINAL : public nsIUTF8StringEnumerator
|
||||
{
|
||||
public:
|
||||
UTF8StringEnumerator() : mIndex(0) { }
|
||||
|
|
|
@ -7,11 +7,12 @@
|
|||
#define nsGnomeVFSService_h_
|
||||
|
||||
#include "nsIGnomeVFSService.h"
|
||||
#include "mozilla/Attributes.h"
|
||||
|
||||
#define NS_GNOMEVFSSERVICE_CID \
|
||||
{0x5f43022c, 0x6194, 0x4b37, {0xb2, 0x6d, 0xe4, 0x10, 0x24, 0x62, 0x52, 0x64}}
|
||||
|
||||
class nsGnomeVFSService : public nsIGnomeVFSService
|
||||
class nsGnomeVFSService MOZ_FINAL : public nsIGnomeVFSService
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
|
|
Загрузка…
Ссылка в новой задаче