From 43919157549c4d3ad8ae49b6635ef4827a4a3bb1 Mon Sep 17 00:00:00 2001 From: "sgehani%netscape.com" Date: Thu, 11 Nov 1999 00:24:24 +0000 Subject: [PATCH] Fix build warnings by moving a static struct from a .h to its .cpp. Fixes bug 15898. [r=ssu] --- xpinstall/src/nsInstallResources.cpp | 31 ++++++++++++++++++++++++++++ xpinstall/src/nsInstallResources.h | 30 --------------------------- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/xpinstall/src/nsInstallResources.cpp b/xpinstall/src/nsInstallResources.cpp index 1b02e01b2f8..ca945e95588 100644 --- a/xpinstall/src/nsInstallResources.cpp +++ b/xpinstall/src/nsInstallResources.cpp @@ -28,6 +28,37 @@ #include "nscore.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* nsInstallResources::GetDefaultVal(const char* aResName) { diff --git a/xpinstall/src/nsInstallResources.h b/xpinstall/src/nsInstallResources.h index 07ca9d503d0..9ae4a4da3bc 100644 --- a/xpinstall/src/nsInstallResources.h +++ b/xpinstall/src/nsInstallResources.h @@ -36,36 +36,6 @@ typedef struct _nsXPIResourceTableItem char *defaultString; } 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 {