Not part of build. Type ahead find. More cleanup

extensions/typeaheadfind/src/nsTypeAheadFind.cpp

@@ -262,12 +262,9 @@ nsTypeAheadFind::PrefsReset(const char* aPrefName, void* instance_data)
   }
 
   PRBool wasTypeAheadOn = typeAheadFind->mIsTypeAheadOn;
-  PRBool temp_bool;
 
   prefs->GetBoolPref("accessibility.typeaheadfind",
-                     &temp_bool);
+                     &typeAheadFind->mIsTypeAheadOn);
-
-  typeAheadFind->mIsTypeAheadOn = temp_bool;
 
   if (typeAheadFind->mIsTypeAheadOn != wasTypeAheadOn) {
     nsCOMPtr<nsIWebProgress> progress =
@@ -305,19 +302,16 @@ nsTypeAheadFind::PrefsReset(const char* aPrefName, void* instance_data)
   }
 
   prefs->GetBoolPref("accessibility.typeaheadfind.linksonly",
-                     &temp_bool);
+                     &typeAheadFind->mLinksOnlyPref);
-  typeAheadFind->mLinksOnlyPref = temp_bool;
 
   prefs->GetBoolPref("accessibility.typeaheadfind.startlinksonly",
-                     &temp_bool);
+                     &typeAheadFind->mStartLinksOnlyPref);
-  typeAheadFind->mStartLinksOnlyPref = temp_bool;
 
   prefs->GetIntPref("accessibility.typeaheadfind.timeout",
                      &typeAheadFind->mTimeoutLength);
 
   prefs->GetBoolPref("accessibility.browsewithcaret",
-                     &temp_bool);
+                     &typeAheadFind->mCaretBrowsingOn);
-  typeAheadFind->mCaretBrowsingOn = temp_bool;
 
   return 0;  // PREF_OK
 }

extensions/typeaheadfind/src/nsTypeAheadFind.h

@@ -160,11 +160,11 @@ protected:
 
   // Current find state
   nsString mTypeAheadBuffer;
-  PRPackedBool mLinksOnlyPref;
+  PRBool mLinksOnlyPref;
-  PRPackedBool mStartLinksOnlyPref;
+  PRBool mStartLinksOnlyPref;
   PRPackedBool mLinksOnly;
-  PRPackedBool mIsTypeAheadOn;
+  PRBool mIsTypeAheadOn;
-  PRPackedBool mCaretBrowsingOn;
+  PRBool mCaretBrowsingOn;
   PRPackedBool mLiteralTextSearchOnly;
   PRPackedBool mDontTryExactMatch;
   PRInt32 mRepeatingMode;