diff --git a/editor/base/nsEditorShell.cpp b/editor/base/nsEditorShell.cpp index 479423cfcfee..d50d28018242 100644 --- a/editor/base/nsEditorShell.cpp +++ b/editor/base/nsEditorShell.cpp @@ -2002,7 +2002,7 @@ nsEditorShell::GetParagraphFormat(PRUnichar * *paragraphFormat) } NS_IMETHODIMP -nsEditorShell::SetParagraphFormat(PRUnichar * paragraphFormat) +nsEditorShell::SetParagraphFormat(const PRUnichar * paragraphFormat) { nsresult err = NS_NOINTERFACE; diff --git a/editor/composer/src/nsEditorShell.cpp b/editor/composer/src/nsEditorShell.cpp index 479423cfcfee..d50d28018242 100644 --- a/editor/composer/src/nsEditorShell.cpp +++ b/editor/composer/src/nsEditorShell.cpp @@ -2002,7 +2002,7 @@ nsEditorShell::GetParagraphFormat(PRUnichar * *paragraphFormat) } NS_IMETHODIMP -nsEditorShell::SetParagraphFormat(PRUnichar * paragraphFormat) +nsEditorShell::SetParagraphFormat(const PRUnichar * paragraphFormat) { nsresult err = NS_NOINTERFACE; diff --git a/js/src/xpconnect/tests/TestXPC.cpp b/js/src/xpconnect/tests/TestXPC.cpp index 14a44dce1bcb..bcc55b356a54 100644 --- a/js/src/xpconnect/tests/TestXPC.cpp +++ b/js/src/xpconnect/tests/TestXPC.cpp @@ -163,7 +163,7 @@ NS_IMETHODIMP nsTestXPCFoo::GetFoo(char * *aFoo) return NS_OK; } -NS_IMETHODIMP nsTestXPCFoo::SetFoo(char * aFoo) +NS_IMETHODIMP nsTestXPCFoo::SetFoo(const char * aFoo) { printf("nsTestXPCFoo::Set called "); if(mFoo) diff --git a/mailnews/addrbook/src/nsAbCardProperty.cpp b/mailnews/addrbook/src/nsAbCardProperty.cpp index 0b33c06abd88..73a1ce1580d5 100644 --- a/mailnews/addrbook/src/nsAbCardProperty.cpp +++ b/mailnews/addrbook/src/nsAbCardProperty.cpp @@ -219,7 +219,7 @@ nsresult nsAbCardProperty::GetAttributeName(PRUnichar **aName, nsString& value) } -nsresult nsAbCardProperty::SetAttributeName(PRUnichar *aName, nsString& arrtibute) +nsresult nsAbCardProperty::SetAttributeName(const PRUnichar *aName, nsString& arrtibute) { if (aName) arrtibute = aName; @@ -842,3 +842,301 @@ NS_IMETHODIMP nsAbCardProperty::GetCollationKey(const PRUnichar *str, PRUnichar return rv; } + +NS_IMETHODIMP +nsAbCardProperty::GetFirstName(PRUnichar * *aFirstName) +{ return GetAttributeName(aFirstName, m_FirstName); } + +NS_IMETHODIMP +nsAbCardProperty::GetLastName(PRUnichar * *aLastName) +{ return GetAttributeName(aLastName, m_LastName); } + +NS_IMETHODIMP +nsAbCardProperty::GetDisplayName(PRUnichar * *aDisplayName) +{ return GetAttributeName(aDisplayName, m_DisplayName); } + +NS_IMETHODIMP +nsAbCardProperty::GetNickName(PRUnichar * *aNickName) +{ return GetAttributeName(aNickName, m_NickName); } + +NS_IMETHODIMP +nsAbCardProperty::GetPrimaryEmail(PRUnichar * *aPrimaryEmail) +{ return GetAttributeName(aPrimaryEmail, m_PrimaryEmail); } + +NS_IMETHODIMP +nsAbCardProperty::GetSecondEmail(PRUnichar * *aSecondEmail) +{ return GetAttributeName(aSecondEmail, m_SecondEmail); } + +NS_IMETHODIMP +nsAbCardProperty::GetWorkPhone(PRUnichar * *aWorkPhone) +{ return GetAttributeName(aWorkPhone, m_WorkPhone); } + +NS_IMETHODIMP +nsAbCardProperty::GetHomePhone(PRUnichar * *aHomePhone) +{ return GetAttributeName(aHomePhone, m_HomePhone); } + +NS_IMETHODIMP +nsAbCardProperty::GetFaxNumber(PRUnichar * *aFaxNumber) +{ return GetAttributeName(aFaxNumber, m_FaxNumber); } + +NS_IMETHODIMP +nsAbCardProperty::GetPagerNumber(PRUnichar * *aPagerNumber) +{ return GetAttributeName(aPagerNumber, m_PagerNumber); } + +NS_IMETHODIMP +nsAbCardProperty::GetCellularNumber(PRUnichar * *aCellularNumber) +{ return GetAttributeName(aCellularNumber, m_CellularNumber); } + +NS_IMETHODIMP +nsAbCardProperty::GetHomeAddress(PRUnichar * *aHomeAddress) +{ return GetAttributeName(aHomeAddress, m_HomeAddress); } + +NS_IMETHODIMP +nsAbCardProperty::GetHomeAddress2(PRUnichar * *aHomeAddress2) +{ return GetAttributeName(aHomeAddress2, m_HomeAddress2); } + +NS_IMETHODIMP +nsAbCardProperty::GetHomeCity(PRUnichar * *aHomeCity) +{ return GetAttributeName(aHomeCity, m_HomeCity); } + +NS_IMETHODIMP +nsAbCardProperty::GetHomeState(PRUnichar * *aHomeState) +{ return GetAttributeName(aHomeState, m_HomeState); } + +NS_IMETHODIMP +nsAbCardProperty::GetHomeZipCode(PRUnichar * *aHomeZipCode) +{ return GetAttributeName(aHomeZipCode, m_HomeZipCode); } + +NS_IMETHODIMP +nsAbCardProperty::GetHomeCountry(PRUnichar * *aHomecountry) +{ return GetAttributeName(aHomecountry, m_HomeCountry); } + +NS_IMETHODIMP +nsAbCardProperty::GetWorkAddress(PRUnichar * *aWorkAddress) +{ return GetAttributeName(aWorkAddress, m_WorkAddress); } + +NS_IMETHODIMP +nsAbCardProperty::GetWorkAddress2(PRUnichar * *aWorkAddress2) +{ return GetAttributeName(aWorkAddress2, m_WorkAddress2); } + +NS_IMETHODIMP +nsAbCardProperty::GetWorkCity(PRUnichar * *aWorkCity) +{ return GetAttributeName(aWorkCity, m_WorkCity); } + +NS_IMETHODIMP +nsAbCardProperty::GetWorkState(PRUnichar * *aWorkState) +{ return GetAttributeName(aWorkState, m_WorkState); } + +NS_IMETHODIMP +nsAbCardProperty::GetWorkZipCode(PRUnichar * *aWorkZipCode) +{ return GetAttributeName(aWorkZipCode, m_WorkZipCode); } + +NS_IMETHODIMP +nsAbCardProperty::GetWorkCountry(PRUnichar * *aWorkCountry) +{ return GetAttributeName(aWorkCountry, m_WorkCountry); } + +NS_IMETHODIMP +nsAbCardProperty::GetJobTitle(PRUnichar * *aJobTitle) +{ return GetAttributeName(aJobTitle, m_JobTitle); } + +NS_IMETHODIMP +nsAbCardProperty::GetDepartment(PRUnichar * *aDepartment) +{ return GetAttributeName(aDepartment, m_Department); } + +NS_IMETHODIMP +nsAbCardProperty::GetCompany(PRUnichar * *aCompany) +{ return GetAttributeName(aCompany, m_Company); } + +NS_IMETHODIMP +nsAbCardProperty::GetWebPage1(PRUnichar * *aWebPage1) +{ return GetAttributeName(aWebPage1, m_WebPage1); } + +NS_IMETHODIMP +nsAbCardProperty::GetWebPage2(PRUnichar * *aWebPage2) +{ return GetAttributeName(aWebPage2, m_WebPage2); } + +NS_IMETHODIMP +nsAbCardProperty::GetBirthYear(PRUnichar * *aBirthYear) +{ return GetAttributeName(aBirthYear, m_BirthYear); } + +NS_IMETHODIMP +nsAbCardProperty::GetBirthMonth(PRUnichar * *aBirthMonth) +{ return GetAttributeName(aBirthMonth, m_BirthMonth); } + +NS_IMETHODIMP +nsAbCardProperty::GetBirthDay(PRUnichar * *aBirthDay) +{ return GetAttributeName(aBirthDay, m_BirthDay); } + +NS_IMETHODIMP +nsAbCardProperty::GetCustom1(PRUnichar * *aCustom1) +{ return GetAttributeName(aCustom1, m_Custom1); } + +NS_IMETHODIMP +nsAbCardProperty::GetCustom2(PRUnichar * *aCustom2) +{ return GetAttributeName(aCustom2, m_Custom2); } + +NS_IMETHODIMP +nsAbCardProperty::GetCustom3(PRUnichar * *aCustom3) +{ return GetAttributeName(aCustom3, m_Custom3); } + +NS_IMETHODIMP +nsAbCardProperty::GetCustom4(PRUnichar * *aCustom4) +{ return GetAttributeName(aCustom4, m_Custom4); } + +NS_IMETHODIMP +nsAbCardProperty::GetNotes(PRUnichar * *aNotes) +{ return GetAttributeName(aNotes, m_Note); } + +NS_IMETHODIMP +nsAbCardProperty::GetLastModifiedDate(PRUint32 *aLastModifiedDate) +{ return *aLastModifiedDate = m_LastModDate; } + + +NS_IMETHODIMP +nsAbCardProperty::SetFirstName(const PRUnichar * aFirstName) +{ return SetAttributeName(aFirstName, m_FirstName); } + +NS_IMETHODIMP +nsAbCardProperty::SetLastName(const PRUnichar * aLastName) +{ return SetAttributeName(aLastName, m_LastName); } + +NS_IMETHODIMP +nsAbCardProperty::SetDisplayName(const PRUnichar * aDisplayName) +{ return SetAttributeName(aDisplayName, m_DisplayName); } + +NS_IMETHODIMP +nsAbCardProperty::SetNickName(const PRUnichar * aNickName) +{ return SetAttributeName(aNickName, m_NickName); } + +NS_IMETHODIMP +nsAbCardProperty::SetPrimaryEmail(const PRUnichar * aPrimaryEmail) +{ return SetAttributeName(aPrimaryEmail, m_PrimaryEmail); } + +NS_IMETHODIMP +nsAbCardProperty::SetSecondEmail(const PRUnichar * aSecondEmail) +{ return SetAttributeName(aSecondEmail, m_SecondEmail); } + +NS_IMETHODIMP +nsAbCardProperty::SetWorkPhone(const PRUnichar * aWorkPhone) +{ return SetAttributeName(aWorkPhone, m_WorkPhone); } + +NS_IMETHODIMP +nsAbCardProperty::SetHomePhone(const PRUnichar * aHomePhone) +{ return SetAttributeName(aHomePhone, m_HomePhone); } + +NS_IMETHODIMP +nsAbCardProperty::SetFaxNumber(const PRUnichar * aFaxNumber) +{ return SetAttributeName(aFaxNumber, m_FaxNumber); } + +NS_IMETHODIMP +nsAbCardProperty::SetPagerNumber(const PRUnichar * aPagerNumber) +{ return SetAttributeName(aPagerNumber, m_PagerNumber); } + +NS_IMETHODIMP +nsAbCardProperty::SetCellularNumber(const PRUnichar * aCellularNumber) +{ return SetAttributeName(aCellularNumber, m_CellularNumber); } + +NS_IMETHODIMP +nsAbCardProperty::SetHomeAddress(const PRUnichar * aHomeAddress) +{ return SetAttributeName(aHomeAddress, m_HomeAddress); } + +NS_IMETHODIMP +nsAbCardProperty::SetHomeAddress2(const PRUnichar * aHomeAddress2) +{ return SetAttributeName(aHomeAddress2, m_HomeAddress2); } + +NS_IMETHODIMP +nsAbCardProperty::SetHomeCity(const PRUnichar * aHomeCity) +{ return SetAttributeName(aHomeCity, m_HomeCity); } + +NS_IMETHODIMP +nsAbCardProperty::SetHomeState(const PRUnichar * aHomeState) +{ return SetAttributeName(aHomeState, m_HomeState); } + +NS_IMETHODIMP +nsAbCardProperty::SetHomeZipCode(const PRUnichar * aHomeZipCode) +{ return SetAttributeName(aHomeZipCode, m_HomeZipCode); } + +NS_IMETHODIMP +nsAbCardProperty::SetHomeCountry(const PRUnichar * aHomecountry) +{ return SetAttributeName(aHomecountry, m_HomeCountry); } + +NS_IMETHODIMP +nsAbCardProperty::SetWorkAddress(const PRUnichar * aWorkAddress) +{ return SetAttributeName(aWorkAddress, m_WorkAddress); } + +NS_IMETHODIMP +nsAbCardProperty::SetWorkAddress2(const PRUnichar * aWorkAddress2) +{ return SetAttributeName(aWorkAddress2, m_WorkAddress2); } + +NS_IMETHODIMP +nsAbCardProperty::SetWorkCity(const PRUnichar * aWorkCity) +{ return SetAttributeName(aWorkCity, m_WorkCity); } + +NS_IMETHODIMP +nsAbCardProperty::SetWorkState(const PRUnichar * aWorkState) +{ return SetAttributeName(aWorkState, m_WorkState); } + +NS_IMETHODIMP +nsAbCardProperty::SetWorkZipCode(const PRUnichar * aWorkZipCode) +{ return SetAttributeName(aWorkZipCode, m_WorkZipCode); } + +NS_IMETHODIMP +nsAbCardProperty::SetWorkCountry(const PRUnichar * aWorkCountry) +{ return SetAttributeName(aWorkCountry, m_WorkCountry); } + +NS_IMETHODIMP +nsAbCardProperty::SetJobTitle(const PRUnichar * aJobTitle) +{ return SetAttributeName(aJobTitle, m_JobTitle); } + +NS_IMETHODIMP +nsAbCardProperty::SetDepartment(const PRUnichar * aDepartment) +{ return SetAttributeName(aDepartment, m_Department); } + +NS_IMETHODIMP +nsAbCardProperty::SetCompany(const PRUnichar * aCompany) +{ return SetAttributeName(aCompany, m_Company); } + +NS_IMETHODIMP +nsAbCardProperty::SetWebPage1(const PRUnichar * aWebPage1) +{ return SetAttributeName(aWebPage1, m_WebPage1); } + +NS_IMETHODIMP +nsAbCardProperty::SetWebPage2(const PRUnichar * aWebPage2) +{ return SetAttributeName(aWebPage2, m_WebPage2); } + +NS_IMETHODIMP +nsAbCardProperty::SetBirthYear(const PRUnichar * aBirthYear) +{ return SetAttributeName(aBirthYear, m_BirthYear); } + +NS_IMETHODIMP +nsAbCardProperty::SetBirthMonth(const PRUnichar * aBirthMonth) +{ return SetAttributeName(aBirthMonth, m_BirthMonth); } + +NS_IMETHODIMP +nsAbCardProperty::SetBirthDay(const PRUnichar * aBirthDay) +{ return SetAttributeName(aBirthDay, m_BirthDay); } + +NS_IMETHODIMP +nsAbCardProperty::SetCustom1(const PRUnichar * aCustom1) +{ return SetAttributeName(aCustom1, m_Custom1); } + +NS_IMETHODIMP +nsAbCardProperty::SetCustom2(const PRUnichar * aCustom2) +{ return SetAttributeName(aCustom2, m_Custom2); } + +NS_IMETHODIMP +nsAbCardProperty::SetCustom3(const PRUnichar * aCustom3) +{ return SetAttributeName(aCustom3, m_Custom3); } + +NS_IMETHODIMP +nsAbCardProperty::SetCustom4(const PRUnichar * aCustom4) +{ return SetAttributeName(aCustom4, m_Custom4); } + +NS_IMETHODIMP +nsAbCardProperty::SetNotes(const PRUnichar * aNotes) +{ return SetAttributeName(aNotes, m_Note); } + +NS_IMETHODIMP +nsAbCardProperty::SetLastModifiedDate(PRUint32 aLastModifiedDate) +{ return m_LastModDate = aLastModifiedDate; } + diff --git a/mailnews/addrbook/src/nsAbCardProperty.h b/mailnews/addrbook/src/nsAbCardProperty.h index 6bdab8e8f3c4..0072dd4395e3 100644 --- a/mailnews/addrbook/src/nsAbCardProperty.h +++ b/mailnews/addrbook/src/nsAbCardProperty.h @@ -40,125 +40,18 @@ class nsAbCardProperty: public nsIAbCard public: NS_DECL_ISUPPORTS - + NS_DECL_NSIABCARD nsAbCardProperty(void); virtual ~nsAbCardProperty(void); // nsIAbCard methods: - NS_IMETHOD GetFirstName(PRUnichar * *aFirstName) { return GetAttributeName(aFirstName, m_FirstName); } - NS_IMETHOD GetLastName(PRUnichar * *aLastName) { return GetAttributeName(aLastName, m_LastName); } - NS_IMETHOD GetDisplayName(PRUnichar * *aDisplayName) { return GetAttributeName(aDisplayName, m_DisplayName); } - NS_IMETHOD GetNickName(PRUnichar * *aNickName) { return GetAttributeName(aNickName, m_NickName); } - NS_IMETHOD GetPrimaryEmail(PRUnichar * *aPrimaryEmail) { return GetAttributeName(aPrimaryEmail, m_PrimaryEmail); } - NS_IMETHOD GetSecondEmail(PRUnichar * *aSecondEmail) { return GetAttributeName(aSecondEmail, m_SecondEmail); } - NS_IMETHOD GetWorkPhone(PRUnichar * *aWorkPhone) { return GetAttributeName(aWorkPhone, m_WorkPhone); } - NS_IMETHOD GetHomePhone(PRUnichar * *aHomePhone) { return GetAttributeName(aHomePhone, m_HomePhone); } - NS_IMETHOD GetFaxNumber(PRUnichar * *aFaxNumber) { return GetAttributeName(aFaxNumber, m_FaxNumber); } - NS_IMETHOD GetPagerNumber(PRUnichar * *aPagerNumber) { return GetAttributeName(aPagerNumber, m_PagerNumber); } - NS_IMETHOD GetCellularNumber(PRUnichar * *aCellularNumber) { return GetAttributeName(aCellularNumber, m_CellularNumber); } - NS_IMETHOD GetHomeAddress(PRUnichar * *aHomeAddress) { return GetAttributeName(aHomeAddress, m_HomeAddress); } - NS_IMETHOD GetHomeAddress2(PRUnichar * *aHomeAddress2) { return GetAttributeName(aHomeAddress2, m_HomeAddress2); } - NS_IMETHOD GetHomeCity(PRUnichar * *aHomeCity) { return GetAttributeName(aHomeCity, m_HomeCity); } - NS_IMETHOD GetHomeState(PRUnichar * *aHomeState) { return GetAttributeName(aHomeState, m_HomeState); } - NS_IMETHOD GetHomeZipCode(PRUnichar * *aHomeZipCode) { return GetAttributeName(aHomeZipCode, m_HomeZipCode); } - NS_IMETHOD GetHomeCountry(PRUnichar * *aHomecountry) { return GetAttributeName(aHomecountry, m_HomeCountry); } - NS_IMETHOD GetWorkAddress(PRUnichar * *aWorkAddress) { return GetAttributeName(aWorkAddress, m_WorkAddress); } - NS_IMETHOD GetWorkAddress2(PRUnichar * *aWorkAddress2) { return GetAttributeName(aWorkAddress2, m_WorkAddress2); } - NS_IMETHOD GetWorkCity(PRUnichar * *aWorkCity) { return GetAttributeName(aWorkCity, m_WorkCity); } - NS_IMETHOD GetWorkState(PRUnichar * *aWorkState) { return GetAttributeName(aWorkState, m_WorkState); } - NS_IMETHOD GetWorkZipCode(PRUnichar * *aWorkZipCode) { return GetAttributeName(aWorkZipCode, m_WorkZipCode); } - NS_IMETHOD GetWorkCountry(PRUnichar * *aWorkCountry) { return GetAttributeName(aWorkCountry, m_WorkCountry); } - NS_IMETHOD GetJobTitle(PRUnichar * *aJobTitle) { return GetAttributeName(aJobTitle, m_JobTitle); } - NS_IMETHOD GetDepartment(PRUnichar * *aDepartment) { return GetAttributeName(aDepartment, m_Department); } - NS_IMETHOD GetCompany(PRUnichar * *aCompany) { return GetAttributeName(aCompany, m_Company); } - NS_IMETHOD GetWebPage1(PRUnichar * *aWebPage1) { return GetAttributeName(aWebPage1, m_WebPage1); } - NS_IMETHOD GetWebPage2(PRUnichar * *aWebPage2) { return GetAttributeName(aWebPage2, m_WebPage2); } - NS_IMETHOD GetBirthYear(PRUnichar * *aBirthYear) { return GetAttributeName(aBirthYear, m_BirthYear); } - NS_IMETHOD GetBirthMonth(PRUnichar * *aBirthMonth) { return GetAttributeName(aBirthMonth, m_BirthMonth); } - NS_IMETHOD GetBirthDay(PRUnichar * *aBirthDay) { return GetAttributeName(aBirthDay, m_BirthDay); } - NS_IMETHOD GetCustom1(PRUnichar * *aCustom1) { return GetAttributeName(aCustom1, m_Custom1); } - NS_IMETHOD GetCustom2(PRUnichar * *aCustom2) { return GetAttributeName(aCustom2, m_Custom2); } - NS_IMETHOD GetCustom3(PRUnichar * *aCustom3) { return GetAttributeName(aCustom3, m_Custom3); } - NS_IMETHOD GetCustom4(PRUnichar * *aCustom4) { return GetAttributeName(aCustom4, m_Custom4); } - NS_IMETHOD GetNotes(PRUnichar * *aNotes) { return GetAttributeName(aNotes, m_Note); } - NS_IMETHOD GetLastModifiedDate(PRUint32 *aLastModifiedDate) { return *aLastModifiedDate = m_LastModDate; } - - NS_IMETHOD SetFirstName(PRUnichar * aFirstName) { return SetAttributeName(aFirstName, m_FirstName); } - NS_IMETHOD SetLastName(PRUnichar * aLastName) { return SetAttributeName(aLastName, m_LastName); } - NS_IMETHOD SetDisplayName(PRUnichar * aDisplayName) { return SetAttributeName(aDisplayName, m_DisplayName); } - NS_IMETHOD SetNickName(PRUnichar * aNickName) { return SetAttributeName(aNickName, m_NickName); } - NS_IMETHOD SetPrimaryEmail(PRUnichar * aPrimaryEmail) { return SetAttributeName(aPrimaryEmail, m_PrimaryEmail); } - NS_IMETHOD SetSecondEmail(PRUnichar * aSecondEmail) { return SetAttributeName(aSecondEmail, m_SecondEmail); } - NS_IMETHOD SetWorkPhone(PRUnichar * aWorkPhone) { return SetAttributeName(aWorkPhone, m_WorkPhone); } - NS_IMETHOD SetHomePhone(PRUnichar * aHomePhone) { return SetAttributeName(aHomePhone, m_HomePhone); } - NS_IMETHOD SetFaxNumber(PRUnichar * aFaxNumber) { return SetAttributeName(aFaxNumber, m_FaxNumber); } - NS_IMETHOD SetPagerNumber(PRUnichar * aPagerNumber) { return SetAttributeName(aPagerNumber, m_PagerNumber); } - NS_IMETHOD SetCellularNumber(PRUnichar * aCellularNumber) { return SetAttributeName(aCellularNumber, m_CellularNumber); } - NS_IMETHOD SetHomeAddress(PRUnichar * aHomeAddress) { return SetAttributeName(aHomeAddress, m_HomeAddress); } - NS_IMETHOD SetHomeAddress2(PRUnichar * aHomeAddress2) { return SetAttributeName(aHomeAddress2, m_HomeAddress2); } - NS_IMETHOD SetHomeCity(PRUnichar * aHomeCity) { return SetAttributeName(aHomeCity, m_HomeCity); } - NS_IMETHOD SetHomeState(PRUnichar * aHomeState) { return SetAttributeName(aHomeState, m_HomeState); } - NS_IMETHOD SetHomeZipCode(PRUnichar * aHomeZipCode) { return SetAttributeName(aHomeZipCode, m_HomeZipCode); } - NS_IMETHOD SetHomeCountry(PRUnichar * aHomecountry) { return SetAttributeName(aHomecountry, m_HomeCountry); } - NS_IMETHOD SetWorkAddress(PRUnichar * aWorkAddress) { return SetAttributeName(aWorkAddress, m_WorkAddress); } - NS_IMETHOD SetWorkAddress2(PRUnichar * aWorkAddress2) { return SetAttributeName(aWorkAddress2, m_WorkAddress2); } - NS_IMETHOD SetWorkCity(PRUnichar * aWorkCity) { return SetAttributeName(aWorkCity, m_WorkCity); } - NS_IMETHOD SetWorkState(PRUnichar * aWorkState) { return SetAttributeName(aWorkState, m_WorkState); } - NS_IMETHOD SetWorkZipCode(PRUnichar * aWorkZipCode) { return SetAttributeName(aWorkZipCode, m_WorkZipCode); } - NS_IMETHOD SetWorkCountry(PRUnichar * aWorkCountry) { return SetAttributeName(aWorkCountry, m_WorkCountry); } - NS_IMETHOD SetJobTitle(PRUnichar * aJobTitle) { return SetAttributeName(aJobTitle, m_JobTitle); } - NS_IMETHOD SetDepartment(PRUnichar * aDepartment) { return SetAttributeName(aDepartment, m_Department); } - NS_IMETHOD SetCompany(PRUnichar * aCompany) { return SetAttributeName(aCompany, m_Company); } - NS_IMETHOD SetWebPage1(PRUnichar * aWebPage1) { return SetAttributeName(aWebPage1, m_WebPage1); } - NS_IMETHOD SetWebPage2(PRUnichar * aWebPage2) { return SetAttributeName(aWebPage2, m_WebPage2); } - NS_IMETHOD SetBirthYear(PRUnichar * aBirthYear) { return SetAttributeName(aBirthYear, m_BirthYear); } - NS_IMETHOD SetBirthMonth(PRUnichar * aBirthMonth) { return SetAttributeName(aBirthMonth, m_BirthMonth); } - NS_IMETHOD SetBirthDay(PRUnichar * aBirthDay) { return SetAttributeName(aBirthDay, m_BirthDay); } - NS_IMETHOD SetCustom1(PRUnichar * aCustom1) { return SetAttributeName(aCustom1, m_Custom1); } - NS_IMETHOD SetCustom2(PRUnichar * aCustom2) { return SetAttributeName(aCustom2, m_Custom2); } - NS_IMETHOD SetCustom3(PRUnichar * aCustom3) { return SetAttributeName(aCustom3, m_Custom3); } - NS_IMETHOD SetCustom4(PRUnichar * aCustom4) { return SetAttributeName(aCustom4, m_Custom4); } - NS_IMETHOD SetNotes(PRUnichar * aNotes) { return SetAttributeName(aNotes, m_Note); } - NS_IMETHOD SetLastModifiedDate(PRUint32 aLastModifiedDate) { return m_LastModDate = aLastModifiedDate; } - - NS_IMETHOD GetSendPlainText(PRBool *aSendPlainText); - NS_IMETHOD SetSendPlainText(PRBool aSendPlainText); - - NS_IMETHOD GetDbTableID(PRUint32 *aDbTableID); - NS_IMETHOD SetDbTableID(PRUint32 aDbTableID); - NS_IMETHOD GetDbRowID(PRUint32 *aDbRowID); - NS_IMETHOD SetDbRowID(PRUint32 aDbRowID); - - NS_IMETHOD GetCardValue(const char *attrname, PRUnichar **value); - NS_IMETHOD SetCardValue(const char *attrname, const PRUnichar *value); - NS_IMETHOD SetAbDatabase(nsIAddrDatabase* database); - - NS_IMETHOD GetAnonymousStrAttrubutesList(nsVoidArray **attrlist); - NS_IMETHOD GetAnonymousStrValuesList(nsVoidArray **valuelist); - NS_IMETHOD GetAnonymousIntAttrubutesList(nsVoidArray **attrlist); - NS_IMETHOD GetAnonymousIntValuesList(nsVoidArray **valuelist); - NS_IMETHOD GetAnonymousBoolAttrubutesList(nsVoidArray **attrlist); - NS_IMETHOD GetAnonymousBoolValuesList(nsVoidArray **valuelist); - - NS_IMETHOD SetAnonymousStringAttribute(const char *attrname, const char *value); - NS_IMETHOD SetAnonymousIntAttribute(const char *attrname, PRUint32 value); - NS_IMETHOD SetAnonymousBoolAttribute(const char *attrname, PRBool value); - NS_IMETHOD AddAnonymousAttributesToDB(); - NS_IMETHOD EditAnonymousAttributesInDB(); - - NS_IMETHOD GetCardURI(char **uri); - NS_IMETHOD AddCardToDatabase(const char *uri); - NS_IMETHOD EditCardToDatabase(const char *uri); - NS_IMETHOD CopyCard(nsIAbCard* srcCard); - - NS_IMETHOD GetCollationKey(const PRUnichar *str, PRUnichar **key); protected: nsresult GetCardDatabase(const char *uri); nsresult GetAttributeName(PRUnichar **aName, nsString& value); - nsresult SetAttributeName(PRUnichar *aName, nsString& arrtibute); + nsresult SetAttributeName(const PRUnichar *aName, nsString& arrtibute); nsresult RemoveAnonymousList(nsVoidArray* pArray); nsresult SetAnonymousAttribute(nsVoidArray** pAttrAray, nsVoidArray** pValueArray, void *attrname, void *value); diff --git a/mailnews/addrbook/src/nsAbDirProperty.cpp b/mailnews/addrbook/src/nsAbDirProperty.cpp index c3e405e00b7e..d44767f99b3b 100644 --- a/mailnews/addrbook/src/nsAbDirProperty.cpp +++ b/mailnews/addrbook/src/nsAbDirProperty.cpp @@ -108,7 +108,7 @@ NS_IMETHODIMP nsAbDirProperty::GetDirName(PRUnichar **aDirName) return NS_ERROR_NULL_POINTER; } -NS_IMETHODIMP nsAbDirProperty::SetDirName(PRUnichar * aDirName) +NS_IMETHODIMP nsAbDirProperty::SetDirName(const PRUnichar * aDirName) { if (aDirName) m_DirName = aDirName; @@ -151,3 +151,48 @@ NS_IMETHODIMP nsAbDirProperty::SetServer(DIR_Server * aServer) m_Server = aServer; return NS_OK; } + +NS_IMETHODIMP +nsAbDirProperty::GetChildNodes(nsIEnumerator **childList) +{ return NS_OK; } + +NS_IMETHODIMP +nsAbDirProperty::GetChildCards(nsIEnumerator **childCards) +{ return NS_OK; } + +NS_IMETHODIMP +nsAbDirProperty::AddChildCards(const char *uriName, nsIAbCard **childCard) +{ return NS_OK; } + +NS_IMETHODIMP +nsAbDirProperty::AddDirectory(const char *uriName, nsIAbDirectory **childDir) +{ return NS_OK; } + +NS_IMETHODIMP +nsAbDirProperty::DeleteDirectories(nsISupportsArray *dierctories) +{ return NS_OK; } + +NS_IMETHODIMP +nsAbDirProperty::DeleteCards(nsISupportsArray *cards) +{ return NS_OK; } + +NS_IMETHODIMP +nsAbDirProperty::HasCard(nsIAbCard *cards, PRBool *hasCard) +{ return NS_OK; } + +NS_IMETHODIMP +nsAbDirProperty::HasDirectory(nsIAbDirectory *dir, PRBool *hasDir) +{ return NS_OK; } + +NS_IMETHODIMP +nsAbDirProperty::GetMailingList(nsIEnumerator **mailingList) +{ return NS_OK; } + +NS_IMETHODIMP +nsAbDirProperty::CreateNewDirectory(const PRUnichar *dirName, const char *fileName) +{ return NS_OK; } + +NS_IMETHODIMP +nsAbDirProperty::GetDirUri(char **uri) +{ return NS_OK; } + diff --git a/mailnews/addrbook/src/nsAbDirProperty.h b/mailnews/addrbook/src/nsAbDirProperty.h index 75b38fdaeb82..3cf0656c3db0 100644 --- a/mailnews/addrbook/src/nsAbDirProperty.h +++ b/mailnews/addrbook/src/nsAbDirProperty.h @@ -31,7 +31,7 @@ #include "nsISupportsArray.h" #include "nsCOMPtr.h" #include "nsDirPrefs.h" - +#include "nsIAbBase.h" /* * Address Book Directory */ @@ -43,27 +43,7 @@ public: virtual ~nsAbDirProperty(void); NS_DECL_ISUPPORTS - - // nsIAbDirectory methods: - NS_IMETHOD GetDirName(PRUnichar **aDirName); - NS_IMETHOD SetDirName(PRUnichar * aDirName); - NS_IMETHOD GetLastModifiedDate(PRUint32 *aLastModifiedDate); - NS_IMETHOD SetLastModifiedDate(PRUint32 aLastModifiedDate); - NS_IMETHOD GetServer(DIR_Server * *aServer); - NS_IMETHOD SetServer(DIR_Server * aServer); - NS_IMETHOD GetDirFilePath(char **dbPath); - - NS_IMETHOD GetChildNodes(nsIEnumerator **childList) { return NS_OK; } - NS_IMETHOD GetChildCards(nsIEnumerator **childCards) { return NS_OK; } - NS_IMETHOD AddChildCards(const char *uriName, nsIAbCard **childCard) { return NS_OK; } - NS_IMETHOD AddDirectory(const char *uriName, nsIAbDirectory **childDir) { return NS_OK; } - NS_IMETHOD DeleteDirectories(nsISupportsArray *dierctories) { return NS_OK; } - NS_IMETHOD DeleteCards(nsISupportsArray *cards) { return NS_OK; } - NS_IMETHOD HasCard(nsIAbCard *cards, PRBool *hasCard) { return NS_OK; } - NS_IMETHOD HasDirectory(nsIAbDirectory *dir, PRBool *hasDir) { return NS_OK; } - NS_IMETHOD GetMailingList(nsIEnumerator **mailingList) { return NS_OK; } - NS_IMETHOD CreateNewDirectory(const PRUnichar *dirName, const char *fileName) { return NS_OK; } - NS_IMETHOD GetDirUri(char **uri) { return NS_OK; } + NS_DECL_NSIABDIRECTORY protected: diff --git a/mailnews/base/public/nsIMsgIncomingServer.idl b/mailnews/base/public/nsIMsgIncomingServer.idl index 714793bc7ed6..7ce2fae09ef0 100644 --- a/mailnews/base/public/nsIMsgIncomingServer.idl +++ b/mailnews/base/public/nsIMsgIncomingServer.idl @@ -55,7 +55,7 @@ interface nsIMsgIncomingServer : nsISupports { in false, we will return an empty password if we don't know it already and we will NOT ask the user */ string getPassword(in boolean aWithUI); - void setPassword(in string aPassword); + void setPassword([const] in string aPassword); /* should we download whole messages when biff goes off? */ attribute boolean downloadOnBiff; @@ -113,7 +113,7 @@ _class::Get##_postfix(char **retval) \ return GetCharValue(_prefname, retval); \ } \ NS_IMETHODIMP \ -_class::Set##_postfix(char *chvalue) \ +_class::Set##_postfix(const char *chvalue) \ { \ return SetCharValue(_prefname, chvalue); \ } diff --git a/mailnews/base/search/src/nsMsgFilter.cpp b/mailnews/base/search/src/nsMsgFilter.cpp index 36cfe84bd41f..dd5d57e5e117 100644 --- a/mailnews/base/search/src/nsMsgFilter.cpp +++ b/mailnews/base/search/src/nsMsgFilter.cpp @@ -84,12 +84,18 @@ NS_IMETHODIMP nsMsgFilter::GetEnabled(PRBool *aResult) return NS_OK; } +NS_IMETHODIMP nsMsgFilter::SetEnabled(PRBool enabled) +{ + m_enabled=enabled; + return NS_OK; +} + NS_IMETHODIMP nsMsgFilter::GetFilterName(char **name) { return NS_OK; } -NS_IMETHODIMP nsMsgFilter::SetFilterName(char *name) +NS_IMETHODIMP nsMsgFilter::SetFilterName(const char *name) { return NS_OK; } @@ -99,7 +105,7 @@ NS_IMETHODIMP nsMsgFilter::GetFilterDesc(char **description) return NS_OK; } -NS_IMETHODIMP nsMsgFilter::SetFilterDesc(char *description) +NS_IMETHODIMP nsMsgFilter::SetFilterDesc(const char *description) { return NS_OK; } diff --git a/mailnews/base/search/src/nsMsgFilter.h b/mailnews/base/search/src/nsMsgFilter.h index fe6bce14d8e0..81a731bc0c5f 100644 --- a/mailnews/base/search/src/nsMsgFilter.h +++ b/mailnews/base/search/src/nsMsgFilter.h @@ -46,42 +46,7 @@ public: nsMsgFilter(); virtual ~nsMsgFilter (); - NS_IMETHOD GetFilterType(nsMsgFilterTypeType *filterType); - NS_IMETHOD GetEnabled(PRBool *enabled); - NS_IMETHOD SetEnabled(PRBool enabled) {m_enabled = enabled; return NS_OK;} - NS_IMETHOD GetFilterName(char **name); - NS_IMETHOD SetFilterName(char *name); - NS_IMETHOD GetFilterDesc(char **description); - NS_IMETHOD SetFilterDesc(char *description); - - NS_IMETHOD AddTerm( - nsMsgSearchAttribute attrib, /* attribute for this term */ - nsMsgSearchOperator op, /* operator e.g. opContains */ - nsMsgSearchValue *value, /* value e.g. "Dogbert" */ - PRBool BooleanAND, /* PR_TRUE if AND is the boolean operator. PR_FALSE if OR is the boolean operators */ - const char * arbitraryHeader); /* arbitrary header specified by user. ignored unless attrib = attribOtherHeader */ - - NS_IMETHOD GetNumTerms(PRInt32 *numTerms); - - NS_IMETHOD GetTerm(PRInt32 termIndex, - nsMsgSearchAttribute *attrib, /* attribute for this term */ - nsMsgSearchOperator *op, /* operator e.g. opContains */ - nsMsgSearchValue *value, /* value e.g. "Dogbert" */ - PRBool *BooleanAnd, /* PR_TRUE if AND is the boolean operator. PR_FALSE if OR is the boolean operator */ - char ** arbitraryHeader); /* arbitrary header specified by user. ignore unless attrib = attribOtherHeader */ - - NS_IMETHOD SetScope(nsMsgSearchScopeTerm *scope); - NS_IMETHOD GetScope(nsMsgSearchScopeTerm **scope); - - /* if type is acChangePriority, value is a pointer to priority. - If type is acMoveToFolder, value is pointer to folder name. - Otherwise, value is ignored. - */ - NS_IMETHOD SetAction(nsMsgRuleActionType type, void *value); - NS_IMETHOD GetAction(nsMsgRuleActionType *type, void **value) ; - NS_IMETHOD MatchHdr(nsIMsgDBHdr *msgHdr, nsIMsgFolder *folder, nsIMsgDatabase *db, const char *headers, PRUint32 headersSize, PRBool *pResult) ; - NS_IMETHOD LogRuleHit(nsOutputStream *stream, nsIMsgDBHdr *header); - + NS_DECL_NSIMSGFILTER nsMsgFilterTypeType GetType() {return m_type;} void SetType(nsMsgFilterTypeType type) {m_type = type;} diff --git a/mailnews/base/src/nsMsgAccount.cpp b/mailnews/base/src/nsMsgAccount.cpp index 4605032378db..ac7e7834ee53 100644 --- a/mailnews/base/src/nsMsgAccount.cpp +++ b/mailnews/base/src/nsMsgAccount.cpp @@ -380,7 +380,7 @@ nsMsgAccount::RemoveIdentity(nsIMsgIdentity *identity) NS_IMPL_GETTER_STR(nsMsgAccount::GetKey, m_accountKey); nsresult -nsMsgAccount::SetKey(char *accountKey) +nsMsgAccount::SetKey(const char *accountKey) { if (!accountKey) return NS_ERROR_NULL_POINTER; diff --git a/mailnews/base/util/nsMsgDBFolder.cpp b/mailnews/base/util/nsMsgDBFolder.cpp index 448c3bc30859..0a88fe65139f 100644 --- a/mailnews/base/util/nsMsgDBFolder.cpp +++ b/mailnews/base/util/nsMsgDBFolder.cpp @@ -175,7 +175,7 @@ NS_IMETHODIMP nsMsgDBFolder::GetCharset(PRUnichar * *aCharset) return rv; } -NS_IMETHODIMP nsMsgDBFolder::SetCharset(PRUnichar * aCharset) +NS_IMETHODIMP nsMsgDBFolder::SetCharset(const PRUnichar * aCharset) { nsresult rv; diff --git a/mailnews/base/util/nsMsgDBFolder.h b/mailnews/base/util/nsMsgDBFolder.h index c86bf847e5bb..99d323fab8b5 100644 --- a/mailnews/base/util/nsMsgDBFolder.h +++ b/mailnews/base/util/nsMsgDBFolder.h @@ -47,7 +47,7 @@ public: NS_IMETHOD GetThreadForMessage(nsIMessage *message, nsIMsgThread **thread); NS_IMETHOD HasMessage(nsIMessage *message, PRBool *hasMessage); NS_IMETHOD GetCharset(PRUnichar * *aCharset); - NS_IMETHOD SetCharset(PRUnichar * aCharset); + NS_IMETHOD SetCharset(const PRUnichar * aCharset); NS_IMETHOD GetMsgDatabase(nsIMsgDatabase** aMsgDatabase); diff --git a/mailnews/base/util/nsMsgFolder.cpp b/mailnews/base/util/nsMsgFolder.cpp index baf071110db7..2aee5b70cfc9 100644 --- a/mailnews/base/util/nsMsgFolder.cpp +++ b/mailnews/base/util/nsMsgFolder.cpp @@ -407,7 +407,7 @@ NS_IMETHODIMP nsMsgFolder::GetPrettyName(PRUnichar ** name) return (*name) ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } -NS_IMETHODIMP nsMsgFolder::SetPrettyName(PRUnichar *name) +NS_IMETHODIMP nsMsgFolder::SetPrettyName(const PRUnichar *name) { mName = name; return NS_OK; @@ -439,7 +439,7 @@ NS_IMETHODIMP nsMsgFolder::GetName(PRUnichar **name) return NS_OK; } -NS_IMETHODIMP nsMsgFolder::SetName(PRUnichar * name) +NS_IMETHODIMP nsMsgFolder::SetName(const PRUnichar * name) { // override the URI-generated name mName = name; diff --git a/mailnews/base/util/nsMsgFolder.h b/mailnews/base/util/nsMsgFolder.h index 12194237e668..ebc170936f83 100644 --- a/mailnews/base/util/nsMsgFolder.h +++ b/mailnews/base/util/nsMsgFolder.h @@ -79,7 +79,7 @@ public: // nsIFolder methods: NS_IMETHOD GetURI(char* *name) { return nsRDFResource::GetValue(name); } NS_IMETHOD GetName(PRUnichar **name); - NS_IMETHOD SetName(PRUnichar *name); + NS_IMETHOD SetName(const PRUnichar *name); NS_IMETHOD GetChildNamed(const char *name, nsISupports* *result); NS_IMETHOD GetSubFolders(nsIEnumerator* *result); NS_IMETHOD GetHasSubFolders(PRBool *_retval); @@ -109,7 +109,7 @@ public: NS_IMETHOD GetPrettyName(PRUnichar ** name); - NS_IMETHOD SetPrettyName(PRUnichar * name); + NS_IMETHOD SetPrettyName(const PRUnichar * name); #if 0 static nsresult GetRoot(nsIMsgFolder* *result); #endif @@ -282,7 +282,7 @@ public: NS_IMETHOD GetNewMessages(); NS_IMETHOD GetCharset(PRUnichar * *aCharset) = 0; - NS_IMETHOD SetCharset(PRUnichar * aCharset) = 0; + NS_IMETHOD SetCharset(const PRUnichar * aCharset) = 0; NS_IMETHOD GetBiffState(PRUint32 *aBiffState); NS_IMETHOD SetBiffState(PRUint32 aBiffState); diff --git a/mailnews/base/util/nsMsgIdentity.cpp b/mailnews/base/util/nsMsgIdentity.cpp index 59c523081e40..8ffe85b40b61 100644 --- a/mailnews/base/util/nsMsgIdentity.cpp +++ b/mailnews/base/util/nsMsgIdentity.cpp @@ -202,7 +202,7 @@ nsMsgIdentity::getDefaultCharPref(const char *prefname, nsresult nsMsgIdentity::setCharPref(const char *prefname, - char *val) + const char *val) { nsresult rv = getPrefService(); if (NS_FAILED(rv)) return rv; @@ -267,7 +267,7 @@ nsMsgIdentity::setIntPref(const char *prefname, } nsresult -nsMsgIdentity::SetKey(char* identityKey) +nsMsgIdentity::SetKey(const char* identityKey) { PR_FREEIF(m_identityKey); m_identityKey = PL_strdup(identityKey); @@ -301,7 +301,7 @@ nsMsgIdentity::GetIdentityName(char **idName) { return rv; } -nsresult nsMsgIdentity::SetIdentityName(char *idName) { +nsresult nsMsgIdentity::SetIdentityName(const char *idName) { return setCharPref("identityName", idName); } diff --git a/mailnews/base/util/nsMsgIdentity.h b/mailnews/base/util/nsMsgIdentity.h index 8dbf135a35bb..698b69f6dcf4 100644 --- a/mailnews/base/util/nsMsgIdentity.h +++ b/mailnews/base/util/nsMsgIdentity.h @@ -57,7 +57,7 @@ protected: char *getDefaultPrefName(const char *pref); nsresult getCharPref(const char *pref, char **); nsresult getDefaultCharPref(const char *pref, char **); - nsresult setCharPref(const char *pref, char *); + nsresult setCharPref(const char *pref, const char *); nsresult getBoolPref(const char *pref, PRBool *); nsresult getDefaultBoolPref(const char *pref, PRBool *); @@ -77,7 +77,7 @@ nsMsgIdentity::Get##_postfix(char **retval) \ return getCharPref(_prefname, retval); \ } \ NS_IMETHODIMP \ -nsMsgIdentity::Set##_postfix(char *value) \ +nsMsgIdentity::Set##_postfix(const char *value) \ { \ return setCharPref(_prefname, value);\ } diff --git a/mailnews/base/util/nsMsgIncomingServer.cpp b/mailnews/base/util/nsMsgIncomingServer.cpp index 6a4aa5270599..a2fbdb4c5654 100644 --- a/mailnews/base/util/nsMsgIncomingServer.cpp +++ b/mailnews/base/util/nsMsgIncomingServer.cpp @@ -64,7 +64,7 @@ NS_IMPL_GETTER_STR(nsMsgIncomingServer::GetKey, m_serverKey) NS_IMETHODIMP -nsMsgIncomingServer::SetKey(char * serverKey) +nsMsgIncomingServer::SetKey(const char * serverKey) { nsresult rv = NS_OK; // in order to actually make use of the key, we need the prefs @@ -385,7 +385,7 @@ nsMsgIncomingServer::GetPrettyName(PRUnichar **retval) { } NS_IMETHODIMP -nsMsgIncomingServer::SetPrettyName(PRUnichar *value) { +nsMsgIncomingServer::SetPrettyName(const PRUnichar *value) { // this is lossy. Not sure what to do. nsCString str(value); return SetCharValue("name", str.GetBuffer()); diff --git a/mailnews/base/util/nsMsgIncomingServer.h b/mailnews/base/util/nsMsgIncomingServer.h index b898b63add90..c80d8dffd8bf 100644 --- a/mailnews/base/util/nsMsgIncomingServer.h +++ b/mailnews/base/util/nsMsgIncomingServer.h @@ -53,7 +53,7 @@ protected: // these are private pref getters and setters for the password // field. Callers should be using Get/Set Password NS_IMETHOD GetPrefPassword(char * *aPassword); - NS_IMETHOD SetPrefPassword(char * aPassword); + NS_IMETHOD SetPrefPassword(const char * aPassword); nsCOMPtr m_rootFolder; nsresult getDefaultCharPref(const char *pref, char **); diff --git a/mailnews/base/util/nsMsgMailNewsUrl.cpp b/mailnews/base/util/nsMsgMailNewsUrl.cpp index 37fe51dcf1c0..c572097e9a8c 100644 --- a/mailnews/base/util/nsMsgMailNewsUrl.cpp +++ b/mailnews/base/util/nsMsgMailNewsUrl.cpp @@ -244,7 +244,7 @@ NS_IMETHODIMP nsMsgMailNewsUrl::GetSpec(char * *aSpec) return m_baseURL->GetSpec(aSpec); } -NS_IMETHODIMP nsMsgMailNewsUrl::SetSpec(char * aSpec) +NS_IMETHODIMP nsMsgMailNewsUrl::SetSpec(const char * aSpec) { return m_baseURL->SetSpec(aSpec); } @@ -254,7 +254,7 @@ NS_IMETHODIMP nsMsgMailNewsUrl::GetScheme(char * *aScheme) return m_baseURL->GetScheme(aScheme); } -NS_IMETHODIMP nsMsgMailNewsUrl::SetScheme(char * aScheme) +NS_IMETHODIMP nsMsgMailNewsUrl::SetScheme(const char * aScheme) { return m_baseURL->SetScheme(aScheme); } @@ -265,7 +265,7 @@ NS_IMETHODIMP nsMsgMailNewsUrl::GetPreHost(char * *aPreHost) return m_baseURL->GetPreHost(aPreHost); } -NS_IMETHODIMP nsMsgMailNewsUrl::SetPreHost(char * aPreHost) +NS_IMETHODIMP nsMsgMailNewsUrl::SetPreHost(const char * aPreHost) { return m_baseURL->SetPreHost(aPreHost); } @@ -275,7 +275,7 @@ NS_IMETHODIMP nsMsgMailNewsUrl::GetHost(char * *aHost) return m_baseURL->GetHost(aHost); } -NS_IMETHODIMP nsMsgMailNewsUrl::SetHost(char * aHost) +NS_IMETHODIMP nsMsgMailNewsUrl::SetHost(const char * aHost) { return m_baseURL->SetHost(aHost); } @@ -295,7 +295,7 @@ NS_IMETHODIMP nsMsgMailNewsUrl::GetPath(char * *aPath) return m_baseURL->GetPath(aPath); } -NS_IMETHODIMP nsMsgMailNewsUrl::SetPath(char * aPath) +NS_IMETHODIMP nsMsgMailNewsUrl::SetPath(const char * aPath) { return m_baseURL->SetPath(aPath); } @@ -321,7 +321,7 @@ NS_IMETHODIMP nsMsgMailNewsUrl::GetDirectory(char * *aDirectory) return m_baseURL->GetDirectory(aDirectory); } -NS_IMETHODIMP nsMsgMailNewsUrl::SetDirectory(char *aDirectory) +NS_IMETHODIMP nsMsgMailNewsUrl::SetDirectory(const char *aDirectory) { return m_baseURL->SetDirectory(aDirectory); @@ -332,7 +332,7 @@ NS_IMETHODIMP nsMsgMailNewsUrl::GetFileName(char * *aFileName) return m_baseURL->GetFileName(aFileName); } -NS_IMETHODIMP nsMsgMailNewsUrl::SetFileName(char * aFileName) +NS_IMETHODIMP nsMsgMailNewsUrl::SetFileName(const char * aFileName) { return m_baseURL->SetFileName(aFileName); } @@ -342,7 +342,7 @@ NS_IMETHODIMP nsMsgMailNewsUrl::GetParam(char * *aParam) return m_baseURL->GetParam(aParam); } -NS_IMETHODIMP nsMsgMailNewsUrl::SetParam(char *aParam) +NS_IMETHODIMP nsMsgMailNewsUrl::SetParam(const char *aParam) { return m_baseURL->SetParam(aParam); } @@ -352,7 +352,7 @@ NS_IMETHODIMP nsMsgMailNewsUrl::GetQuery(char * *aQuery) return m_baseURL->GetQuery(aQuery); } -NS_IMETHODIMP nsMsgMailNewsUrl::SetQuery(char *aQuery) +NS_IMETHODIMP nsMsgMailNewsUrl::SetQuery(const char *aQuery) { return m_baseURL->SetQuery(aQuery); } @@ -362,7 +362,7 @@ NS_IMETHODIMP nsMsgMailNewsUrl::GetRef(char * *aRef) return m_baseURL->GetRef(aRef); } -NS_IMETHODIMP nsMsgMailNewsUrl::SetRef(char *aRef) +NS_IMETHODIMP nsMsgMailNewsUrl::SetRef(const char *aRef) { return m_baseURL->SetRef(aRef); } diff --git a/mailnews/compose/src/nsSmtpServer.cpp b/mailnews/compose/src/nsSmtpServer.cpp index ac65d9ae1fef..23872b984a05 100644 --- a/mailnews/compose/src/nsSmtpServer.cpp +++ b/mailnews/compose/src/nsSmtpServer.cpp @@ -45,7 +45,7 @@ nsSmtpServer::GetKey(char * *aKey) } NS_IMETHODIMP -nsSmtpServer::SetKey(char * aKey) +nsSmtpServer::SetKey(const char * aKey) { mKey = aKey; return NS_OK; @@ -64,7 +64,7 @@ nsSmtpServer::GetHostname(char * *aHostname) } NS_IMETHODIMP -nsSmtpServer::SetHostname(char * aHostname) +nsSmtpServer::SetHostname(const char * aHostname) { nsresult rv; nsCAutoString pref; @@ -86,7 +86,7 @@ nsSmtpServer::GetUsername(char * *aUsername) } NS_IMETHODIMP -nsSmtpServer::SetUsername(char * aUsername) +nsSmtpServer::SetUsername(const char * aUsername) { nsresult rv; nsCAutoString pref; @@ -108,7 +108,7 @@ nsSmtpServer::GetPassword(char * *aPassword) } NS_IMETHODIMP -nsSmtpServer::SetPassword(char * aPassword) +nsSmtpServer::SetPassword(const char * aPassword) { nsresult rv; nsCAutoString pref; diff --git a/mailnews/compose/src/nsSmtpUrl.cpp b/mailnews/compose/src/nsSmtpUrl.cpp index 54e3f45d9907..bf1f63c22aaf 100644 --- a/mailnews/compose/src/nsSmtpUrl.cpp +++ b/mailnews/compose/src/nsSmtpUrl.cpp @@ -262,7 +262,7 @@ nsresult nsSmtpUrl::ParseMessageToPost(char * searchPart) } -NS_IMETHODIMP nsSmtpUrl::SetSpec(char * aSpec) +NS_IMETHODIMP nsSmtpUrl::SetSpec(const char * aSpec) { nsresult rv = nsMsgMailNewsUrl::SetSpec(aSpec); if (NS_SUCCEEDED(rv)) @@ -304,7 +304,7 @@ nsresult nsSmtpUrl::GetUserEmailAddress(char ** aUserName) return rv; } -nsresult nsSmtpUrl::SetUserEmailAddress(char * aUserName) +nsresult nsSmtpUrl::SetUserEmailAddress(const char * aUserName) { nsresult rv = NS_OK; if (aUserName) diff --git a/mailnews/compose/src/nsSmtpUrl.h b/mailnews/compose/src/nsSmtpUrl.h index ced5d1d683d7..020510a09d10 100644 --- a/mailnews/compose/src/nsSmtpUrl.h +++ b/mailnews/compose/src/nsSmtpUrl.h @@ -30,7 +30,7 @@ public: NS_DECL_ISUPPORTS_INHERITED // nsIURI over-ride... - NS_IMETHOD SetSpec(char * aSpec); + NS_IMETHOD SetSpec(const char * aSpec); // From nsISmtpUrl NS_DECL_NSISMTPURL diff --git a/mailnews/db/msgdb/public/nsMsgThread.h b/mailnews/db/msgdb/public/nsMsgThread.h index b4f0e71f4386..b74b37d02686 100644 --- a/mailnews/db/msgdb/public/nsMsgThread.h +++ b/mailnews/db/msgdb/public/nsMsgThread.h @@ -37,24 +37,7 @@ public: friend class nsMsgThreadEnumerator; NS_DECL_ISUPPORTS - - NS_IMETHOD SetThreadKey(nsMsgKey threadKey); - NS_IMETHOD GetThreadKey(nsMsgKey *result); - NS_IMETHOD GetFlags(PRUint32 *result); - NS_IMETHOD SetFlags(PRUint32 flags); - NS_IMETHOD SetSubject(char *subject); - NS_IMETHOD GetSubject(char **result); - NS_IMETHOD GetNumChildren(PRUint32 *result); - NS_IMETHOD GetNumUnreadChildren (PRUint32 *result); - NS_IMETHOD AddChild(nsIMsgDBHdr *child, nsIMsgDBHdr *inReplyTo, PRBool threadInThread, nsIDBChangeAnnouncer *announcer); - NS_IMETHOD GetChildAt(PRInt32 index, nsIMsgDBHdr **result); - NS_IMETHOD GetChild(nsMsgKey msgKey, nsIMsgDBHdr **result); - NS_IMETHOD GetChildHdrAt(PRInt32 index, nsIMsgDBHdr **result); - NS_IMETHOD RemoveChildAt(PRInt32 index); - NS_IMETHOD RemoveChildHdr(nsIMsgDBHdr *child, nsIDBChangeAnnouncer *announcer); - NS_IMETHOD MarkChildRead(PRBool bRead); - NS_IMETHOD EnumerateMessages(nsMsgKey parent, nsISimpleEnumerator* *result); - NS_IMETHOD GetRootHdr(PRInt32 *resultIndex, nsIMsgDBHdr **result); + NS_DECL_NSIMSGTHREAD // non-interface methods PRBool TryReferenceThreading(nsIMsgDBHdr *newHeader); diff --git a/mailnews/db/msgdb/src/nsMsgThread.cpp b/mailnews/db/msgdb/src/nsMsgThread.cpp index ce2acaa8e4ad..1caaed0e37ef 100644 --- a/mailnews/db/msgdb/src/nsMsgThread.cpp +++ b/mailnews/db/msgdb/src/nsMsgThread.cpp @@ -133,7 +133,7 @@ NS_IMETHODIMP nsMsgThread::SetFlags(PRUint32 flags) return ret; } -NS_IMETHODIMP nsMsgThread::SetSubject(char *subject) +NS_IMETHODIMP nsMsgThread::SetSubject(const char *subject) { return m_mdbDB->CharPtrToRowCellColumn(m_metaRow, m_mdbDB->m_threadSubjectColumnToken, subject); } diff --git a/mailnews/imap/src/nsImapIncomingServer.cpp b/mailnews/imap/src/nsImapIncomingServer.cpp index 5abf8cca78a5..3195d95aaeb5 100644 --- a/mailnews/imap/src/nsImapIncomingServer.cpp +++ b/mailnews/imap/src/nsImapIncomingServer.cpp @@ -67,7 +67,7 @@ public: virtual ~nsImapIncomingServer(); // overriding nsMsgIncomingServer methods - NS_IMETHOD SetKey(char * aKey); // override nsMsgIncomingServer's implementation... + NS_IMETHOD SetKey(const char * aKey); // override nsMsgIncomingServer's implementation... NS_IMETHOD GetServerURI(char * *aServerURI); NS_DECL_NSIIMAPINCOMINGSERVER @@ -136,7 +136,7 @@ nsImapIncomingServer::~nsImapIncomingServer() { } -NS_IMETHODIMP nsImapIncomingServer::SetKey(char * aKey) // override nsMsgIncomingServer's implementation... +NS_IMETHODIMP nsImapIncomingServer::SetKey(const char * aKey) // override nsMsgIncomingServer's implementation... { nsMsgIncomingServer::SetKey(aKey); @@ -1419,7 +1419,7 @@ NS_IMETHODIMP nsImapIncomingServer::SetMailServerUrls(const char *manageMailAcc return SetManageMailAccountUrl((char *) manageMailAccount); } -NS_IMETHODIMP nsImapIncomingServer::SetManageMailAccountUrl(char *manageMailAccountUrl) +NS_IMETHODIMP nsImapIncomingServer::SetManageMailAccountUrl(const char *manageMailAccountUrl) { m_manageMailAccountUrl = manageMailAccountUrl; return NS_OK; diff --git a/mailnews/local/src/nsMailboxUrl.cpp b/mailnews/local/src/nsMailboxUrl.cpp index a77d6c82c7bf..a8fe119c2370 100644 --- a/mailnews/local/src/nsMailboxUrl.cpp +++ b/mailnews/local/src/nsMailboxUrl.cpp @@ -353,7 +353,7 @@ nsresult nsMailboxUrl::ParseUrl(const nsString& aSpec) return NS_OK; } -NS_IMETHODIMP nsMailboxUrl::SetSpec(char * aSpec) +NS_IMETHODIMP nsMailboxUrl::SetSpec(const char * aSpec) { nsresult rv = nsMsgMailNewsUrl::SetSpec(aSpec); if (NS_SUCCEEDED(rv)) diff --git a/mailnews/local/src/nsMailboxUrl.h b/mailnews/local/src/nsMailboxUrl.h index 54ce44c033cd..eafbc0e151c8 100644 --- a/mailnews/local/src/nsMailboxUrl.h +++ b/mailnews/local/src/nsMailboxUrl.h @@ -30,7 +30,7 @@ class nsMailboxUrl : public nsIMailboxUrl, public nsMsgMailNewsUrl, public nsIMs { public: // nsIURI over-ride... - NS_IMETHOD SetSpec(char * aSpec); + NS_IMETHOD SetSpec(const char * aSpec); // from nsIMailboxUrl: NS_IMETHOD GetMessageHeader(nsIMsgDBHdr ** aMsgHdr); diff --git a/mailnews/local/src/nsPop3Sink.cpp b/mailnews/local/src/nsPop3Sink.cpp index 9a878c8d394d..30bfd207059a 100644 --- a/mailnews/local/src/nsPop3Sink.cpp +++ b/mailnews/local/src/nsPop3Sink.cpp @@ -96,7 +96,7 @@ nsPop3Sink::SetSenderAuthedFlag(void* closure, PRBool authed) } nsresult -nsPop3Sink::SetMailAccountURL(char* urlString) +nsPop3Sink::SetMailAccountURL(const char* urlString) { if (urlString) { diff --git a/mailnews/news/src/nsNNTPHost.cpp b/mailnews/news/src/nsNNTPHost.cpp index 2aa110c219cb..6bd8d18e26d7 100644 --- a/mailnews/news/src/nsNNTPHost.cpp +++ b/mailnews/news/src/nsNNTPHost.cpp @@ -354,7 +354,7 @@ nsNNTPHost::WriteTimer(void* closure) nsresult -nsNNTPHost::SetNewsRCFilename(char* name) +nsNNTPHost::SetNewsRCFilename(const char* name) { delete [] m_filename; m_filename = new char [PL_strlen(name) + 1]; diff --git a/mailnews/news/src/nsNNTPHost.h b/mailnews/news/src/nsNNTPHost.h index 1f2baec9c15c..85d0b9473709 100644 --- a/mailnews/news/src/nsNNTPHost.h +++ b/mailnews/news/src/nsNNTPHost.h @@ -128,7 +128,7 @@ public: /* the Setter implementation is a little more complex */ NS_IMPL_CLASS_GETTER(GetNewsRCFilename, char *, m_filename); - NS_IMETHOD SetNewsRCFilename(char *); + NS_IMETHOD SetNewsRCFilename(const char *); // helper for accessing the above accessors from within this class diff --git a/mailnews/news/src/nsNNTPNewsgroup.cpp b/mailnews/news/src/nsNNTPNewsgroup.cpp index ac2c2edb741a..a501fa58b1e6 100644 --- a/mailnews/news/src/nsNNTPNewsgroup.cpp +++ b/mailnews/news/src/nsNNTPNewsgroup.cpp @@ -61,7 +61,7 @@ nsresult nsNNTPNewsgroup::GetName(char ** aName) return NS_OK; } -nsresult nsNNTPNewsgroup::SetName(char *aName) +nsresult nsNNTPNewsgroup::SetName(const char *aName) { if (aName) { @@ -84,7 +84,7 @@ nsresult nsNNTPNewsgroup::GetPrettyName(char ** aName) return NS_OK; } -nsresult nsNNTPNewsgroup::SetPrettyName(char *aName) +nsresult nsNNTPNewsgroup::SetPrettyName(const char *aName) { if (aName) { @@ -107,7 +107,7 @@ nsresult nsNNTPNewsgroup::GetPassword(char ** aName) return NS_OK; } -nsresult nsNNTPNewsgroup::SetPassword(char *aName) +nsresult nsNNTPNewsgroup::SetPassword(const char *aName) { if (aName) { @@ -130,7 +130,7 @@ nsresult nsNNTPNewsgroup::GetUsername(char ** aUsername) return NS_OK; } -nsresult nsNNTPNewsgroup::SetUsername(char *aUsername) +nsresult nsNNTPNewsgroup::SetUsername(const char *aUsername) { if (aUsername) { diff --git a/mailnews/news/src/nsNewsFolder.cpp b/mailnews/news/src/nsNewsFolder.cpp index 18c26af58a8e..cfc1885819e6 100644 --- a/mailnews/news/src/nsNewsFolder.cpp +++ b/mailnews/news/src/nsNewsFolder.cpp @@ -1252,7 +1252,7 @@ NS_IMETHODIMP nsMsgNewsFolder::GetUnreadSetStr(char * *aUnreadSetStr) return NS_OK; } -NS_IMETHODIMP nsMsgNewsFolder::SetUnreadSetStr(char * aUnreadSetStr) +NS_IMETHODIMP nsMsgNewsFolder::SetUnreadSetStr(const char * aUnreadSetStr) { if (!aUnreadSetStr) return NS_ERROR_NULL_POINTER; diff --git a/mailnews/news/src/nsNntpUrl.cpp b/mailnews/news/src/nsNntpUrl.cpp index f989e7c351da..fb37e1ebb07b 100644 --- a/mailnews/news/src/nsNntpUrl.cpp +++ b/mailnews/news/src/nsNntpUrl.cpp @@ -363,7 +363,7 @@ NS_IMETHODIMP nsNntpUrl::GetMessageHeader(nsIMsgDBHdr ** aMsgHdr) return NS_OK; } -NS_IMETHODIMP nsNntpUrl::SetNewsgroupName(char * aNewsgroupName) +NS_IMETHODIMP nsNntpUrl::SetNewsgroupName(const char * aNewsgroupName) { if (!aNewsgroupName) return NS_ERROR_NULL_POINTER; diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp index f0e1daaf48d3..c5f5e6e44ff4 100644 --- a/netwerk/base/src/nsIOService.cpp +++ b/netwerk/base/src/nsIOService.cpp @@ -314,7 +314,7 @@ nsIOService::GetLanguage(PRUnichar* *aLanguage) } NS_IMETHODIMP -nsIOService::SetLanguage(PRUnichar* aLanguage) +nsIOService::SetLanguage(const PRUnichar* aLanguage) { nsCString lang(aLanguage); mAppLanguage->SetString(lang); diff --git a/netwerk/base/src/nsSimpleURI.cpp b/netwerk/base/src/nsSimpleURI.cpp index f2681e46f771..f717e3535040 100644 --- a/netwerk/base/src/nsSimpleURI.cpp +++ b/netwerk/base/src/nsSimpleURI.cpp @@ -84,7 +84,7 @@ nsSimpleURI::GetSpec(char* *result) } NS_IMETHODIMP -nsSimpleURI::SetSpec(char* aSpec) +nsSimpleURI::SetSpec(const char* aSpec) { nsAutoString spec(aSpec); PRUint32 pos = spec.Find(":"); @@ -118,7 +118,7 @@ nsSimpleURI::GetScheme(char* *result) } NS_IMETHODIMP -nsSimpleURI::SetScheme(char* scheme) +nsSimpleURI::SetScheme(const char* scheme) { if (mScheme) nsCRT::free(mScheme); mScheme = nsCRT::strdup(scheme); @@ -132,7 +132,7 @@ nsSimpleURI::GetPreHost(char* *result) } NS_IMETHODIMP -nsSimpleURI::SetPreHost(char* preHost) +nsSimpleURI::SetPreHost(const char* preHost) { return NS_ERROR_FAILURE; } @@ -144,7 +144,7 @@ nsSimpleURI::GetHost(char* *result) } NS_IMETHODIMP -nsSimpleURI::SetHost(char* host) +nsSimpleURI::SetHost(const char* host) { return NS_ERROR_FAILURE; } @@ -169,7 +169,7 @@ nsSimpleURI::GetPath(char* *result) } NS_IMETHODIMP -nsSimpleURI::SetPath(char* path) +nsSimpleURI::SetPath(const char* path) { if (mPath) nsCRT::free(mPath); mPath = nsCRT::strdup(path); diff --git a/netwerk/base/src/nsSimpleURI.h b/netwerk/base/src/nsSimpleURI.h index 424acde76fc1..de3d7834aa58 100644 --- a/netwerk/base/src/nsSimpleURI.h +++ b/netwerk/base/src/nsSimpleURI.h @@ -40,19 +40,19 @@ public: /* attribute string Spec; */ NS_IMETHOD GetSpec(char * *aSpec); - NS_IMETHOD SetSpec(char * aSpec); + NS_IMETHOD SetSpec(const char * aSpec); /* attribute string Scheme; */ NS_IMETHOD GetScheme(char * *aScheme); - NS_IMETHOD SetScheme(char * aScheme); + NS_IMETHOD SetScheme(const char * aScheme); /* attribute string PreHost; */ NS_IMETHOD GetPreHost(char * *aPreHost); - NS_IMETHOD SetPreHost(char * aPreHost); + NS_IMETHOD SetPreHost(const char * aPreHost); /* attribute string Host; */ NS_IMETHOD GetHost(char * *aHost); - NS_IMETHOD SetHost(char * aHost); + NS_IMETHOD SetHost(const char * aHost); /* attribute long Port; */ NS_IMETHOD GetPort(PRInt32 *aPort); @@ -60,7 +60,7 @@ public: /* attribute string Path; */ NS_IMETHOD GetPath(char * *aPath); - NS_IMETHOD SetPath(char * aPath); + NS_IMETHOD SetPath(const char * aPath); /* boolean Equals (in nsIURI other); */ NS_IMETHOD Equals(nsIURI *other, PRBool *_retval); diff --git a/netwerk/base/src/nsStdURL.cpp b/netwerk/base/src/nsStdURL.cpp index baf62e55cf52..8e3e3408875d 100644 --- a/netwerk/base/src/nsStdURL.cpp +++ b/netwerk/base/src/nsStdURL.cpp @@ -668,7 +668,7 @@ PRInt32 ExtractPortFrom(char* src, int start, int length) } nsresult -nsStdURL::DupString(char* *o_Destination, char* i_Source) +nsStdURL::DupString(char* *o_Destination, const char* i_Source) { if (!o_Destination) return NS_ERROR_NULL_POINTER; @@ -685,7 +685,7 @@ nsStdURL::DupString(char* *o_Destination, char* i_Source) } NS_IMETHODIMP -nsStdURL::SetDirectory(char* i_Directory) +nsStdURL::SetDirectory(const char* i_Directory) { if (!i_Directory) return NS_ERROR_NULL_POINTER; @@ -706,7 +706,7 @@ nsStdURL::SetDirectory(char* i_Directory) } NS_IMETHODIMP -nsStdURL::SetFileName(char* i_FileName) +nsStdURL::SetFileName(const char* i_FileName) { nsParsePath pp(this); // Someone mayhave set .. in the name if (!i_FileName) @@ -727,7 +727,7 @@ nsStdURL::SetFileName(char* i_FileName) } NS_IMETHODIMP -nsStdURL::SetRef(char* i_Ref) +nsStdURL::SetRef(const char* i_Ref) { nsresult status; if (i_Ref && (*i_Ref == '#')) @@ -738,7 +738,7 @@ nsStdURL::SetRef(char* i_Ref) } NS_IMETHODIMP -nsStdURL::SetParam(char* i_Param) +nsStdURL::SetParam(const char* i_Param) { nsresult status; if (i_Param && (*i_Param == ';')) @@ -749,7 +749,7 @@ nsStdURL::SetParam(char* i_Param) } NS_IMETHODIMP -nsStdURL::SetQuery(char* i_Query) +nsStdURL::SetQuery(const char* i_Query) { nsresult status; if (i_Query && (*i_Query == '?')) @@ -955,7 +955,7 @@ nsStdURL::ParsePath(void) } NS_METHOD -nsStdURL::SetSpec(char* i_Spec) +nsStdURL::SetSpec(const char* i_Spec) { CRTFREEIF(mSpec); nsresult status = DupString(&mSpec, i_Spec); @@ -974,7 +974,7 @@ nsStdURL::SetSpec(char* i_Spec) } NS_METHOD -nsStdURL::SetPath(char* i_Path) +nsStdURL::SetPath(const char* i_Path) { if (mPath) nsCRT::free(mPath); nsresult status = DupString(&mPath, i_Path); diff --git a/netwerk/base/src/nsStdURL.h b/netwerk/base/src/nsStdURL.h index 4ef1c1c948a3..10cabd24e835 100644 --- a/netwerk/base/src/nsStdURL.h +++ b/netwerk/base/src/nsStdURL.h @@ -67,7 +67,7 @@ protected: nsresult ReconstructSpec(void); // Some handy functions - nsresult DupString(char* *o_Destination, char* i_Source); + nsresult DupString(char* *o_Destination, const char* i_Source); nsresult ExtractString(char* i_Source, char* *o_Destination, PRUint32 start, PRUint32 length); protected: @@ -148,7 +148,7 @@ nsStdURL::GetQuery(char* *o_Query) } inline NS_METHOD -nsStdURL::SetScheme(char* i_Scheme) +nsStdURL::SetScheme(const char* i_Scheme) { if (mScheme) nsCRT::free(mScheme); nsresult status = DupString(&mScheme, i_Scheme); @@ -157,7 +157,7 @@ nsStdURL::SetScheme(char* i_Scheme) } inline NS_METHOD -nsStdURL::SetPreHost(char* i_PreHost) +nsStdURL::SetPreHost(const char* i_PreHost) { if (mPreHost) nsCRT::free(mPreHost); nsresult status = DupString(&mPreHost, i_PreHost); @@ -166,7 +166,7 @@ nsStdURL::SetPreHost(char* i_PreHost) } inline NS_METHOD -nsStdURL::SetHost(char* i_Host) +nsStdURL::SetHost(const char* i_Host) { if (mHost) nsCRT::free(mHost); nsresult status = DupString(&mHost, i_Host); diff --git a/netwerk/mime/src/nsMIMEInfoImpl.cpp b/netwerk/mime/src/nsMIMEInfoImpl.cpp index 59b12794254c..22aa5801b2d3 100644 --- a/netwerk/mime/src/nsMIMEInfoImpl.cpp +++ b/netwerk/mime/src/nsMIMEInfoImpl.cpp @@ -58,7 +58,7 @@ nsMIMEInfoImpl::GetFileExtensions(char * *aFileExtensions) { } NS_IMETHODIMP -nsMIMEInfoImpl::SetFileExtensions(char * aFileExtensions) { +nsMIMEInfoImpl::SetFileExtensions(const char * aFileExtensions) { mFileExtensions.SetString(aFileExtensions); return NS_OK; } @@ -75,7 +75,7 @@ nsMIMEInfoImpl::GetMIMEType(char * *aMIMEType) { } NS_IMETHODIMP -nsMIMEInfoImpl::SetMIMEType(char * aMIMEType) { +nsMIMEInfoImpl::SetMIMEType(const char * aMIMEType) { NS_RELEASE(mMIMEType); mMIMEType = NS_NewAtom(aMIMEType); if (!mMIMEType) return NS_ERROR_OUT_OF_MEMORY; @@ -92,7 +92,7 @@ nsMIMEInfoImpl::GetDescription(PRUnichar * *aDescription) { } NS_IMETHODIMP -nsMIMEInfoImpl::SetDescription(PRUnichar * aDescription) { +nsMIMEInfoImpl::SetDescription(const PRUnichar * aDescription) { mDescription.SetString(aDescription); return NS_OK; } diff --git a/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp index e26fa5e94740..351af23b68fe 100644 --- a/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp +++ b/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp @@ -63,7 +63,7 @@ public: return NS_OK; }; - NS_IMETHOD SetContentType(char *aContentType) { + NS_IMETHOD SetContentType(const char *aContentType) { mContentType = aContentType; return NS_OK; }; diff --git a/uriloader/exthandler/nsMIMEInfoImpl.cpp b/uriloader/exthandler/nsMIMEInfoImpl.cpp index 59b12794254c..22aa5801b2d3 100644 --- a/uriloader/exthandler/nsMIMEInfoImpl.cpp +++ b/uriloader/exthandler/nsMIMEInfoImpl.cpp @@ -58,7 +58,7 @@ nsMIMEInfoImpl::GetFileExtensions(char * *aFileExtensions) { } NS_IMETHODIMP -nsMIMEInfoImpl::SetFileExtensions(char * aFileExtensions) { +nsMIMEInfoImpl::SetFileExtensions(const char * aFileExtensions) { mFileExtensions.SetString(aFileExtensions); return NS_OK; } @@ -75,7 +75,7 @@ nsMIMEInfoImpl::GetMIMEType(char * *aMIMEType) { } NS_IMETHODIMP -nsMIMEInfoImpl::SetMIMEType(char * aMIMEType) { +nsMIMEInfoImpl::SetMIMEType(const char * aMIMEType) { NS_RELEASE(mMIMEType); mMIMEType = NS_NewAtom(aMIMEType); if (!mMIMEType) return NS_ERROR_OUT_OF_MEMORY; @@ -92,7 +92,7 @@ nsMIMEInfoImpl::GetDescription(PRUnichar * *aDescription) { } NS_IMETHODIMP -nsMIMEInfoImpl::SetDescription(PRUnichar * aDescription) { +nsMIMEInfoImpl::SetDescription(const PRUnichar * aDescription) { mDescription.SetString(aDescription); return NS_OK; } diff --git a/widget/src/xpwidgets/nsFileSpecWithUIImpl.h b/widget/src/xpwidgets/nsFileSpecWithUIImpl.h index 6c4c4dc4fcf9..f52eda9ccb36 100644 --- a/widget/src/xpwidgets/nsFileSpecWithUIImpl.h +++ b/widget/src/xpwidgets/nsFileSpecWithUIImpl.h @@ -51,25 +51,25 @@ class nsFileSpecWithUIImpl NS_IMETHOD GetURLString(char * *aURLString) { return mBaseFileSpec ? mBaseFileSpec->GetURLString(aURLString) : NS_ERROR_NOT_INITIALIZED; } - NS_IMETHOD SetURLString(char * aURLString) + NS_IMETHOD SetURLString(const char * aURLString) { return mBaseFileSpec ? mBaseFileSpec->SetURLString(aURLString) : NS_ERROR_NOT_INITIALIZED; } /* attribute string UnixStyleFilePath; */ NS_IMETHOD GetUnixStyleFilePath(char * *aUnixStyleFilePath) { return mBaseFileSpec ? mBaseFileSpec->GetUnixStyleFilePath(aUnixStyleFilePath) : NS_ERROR_NOT_INITIALIZED; } - NS_IMETHOD SetUnixStyleFilePath(char * aUnixStyleFilePath) + NS_IMETHOD SetUnixStyleFilePath(const char * aUnixStyleFilePath) { return mBaseFileSpec ? mBaseFileSpec->SetUnixStyleFilePath(aUnixStyleFilePath) : NS_ERROR_NOT_INITIALIZED; } /* attribute string PersistentDescriptorString; */ NS_IMETHOD GetPersistentDescriptorString(char * *aPersistentDescriptorString) { return mBaseFileSpec ? mBaseFileSpec->GetPersistentDescriptorString(aPersistentDescriptorString) : NS_ERROR_NOT_INITIALIZED; } - NS_IMETHOD SetPersistentDescriptorString(char * aPersistentDescriptorString) + NS_IMETHOD SetPersistentDescriptorString(const char * aPersistentDescriptorString) { return mBaseFileSpec ? mBaseFileSpec->SetPersistentDescriptorString(aPersistentDescriptorString) : NS_ERROR_NOT_INITIALIZED; } /* attribute string NativePath; */ NS_IMETHOD GetNativePath(char * *aNativePath) { return mBaseFileSpec ? mBaseFileSpec->GetNativePath(aNativePath) : NS_ERROR_NOT_INITIALIZED; } - NS_IMETHOD SetNativePath(char * aNativePath) + NS_IMETHOD SetNativePath(const char * aNativePath) { return mBaseFileSpec ? mBaseFileSpec->SetNativePath(aNativePath) : NS_ERROR_NOT_INITIALIZED; } /* readonly attribute string NSPRPath; */ @@ -91,7 +91,7 @@ class nsFileSpecWithUIImpl /* attribute string LeafName; */ NS_IMETHOD GetLeafName(char * *aLeafName) { return mBaseFileSpec ? mBaseFileSpec->GetLeafName(aLeafName) : NS_ERROR_NOT_INITIALIZED; } - NS_IMETHOD SetLeafName(char * aLeafName) + NS_IMETHOD SetLeafName(const char * aLeafName) { return mBaseFileSpec ? mBaseFileSpec->SetLeafName(aLeafName) : NS_ERROR_NOT_INITIALIZED; } /* readonly attribute nsIFileSpec Parent; */ @@ -202,7 +202,7 @@ class nsFileSpecWithUIImpl NS_IMETHOD GetFileContents(char** _retval) { return mBaseFileSpec ? mBaseFileSpec->GetFileContents(_retval) : NS_ERROR_NOT_INITIALIZED; } - NS_IMETHOD SetFileContents(char* s) + NS_IMETHOD SetFileContents(const char* s) { return mBaseFileSpec ? mBaseFileSpec->SetFileContents(s) : NS_ERROR_NOT_INITIALIZED; } NS_IMETHOD GetFileSpec(nsFileSpec *_retval) diff --git a/xpcom/base/nsCom.h b/xpcom/base/nsCom.h index 16d54a1045cd..5263f0047d29 100644 --- a/xpcom/base/nsCom.h +++ b/xpcom/base/nsCom.h @@ -132,7 +132,7 @@ _method(char* *aString)\ } #define NS_METHOD_SETTER_STR(_method, _member) \ -_method(char *aString)\ +_method(const char *aString)\ {\ PR_FREEIF(_member);\ if (aString) _member = PL_strdup(aString); \ diff --git a/xpcom/ds/nsSupportsPrimitives.cpp b/xpcom/ds/nsSupportsPrimitives.cpp index 51952937b941..a1947a1fb8d1 100644 --- a/xpcom/ds/nsSupportsPrimitives.cpp +++ b/xpcom/ds/nsSupportsPrimitives.cpp @@ -56,7 +56,7 @@ NS_IMETHODIMP nsSupportsIDImpl::GetData(nsID **aData) } } -NS_IMETHODIMP nsSupportsIDImpl::SetData(nsID *aData) +NS_IMETHODIMP nsSupportsIDImpl::SetData(const nsID *aData) { if(mData) nsAllocator::Free(mData); @@ -132,7 +132,7 @@ NS_IMETHODIMP nsSupportsStringImpl::GetData(char **aData) } } -NS_IMETHODIMP nsSupportsStringImpl::SetData(char *aData) +NS_IMETHODIMP nsSupportsStringImpl::SetData(const char *aData) { if(mData) nsAllocator::Free(mData); @@ -185,7 +185,7 @@ NS_IMETHODIMP nsSupportsWStringImpl::GetData(PRUnichar **aData) } } -NS_IMETHODIMP nsSupportsWStringImpl::SetData(PRUnichar *aData) +NS_IMETHODIMP nsSupportsWStringImpl::SetData(const PRUnichar *aData) { if(mData) nsAllocator::Free(mData); diff --git a/xpcom/io/nsFileSpec.cpp b/xpcom/io/nsFileSpec.cpp index d5fa46f08f87..c66720ee5167 100644 --- a/xpcom/io/nsFileSpec.cpp +++ b/xpcom/io/nsFileSpec.cpp @@ -528,6 +528,9 @@ nsFileURL::~nsFileURL() void nsFileURL::operator = (const char* inString) //---------------------------------------------------------------------------------------- { + // XXX is this called by nsFileSpecImpl.cpp::SetURLString? + // if so, there's a bug... + mURL = inString; NS_ASSERTION(strstr(inString, kFileURLPrefix) == inString, "Not a URL!"); } // nsFileURL::operator = @@ -688,6 +691,8 @@ nsFilePath::~nsFilePath() void nsFilePath::operator = (const nsFileSpec& inOther) //---------------------------------------------------------------------------------------- { + // XXX bug here, again if. + mPath = inOther.mPath; } #endif // XP_UNIX diff --git a/xpcom/io/nsFileSpecImpl.cpp b/xpcom/io/nsFileSpecImpl.cpp index 318e88b54b37..6284977bce08 100644 --- a/xpcom/io/nsFileSpecImpl.cpp +++ b/xpcom/io/nsFileSpecImpl.cpp @@ -104,7 +104,7 @@ NS_IMETHODIMP nsFileSpecImpl::GetURLString(char * *aURLString) } // nsFileSpecImpl::GetURLString //---------------------------------------------------------------------------------------- -NS_IMETHODIMP nsFileSpecImpl::SetURLString(char * aURLString) +NS_IMETHODIMP nsFileSpecImpl::SetURLString(const char * aURLString) //---------------------------------------------------------------------------------------- { mFileSpec = nsFileURL(aURLString); @@ -126,7 +126,7 @@ NS_IMETHODIMP nsFileSpecImpl::GetUnixStyleFilePath(char * *aUnixStyleFilePath) } //---------------------------------------------------------------------------------------- -NS_IMETHODIMP nsFileSpecImpl::SetUnixStyleFilePath(char * aUnixStyleFilePath) +NS_IMETHODIMP nsFileSpecImpl::SetUnixStyleFilePath(const char * aUnixStyleFilePath) //---------------------------------------------------------------------------------------- { mFileSpec = nsFilePath(aUnixStyleFilePath); @@ -150,7 +150,7 @@ NS_IMETHODIMP nsFileSpecImpl::GetPersistentDescriptorString(char * *aPersistentD } //---------------------------------------------------------------------------------------- -NS_IMETHODIMP nsFileSpecImpl::SetPersistentDescriptorString(char * aPersistentDescriptorString) +NS_IMETHODIMP nsFileSpecImpl::SetPersistentDescriptorString(const char * aPersistentDescriptorString) //---------------------------------------------------------------------------------------- { nsPersistentFileDescriptor desc(mFileSpec); @@ -173,7 +173,7 @@ NS_IMETHODIMP nsFileSpecImpl::GetNativePath(char * *aNativePath) } //---------------------------------------------------------------------------------------- -NS_IMETHODIMP nsFileSpecImpl::SetNativePath(char * aNativePath) +NS_IMETHODIMP nsFileSpecImpl::SetNativePath(const char * aNativePath) //---------------------------------------------------------------------------------------- { mFileSpec = aNativePath; @@ -228,7 +228,7 @@ NS_IMETHODIMP nsFileSpecImpl::GetLeafName(char * *aLeafName) } //---------------------------------------------------------------------------------------- -NS_IMETHODIMP nsFileSpecImpl::SetLeafName(char * aLeafName) +NS_IMETHODIMP nsFileSpecImpl::SetLeafName(const char * aLeafName) //---------------------------------------------------------------------------------------- { mFileSpec.SetLeafName(aLeafName); @@ -485,7 +485,7 @@ NS_IMETHODIMP nsFileSpecImpl::GetOutputStream(nsIOutputStream** _retval) } //---------------------------------------------------------------------------------------- -NS_IMETHODIMP nsFileSpecImpl::SetFileContents(char* inString) +NS_IMETHODIMP nsFileSpecImpl::SetFileContents(const char* inString) //---------------------------------------------------------------------------------------- { nsresult rv = OpenStreamForWriting(); diff --git a/xpcom/sample/nsSample.cpp b/xpcom/sample/nsSample.cpp index 5386ab684fa8..230a5083d069 100644 --- a/xpcom/sample/nsSample.cpp +++ b/xpcom/sample/nsSample.cpp @@ -211,7 +211,7 @@ SampleImpl::GetValue(char** aValue) } NS_IMETHODIMP -SampleImpl::SetValue(char* aValue) +SampleImpl::SetValue(const char* aValue) { NS_PRECONDITION(aValue != nsnull, "null ptr"); if (! aValue) @@ -222,9 +222,9 @@ SampleImpl::SetValue(char* aValue) } /** - * Another buffer passing convention is that buffer's passed INTO your + * Another buffer passing convention is that buffers passed INTO your * object ARE NOT YOURS. Keep your hands off them, unless they are - * declared "in out". If you want to keep the value for posterity, + * declared "inout". If you want to keep the value for posterity, * you will have to make a copy of it. */ mValue = PL_strdup(aValue); diff --git a/xpcom/typelib/xpidl/xpidl_header.c b/xpcom/typelib/xpidl/xpidl_header.c index 468f86878a64..12a798065354 100644 --- a/xpcom/typelib/xpidl/xpidl_header.c +++ b/xpcom/typelib/xpidl/xpidl_header.c @@ -446,6 +446,15 @@ write_attr_accessor(IDL_tree attr_tree, FILE * outfile, getter ? 'G' : 'S', toupper(*attrname), attrname + 1); if (!as_call) { + /* Setters for string, wstring and nsid get const. */ + if (!getter && + (IDL_NODE_TYPE(ATTR_TYPE_DECL(attr_tree)) == IDLN_TYPE_STRING || + IDL_NODE_TYPE(ATTR_TYPE_DECL(attr_tree)) == IDLN_TYPE_WIDE_STRING || + IDL_tree_property_get(ATTR_TYPE_DECL(attr_tree), "nsid"))) + { + fputs("const ", outfile); + } + if (!write_type(ATTR_TYPE_DECL(attr_tree), outfile)) return FALSE; fprintf(outfile, "%s%s", @@ -532,9 +541,9 @@ do_const_dcl(TreeState *state) fprintf(state->file, "\n enum { %s = %d };\n", name, (int) IDL_INTEGER(dcl->const_exp).value); } else { - XPIDL_WARNING((state->tree, IDL_WARNING1, - "const decl \'%s\' was not of type " - "short or long, ignored", name)); + IDL_tree_error(state->tree, + "const decl \'%s\' must be of type short or long", + name); } return TRUE; } @@ -667,7 +676,7 @@ write_method_signature(IDL_tree method_tree, FILE *outfile, gboolean as_call) fputc(' ', outfile); } name = IDL_IDENT(op->ident).str; - fprintf(outfile, " %c%s(", toupper(*name), name + 1); + fprintf(outfile, "%c%s(", toupper(*name), name + 1); for (iter = op->parameter_dcls; iter; iter = IDL_LIST(iter).next) { if (!as_call) { if (!write_param(IDL_LIST(iter).data, outfile)) diff --git a/xpfe/components/find/src/nsFindComponent.cpp b/xpfe/components/find/src/nsFindComponent.cpp index 16aa751b1076..9069e4f47cc3 100644 --- a/xpfe/components/find/src/nsFindComponent.cpp +++ b/xpfe/components/find/src/nsFindComponent.cpp @@ -592,7 +592,7 @@ nsFindComponent::Context::GetSearchString(PRUnichar * *aSearchString) { } NS_IMETHODIMP -nsFindComponent::Context::SetSearchString(PRUnichar *aSearchString) { +nsFindComponent::Context::SetSearchString(const PRUnichar *aSearchString) { nsresult rv = NS_OK; mSearchString = aSearchString ? nsString( aSearchString ) : nsString(); return rv; @@ -613,7 +613,7 @@ nsFindComponent::Context::GetReplaceString(PRUnichar * *aReplaceString) { } NS_IMETHODIMP -nsFindComponent::Context::SetReplaceString(PRUnichar *aReplaceString) { +nsFindComponent::Context::SetReplaceString(const PRUnichar *aReplaceString) { nsresult rv = NS_OK; mReplaceString = aReplaceString ? nsString( aReplaceString ) : nsString(); return rv; diff --git a/xpfe/components/related/src/nsRelatedLinksHandler.cpp b/xpfe/components/related/src/nsRelatedLinksHandler.cpp index 914fbe48d0e6..05b62f3c1327 100644 --- a/xpfe/components/related/src/nsRelatedLinksHandler.cpp +++ b/xpfe/components/related/src/nsRelatedLinksHandler.cpp @@ -551,8 +551,7 @@ public: NS_DECL_ISUPPORTS // nsIRelatedLinksHandler methods - NS_IMETHOD GetURL(char * *aURL); - NS_IMETHOD SetURL(char * aURL); + NS_DECL_NSIRELATEDLINKSHANDLER // nsIRDFDataSource methods @@ -779,7 +778,7 @@ RelatedLinksHandlerImpl::GetURL(char** aURL) NS_IMETHODIMP -RelatedLinksHandlerImpl::SetURL(char* aURL) +RelatedLinksHandlerImpl::SetURL(const char* aURL) { NS_PRECONDITION(aURL != nsnull, "null ptr"); if (! aURL)