From b40c9906279a60165875c8c968c4acca5d39de93 Mon Sep 17 00:00:00 2001 From: Ryan Leavengood Date: Wed, 5 Sep 2007 02:47:33 +0000 Subject: [PATCH] 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 | 4 +-- src/apps/stylededit/ColorMenuItem.h | 9 ++++--- src/apps/stylededit/FindWindow.h | 4 +-- src/apps/stylededit/ReplaceWindow.cpp | 6 +++-- src/apps/stylededit/ReplaceWindow.h | 10 ++++---- src/apps/stylededit/StyledEditApp.cpp | 4 +-- src/apps/stylededit/StyledEditApp.h | 32 ++++++++++++------------ src/apps/stylededit/StyledEditView.h | 19 +++++++------- src/apps/stylededit/StyledEditWindow.cpp | 2 +- src/apps/stylededit/StyledEditWindow.h | 10 ++++---- 10 files changed, 52 insertions(+), 48 deletions(-) diff --git a/src/apps/stylededit/ColorMenuItem.cpp b/src/apps/stylededit/ColorMenuItem.cpp index 52fb2eef95..923bdcd816 100644 --- a/src/apps/stylededit/ColorMenuItem.cpp +++ b/src/apps/stylededit/ColorMenuItem.cpp @@ -12,8 +12,8 @@ #include ColorMenuItem::ColorMenuItem(const char *label, rgb_color color, BMessage *message) - : BMenuItem(label, message, 0, 0) - , fItemColor(color) + : BMenuItem(label, message, 0, 0), + fItemColor(color) { } diff --git a/src/apps/stylededit/ColorMenuItem.h b/src/apps/stylededit/ColorMenuItem.h index c202d0c8e7..257d91cb78 100644 --- a/src/apps/stylededit/ColorMenuItem.h +++ b/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); - void DrawContent(); + ColorMenuItem(const char *label, rgb_color color, + BMessage *message); + + protected: + virtual void DrawContent(); private: - rgb_color fItemColor; + rgb_color fItemColor; }; #endif // COLOR_MENU_ITEM_H diff --git a/src/apps/stylededit/FindWindow.h b/src/apps/stylededit/FindWindow.h index b40d77c4ac..008c55ac4d 100644 --- a/src/apps/stylededit/FindWindow.h +++ b/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); - void DispatchMessage(BMessage* message, BHandler* handler); + virtual void MessageReceived(BMessage* message); + virtual void DispatchMessage(BMessage* message, BHandler* handler); private: void _SendMessage(); diff --git a/src/apps/stylededit/ReplaceWindow.cpp b/src/apps/stylededit/ReplaceWindow.cpp index dbcafa8edd..1e05cc84b8 100644 --- a/src/apps/stylededit/ReplaceWindow.cpp +++ b/src/apps/stylededit/ReplaceWindow.cpp @@ -116,8 +116,10 @@ ReplaceWindow::_ChangeUI() fBackSearchBox->SetEnabled(fUIchange); fReplaceButton->SetEnabled(fUIchange); - fUIchange ? fReplaceButton->MakeDefault(true) - : fReplaceAllButton->MakeDefault(true); + if (fUIchange) + fReplaceButton->MakeDefault(true); + else + fReplaceAllButton->MakeDefault(true); fUIchange = !fUIchange; } diff --git a/src/apps/stylededit/ReplaceWindow.h b/src/apps/stylededit/ReplaceWindow.h index 24ba46e65a..941363bd32 100644 --- a/src/apps/stylededit/ReplaceWindow.h +++ b/src/apps/stylededit/ReplaceWindow.h @@ -24,12 +24,12 @@ class BTextControl; class ReplaceWindow : public BWindow { public: - ReplaceWindow(BRect frame, BHandler *_handler, - BString *searchString, BString *replaceString, - bool caseState, bool wrapState, bool backState); + ReplaceWindow(BRect frame, BHandler *_handler, + BString *searchString, BString *replaceString, + bool caseState, bool wrapState, bool backState); - void MessageReceived(BMessage* message); - void DispatchMessage(BMessage* message, BHandler *handler); + virtual void MessageReceived(BMessage* message); + virtual void DispatchMessage(BMessage* message, BHandler *handler); private: void _SendMessage(uint32 what); diff --git a/src/apps/stylededit/StyledEditApp.cpp b/src/apps/stylededit/StyledEditApp.cpp index c1d7de41ce..663781fca6 100644 --- a/src/apps/stylededit/StyledEditApp.cpp +++ b/src/apps/stylededit/StyledEditApp.cpp @@ -79,8 +79,8 @@ namespace StyledEditApp::StyledEditApp() - : BApplication(APP_SIGNATURE) - , fOpenPanel(NULL) + : BApplication(APP_SIGNATURE), + fOpenPanel(NULL) { fOpenPanel = new BFilePanel(); BMenuBar *menuBar = diff --git a/src/apps/stylededit/StyledEditApp.h b/src/apps/stylededit/StyledEditApp.h index 5d87199bff..8026c24e31 100644 --- a/src/apps/stylededit/StyledEditApp.h +++ b/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); - void RefsReceived(BMessage *message); - void ReadyToRun(); + virtual void MessageReceived(BMessage *message); + virtual void RefsReceived(BMessage *message); + virtual void ReadyToRun(); - void DispatchMessage(BMessage *an_event, BHandler *handler); + virtual void DispatchMessage(BMessage *an_event, BHandler *handler); - int32 NumberOfWindows(); - void OpenDocument(); - void OpenDocument(entry_ref * ref); - void CloseDocument(); + int32 NumberOfWindows(); + void OpenDocument(); + void OpenDocument(entry_ref *ref); + 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; - BMenu *fOpenPanelEncodingMenu; - uint32 fOpenAsEncoding; - int32 fWindowCount; - int32 fNextUntitledWindow; + BFilePanel *fOpenPanel; + BMenu *fOpenPanelEncodingMenu; + uint32 fOpenAsEncoding; + int32 fWindowCount; + int32 fNextUntitledWindow; }; diff --git a/src/apps/stylededit/StyledEditView.h b/src/apps/stylededit/StyledEditView.h index b65218635a..9daa97757f 100644 --- a/src/apps/stylededit/StyledEditView.h +++ b/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, - BHandler *handler); - ~StyledEditView(); + StyledEditView(BRect viewframe, BRect textframe, + BHandler *handler); + 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; diff --git a/src/apps/stylededit/StyledEditWindow.cpp b/src/apps/stylededit/StyledEditWindow.cpp index 83ec2584e1..c14c6760f5 100644 --- a/src/apps/stylededit/StyledEditWindow.cpp +++ b/src/apps/stylededit/StyledEditWindow.cpp @@ -29,11 +29,11 @@ #include #include #include +#include #include #include #include #include -#include #include diff --git a/src/apps/stylededit/StyledEditWindow.h b/src/apps/stylededit/StyledEditWindow.h index f986a19e30..42776f2ba3 100644 --- a/src/apps/stylededit/StyledEditWindow.h +++ b/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(); - bool QuitRequested(); - void MessageReceived(BMessage *message); - void MenusBeginning(); + virtual void Quit(); + virtual bool QuitRequested(); + virtual void MessageReceived(BMessage *message); + virtual void MenusBeginning(); status_t Save(BMessage *message = 0); status_t SaveAs(BMessage *message = 0);