зеркало из https://github.com/mozilla/gecko-dev.git
Bug 467948 - fix some deprecated conversion from string constant warnings; r=dbaron
This commit is contained in:
Родитель
74b1bb6beb
Коммит
a56370e043
|
@ -262,26 +262,6 @@ mai_atk_object_get_type(void)
|
|||
return type;
|
||||
}
|
||||
|
||||
/*
|
||||
* Must keep sychronization with enumerate AtkProperty in
|
||||
* accessible/src/base/nsAccessibleEventData.h
|
||||
*/
|
||||
static char * sAtkPropertyNameArray[PROP_LAST] = {
|
||||
0,
|
||||
"accessible-name",
|
||||
"accessible-description",
|
||||
"accessible-parent",
|
||||
"accessible-role",
|
||||
"accessible-layer",
|
||||
"accessible-mdi-zorder",
|
||||
"accessible-table-caption",
|
||||
"accessible-table-column-description",
|
||||
"accessible-table-column-header",
|
||||
"accessible-table-row-description",
|
||||
"accessible-table-row-header",
|
||||
"accessible-table-summary"
|
||||
};
|
||||
|
||||
#ifdef MAI_LOGGING
|
||||
PRInt32 nsAccessibleWrap::mAccWrapCreated = 0;
|
||||
PRInt32 nsAccessibleWrap::mAccWrapDeleted = 0;
|
||||
|
|
|
@ -1237,7 +1237,7 @@ NS_IMETHODIMP nsHTMLTableAccessible::GetDescription(nsAString& aDescription)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
PRBool nsHTMLTableAccessible::HasDescendant(char *aTagName, PRBool aAllowEmpty)
|
||||
PRBool nsHTMLTableAccessible::HasDescendant(const char *aTagName, PRBool aAllowEmpty)
|
||||
{
|
||||
nsCOMPtr<nsIDOMElement> tableElt(do_QueryInterface(mDOMNode));
|
||||
NS_ENSURE_TRUE(tableElt, PR_FALSE);
|
||||
|
|
|
@ -210,7 +210,7 @@ protected:
|
|||
virtual void CacheChildren();
|
||||
nsresult GetTableNode(nsIDOMNode **_retval);
|
||||
nsresult GetTableLayout(nsITableLayout **aLayoutObject);
|
||||
PRBool HasDescendant(char *aTagName, PRBool aAllowEmpty = PR_TRUE);
|
||||
PRBool HasDescendant(const char *aTagName, PRBool aAllowEmpty = PR_TRUE);
|
||||
#ifdef SHOW_LAYOUT_HEURISTIC
|
||||
nsAutoString mLayoutHeuristic;
|
||||
#endif
|
||||
|
|
|
@ -47,8 +47,8 @@ enum {
|
|||
};
|
||||
|
||||
struct DialogDescription {
|
||||
int flags;
|
||||
gchar* icon;
|
||||
int flags;
|
||||
const gchar* icon;
|
||||
};
|
||||
|
||||
// This table contains the optional widgets and icons associated with
|
||||
|
|
|
@ -76,10 +76,10 @@ private:
|
|||
|
||||
public:
|
||||
|
||||
void AddTrace(char * aTrace);
|
||||
void DelTrace(char * aTrace);
|
||||
void PrintError(char * aCall, int aError);
|
||||
void PrintError(char * aCall, char * aMessage);
|
||||
void AddTrace(const char * aTrace);
|
||||
void DelTrace(const char * aTrace);
|
||||
void PrintError(const char * aCall, const int aError);
|
||||
void PrintError(const char * aCall, const char * aMessage);
|
||||
};
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
@ -178,24 +178,24 @@ int main(int argc, char ** argv)
|
|||
|
||||
const char * nsTestLog::kTraceDelimiter = ".";
|
||||
|
||||
void nsTestLog::AddTrace(char * aTrace)
|
||||
void nsTestLog::AddTrace(const char * aTrace)
|
||||
{
|
||||
mTrace.Append(aTrace);
|
||||
mTrace.Append(kTraceDelimiter);
|
||||
}
|
||||
|
||||
void nsTestLog::DelTrace(char * aTrace)
|
||||
void nsTestLog::DelTrace(const char * aTrace)
|
||||
{
|
||||
mTrace.Truncate(mTrace.Length() - strlen(aTrace) - strlen(kTraceDelimiter));
|
||||
}
|
||||
|
||||
void nsTestLog::PrintError(char * aCall, int aError)
|
||||
void nsTestLog::PrintError(const char * aCall, const int aError)
|
||||
{
|
||||
const char * trace = mTrace.get();
|
||||
printf("ERROR at %s%s code=0x%x.\n", trace, aCall, aError);
|
||||
}
|
||||
|
||||
void nsTestLog::PrintError(char * aCall, char * aMessage)
|
||||
void nsTestLog::PrintError(const char * aCall, const char * aMessage)
|
||||
{
|
||||
const char * trace = mTrace.get();
|
||||
printf("ERROR at %s%s reason: %s.\n", trace, aCall, aMessage);
|
||||
|
@ -206,7 +206,7 @@ void nsTestLog::PrintError(char * aCall, char * aMessage)
|
|||
|
||||
nsresult nsTestUConv::TestEncoders()
|
||||
{
|
||||
char * trace = "TestEncoders";
|
||||
const char * trace = "TestEncoders";
|
||||
mLog.AddTrace(trace);
|
||||
nsresult res = NS_OK;
|
||||
|
||||
|
@ -234,7 +234,7 @@ nsresult nsTestUConv::TestEncoders()
|
|||
|
||||
nsresult nsTestUConv::TestDecoders()
|
||||
{
|
||||
char * trace = "TestDecoders";
|
||||
const char * trace = "TestDecoders";
|
||||
mLog.AddTrace(trace);
|
||||
nsresult res = NS_OK;
|
||||
|
||||
|
@ -246,7 +246,7 @@ nsresult nsTestUConv::TestDecoders()
|
|||
|
||||
nsresult nsTestUConv::TestCharsetManager()
|
||||
{
|
||||
char * trace = "TestCharsetManager";
|
||||
const char * trace = "TestCharsetManager";
|
||||
mLog.AddTrace(trace);
|
||||
nsresult res = NS_OK;
|
||||
nsAutoString name;
|
||||
|
@ -265,7 +265,7 @@ nsresult nsTestUConv::TestCharsetManager()
|
|||
|
||||
nsresult nsTestUConv::DisplayDetectors()
|
||||
{
|
||||
char * trace = "DisplayDetectors";
|
||||
const char * trace = "DisplayDetectors";
|
||||
mLog.AddTrace(trace);
|
||||
nsresult res = NS_OK;
|
||||
|
||||
|
@ -314,7 +314,7 @@ nsresult nsTestUConv::DisplayDetectors()
|
|||
|
||||
nsresult nsTestUConv::DisplayCharsets()
|
||||
{
|
||||
char * trace = "DisplayCharsets";
|
||||
const char * trace = "DisplayCharsets";
|
||||
mLog.AddTrace(trace);
|
||||
nsresult res = NS_OK;
|
||||
|
||||
|
@ -448,7 +448,7 @@ nsresult nsTestUConv::DisplayCharsets()
|
|||
|
||||
nsresult nsTestUConv::TestTempBug()
|
||||
{
|
||||
char * trace = "TestTempBug";
|
||||
const char * trace = "TestTempBug";
|
||||
mLog.AddTrace(trace);
|
||||
nsresult res = NS_OK;
|
||||
|
||||
|
@ -471,7 +471,7 @@ nsresult nsTestUConv::Encode(PRUnichar ** aSrc, PRUnichar * aSrcEnd,
|
|||
char ** aDest, char * aDestEnd,
|
||||
const nsAFlatCString& aCharset)
|
||||
{
|
||||
char * trace = "Encode";
|
||||
const char * trace = "Encode";
|
||||
mLog.AddTrace(trace);
|
||||
nsresult res = NS_OK;
|
||||
|
||||
|
@ -540,7 +540,7 @@ void nsTestUConv::PrintSpaces(int aCount)
|
|||
|
||||
nsresult nsTestUConv::Main(int aArgC, char ** aArgV)
|
||||
{
|
||||
char * trace = "Main";
|
||||
const char * trace = "Main";
|
||||
mLog.AddTrace(trace);
|
||||
nsresult res = NS_OK;
|
||||
|
||||
|
|
|
@ -453,7 +453,7 @@ VR_INTERFACE(REGERR) NR_RegGetEntryInfo(
|
|||
VR_INTERFACE(REGERR) NR_RegGetEntryString(
|
||||
HREG hReg, /* handle of open registry */
|
||||
RKEY key, /* containing key */
|
||||
char *name, /* entry name */
|
||||
const char *name, /* entry name */
|
||||
char *buffer, /* buffer to hold value (UTF String) */
|
||||
uint32 bufsize /* length of buffer */
|
||||
);
|
||||
|
|
|
@ -2788,7 +2788,7 @@ VR_INTERFACE(REGERR) NR_RegGetEntryInfo( HREG hReg, RKEY key, char *name,
|
|||
* bufsize - size of buffer
|
||||
* ---------------------------------------------------------------------
|
||||
*/
|
||||
VR_INTERFACE(REGERR) NR_RegGetEntryString( HREG hReg, RKEY key, char *name,
|
||||
VR_INTERFACE(REGERR) NR_RegGetEntryString( HREG hReg, RKEY key, const char *name,
|
||||
char *buffer, uint32 bufsize)
|
||||
{
|
||||
REGERR err;
|
||||
|
|
|
@ -168,10 +168,9 @@ static void LoadExtraSharedLibs()
|
|||
nsresult res;
|
||||
nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &res));
|
||||
if (NS_SUCCEEDED(res) && (prefs != nsnull)) {
|
||||
char *sonamesListFromPref = PREF_PLUGINS_SONAME;
|
||||
char *sonameList = NULL;
|
||||
PRBool prefSonameListIsSet = PR_TRUE;
|
||||
res = prefs->GetCharPref(sonamesListFromPref, &sonameList);
|
||||
res = prefs->GetCharPref(PREF_PLUGINS_SONAME, &sonameList);
|
||||
if (!sonameList) {
|
||||
// pref is not set, lets use hardcoded list
|
||||
prefSonameListIsSet = PR_FALSE;
|
||||
|
@ -247,7 +246,7 @@ static void LoadExtraSharedLibs()
|
|||
// if user specified some bogus soname I overwrite it here,
|
||||
// otherwise it'll decrease performance by calling popen() in SearchForSoname
|
||||
// every time for each bogus name
|
||||
prefs->SetCharPref(sonamesListFromPref, (const char *)sonameListToSave);
|
||||
prefs->SetCharPref(PREF_PLUGINS_SONAME, (const char *)sonameListToSave);
|
||||
}
|
||||
PL_strfree(sonameList);
|
||||
}
|
||||
|
|
|
@ -64,7 +64,7 @@ CacheLogInit()
|
|||
|
||||
|
||||
void
|
||||
CacheLogPrintPath(PRLogModuleLevel level, char * format, nsIFile * item)
|
||||
CacheLogPrintPath(PRLogModuleLevel level, const char * format, nsIFile * item)
|
||||
{
|
||||
nsCAutoString path;
|
||||
nsresult rv = item->GetNativePath(path);
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
extern PRLogModuleInfo * gCacheLog;
|
||||
void CacheLogInit();
|
||||
void CacheLogPrintPath(PRLogModuleLevel level,
|
||||
char * format,
|
||||
const char * format,
|
||||
nsIFile * item);
|
||||
#define CACHE_LOG_INIT() CacheLogInit()
|
||||
#define CACHE_LOG_ALWAYS(args) PR_LOG(gCacheLog, PR_LOG_ALWAYS, args)
|
||||
|
|
|
@ -822,7 +822,7 @@ PRIntn freeClientAuthHashItems(PLHashEntry *he, PRIntn i, void *arg)
|
|||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
char* configFilePath;
|
||||
const char* configFilePath;
|
||||
if (argc == 1)
|
||||
configFilePath = "ssltunnel.cfg";
|
||||
else
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
|
||||
static const char* gFunction = "main";
|
||||
|
||||
static PRBool VerifyResult(nsresult aRV, char* aMsg)
|
||||
static PRBool VerifyResult(nsresult aRV, const char* aMsg)
|
||||
{
|
||||
if (NS_FAILED(aRV)) {
|
||||
fail("%s %s, rv=%x", gFunction, aMsg, aRV);
|
||||
|
|
|
@ -294,7 +294,7 @@ void nsProcess::ProcessComplete()
|
|||
mThread = nsnull;
|
||||
}
|
||||
|
||||
char* topic;
|
||||
const char* topic;
|
||||
if (mExitValue < 0)
|
||||
topic = "process-failed";
|
||||
else
|
||||
|
|
Загрузка…
Ссылка в новой задаче