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

string changes

This commit is contained in:
pavlov%netscape.com 2000-04-27 21:46:26 +00:00
Родитель 3aa64bafea
Коммит db99461de9
3 изменённых файлов: 61 добавлений и 61 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
widget/src/unix_services/toolkit_service/nsIUnixToolkitService.h
Просмотреть файл

@ -64,7 +64,7 @@ public:
* @param [IN] aToolkitName The name of the toolkit to use.
*
*/
NS_IMETHOD SetToolkitName(const nsString & aToolkitName) = 0;
NS_IMETHOD SetToolkitName(const nsCString & aToolkitName) = 0;
/**
* Set the name of the widget toolkit to use. It is usually not required
@ -77,7 +77,7 @@ public:
* @param [IN] aToolkitName The name of the widget toolkit to use.
*
*/
NS_IMETHOD SetWidgetToolkitName(const nsString & aToolkitName) = 0;
NS_IMETHOD SetWidgetToolkitName(const nsCString & aToolkitName) = 0;
/**
* Set the name of the gfx toolkit to use. It is usually not required to
@ -90,7 +90,7 @@ public:
* @param [IN] aToolkitName The name of the gfx toolkit to use.
*
*/
NS_IMETHOD SetGfxToolkitName(const nsString & aToolkitName) = 0;
NS_IMETHOD SetGfxToolkitName(const nsCString & aToolkitName) = 0;
/**
@ -104,7 +104,7 @@ public:
* is valid.
*
*/
NS_IMETHOD IsValidToolkit(const nsString & aToolkitName,
NS_IMETHOD IsValidToolkit(const nsCString & aToolkitName,
PRBool * aResultOut) = 0;
/**
@ -118,7 +118,7 @@ public:
* is valid.
*
*/
NS_IMETHOD IsValidWidgetToolkit(const nsString & aToolkitName,
NS_IMETHOD IsValidWidgetToolkit(const nsCString & aToolkitName,
PRBool * aResultOut) = 0;
/**
@ -132,7 +132,7 @@ public:
* is valid.
*
*/
NS_IMETHOD IsValidGfxToolkit(const nsString & aToolkitName,
NS_IMETHOD IsValidGfxToolkit(const nsCString & aToolkitName,
PRBool * aResultOut) = 0;
/**
@ -142,7 +142,7 @@ public:
* @param [OUT] aToolkitNameOut On return it holds the toolkit name.
*
*/
NS_IMETHOD GetToolkitName(nsString & aToolkitNameOut) = 0;
NS_IMETHOD GetToolkitName(nsCString & aToolkitNameOut) = 0;
/**
* Get the name of the widget toolkit currently being used. The toolkit
@ -151,7 +151,7 @@ public:
* @param [OUT] aToolkitNameOut On return it holds the toolkit name.
*
*/
NS_IMETHOD GetWidgetToolkitName(nsString & aToolkitNameOut) = 0;
NS_IMETHOD GetWidgetToolkitName(nsCString & aToolkitNameOut) = 0;
/**
* Get the name of the gfx toolkit currently being used. The toolkit name
@ -160,7 +160,7 @@ public:
* @param [OUT] aToolkitNameOut On return it holds the toolkit name.
*
*/
NS_IMETHOD GetGfxToolkitName(nsString & aToolkitNameOut) = 0;
NS_IMETHOD GetGfxToolkitName(nsCString & aToolkitNameOut) = 0;
/**
* Get the name of the widget dll. The widget dll will be something like:
@ -169,7 +169,7 @@ public:
* @param [OUT] aWidgetDllNameOut On return it holds the widget dll name.
*
*/
NS_IMETHOD GetWidgetDllName(nsString & aWidgetDllNameOut) = 0;
NS_IMETHOD GetWidgetDllName(nsCString & aWidgetDllNameOut) = 0;
/**
* Get the name of the gfx dll. The gfx dll will be something like:
@ -179,7 +179,7 @@ public:
*
* The gfx dll will be something like: libgfx_{gtk,motif,xlib,qt}.so
*/
NS_IMETHOD GetGfxDllName(nsString & aGfxDllNameOut) = 0;
NS_IMETHOD GetGfxDllName(nsCString & aGfxDllNameOut) = 0;
/**
* Get the CID of the timer class associated with the toolkit in use.

66
widget/src/unix_services/toolkit_service/nsUnixToolkitService.cpp
Просмотреть файл

@ -28,12 +28,12 @@
#include "nsITimer.h" // For nsITimer
#include "nsCRT.h" // For strcasecmp()
#include "prenv.h" // For PR_GetEnv()
#include "nsFileSpec.h" // For nsAutoCString
#include "nsFileSpec.h" // For nsCAutoString
/* static */ nsString * nsUnixToolkitService::sWidgetToolkitName = nsnull;
/* static */ nsString * nsUnixToolkitService::sGfxToolkitName = nsnull;
/* static */ nsString * nsUnixToolkitService::sWidgetDllName = nsnull;
/* static */ nsString * nsUnixToolkitService::sGfxDllName = nsnull;
/* static */ nsCString * nsUnixToolkitService::sWidgetToolkitName = nsnull;
/* static */ nsCString * nsUnixToolkitService::sGfxToolkitName = nsnull;
/* static */ nsCString * nsUnixToolkitService::sWidgetDllName = nsnull;
/* static */ nsCString * nsUnixToolkitService::sGfxDllName = nsnull;
/* static */ const nsCID * nsUnixToolkitService::sTimerCID = nsnull;
@ -69,7 +69,7 @@ NS_IMPL_QUERY_INTERFACE(nsUnixToolkitService, NS_GET_IID(nsIUnixToolkitService))
//////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP
nsUnixToolkitService::SetToolkitName(const nsString & aToolkitName)
nsUnixToolkitService::SetToolkitName(const nsCString & aToolkitName)
{
PRBool isValid;
nsresult rv = NS_OK;
@ -94,7 +94,7 @@ nsUnixToolkitService::SetToolkitName(const nsString & aToolkitName)
}
//////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP
nsUnixToolkitService::SetWidgetToolkitName(const nsString & aToolkitName)
nsUnixToolkitService::SetWidgetToolkitName(const nsCString & aToolkitName)
{
PRBool isValid;
@ -106,15 +106,15 @@ nsUnixToolkitService::SetWidgetToolkitName(const nsString & aToolkitName)
{
Cleanup();
sWidgetToolkitName = new nsString(aToolkitName);
sGfxToolkitName = new nsString(aToolkitName);
sWidgetToolkitName = new nsCString(aToolkitName);
sGfxToolkitName = new nsCString(aToolkitName);
}
return NS_OK;
}
//////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP
nsUnixToolkitService::SetGfxToolkitName(const nsString & aToolkitName)
nsUnixToolkitService::SetGfxToolkitName(const nsCString & aToolkitName)
{
PRBool isValid;
@ -126,15 +126,15 @@ nsUnixToolkitService::SetGfxToolkitName(const nsString & aToolkitName)
{
Cleanup();
sWidgetToolkitName = new nsString(aToolkitName);
sGfxToolkitName = new nsString(aToolkitName);
sWidgetToolkitName = new nsCString(aToolkitName);
sGfxToolkitName = new nsCString(aToolkitName);
}
return NS_OK;
}
//////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP
nsUnixToolkitService::IsValidToolkit(const nsString & aToolkitName,
nsUnixToolkitService::IsValidToolkit(const nsCString & aToolkitName,
PRBool * aResultOut)
{
NS_ASSERTION(nsnull != aResultOut,"null out param.");
@ -153,21 +153,21 @@ nsUnixToolkitService::IsValidToolkit(const nsString & aToolkitName,
}
//////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP
nsUnixToolkitService::IsValidWidgetToolkit(const nsString & aToolkitName,
nsUnixToolkitService::IsValidWidgetToolkit(const nsCString & aToolkitName,
PRBool * aResultOut)
{
return IsValidToolkit(aToolkitName, aResultOut);
}
//////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP
nsUnixToolkitService::IsValidGfxToolkit(const nsString & aToolkitName,
nsUnixToolkitService::IsValidGfxToolkit(const nsCString & aToolkitName,
PRBool * aResultOut)
{
return IsValidToolkit(aToolkitName, aResultOut);
}
//////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP
nsUnixToolkitService::GetToolkitName(nsString & aToolkitNameOut)
nsUnixToolkitService::GetToolkitName(nsCString & aToolkitNameOut)
{
aToolkitNameOut = "";
@ -175,7 +175,7 @@ nsUnixToolkitService::GetToolkitName(nsString & aToolkitNameOut)
}
//////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP
nsUnixToolkitService::GetWidgetToolkitName(nsString & aToolkitNameOut)
nsUnixToolkitService::GetWidgetToolkitName(nsCString & aToolkitNameOut)
{
aToolkitNameOut = "";
@ -185,7 +185,7 @@ nsUnixToolkitService::GetWidgetToolkitName(nsString & aToolkitNameOut)
}
//////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP
nsUnixToolkitService::GetGfxToolkitName(nsString & aToolkitNameOut)
nsUnixToolkitService::GetGfxToolkitName(nsCString & aToolkitNameOut)
{
aToolkitNameOut = "";
@ -195,15 +195,15 @@ nsUnixToolkitService::GetGfxToolkitName(nsString & aToolkitNameOut)
}
//////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP
nsUnixToolkitService::GetWidgetDllName(nsString & aWidgetDllNameOut)
nsUnixToolkitService::GetWidgetDllName(nsCString & aWidgetDllNameOut)
{
nsresult rv = NS_ERROR_FAILURE;
// Set sWidgetDllName only once
if (nsnull == sWidgetDllName)
{
nsAutoString name;
nsAutoString toolkit;
nsCAutoString name;
nsCAutoString toolkit;
nsresult rv2 = GlobalGetWidgetToolkitName(toolkit);
@ -226,7 +226,7 @@ nsUnixToolkitService::GetWidgetDllName(nsString & aWidgetDllNameOut)
name = "error";
}
sWidgetDllName = new nsString(name);
sWidgetDllName = new nsCString(name);
if (!sWidgetDllName)
{
@ -242,15 +242,15 @@ nsUnixToolkitService::GetWidgetDllName(nsString & aWidgetDllNameOut)
}
//////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP
nsUnixToolkitService::GetGfxDllName(nsString & aGfxDllNameOut)
nsUnixToolkitService::GetGfxDllName(nsCString & aGfxDllNameOut)
{
nsresult rv = NS_ERROR_FAILURE;
// Set sGfxDllName only once
if (nsnull == sGfxDllName)
{
nsAutoString name;
nsAutoString toolkit;
nsCAutoString name;
nsCAutoString toolkit;
nsresult rv2 = GlobalGetGfxToolkitName(toolkit);
@ -274,7 +274,7 @@ nsUnixToolkitService::GetGfxDllName(nsString & aGfxDllNameOut)
name = "error";
}
sGfxDllName = new nsString(name);
sGfxDllName = new nsCString(name);
if (!sGfxDllName)
{
@ -307,7 +307,7 @@ nsUnixToolkitService::GetTimerCID(nsCID ** aTimerCIDOut)
if (nsnull == sTimerCID)
{
nsAutoString unixToolkitName;
nsCAutoString unixToolkitName;
GlobalGetWidgetToolkitName(unixToolkitName);
@ -348,7 +348,7 @@ nsUnixToolkitService::GetTimerCID(nsCID ** aTimerCIDOut)
}
//////////////////////////////////////////////////////////////////////////
/* static */ nsresult
nsUnixToolkitService::GlobalGetWidgetToolkitName(nsString & aStringOut)
nsUnixToolkitService::GlobalGetWidgetToolkitName(nsCString & aStringOut)
{
nsresult rv = EnsureWidgetToolkitName();
@ -366,7 +366,7 @@ nsUnixToolkitService::GlobalGetWidgetToolkitName(nsString & aStringOut)
//////////////////////////////////////////////////////////////////////////
/* static */ nsresult
nsUnixToolkitService::GlobalGetGfxToolkitName(nsString & aStringOut)
nsUnixToolkitService::GlobalGetGfxToolkitName(nsCString & aStringOut)
{
nsresult rv = EnsureGfxToolkitName();
@ -390,7 +390,7 @@ nsUnixToolkitService::EnsureWidgetToolkitName()
if (nsnull != sWidgetToolkitName)
return NS_OK;
sWidgetToolkitName = new nsString("unknown");
sWidgetToolkitName = new nsCString("unknown");
if (!sWidgetToolkitName)
return NS_ERROR_OUT_OF_MEMORY;
@ -448,7 +448,7 @@ nsUnixToolkitService::EnsureWidgetToolkitName()
#ifdef NS_DEBUG
printf("nsUnixToolkitService: Using '%s' for the Widget Toolkit.\n",
(const char *) nsAutoCString(*sWidgetToolkitName));
(const char *) nsCAutoString(*sWidgetToolkitName));
#endif
return NS_OK;
@ -462,7 +462,7 @@ nsUnixToolkitService::EnsureGfxToolkitName()
if (nsnull != sGfxToolkitName)
return NS_OK;
sGfxToolkitName = new nsString("unknown");
sGfxToolkitName = new nsCString("unknown");
if (!sGfxToolkitName)
return NS_ERROR_OUT_OF_MEMORY;
@ -520,7 +520,7 @@ nsUnixToolkitService::EnsureGfxToolkitName()
#ifdef NS_DEBUG
printf("nsUnixToolkitService: Using '%s' for the Gfx Toolkit.\n",
(const char *) nsAutoCString(*sGfxToolkitName));
(const char *) nsCAutoString(*sGfxToolkitName));
#endif
return NS_OK;

34
widget/src/unix_services/toolkit_service/nsUnixToolkitService.h
Просмотреть файл

@ -30,40 +30,40 @@ class nsUnixToolkitService : public nsIUnixToolkitService
NS_DECL_ISUPPORTS
NS_IMETHOD SetToolkitName(const nsString & aToolkitName);
NS_IMETHOD SetWidgetToolkitName(const nsString & aToolkitName);
NS_IMETHOD SetGfxToolkitName(const nsString & aToolkitName);
NS_IMETHOD SetToolkitName(const nsCString & aToolkitName);
NS_IMETHOD SetWidgetToolkitName(const nsCString & aToolkitName);
NS_IMETHOD SetGfxToolkitName(const nsCString & aToolkitName);
NS_IMETHOD IsValidToolkit(const nsString & aToolkitName,
NS_IMETHOD IsValidToolkit(const nsCString & aToolkitName,
PRBool * aResultOut);
NS_IMETHOD IsValidWidgetToolkit(const nsString & aToolkitName,
NS_IMETHOD IsValidWidgetToolkit(const nsCString & aToolkitName,
PRBool * aResultOut);
NS_IMETHOD IsValidGfxToolkit(const nsString & aToolkitName,
NS_IMETHOD IsValidGfxToolkit(const nsCString & aToolkitName,
PRBool * aResultOut);
NS_IMETHOD GetToolkitName(nsString & aToolkitNameOut);
NS_IMETHOD GetWidgetToolkitName(nsString & aToolkitNameOut);
NS_IMETHOD GetGfxToolkitName(nsString & aToolkitNameOut);
NS_IMETHOD GetToolkitName(nsCString & aToolkitNameOut);
NS_IMETHOD GetWidgetToolkitName(nsCString & aToolkitNameOut);
NS_IMETHOD GetGfxToolkitName(nsCString & aToolkitNameOut);
NS_IMETHOD GetWidgetDllName(nsString & aWidgetDllNameOut);
NS_IMETHOD GetGfxDllName(nsString & aGfxDllNameOut);
NS_IMETHOD GetWidgetDllName(nsCString & aWidgetDllNameOut);
NS_IMETHOD GetGfxDllName(nsCString & aGfxDllNameOut);
NS_IMETHOD GetTimerCID(nsCID ** aTimerCIDOut);
private:
static nsresult GlobalGetWidgetToolkitName(nsString & aStringOut);
static nsresult GlobalGetGfxToolkitName(nsString & aStringOut);
static nsresult GlobalGetWidgetToolkitName(nsCString & aStringOut);
static nsresult GlobalGetGfxToolkitName(nsCString & aStringOut);
static nsresult EnsureWidgetToolkitName();
static nsresult EnsureGfxToolkitName();
static nsresult Cleanup();
static nsString * sWidgetToolkitName;
static nsString * sGfxToolkitName;
static nsString * sWidgetDllName;
static nsString * sGfxDllName;
static nsCString * sWidgetToolkitName;
static nsCString * sGfxToolkitName;
static nsCString * sWidgetDllName;
static nsCString * sGfxDllName;
static const nsCID * sTimerCID;
static const char * ksDefaultToolkit;