Additional style fixes from Julun: adding back the virtual keyword, moving the

commas on class member initializers, fixing a typo. Thanks!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22174 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/apps/stylededit/ColorMenuItem.cpp

@@ -12,8 +12,8 @@
 #include <Message.h>
 
 ColorMenuItem::ColorMenuItem(const char	*label, rgb_color color, BMessage *message)
-	: BMenuItem(label, message, 0, 0)
+	: BMenuItem(label, message, 0, 0),
-	, fItemColor(color)
+	fItemColor(color)
 {
 }
 

src/apps/stylededit/ColorMenuItem.h

@@ -18,11 +18,14 @@ class BMessage;
 
 class ColorMenuItem: public BMenuItem {
 	public:
-					ColorMenuItem(const char *label, rgb_color color, BMessage *message);
+						ColorMenuItem(const char *label, rgb_color color, 
-					void DrawContent();
+							BMessage *message);
+
+	protected:
+		virtual void	DrawContent();
 
 	private:
-		rgb_color	fItemColor;
+		rgb_color		fItemColor;
 };
 
 #endif	// COLOR_MENU_ITEM_H

src/apps/stylededit/FindWindow.h

@@ -24,8 +24,8 @@ class FindWindow : public BWindow {
 						FindWindow(BRect frame, BHandler* handler, BString *searchString,
 							bool caseState, bool wrapState, bool backState);
 
-		void			MessageReceived(BMessage* message);
+		virtual void	MessageReceived(BMessage* message);
-		void			DispatchMessage(BMessage* message, BHandler* handler);
+		virtual void	DispatchMessage(BMessage* message, BHandler* handler);
 
 	private:
 		void			_SendMessage();

src/apps/stylededit/ReplaceWindow.cpp

@@ -116,8 +116,10 @@ ReplaceWindow::_ChangeUI()
 	fBackSearchBox->SetEnabled(fUIchange);
 
 	fReplaceButton->SetEnabled(fUIchange);
-	fUIchange ? fReplaceButton->MakeDefault(true)
+	if (fUIchange)
-		: fReplaceAllButton->MakeDefault(true);
+		fReplaceButton->MakeDefault(true);
+	else
+		fReplaceAllButton->MakeDefault(true);
 
 	fUIchange = !fUIchange;
 }

src/apps/stylededit/ReplaceWindow.h

