Bug 1433211: Remove unused `nsMsgSearchType`; r=jorgk
authorTom Prince <mozilla@hocat.ca>
Thu, 25 Jan 2018 11:29:06 -0700
changeset 30962 e34f8c36ca9e8889659b99863a03636762154e25
parent 30961 fade6344322e1037883fa8e8fc8f3c7286b6b892
child 30963 00b0d2631cc2f111e14b44c28cecf4189cf5e2c8
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersjorgk
bugs1433211
Bug 1433211: Remove unused `nsMsgSearchType`; r=jorgk MozReview-Commit-ID: 6i1PFFWewwR Differential Revision: https://phabricator.services.mozilla.com/D438
mailnews/base/search/public/nsIMsgSearchSession.idl
mailnews/base/search/public/nsMsgSearchCore.idl
mailnews/base/search/src/nsMsgSearchSession.cpp
mailnews/base/search/src/nsMsgSearchSession.h
--- a/mailnews/base/search/public/nsIMsgSearchSession.idl
+++ b/mailnews/base/search/public/nsIMsgSearchSession.idl
@@ -114,22 +114,16 @@ interface nsIMsgSearchSession :  nsISupp
   // these two methods are used when the search session is using
   // a timer to do local search, and the search adapter needs
   // to run a url (e.g., to reparse a local folder) and wants to
   // pause the timer while running the url. This will fail if the
   // current adapter is not using a timer.
   void pauseSearch();
   void resumeSearch();
 
-  [noscript] readonly attribute voidPtr searchParam;
-  readonly attribute nsMsgSearchType searchType;
-
-  [noscript] nsMsgSearchType SetSearchParam(in nsMsgSearchType type,
-                                            in voidPtr param);
-
   boolean MatchHdr(in nsIMsgDBHdr aMsgHdr, in nsIMsgDatabase aDatabase);
 
   void addSearchHit(in nsIMsgDBHdr header, in nsIMsgFolder folder);
 
   readonly attribute long numResults;
   attribute nsIMsgWindow window;
 
   /* these longs are all actually of type nsMsgSearchBooleanOp */
--- a/mailnews/base/search/public/nsMsgSearchCore.idl
+++ b/mailnews/base/search/public/nsMsgSearchCore.idl
@@ -149,29 +149,16 @@ typedef long nsMsgSearchWidgetValue;
 interface nsMsgSearchWidget {
     const nsMsgSearchWidgetValue Text = 0;
     const nsMsgSearchWidgetValue Date = 1;
     const nsMsgSearchWidgetValue Menu = 2;
   const nsMsgSearchWidgetValue Int = 3;          /* added to account for age in days which requires an integer field */
     const nsMsgSearchWidgetValue None = 4;
 };
 
-typedef long nsMsgSearchTypeValue;
-
-
-/* Used to specify type of search to be performed */
-[scriptable,uuid(964b7f32-304e-11d3-ae13-00a0c900d445)]
-interface nsMsgSearchType {
-  const nsMsgSearchTypeValue None = 0;
-  const nsMsgSearchTypeValue RootDSE = 1;
-  const nsMsgSearchTypeValue Normal = 2;
-  const nsMsgSearchTypeValue LdapVLV = 3;
-  const nsMsgSearchTypeValue NameCompletion = 4;
-};
-
 typedef long nsMsgSearchBooleanOperator;
 
 [scriptable, uuid(a37f3f4a-304e-11d3-8f94-00a0c900d445)]
 interface nsMsgSearchBooleanOp {
     const nsMsgSearchBooleanOperator BooleanOR = 0;
     const nsMsgSearchBooleanOperator BooleanAND = 1;
 };
 
--- a/mailnews/base/search/src/nsMsgSearchSession.cpp
+++ b/mailnews/base/search/src/nsMsgSearchSession.cpp
@@ -292,33 +292,16 @@ NS_IMETHODIMP nsMsgSearchSession::Resume
   {
     m_searchPaused = false;
     return StartTimer();
   }
   else
     return NS_ERROR_FAILURE;
 }
 
-NS_IMETHODIMP nsMsgSearchSession::GetSearchParam(void **aSearchParam)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgSearchSession::GetSearchType(nsMsgSearchType **aSearchType)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP nsMsgSearchSession::SetSearchParam(nsMsgSearchType *type,
-                                                 void *param,
-                                                 nsMsgSearchType **_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 NS_IMETHODIMP nsMsgSearchSession::GetNumResults(int32_t *aNumResults)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP nsMsgSearchSession::SetWindow(nsIMsgWindow *aWindow)
 {
   m_msgWindowWeak = do_GetWeakReference(aWindow);
--- a/mailnews/base/search/src/nsMsgSearchSession.h
+++ b/mailnews/base/search/src/nsMsgSearchSession.h
@@ -75,17 +75,16 @@ protected:
 
   static void TimerCallback(nsITimer *aTimer, void *aClosure);
   // support for searching multiple scopes in serial
   nsresult TimeSliceSerial (bool *aDone);
   nsresult TimeSliceParallel ();
 
   nsMsgSearchAttribValue m_sortAttribute;
   uint32_t m_idxRunningScope;
-  nsMsgSearchType m_searchType;
   bool m_handlingError;
   nsCString m_runningUrl;     // The url for the current search
   nsCOMPtr <nsITimer> m_backgroundTimer;
   bool m_searchPaused;
   nsMsgSearchBoolExpression *m_expressionTree;
 };
 
 #endif