From 2c10dd2caaebefa6fe118f82e484569a159091d5 Mon Sep 17 00:00:00 2001 From: Mike Fleetwood Date: Thu, 22 Nov 2018 19:44:42 +0000 Subject: [PATCH] Put Frame_Resizer_{Base,Extended} modules into GParted namespace (!20) All the other modules are in the GParted namespace, except for main() which has to be in the global namespace, so put these in the GParted namespace too. Closes !20 - Minor namespace and scope operator tidy-ups --- include/Frame_Resizer_Base.h | 8 ++++++++ include/Frame_Resizer_Extended.h | 8 ++++++++ src/Frame_Resizer_Base.cc | 7 +++++++ src/Frame_Resizer_Extended.cc | 7 +++++++ 4 files changed, 30 insertions(+) diff --git a/include/Frame_Resizer_Base.h b/include/Frame_Resizer_Base.h index 50c65890..28ff6381 100644 --- a/include/Frame_Resizer_Base.h +++ b/include/Frame_Resizer_Base.h @@ -22,6 +22,11 @@ #include #include + +namespace GParted +{ + + class Frame_Resizer_Base : public Gtk::Frame { public: @@ -87,4 +92,7 @@ private: }; + +} //GParted + #endif /* GPARTED_FRAME_RESIZER_BASE_H */ diff --git a/include/Frame_Resizer_Extended.h b/include/Frame_Resizer_Extended.h index 8d148c05..f767329c 100644 --- a/include/Frame_Resizer_Extended.h +++ b/include/Frame_Resizer_Extended.h @@ -20,6 +20,11 @@ #include "Frame_Resizer_Base.h" + +namespace GParted +{ + + class Frame_Resizer_Extended : public Frame_Resizer_Base { public: @@ -36,4 +41,7 @@ private: virtual void draw_partition(const Cairo::RefPtr& cr); }; + +} //GParted + #endif /* GPARTED_FRAME_RESIZER_EXTENDED_H */ diff --git a/src/Frame_Resizer_Base.cc b/src/Frame_Resizer_Base.cc index 99b9fb9c..7649ec36 100644 --- a/src/Frame_Resizer_Base.cc +++ b/src/Frame_Resizer_Base.cc @@ -20,6 +20,10 @@ #include +namespace GParted +{ + + Frame_Resizer_Base::Frame_Resizer_Base() { BORDER = 8 ; @@ -450,3 +454,6 @@ Frame_Resizer_Base::~Frame_Resizer_Base() delete cursor_resize; delete cursor_move; } + + +} //GParted diff --git a/src/Frame_Resizer_Extended.cc b/src/Frame_Resizer_Extended.cc index 9b4b771f..c1e80d9d 100644 --- a/src/Frame_Resizer_Extended.cc +++ b/src/Frame_Resizer_Extended.cc @@ -20,6 +20,10 @@ #include +namespace GParted +{ + + Frame_Resizer_Extended::Frame_Resizer_Extended() { } @@ -186,3 +190,6 @@ void Frame_Resizer_Extended::draw_partition(const Cairo::RefPtr& draw_resize_grip(cr, ARROW_LEFT); draw_resize_grip(cr, ARROW_RIGHT); } + + +} //GParted