@@ -24,12 +24,12 @@ class BTextControl;
 
 class ReplaceWindow : public BWindow {
 	public:
-					ReplaceWindow(BRect frame, BHandler *_handler,
+						ReplaceWindow(BRect frame, BHandler *_handler,
-						BString *searchString, BString *replaceString,
+							BString *searchString, BString *replaceString,
-						bool caseState, bool wrapState, bool backState);
+							bool caseState, bool wrapState, bool backState);
 
-		void			MessageReceived(BMessage* message);
+		virtual void	MessageReceived(BMessage* message);
-		void 			DispatchMessage(BMessage* message, BHandler *handler);
+		virtual void	DispatchMessage(BMessage* message, BHandler *handler);
 
 	private:
 		void 			_SendMessage(uint32 what);

src/apps/stylededit/StyledEditApp.cpp

@@ -79,8 +79,8 @@ namespace
 
 
 StyledEditApp::StyledEditApp()
-	: BApplication(APP_SIGNATURE)
+	: BApplication(APP_SIGNATURE),
-	, fOpenPanel(NULL)
+	fOpenPanel(NULL)
 {
 	fOpenPanel = new BFilePanel();
 	BMenuBar *menuBar =

src/apps/stylededit/StyledEditApp.h

@@ -24,29 +24,29 @@ class StyledEditWindow;
 
 class StyledEditApp : public BApplication {
 	public:
-					StyledEditApp();
+						StyledEditApp();
-					~StyledEditApp();
+		virtual			~StyledEditApp();
 
-		void 		MessageReceived(BMessage *message);
+		virtual void	MessageReceived(BMessage *message);
-		void		RefsReceived(BMessage *message);
+		virtual void	RefsReceived(BMessage *message);
-		void		ReadyToRun();
+		virtual void	ReadyToRun();
 
-		void		DispatchMessage(BMessage *an_event, BHandler *handler);
+		virtual void	DispatchMessage(BMessage *an_event, BHandler *handler);
 
-		int32		NumberOfWindows();
+		int32			NumberOfWindows();
-		void		OpenDocument();
+		void			OpenDocument();
-		void		OpenDocument(entry_ref * ref);
+		void			OpenDocument(entry_ref *ref);
-		void		CloseDocument();
+		void			CloseDocument();
 
 	private:
-		void		ArgvReceivedEx(int32 argc, const char *argv[], const char * cwd);
+		void			ArgvReceivedEx(int32 argc, const char *argv[], const char * cwd);
 
 	private:
-		BFilePanel	*fOpenPanel;
+		BFilePanel		*fOpenPanel;
-		BMenu		*fOpenPanelEncodingMenu;
+		BMenu			*fOpenPanelEncodingMenu;
-		uint32		fOpenAsEncoding;
+		uint32			fOpenAsEncoding;
-		int32		fWindowCount;
+		int32			fWindowCount;
-		int32		fNextUntitledWindow;
+		int32			fNextUntitledWindow;
 		
 };
 

src/apps/stylededit/StyledEditView.h

@@ -17,16 +17,20 @@
 
 class BFile;
 class BHandler;
-class BMessanger;
+class BMessenger;
 
 
 class StyledEditView : public BTextView {
 	public:
-					StyledEditView(BRect viewframe, BRect textframe, 
+						StyledEditView(BRect viewframe, BRect textframe, 
-						BHandler *handler);
+							BHandler *handler);
-					~StyledEditView();
+		virtual			~StyledEditView();
 
-		void 		Select(int32 start, int32 finish);
+		virtual void	Select(int32 start, int32 finish);
+		virtual void	DeleteText(int32 start, int32 finish);
+		virtual void	FrameResized(float width, float height);
+		virtual void	InsertText(const char *text, int32 length, int32 offset, 
+							const text_run_array *runs = NULL);
 	
 		void		Reset();
 		status_t	GetStyledText(BPositionIO * stream);
@@ -36,11 +40,6 @@ class StyledEditView : public BTextView {
 		uint32 		GetEncoding() const;
 
 	private:
-		void		DeleteText(int32 start, int32 finish);
-		void		FrameResized(float width, float height);
-		void		InsertText(const char *text, int32 length, int32 offset, 
-					const text_run_array *runs = NULL);
-
 		BMessenger 	*fMessenger;
 		bool		fSuppressChanges;
 		BString		fEncoding;

src/apps/stylededit/StyledEditWindow.cpp

@@ -29,11 +29,11 @@
 #include <MenuItem.h>
 #include <PrintJob.h>
 #include <Rect.h>
+#include <Roster.h>
 #include <ScrollView.h>
 #include <TextControl.h>
 #include <TextView.h>
 #include <TranslationUtils.h>
-#include <Roster.h>
 
 #include <stdlib.h>
 

src/apps/stylededit/StyledEditWindow.h

@@ -30,12 +30,12 @@ class StyledEditWindow : public BWindow {
 	public:
 						StyledEditWindow(BRect frame, int32 id, uint32 encoding = 0);
 						StyledEditWindow(BRect frame, entry_ref *ref, uint32 encoding = 0);
-						~StyledEditWindow();
+		virtual			~StyledEditWindow();
 	
-		void			Quit();
+		virtual void	Quit();
-		bool			QuitRequested();
+		virtual bool	QuitRequested();
-		void			MessageReceived(BMessage *message);
+		virtual void	MessageReceived(BMessage *message);
-		void			MenusBeginning();
+		virtual void	MenusBeginning();
 
 		status_t		Save(BMessage *message = 0);
 		status_t		SaveAs(BMessage *message = 0);