From a1410c52e9b2979c0600917a8aad9e9925a71619 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 14 Feb 2011 22:00:58 +0000 Subject: [PATCH] renamed classes and filenames as per recommendations on ML; Interface singular for interface config; Interfaces plural for overall views/windows dealing with lists of interfaces; avoid using generic terms and abbreviations git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40498 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- ...ingsIfView.cpp => InterfaceAddressView.cpp} | 8 ++++---- ...SettingsIfView.h => InterfaceAddressView.h} | 15 ++++++++------- ...{SettingsWindow.cpp => InterfaceWindow.cpp} | 18 +++++++++--------- .../{SettingsWindow.h => InterfaceWindow.h} | 12 ++++++------ .../InterfacesAddOn/InterfacesAddOn.cpp | 4 ++-- .../kits/net/preflet/InterfacesAddOn/Jamfile | 4 ++-- 6 files changed, 31 insertions(+), 30 deletions(-) rename src/tests/kits/net/preflet/InterfacesAddOn/{SettingsIfView.cpp => InterfaceAddressView.cpp} (77%) rename src/tests/kits/net/preflet/InterfacesAddOn/{SettingsIfView.h => InterfaceAddressView.h} (51%) rename src/tests/kits/net/preflet/InterfacesAddOn/{SettingsWindow.cpp => InterfaceWindow.cpp} (78%) rename src/tests/kits/net/preflet/InterfacesAddOn/{SettingsWindow.h => InterfaceWindow.h} (75%) diff --git a/src/tests/kits/net/preflet/InterfacesAddOn/SettingsIfView.cpp b/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.cpp similarity index 77% rename from src/tests/kits/net/preflet/InterfacesAddOn/SettingsIfView.cpp rename to src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.cpp index 9ed11020eb..017a05123b 100644 --- a/src/tests/kits/net/preflet/InterfacesAddOn/SettingsIfView.cpp +++ b/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.cpp @@ -6,7 +6,7 @@ * Alexander von Gluck, kallisti5@unixzen.com */ -#include "SettingsIfView.h" +#include "InterfaceAddressView.h" #include "NetworkSettings.h" #include @@ -14,8 +14,8 @@ #include -SettingsIfView::SettingsIfView(BRect frame, const char* name, int family, - NetworkSettings* settings) +InterfaceAddressView::InterfaceAddressView(BRect frame, const char* name, + int family, NetworkSettings* settings) : BView(frame, name, B_FOLLOW_ALL_SIDES, 0), fSettings(settings), @@ -36,7 +36,7 @@ SettingsIfView::SettingsIfView(BRect frame, const char* name, int family, } -SettingsIfView::~SettingsIfView() +InterfaceAddressView::~InterfaceAddressView() { } diff --git a/src/tests/kits/net/preflet/InterfacesAddOn/SettingsIfView.h b/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.h similarity index 51% rename from src/tests/kits/net/preflet/InterfacesAddOn/SettingsIfView.h rename to src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.h index f4df690219..d28c019c96 100644 --- a/src/tests/kits/net/preflet/InterfacesAddOn/SettingsIfView.h +++ b/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.h @@ -6,8 +6,8 @@ * Alexander von Gluck, kallisti5@unixzen.com */ -#ifndef SETTINGS_IFVIEW_H -#define SETTINGS_IFVIEW_H +#ifndef INTERFACE_ADDRESS_VIEW_H +#define INTERFACE_ADDRESS_VIEW_H #include "NetworkSettings.h" @@ -15,11 +15,12 @@ #include -class SettingsIfView : public BView { +class InterfaceAddressView : public BView { public: - SettingsIfView(BRect frame, const char* name, - int family, NetworkSettings* settings); - virtual ~SettingsIfView(); + InterfaceAddressView(BRect frame, + const char* name, int family, + NetworkSettings* settings); + virtual ~InterfaceAddressView(); private: NetworkSettings* fSettings; @@ -27,5 +28,5 @@ private: }; -#endif /* SETTINGS_IFVIEW_H */ +#endif /* INTERFACE_ADDRESS_VIEW_H */ diff --git a/src/tests/kits/net/preflet/InterfacesAddOn/SettingsWindow.cpp b/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceWindow.cpp similarity index 78% rename from src/tests/kits/net/preflet/InterfacesAddOn/SettingsWindow.cpp rename to src/tests/kits/net/preflet/InterfacesAddOn/InterfaceWindow.cpp index 56f3860b85..0bb55ded82 100644 --- a/src/tests/kits/net/preflet/InterfacesAddOn/SettingsWindow.cpp +++ b/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceWindow.cpp @@ -7,8 +7,8 @@ */ -#include "SettingsWindow.h" -#include "SettingsIfView.h" +#include "InterfaceWindow.h" +#include "InterfaceAddressView.h" #include @@ -16,7 +16,7 @@ #define B_TRANSLATE_CONTEXT "NetworkSetupWindow" -SettingsWindow::SettingsWindow(NetworkSettings* settings) +InterfaceWindow::InterfaceWindow(NetworkSettings* settings) : BWindow(BRect(50, 50, 400, 302), "Interface Settings", B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE, @@ -51,13 +51,13 @@ SettingsWindow::SettingsWindow(NetworkSettings* settings) } -SettingsWindow::~SettingsWindow() +InterfaceWindow::~InterfaceWindow() { } void -SettingsWindow::MessageReceived(BMessage* message) +InterfaceWindow::MessageReceived(BMessage* message) { switch (message->what) { default: @@ -68,12 +68,12 @@ SettingsWindow::MessageReceived(BMessage* message) status_t -SettingsWindow::_PopulateTabs() +InterfaceWindow::_PopulateTabs() { BRect frame = fTabView->Bounds(); - BView* view4 = new SettingsIfView(frame, "net_settings_ipv4", + BView* view4 = new InterfaceAddressView(frame, "net_settings_ipv4", AF_INET, fNetworkSettings); - BView* view6 = new SettingsIfView(frame, "net_settings_ipv6", + BView* view6 = new InterfaceAddressView(frame, "net_settings_ipv6", AF_INET6, fNetworkSettings); BTab* tab4 = new BTab; @@ -90,7 +90,7 @@ SettingsWindow::_PopulateTabs() bool -SettingsWindow::QuitRequested() +InterfaceWindow::QuitRequested() { return true; } diff --git a/src/tests/kits/net/preflet/InterfacesAddOn/SettingsWindow.h b/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceWindow.h similarity index 75% rename from src/tests/kits/net/preflet/InterfacesAddOn/SettingsWindow.h rename to src/tests/kits/net/preflet/InterfacesAddOn/InterfaceWindow.h index 21133b7137..82ee5682de 100644 --- a/src/tests/kits/net/preflet/InterfacesAddOn/SettingsWindow.h +++ b/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceWindow.h @@ -7,8 +7,8 @@ */ -#ifndef SETTINGS_WINDOW_H -#define SETTINGS_WINDOW_H +#ifndef INTERFACE_WINDOW_H +#define INTERFACE_WINDOW_H #include "NetworkSettings.h" @@ -26,10 +26,10 @@ enum { }; -class SettingsWindow : public BWindow { +class InterfaceWindow : public BWindow { public: - SettingsWindow(NetworkSettings* settings); - virtual ~SettingsWindow(); + InterfaceWindow(NetworkSettings* settings); + virtual ~InterfaceWindow(); virtual bool QuitRequested(); virtual void MessageReceived(BMessage* mesage); @@ -43,5 +43,5 @@ private: }; -#endif /* SETTINGS_WINDOW_H */ +#endif /* INTERFACE_WINDOW_H */ diff --git a/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesAddOn.cpp b/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesAddOn.cpp index c71ce88d06..1b943fc33c 100644 --- a/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesAddOn.cpp +++ b/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesAddOn.cpp @@ -16,7 +16,7 @@ #include "InterfacesAddOn.h" #include "InterfacesListView.h" -#include "SettingsWindow.h" +#include "InterfaceWindow.h" #include @@ -137,7 +137,7 @@ InterfacesAddOn::MessageReceived(BMessage* msg) if (!item) break; - SettingsWindow* sw = new SettingsWindow(item->GetSettings()); + InterfaceWindow* sw = new InterfaceWindow(item->GetSettings()); sw->Show(); break; } diff --git a/src/tests/kits/net/preflet/InterfacesAddOn/Jamfile b/src/tests/kits/net/preflet/InterfacesAddOn/Jamfile index a1acd9190f..0c847ccf1b 100644 --- a/src/tests/kits/net/preflet/InterfacesAddOn/Jamfile +++ b/src/tests/kits/net/preflet/InterfacesAddOn/Jamfile @@ -17,8 +17,8 @@ Addon Interfaces : InterfacesAddOn.cpp InterfacesListView.cpp NetworkSettings.cpp - SettingsWindow.cpp - SettingsIfView.cpp + InterfaceWindow.cpp + InterfaceAddressView.cpp # from src/apps/networkstatus RadioView.cpp