зеркало из https://github.com/mozilla/pjs.git
Fix build warnings by moving a static struct from a .h to its .cpp.
Fixes bug 15898. [r=ssu]
This commit is contained in:
Родитель
f846e017a7
Коммит
4391915754
|
@ -28,6 +28,37 @@
|
||||||
#include "nscore.h"
|
#include "nscore.h"
|
||||||
#include "nsInstallResources.h"
|
#include "nsInstallResources.h"
|
||||||
|
|
||||||
|
static nsXPIResourceTableItem XPIResTable[] =
|
||||||
|
{
|
||||||
|
/*---------------------------------------------------------------------*
|
||||||
|
* Install Actions
|
||||||
|
*---------------------------------------------------------------------*/
|
||||||
|
{ "InstallFile", "Installing: %s" },
|
||||||
|
{ "ReplaceFile", "Replacing: %s" },
|
||||||
|
{ "DeleteFile", "Deleting file: %s" },
|
||||||
|
{ "DeleteComponent", "Deleting component: %s" },
|
||||||
|
{ "Execute", "Executing: %s" },
|
||||||
|
{ "ExecuteWithArgs", "Executing: %s with argument: %s" },
|
||||||
|
{ "Patch", "Patching: %s" },
|
||||||
|
{ "Uninstall", "Uninstalling: %s" },
|
||||||
|
|
||||||
|
// XXX FileOp*() action strings
|
||||||
|
// XXX WinReg and WinProfile action strings
|
||||||
|
|
||||||
|
/*---------------------------------------------------------------------*
|
||||||
|
* Dialog Messages
|
||||||
|
*---------------------------------------------------------------------*/
|
||||||
|
{ "ShouldWeInstallMsg", "Attempting to download and install software. Do you feel lucky punk?" },
|
||||||
|
{ "FinishingInstallMsg", "Finishing install... please wait." },
|
||||||
|
|
||||||
|
/*---------------------------------------------------------------------*
|
||||||
|
* Miscellaneous
|
||||||
|
*---------------------------------------------------------------------*/
|
||||||
|
{ "ERROR", "ERROR" },
|
||||||
|
|
||||||
|
{ NS_XPI_EOT, "" }
|
||||||
|
};
|
||||||
|
|
||||||
char*
|
char*
|
||||||
nsInstallResources::GetDefaultVal(const char* aResName)
|
nsInstallResources::GetDefaultVal(const char* aResName)
|
||||||
{
|
{
|
||||||
|
|
|
@ -36,36 +36,6 @@ typedef struct _nsXPIResourceTableItem
|
||||||
char *defaultString;
|
char *defaultString;
|
||||||
} nsXPIResourceTableItem;
|
} nsXPIResourceTableItem;
|
||||||
|
|
||||||
static nsXPIResourceTableItem XPIResTable[] =
|
|
||||||
{
|
|
||||||
/*---------------------------------------------------------------------*
|
|
||||||
* Install Actions
|
|
||||||
*---------------------------------------------------------------------*/
|
|
||||||
{ "InstallFile", "Installing: %s" },
|
|
||||||
{ "ReplaceFile", "Replacing: %s" },
|
|
||||||
{ "DeleteFile", "Deleting file: %s" },
|
|
||||||
{ "DeleteComponent", "Deleting component: %s" },
|
|
||||||
{ "Execute", "Executing: %s" },
|
|
||||||
{ "ExecuteWithArgs", "Executing: %s with argument: %s" },
|
|
||||||
{ "Patch", "Patching: %s" },
|
|
||||||
{ "Uninstall", "Uninstalling: %s" },
|
|
||||||
|
|
||||||
// XXX FileOp*() action strings
|
|
||||||
// XXX WinReg and WinProfile action strings
|
|
||||||
|
|
||||||
/*---------------------------------------------------------------------*
|
|
||||||
* Dialog Messages
|
|
||||||
*---------------------------------------------------------------------*/
|
|
||||||
{ "ShouldWeInstallMsg", "Attempting to download and install software. Do you feel lucky punk?" },
|
|
||||||
{ "FinishingInstallMsg", "Finishing install... please wait." },
|
|
||||||
|
|
||||||
/*---------------------------------------------------------------------*
|
|
||||||
* Miscellaneous
|
|
||||||
*---------------------------------------------------------------------*/
|
|
||||||
{ "ERROR", "ERROR" },
|
|
||||||
|
|
||||||
{ NS_XPI_EOT, "" }
|
|
||||||
};
|
|
||||||
|
|
||||||
class nsInstallResources
|
class nsInstallResources
|
||||||
{
|
{
|
||||||
|
|
Загрузка…
Ссылка в новой задаче