DiskProbe: Coding style cleanup

* Not complete, no functional changes intended.

src/apps/diskprobe/AttributeWindow.h

@@ -1,6 +1,6 @@
 /*
-** Copyright 2004, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2004-2018, Axel Dörfler, [email protected].
-** Distributed under the terms of the MIT License.
+ * All rights reserved. Distributed under the terms of the MIT license.
  */
 #ifndef ATTRIBUTE_WINDOW_H
 #define ATTRIBUTE_WINDOW_H
@@ -8,19 +8,22 @@
 
 #include "ProbeWindow.h"
 
+
 class ProbeView;
 class TypeEditorView;
 
 
 class AttributeWindow : public ProbeWindow {
 public:
-		AttributeWindow(BRect rect, entry_ref *ref, const char *attribute = NULL,
+								AttributeWindow(BRect rect, entry_ref* ref,
+									const char* attribute = NULL,
 									const BMessage* settings = NULL);
 	virtual						~AttributeWindow();
 
 	virtual void				MessageReceived(BMessage* message);
 	virtual bool				QuitRequested();
-		virtual bool Contains(const entry_ref &ref, const char *attribute);
+	virtual bool				Contains(const entry_ref& ref,
+									const char* attribute);
 
 private:
 			ProbeView*			fProbeView;
@@ -28,4 +31,5 @@ class AttributeWindow : public ProbeWindow {
 			char*				fAttribute;
 };
 
+
 #endif	/* ATTRIBUTE_WINDOW_H */

src/apps/diskprobe/DataEditor.h

@@ -1,6 +1,6 @@
 /*
- * Copyright 2004-2007, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2004-2018, Axel Dörfler, [email protected].
- * Distributed under the terms of the MIT License.
+ * All rights reserved. Distributed under the terms of the MIT license.
  */
 #ifndef DATA_EDITOR_H
 #define DATA_EDITOR_H
@@ -11,6 +11,7 @@
 #include <Locker.h>
 #include <ObjectList.h>
 
+
 class BHandler;
 class BLooper;
 class BMessage;
@@ -23,30 +24,39 @@ class StateWatcher;
 class DataEditor : public BLocker {
 public:
 								DataEditor();
-		DataEditor(entry_ref &ref, const char *attribute = NULL);
+								DataEditor(entry_ref& ref,
-		DataEditor(BEntry &entry, const char *attribute = NULL);
+									const char* attribute = NULL);
+								DataEditor(BEntry& entry,
+									const char* attribute = NULL);
 								DataEditor(const DataEditor& editor);
-		~DataEditor();
+	virtual						~DataEditor();
 
-		status_t SetTo(const char *path, const char *attribute = NULL);
+			status_t			SetTo(const char* path,
-		status_t SetTo(entry_ref &ref, const char *attribute = NULL);
+									const char* attribute = NULL);
-		status_t SetTo(BEntry &entry, const char *attribute = NULL);
+			status_t			SetTo(entry_ref &ref,
+									const char* attribute = NULL);
+			status_t			SetTo(BEntry &entry,
+									const char* attribute = NULL);
 
 			status_t			Save();
 
 			bool				IsReadOnly() const { return fIsReadOnly; }
 			bool				IsDevice() const { return fIsDevice; }
-		bool IsAttribute() const { return fAttribute != NULL; }
+			bool				IsAttribute() const
-		bool IsModified() const { return fLastChange != fFirstChange; }
+									{ return fAttribute != NULL; }
+			bool				IsModified() const
+									{ return fLastChange != fFirstChange; }
 
 			const char*			Attribute() const { return fAttribute; }
 			type_code			Type() const { return fType; }
 
 			status_t			InitCheck();
 
-		status_t Replace(off_t offset, const uint8 *data, size_t length);
+			status_t			Replace(off_t offset, const uint8* data,
+									size_t length);
 			status_t			Remove(off_t offset, off_t length);
-		status_t Insert(off_t offset, const uint8 *data, size_t length);
+			status_t			Insert(off_t offset, const uint8* data,
+									size_t length);
 
 			status_t			MoveBy(int32 bytes);
 			status_t			MoveTo(off_t offset);
@@ -74,13 +84,16 @@ class DataEditor : public BLocker {
 			status_t			GetViewBuffer(const uint8** _buffer);
 
 			status_t			StartWatching(BMessenger target);
-		status_t StartWatching(BHandler *handler, BLooper *looper = NULL);
+			status_t			StartWatching(BHandler* handler,
+									BLooper* looper = NULL);
 			void				StopWatching(BMessenger target);
-		void StopWatching(BHandler *handler, BLooper *looper = NULL);
+			void				StopWatching(BHandler* handler,
+									BLooper* looper = NULL);
 
-		off_t Find(off_t startPosition, const uint8 *data, size_t dataSize,
+			off_t				Find(off_t startPosition, const uint8* data,
-					bool caseInsensitive, bool cyclic,
+									size_t dataSize, bool caseInsensitive,
-					BMessenger progressMessenger, volatile bool *stop = NULL);
+									bool cyclic, BMessenger progressMessenger,
+									volatile bool* stop = NULL);
 
 			BFile&				File() { return fFile; }
 			const entry_ref&	AttributeRef() const { return fAttributeRef; }
@@ -91,21 +104,26 @@ class DataEditor : public BLocker {
 
 			status_t			SetViewOffset(off_t offset, bool sendNotices);
 			status_t			SetViewSize(size_t size, bool sendNotices);
-		void SendNotices(uint32 what, BMessage *message = NULL);
+			void				SendNotices(uint32 what,
+									BMessage* message = NULL);
 			void				SendNotices(DataChange* change);
 			status_t			Update();
 			void				AddChange(DataChange* change);
 			void				ApplyChanges();
 			void				RemoveRedos();
 
+private:
 			BObjectList<BMessenger> fObservers;
 
-		entry_ref	fRef, fAttributeRef;
+			entry_ref			fRef;
+			entry_ref			fAttributeRef;
 			BFile				fFile;
 			const char*			fAttribute;
 			type_code			fType;
-		bool		fIsDevice, fIsReadOnly;
+			bool				fIsDevice;
-		off_t		fRealSize, fSize;
+			bool				fIsReadOnly;
+			off_t				fRealSize;
+			off_t				fSize;
 
 			BObjectList<DataChange>	fChanges;
 			DataChange*			fFirstChange;
@@ -113,17 +131,21 @@ class DataEditor : public BLocker {
 			int32				fChangesFromSaved;
 
 			uint8*				fView;
-		off_t		fRealViewOffset, fViewOffset;
+			off_t				fRealViewOffset;
-		size_t		fRealViewSize, fViewSize;
+			off_t				fViewOffset;
+			size_t				fRealViewSize;
+			size_t				fViewSize;
 			bool				fNeedsUpdate;
 
 			size_t				fBlockSize;
 };
 
+
 static const uint32 kMsgDataEditorStateChange = 'deSC';
 static const uint32 kMsgDataEditorUpdate = 'deUp';
 static const uint32 kMsgDataEditorParameterChange = 'dePC';
 
 static const uint32 kMsgDataEditorFindProgress = 'deFP';
 
+
 #endif	/* DATA_EDITOR_H */

src/apps/diskprobe/DataView.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2015, Axel Dörfler, [email protected].
+ * Copyright 2004-2018, Axel Dörfler, [email protected].
  * Distributed under the terms of the MIT License.
  */
 #ifndef DATA_VIEW_H
@@ -51,7 +51,8 @@ public:
 									uint32 properties = B_FONT_ALL);
 	virtual void				GetPreferredSize(float* _width, float* _height);
 
-			bool			FontSizeFitsBounds() const { return fFitFontSize; }
+			bool				FontSizeFitsBounds() const
+									{ return fFitFontSize; }
 			float				FontSize() const;
 			void				SetFontSize(float point);
 
@@ -78,8 +79,8 @@ private:
 									view_focus* _newFocus = NULL);
 
 			void				DrawSelectionFrame(view_focus which);
-			void			DrawSelectionBlock(view_focus which, int32 start,
+			void				DrawSelectionBlock(view_focus which,
-								int32 end);
+									int32 start, int32 end);
 			void				DrawSelectionBlock(view_focus which);
 			void				DrawSelection(bool frameOnly = false);
 			void				SetActive(bool active);
@@ -94,6 +95,7 @@ private:
 			void				Copy();
 			void				Paste();
 
+private:
 			DataEditor&			fEditor;
 			uint8*				fData;
 			size_t				fDataSize;
@@ -106,15 +108,18 @@ private:
 			view_focus			fFocus;
 			base_type			fBase;
 			bool				fIsActive;
-			int32			fStart, fEnd;
+			int32				fStart;
+			int32				fEnd;
 			int32				fMouseSelectionStart;
 			int32				fKeySelectionStart;
 			int32				fBitPosition;
 			bool				fFitFontSize;
 			int32				fDragMessageSize;
-			int32			fStoredStart, fStoredEnd;
+			int32				fStoredStart;
+			int32				fStoredEnd;
 };
 
+
 static const uint32 kMsgBaseType = 'base';
 static const uint32 kMsgUpdateData = 'updt';
 static const uint32 kMsgSetSelection = 'ssel';
@@ -126,4 +131,5 @@ static const uint32 kDataViewPreferredSize = 'dvps';
 
 extern bool is_valid_utf8(uint8* data, size_t size);
 
+
 #endif	/* DATA_VIEW_H */

src/apps/diskprobe/DiskProbe.cpp

@@ -1,6 +1,6 @@
 /*
- * Copyright 2004-2015, Axel Dörfler, [email protected].
+ * Copyright 2004-2018, Axel Dörfler, [email protected].
- * Distributed under the terms of the MIT License.
+ * All rights reserved. Distributed under the terms of the MIT license.
  */
 
 
@@ -51,7 +51,8 @@ struct disk_probe_settings {
 
 
 enum disk_probe_flags {
-	kCaseSensitive	= 0x01,	// this flag alone is R5 DiskProbe settings compatible
+	kCaseSensitive	= 0x01,
+		// this flag alone is R5 DiskProbe settings compatible
 	kHexFindMode	= 0x02,
 };
 
@@ -67,6 +68,7 @@ class Settings {
 private:
 			status_t			Open(BFile* file, int32 mode);
 
+private:
 			BMessage			fMessage;
 			bool				fUpdated;
 };
@@ -86,8 +88,10 @@ class DiskProbe : public BApplication {
 	virtual bool				QuitRequested();
 
 private:
-		status_t Probe(BEntry &entry, const char *attribute = NULL);
+			status_t			Probe(BEntry& entry,
+									const char* attribute = NULL);
 
+private:
 			Settings			fSettings;
 			BFilePanel*			fFilePanel;
 			BWindow*			fOpenWindow;
@@ -123,7 +127,7 @@ Settings::Settings()
 	if (Open(&file, B_READ_ONLY) != B_OK)
 		return;
 
-	// ToDo: load/save settings as flattened BMessage - but not yet,
+	// TODO: load/save settings as flattened BMessage - but not yet,
 	//		since that will break compatibility with R5's DiskProbe
 
 	disk_probe_settings settings;
@@ -271,14 +275,13 @@ DiskProbe::ReadyToRun()
 }
 
 
-/** Opens a window containing the file pointed to by the entry_ref.
+/*!	Opens a window containing the file pointed to by the entry_ref.
- *	This function will fail if that file doesn't exist or could not
+	This function will fail if that file doesn't exist or could not
- *	be opened.
+	be opened.
- *	It will check if there already is a window that probes the
+	It will check if there already is a window that probes the
- *	file in question and will activate it in that case.
+	file in question and will activate it in that case.
- *	This function must be called with the application looper locked.
+	This function must be called with the application looper locked.
 */
-
 status_t
 DiskProbe::Probe(BEntry& entry, const char* attribute)
 {
@@ -319,15 +322,16 @@ DiskProbe::Probe(BEntry &entry, const char *attribute)
 	rect.OffsetBy(kCascadeOffset, kCascadeOffset);
 
 	BWindow* window;
-	if (attribute != NULL)
+	if (attribute != NULL) {
-		window = new AttributeWindow(rect, &ref, attribute, &fSettings.Message());
+		window = new AttributeWindow(rect, &ref, attribute,
-	else
+			&fSettings.Message());
+	} else
 		window = new FileWindow(rect, &ref, &fSettings.Message());
 
 	window->Show();
 
-	/* adjust the cascading... we can only do this after the window was created
+	// Adjust the cascading... we can only do this after the window was created
-	 * to adjust to the real size */
+	// to adjust to the real size.
 	rect.right = window->Frame().right;
 	rect.bottom = window->Frame().bottom;
 
@@ -472,8 +476,8 @@ DiskProbe::MessageReceived(BMessage *message)
 
 			if (fFindWindow == NULL) {
 				// open it!
-				fFindWindow = new FindWindow(fWindowFrame.OffsetByCopy(80, 80), *message,
+				fFindWindow = new FindWindow(fWindowFrame.OffsetByCopy(80, 80),
-										target, &fSettings.Message());
+					*message, target, &fSettings.Message());
 				fFindWindow->Show();
 			} else
 				fFindWindow->Activate();

src/apps/diskprobe/DiskProbe.h

@@ -1,6 +1,6 @@
 /*
-** Copyright 2004, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2004-2018, Axel Dörfler, [email protected].
-** Distributed under the terms of the MIT License.
+ * All rights reserved. Distributed under the terms of the MIT license.
  */
 #ifndef DISK_PROBE_H
 #define DISK_PROBE_H
@@ -22,4 +22,5 @@ static const uint32 kMsgFindWindowClosed = 'clFw';
 static const uint32 kMsgFindTarget = 'FTgt';
 static const uint32 kMsgFind = 'find';
 
+
 #endif	/* DISK_PROBE_H */

src/apps/diskprobe/FileWindow.h

@@ -1,6 +1,6 @@
 /*
-** Copyright 2004, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2004-2018, Axel Dörfler, [email protected].
-** Distributed under the terms of the MIT License.
+ * All rights reserved. Distributed under the terms of the MIT license.
  */
 #ifndef FILE_WINDOW_H
 #define FILE_WINDOW_H
@@ -8,18 +8,22 @@
 
 #include "ProbeWindow.h"
 
+
 class ProbeView;
 
 
 class FileWindow : public ProbeWindow {
 public:
-		FileWindow(BRect rect, entry_ref *ref, const BMessage *settings = NULL);
+								FileWindow(BRect rect, entry_ref* ref,
+									const BMessage* settings = NULL);
 
 	virtual	bool				QuitRequested();
-		virtual bool Contains(const entry_ref &ref, const char *attribute);
+	virtual	bool				Contains(const entry_ref& ref,
+									const char* attribute);
 
 private:
 			ProbeView*			fProbeView;
 };
 
+
 #endif	/* FILE_WINDOW_H */

src/apps/diskprobe/FindWindow.h

@@ -1,6 +1,6 @@
 /*
- * Copyright 2004-2006, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2004-2018, Axel Dörfler, [email protected].
- * Distributed under the terms of the MIT License.
+ * All rights reserved. Distributed under the terms of the MIT license.
  */
 #ifndef FIND_WINDOW_H
 #define FIND_WINDOW_H
@@ -9,6 +9,7 @@
 #include <Window.h>
 #include <Messenger.h>
 
+
 class BCheckBox;
 class BMenu;
 
@@ -23,7 +24,8 @@ enum find_mode {
 
 class FindWindow : public BWindow {
 public:
-		FindWindow(BRect rect, BMessage &previous, BMessenger &target,
+								FindWindow(BRect rect, BMessage& previous,
+									BMessenger& target,
 									const BMessage* settings = NULL);
 	virtual						~FindWindow();
 
@@ -41,4 +43,5 @@ class FindWindow : public BWindow {
 			BMenu*				fMenu;
 };
 
+
 #endif	/* FIND_WINDOW_H */

src/apps/diskprobe/OpenWindow.h

@@ -1,6 +1,6 @@
 /*
- * Copyright 2004-2006, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2004-2018, Axel Dörfler, [email protected].
- * Distributed under the terms of the MIT License.
+ * All rights reserved. Distributed under the terms of the MIT license.
  */
 #ifndef OPEN_WINDOW_H
 #define OPEN_WINDOW_H
@@ -8,6 +8,7 @@
 
 #include <Window.h>
 
+
 class BEntry;
 class BMenu;
 
@@ -27,4 +28,5 @@ private:
 			BMenu*				fDevicesMenu;
 };
 
+
 #endif	/* OPEN_WINDOW_H */

src/apps/diskprobe/ProbeView.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2015, Axel Dörfler, [email protected].
+ * Copyright 2004-2018, Axel Dörfler, [email protected].
  * Distributed under the terms of the MIT License.
  */
 
@@ -91,7 +91,8 @@ class IconView : public BView {
 
 class PositionSlider : public BSlider {
 public:
-		PositionSlider(const char *name, BMessage *message, off_t size,
+								PositionSlider(const char* name,
+									BMessage* message, off_t size,
 									uint32 blockSize);
 	virtual						~PositionSlider();
 
@@ -111,6 +112,7 @@ class PositionSlider : public BSlider {
 private:
 			void				Reset();
 
+private:
 	static	const int32			kMaxSliderLimit = 0x7fffff80;
 		// this is the maximum value that BSlider seem to work with fine
 
@@ -121,7 +123,8 @@ class PositionSlider : public BSlider {
 
 class HeaderView : public BGridView, public BInvoker {
 public:
-		HeaderView(const entry_ref *ref, DataEditor &editor);
+								HeaderView(const entry_ref* ref,
+									DataEditor& editor);
 	virtual						~HeaderView();
 
 	virtual	void				AttachedToWindow();
@@ -131,7 +134,8 @@ class HeaderView : public BGridView, public BInvoker {
 			base_type			Base() const { return fBase; }
 			void				SetBase(base_type);
 
-		off_t CursorOffset() const { return fPosition % fBlockSize; }
+			off_t				CursorOffset() const
+									{ return fPosition % fBlockSize; }
 			off_t				Position() const { return fPosition; }
 			uint32				BlockSize() const { return fBlockSize; }
 			void				SetTo(off_t position, uint32 blockSize);
@@ -139,12 +143,14 @@ class HeaderView : public BGridView, public BInvoker {
 			void				UpdateIcon();
 
 private:
-		void FormatValue(char *buffer, size_t bufferSize, off_t value);
+			void				FormatValue(char* buffer, size_t bufferSize,
+									off_t value);
 			void				UpdatePositionViews(bool all = true);
 			void				UpdateOffsetViews(bool all = true);
 			void				UpdateFileSizeView();
 			void				NotifyTarget();
 
+private:
 			const char*			fAttribute;
 			off_t				fFileSize;
 			uint32				fBlockSize;
@@ -166,7 +172,8 @@ class HeaderView : public BGridView, public BInvoker {
 
 class TypeMenuItem : public BMenuItem {
 public:
-		TypeMenuItem(const char *name, const char *type, BMessage *message);
+								TypeMenuItem(const char* name, const char* type,
+									BMessage* message);
 
 	virtual	void				GetContentSize(float* _width, float* _height);
 	virtual	void				DrawContent();
@@ -178,14 +185,16 @@ class TypeMenuItem : public BMenuItem {
 
 class EditorLooper : public BLooper {
 public:
-		EditorLooper(const char *name, DataEditor &editor, BMessenger messenger);
+								EditorLooper(const char* name,
+									DataEditor& editor, BMessenger messenger);
 	virtual						~EditorLooper();
 
 	virtual	void				MessageReceived(BMessage* message);
 
 			bool				FindIsRunning() const { return !fQuitFind; }
-		void Find(off_t startAt, const uint8 *data, size_t dataSize,
+			void				Find(off_t startAt, const uint8* data,
-				bool caseInsensitive, BMessenger progressMonitor);
+									size_t dataSize, bool caseInsensitive,
+									BMessenger progressMonitor);
 			void				QuitFind();
 
 private:
@@ -197,8 +206,9 @@ class EditorLooper : public BLooper {
 
 class TypeView : public BView {
 public:
-		TypeView(BRect rect, const char* name, int32 index,
+								TypeView(BRect rect, const char* name,
-			DataEditor& editor, int32 resizingMode);
+									int32 index, DataEditor& editor,
+									int32 resizingMode);
 	virtual						~TypeView();
 
 	virtual	void				FrameResized(float width, float height);
@@ -311,7 +321,8 @@ IconView::UpdateIcon()
 
 PositionSlider::PositionSlider(const char* name, BMessage* message,
 	off_t size, uint32 blockSize)
-	: BSlider(name, NULL, message, 0, kMaxSliderLimit, B_HORIZONTAL,
+	:
+	BSlider(name, NULL, message, 0, kMaxSliderLimit, B_HORIZONTAL,
 		B_TRIANGLE_THUMB),
 	fSize(size),
 	fBlockSize(blockSize)
@@ -912,7 +923,8 @@ HeaderView::MessageReceived(BMessage *message)
 */
 TypeMenuItem::TypeMenuItem(const char* name, const char* type,
 		BMessage* message)
-	: BMenuItem(name, message),
+	:
+	BMenuItem(name, message),
 	fType(type)
 {
 }
@@ -1350,14 +1362,15 @@ ProbeView::AttachedToWindow()
 		Window()->AddChild(bar);
 
 		BMenu* menu = new BMenu(fEditor.IsAttribute()
-			? B_TRANSLATE("Attribute") : fEditor.IsDevice() ? B_TRANSLATE("Device") : B_TRANSLATE("File"));
+			? B_TRANSLATE("Attribute") : fEditor.IsDevice()
+			? B_TRANSLATE("Device") : B_TRANSLATE("File"));
 		AddSaveMenuItems(menu, 0);
 		menu->AddSeparatorItem();
 		AddPrintMenuItems(menu, menu->CountItems());
 		menu->AddSeparatorItem();
 
-		menu->AddItem(new BMenuItem(B_TRANSLATE("Close"), new BMessage(B_CLOSE_REQUESTED),
+		menu->AddItem(new BMenuItem(B_TRANSLATE("Close"),
-			'W'));
+			new BMessage(B_CLOSE_REQUESTED), 'W'));
 		bar->AddItem(menu);
 	}
 
@@ -1365,23 +1378,24 @@ ProbeView::AttachedToWindow()
 
 	BMenu* menu = new BMenu(B_TRANSLATE("Edit"));
 	BMenuItem* item;
-	menu->AddItem(fUndoMenuItem = new BMenuItem(B_TRANSLATE("Undo"), new BMessage(B_UNDO),
+	menu->AddItem(fUndoMenuItem = new BMenuItem(B_TRANSLATE("Undo"),
-		'Z'));
+		new BMessage(B_UNDO), 'Z'));
 	fUndoMenuItem->SetEnabled(fEditor.CanUndo());
 	fUndoMenuItem->SetTarget(fDataView);
-	menu->AddItem(fRedoMenuItem = new BMenuItem(B_TRANSLATE("Redo"), new BMessage(B_REDO),
+	menu->AddItem(fRedoMenuItem = new BMenuItem(B_TRANSLATE("Redo"),
-		'Z', B_SHIFT_KEY));
+		new BMessage(B_REDO), 'Z', B_SHIFT_KEY));
 	fRedoMenuItem->SetEnabled(fEditor.CanRedo());
 	fRedoMenuItem->SetTarget(fDataView);
 	menu->AddSeparatorItem();
-	menu->AddItem(item = new BMenuItem(B_TRANSLATE("Copy"), new BMessage(B_COPY), 'C'));
+	menu->AddItem(item = new BMenuItem(B_TRANSLATE("Copy"),
+		new BMessage(B_COPY), 'C'));
 	item->SetTarget(NULL, Window());
-	menu->AddItem(fPasteMenuItem = new BMenuItem(B_TRANSLATE("Paste"), new BMessage(B_PASTE),
+	menu->AddItem(fPasteMenuItem = new BMenuItem(B_TRANSLATE("Paste"),
-		'V'));
+		new BMessage(B_PASTE), 'V'));
 	fPasteMenuItem->SetTarget(NULL, Window());
 	_CheckClipboard();
-	menu->AddItem(item = new BMenuItem(B_TRANSLATE("Select all"), new BMessage(B_SELECT_ALL),
+	menu->AddItem(item = new BMenuItem(B_TRANSLATE("Select all"),
-		'A'));
+		new BMessage(B_SELECT_ALL), 'A'));
 	item->SetTarget(NULL, Window());
 	menu->AddSeparatorItem();
 	menu->AddItem(item = new BMenuItem(B_TRANSLATE("Find" B_UTF8_ELLIPSIS),
@@ -1398,14 +1412,16 @@ ProbeView::AttachedToWindow()
 	menu = new BMenu(B_TRANSLATE("Block"));
 	BMessage* message = new BMessage(kMsgPositionUpdate);
 	message->AddInt32("delta", 1);
-	menu->AddItem(item = new BMenuItem(B_TRANSLATE("Next"), message, B_RIGHT_ARROW));
+	menu->AddItem(item = new BMenuItem(B_TRANSLATE("Next"), message,
+		B_RIGHT_ARROW));
 	item->SetTarget(fHeaderView);
 	message = new BMessage(kMsgPositionUpdate);
 	message->AddInt32("delta", -1);
-	menu->AddItem(item = new BMenuItem(B_TRANSLATE("Previous"), message, B_LEFT_ARROW));
+	menu->AddItem(item = new BMenuItem(B_TRANSLATE("Previous"), message,
+		B_LEFT_ARROW));
 	item->SetTarget(fHeaderView);
-	menu->AddItem(item = new BMenuItem(B_TRANSLATE("Back"), new BMessage(kMsgLastPosition),
+	menu->AddItem(item = new BMenuItem(B_TRANSLATE("Back"),
-		'J'));
+		new BMessage(kMsgLastPosition), 'J'));
 	item->SetTarget(fHeaderView);
 
 	BMenu* subMenu = new BMenu(B_TRANSLATE("Selection"));
@@ -1963,11 +1979,12 @@ ProbeView::MessageReceived(BMessage *message)
 		{
 			const uint8* data;
 			ssize_t size;
-			if (message->FindData("data", B_RAW_TYPE, (const void **)&data, &size) != B_OK) {
+			if (message->FindData("data", B_RAW_TYPE, (const void**)&data,
+					&size) != B_OK) {
 				// search again for last pattern
 				BMessage* itemMessage = fFindAgainMenuItem->Message();
-				if (itemMessage == NULL
+				if (itemMessage == NULL || itemMessage->FindData("data",
-					|| itemMessage->FindData("data", B_RAW_TYPE, (const void **)&data, &size) != B_OK) {
+						B_RAW_TYPE, (const void**)&data, &size) != B_OK) {
 					// this shouldn't ever happen, but well...
 					beep();
 					break;

src/apps/diskprobe/ProbeView.h

@@ -1,6 +1,6 @@
 /*
- * Copyright 2004-2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Copyright 2004-2018, Axel Dörfler, axeld@pinc-software.de.
- * Distributed under the terms of the MIT License.
+ * All rights reserved. Distributed under the terms of the MIT license.
  */
 #ifndef PROBE_VIEW_H
 #define PROBE_VIEW_H
@@ -24,7 +24,8 @@ class EditorLooper;
 
 class ProbeView : public BView {
 public:
-		ProbeView(entry_ref* ref, const char* attribute = NULL,
+								ProbeView(entry_ref* ref,
+									const char* attribute = NULL,
 									const BMessage* settings = NULL);
 	virtual						~ProbeView();
 
@@ -44,7 +45,8 @@ class ProbeView : public BView {
 
 private:
 			void				_UpdateAttributesMenu(BMenu* menu);
-		void _UpdateSelectionMenuItems(int64 start, int64 end);
+			void				_UpdateSelectionMenuItems(int64 start,
+									int64 end);
 			void				_UpdateBookmarkMenuItems();
 			void				_AddBookmark(off_t position);
 			void				_RemoveTypeEditor();
@@ -54,6 +56,7 @@ class ProbeView : public BView {
 			void				_Print();
 			status_t			_Save();
 
+private:
 			DataEditor			fEditor;
 			EditorLooper*		fEditorLooper;
 			HeaderView*			fHeaderView;
@@ -74,4 +77,5 @@ class ProbeView : public BView {
 			size_t				fLastSearchSize;
 };
 
+
 #endif	/* PROBE_VIEW_H */

src/apps/diskprobe/ProbeWindow.cpp

@@ -1,18 +1,33 @@
 /*
- * Copyright 2004-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Copyright 2004-2018, Axel Dörfler, axeld@pinc-software.de.
- * Distributed under the terms of the MIT License.
+ * All rights reserved. Distributed under the terms of the MIT license.
+ */
+
+
+/*!	Abstract base class for probe windows. It only provides the following
+	functionality:
+		- Access to the basic entry_ref
+		- Common BWindow flags
+		- Stores size in settings on QuitRequested()
+		- Redirects drops to BApplication
+		- Notifies BApplication about closed window
+		- Forwards mouse wheel to the DataView
+		- Contains() checks whether or not the ref/attribute is what this
+		  window contains
 */
 
 
 #include "ProbeWindow.h"
-#include "DiskProbe.h"
 
 #include <Application.h>
 #include <View.h>
 
+#include "DiskProbe.h"
+
 
 ProbeWindow::ProbeWindow(BRect rect, entry_ref* ref)
-	: BWindow(rect, ref->name, B_DOCUMENT_WINDOW,
+	:
+	BWindow(rect, ref->name, B_DOCUMENT_WINDOW,
 		B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS),
 	fRef(*ref)
 {

src/apps/diskprobe/ProbeWindow.h

@@ -1,6 +1,6 @@
 /*
-** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Copyright 2004-2018, Axel Dörfler, axeld@pinc-software.de.
-** Distributed under the terms of the MIT License.
+ * All rights reserved. Distributed under the terms of the MIT license.
  */
 #ifndef PROBE_WINDOW_H
 #define PROBE_WINDOW_H
@@ -18,7 +18,8 @@ class ProbeWindow : public BWindow {
 	virtual	void				MessageReceived(BMessage* message);
 	virtual	bool				QuitRequested();
 
-		virtual bool Contains(const entry_ref &ref, const char *attribute) = 0;
+	virtual	bool				Contains(const entry_ref& ref,
+									const char* attribute) = 0;
 
 protected:
 			const entry_ref&	Ref() const { return fRef; }
@@ -27,4 +28,5 @@ class ProbeWindow : public BWindow {
 			entry_ref			fRef;
 };
 
+
 #endif	/* PROBE_WINDOW_H */

src/apps/diskprobe/TypeEditors.h

@@ -1,6 +1,6 @@
 /*
- * Copyright 2004-2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Copyright 2004-2018, Axel Dörfler, axeld@pinc-software.de.
- * Distributed under the terms of the MIT License.
+ * All rights reserved. Distributed under the terms of the MIT license.
  */
 #ifndef TYPE_EDITORS_H
 #define TYPE_EDITORS_H
@@ -8,15 +8,18 @@
 
 #include <View.h>
 
+
 class DataEditor;
 
 
 class TypeEditorView : public BView {
 public:
-		TypeEditorView(BRect rect, const char* name, uint32 resizingMode,
+								TypeEditorView(BRect rect, const char* name,
-			uint32 flags, DataEditor& editor);
+									uint32 resizingMode, uint32 flags,
-		TypeEditorView(const char* name, uint32 flags, DataEditor& editor);
+									DataEditor& editor);
-		~TypeEditorView();
+								TypeEditorView(const char* name, uint32 flags,
+									DataEditor& editor);
+	virtual						~TypeEditorView();
 
 	virtual	void				CommitChanges();
 	virtual	bool				TypeMatches();
@@ -25,9 +28,11 @@ class TypeEditorView : public BView {
 			DataEditor&			fEditor;
 };
 
+
 extern TypeEditorView* GetTypeEditorFor(BRect rect, DataEditor& editor);
 extern status_t GetNthTypeEditor(int32 index, const char** _name);
 extern TypeEditorView* GetTypeEditorAt(int32 index, BRect rect,
 	DataEditor& editor);
 
+
 #endif	/* TYPE_EDITORS_H */