From 8211d0dd1050428b05f99f34c719cf8d5b7332e1 Mon Sep 17 00:00:00 2001 From: "bienvenu%netscape.com" Date: Thu, 20 Apr 2000 01:17:05 +0000 Subject: [PATCH] remove Init method for search, not part of build --- .../search/public/nsIMsgSearchAdapter.idl | 4 ++-- .../base/search/public/nsMsgSearchAdapter.h | 24 ++++++++++++------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/mailnews/base/search/public/nsIMsgSearchAdapter.idl b/mailnews/base/search/public/nsIMsgSearchAdapter.idl index 570af7f10f4..5ae90e273c5 100644 --- a/mailnews/base/search/public/nsIMsgSearchAdapter.idl +++ b/mailnews/base/search/public/nsIMsgSearchAdapter.idl @@ -35,8 +35,8 @@ class nsMsgSearchScopeTerm; [scriptable, uuid(66f4b80c-0fb5-11d3-a515-0060b0fc04b7)] interface nsIMsgSearchAdapter : nsISupports { - [noscript] void Init(in nsMsgSearchScopeTerm scope, - in nsMsgSearchTermArray terms); +// [noscript] void Init(in nsMsgSearchScopeTerm scope, +// in nsMsgSearchTermArray terms); void ValidateTerms(); void Search(); void SendUrl(); diff --git a/mailnews/base/search/public/nsMsgSearchAdapter.h b/mailnews/base/search/public/nsMsgSearchAdapter.h index e2e4438772d..543f8e7ff91 100644 --- a/mailnews/base/search/public/nsMsgSearchAdapter.h +++ b/mailnews/base/search/public/nsMsgSearchAdapter.h @@ -50,15 +50,17 @@ public: nsMsgSearchAdapter (nsMsgSearchScopeTerm*, nsMsgSearchTermArray&); virtual ~nsMsgSearchAdapter (); - NS_IMETHOD ValidateTerms (); - NS_IMETHOD Search () { return NS_OK; } - NS_IMETHOD SendUrl () { return NS_OK; } - NS_IMETHOD OpenResultElement (nsMsgResultElement *); - NS_IMETHOD ModifyResultElement (nsMsgResultElement*, nsMsgSearchValue*); - NS_IMETHOD GetEncoding (char **encoding) { return NS_OK; } + NS_DECL_ISUPPORTS + NS_DECL_NSIMSGSEARCHADAPTER +// NS_IMETHOD ValidateTerms (); +// NS_IMETHOD Search () { return NS_OK; } +// NS_IMETHOD SendUrl () { return NS_OK; } +// NS_IMETHOD OpenResultElement (nsMsgResultElement *); +// NS_IMETHOD ModifyResultElement (nsMsgResultElement*, nsMsgSearchValue*); +// NS_IMETHOD GetEncoding (char **encoding) { return NS_OK; } - NS_IMETHOD FindTargetFolder (const nsMsgResultElement*, nsIMsgFolder **aFolder); - NS_IMETHOD Abort (); +// NS_IMETHOD FindTargetFolder (const nsMsgResultElement*, nsIMsgFolder **aFolder); +// NS_IMETHOD Abort (); nsMsgSearchScopeTerm *m_scope; nsMsgSearchTermArray &m_searchTerms; @@ -76,6 +78,10 @@ public: static char *TryToConvertCharset(char *sourceStr, const PRUnichar *srcCharset, const PRUnichar *destCharset, PRBool useMIME2Style); static char *GetImapCharsetParam(const PRUnichar *destCharset); void GetSearchCharsets(nsString &srcCharset, nsString &destCharset); + static char *EscapeSearchUrl (const char *nntpCommand); + static char *EscapeImapSearchProtocol(const char *imapCommand); + static char *EscapeQuoteImapSearchProtocol(const char *imapCommand); + static char *UnEscapeSearchUrl (const char *commandSpecificData); // This stuff lives in the base class because the IMAP search syntax // is used by the Dredd SEARCH command as well as IMAP itself @@ -111,7 +117,7 @@ protected: char *TransformSpacesToStars (const char *, msg_TransformType transformType); nsresult OpenNewsResultInUnknownGroup (nsMsgResultElement*); - static nsresult EncodeImapTerm (nsMsgSearchTerm *, PRBool reallyDredd, const char*srcCharset, PRInt16 dest_csid, char **ppOutTerm); + static nsresult EncodeImapTerm (nsMsgSearchTerm *, PRBool reallyDredd, const PRUnichar *srcCharset, const PRUnichar *destCharset, char **ppOutTerm); }; #endif