EasyTracker: Adding namespace. Reducing number of classes.

1 files changed, 4 insertions, 39 deletions

diff --git a/tracker-easy/module.cpp b/tracker-easy/module.cpp
index 0c360e80..c5751e6e 100644
--- a/tracker-easy/module.cpp
+++ b/tracker-easy/module.cpp
@@ -4,52 +4,17 @@
 #include "module.hpp"
 #include "cv-point-extractor.h"
 
-
 #include <memory>
 
-static const QString module_name = "tracker-easy";
-
-#ifdef __clang__
-#   pragma clang diagnostic ignored "-Wweak-vtables"
-#endif
-
-namespace pt_module {
-
-struct pt_module_traits final : IEasyTrackerTraits
-{
-    pointer<IPointExtractor> make_point_extractor() const override
-    {
-        return pointer<IPointExtractor>(new CvPointExtractor(module_name));
-    }
-
-    QString get_module_name() const override
-    {
-        return module_name;
-    }
-
-};
 
-struct tracker_pt : EasyTracker
-{
-    tracker_pt() : EasyTracker(pointer<IEasyTrackerTraits>(new pt_module_traits))
-    {
-    }
-};
 
-struct dialog_pt : EasyTrackerDialog
+namespace EasyTracker
 {
-    dialog_pt();
-};
 
-dialog_pt::dialog_pt() : EasyTrackerDialog(module_name) {}
-
-QString metadata_pt::name() { return tr("Easy Tracker 0.1"); }
-QIcon metadata_pt::icon() { return QIcon(":/Resources/Logo_IR.png"); }
+    QString Metadata::name() { return tr("Easy Tracker 0.1"); }
+    QIcon Metadata::icon() { return QIcon(":/Resources/Logo_IR.png"); }
 
 }
 
-// ns pt_module
-
-using namespace pt_module;
 
-OPENTRACK_DECLARE_TRACKER(tracker_pt, dialog_pt, metadata_pt)
+OPENTRACK_DECLARE_TRACKER(EasyTracker::Tracker, EasyTracker::Dialog, EasyTracker::Metadata)