CLEANUP: Put everything into a Overmix namespace

spillerrec · Sep 29, 2015 · ff51729 · ff51729
1 parent e430be6
commit ff51729
Show file tree

Hide file tree

Showing 102 changed files with 293 additions and 17 deletions.
diff --git a/src/ARenderPipe.hpp b/src/ARenderPipe.hpp
@@ -22,6 +22,8 @@
 
 #include <utility>
 
+namespace Overmix{
+
 class ARenderPipe{
 	private:
 		ImageEx cache;
@@ -57,4 +59,6 @@ class ARenderPipe{
 		virtual ~ARenderPipe(){ }
 };
 
+}
+
 #endif
diff --git a/src/Deteleciner.cpp b/src/Deteleciner.cpp
@@ -19,6 +19,8 @@
 #include "Deteleciner.hpp"
 #include "planes/ImageEx.hpp"
 
+using namespace Overmix;
+
 ImageEx Deteleciner::addInterlaced( ImageEx image ){
 	if( !frame.is_valid() ){
 		frame = image;

diff --git a/src/Deteleciner.hpp b/src/Deteleciner.hpp
@@ -20,6 +20,8 @@
 
 #include "planes/ImageEx.hpp"
 
+namespace Overmix{
+
 class Deteleciner{
 	private:
 		bool active{ false };
@@ -44,4 +46,6 @@ class Deteleciner{
 		ImageEx process( ImageEx img );
 };
 
+}
+
 #endif
diff --git a/src/Geometry.hpp b/src/Geometry.hpp
@@ -24,6 +24,8 @@
 #include <QSize>
 #include <QSizeF>
 
+namespace Overmix{
+
 template<typename T=int>
 struct Point{
 	T x{ 0 };
@@ -182,4 +184,6 @@ struct Rectangle{
 	}
 };
 
+}
+
 #endif
diff --git a/src/MultiPlaneIterator.cpp b/src/MultiPlaneIterator.cpp
@@ -22,6 +22,8 @@
 #include <climits>
 #include <algorithm>
 
+using namespace Overmix;
+
 
 MultiPlaneLineIterator::MultiPlaneLineIterator(
 		int y, int left, int right, const std::vector<PlaneItInfo> &infos, void *data

diff --git a/src/MultiPlaneIterator.hpp b/src/MultiPlaneIterator.hpp
@@ -27,6 +27,8 @@
 #include "color.hpp"
 #include "renders/ARender.hpp"
 
+namespace Overmix{
+
 struct PlaneItInfo{
 	Plane& p;
 	int x, y;
@@ -290,4 +292,6 @@ class MultiPlaneIterator{
 		}
 };
 
+}
+
 #endif
diff --git a/src/RenderOperations.hpp b/src/RenderOperations.hpp
@@ -21,6 +21,8 @@
 #include "ARenderPipe.hpp"
 #include "color.hpp"
 
+namespace Overmix{
+
 class RenderPipeScaling : public ARenderPipe{
 	private:
 		Point<double> size;
@@ -168,4 +170,6 @@ class RenderPipeThreshold : public ARenderPipe{
 		void setSize( int size ){ set( this->size, size ); }
 };
 
+}
+
 #endif
diff --git a/src/aligners/AImageAligner.cpp b/src/aligners/AImageAligner.cpp
@@ -23,6 +23,8 @@
 
 #include <fstream>
 
+using namespace Overmix;
+
 
 AImageAligner::AImageAligner( AContainer& container, AlignMethod method, double scale )
 	:	method(method), scale(scale), raw(false), container(container){

diff --git a/src/aligners/AImageAligner.hpp b/src/aligners/AImageAligner.hpp
@@ -24,6 +24,8 @@
 
 #include <vector>
 
+namespace Overmix{
+
 class AProcessWatcher;
 class ImageContainer;
 
@@ -110,4 +112,6 @@ class AImageAligner : public AContainer{
 		virtual void align( AProcessWatcher* watcher=nullptr ) = 0;
 };
 
+}
+
 #endif
diff --git a/src/aligners/AnimationSaver.cpp b/src/aligners/AnimationSaver.cpp
@@ -27,6 +27,7 @@
 #include <fstream>
 
 using namespace std;
+using namespace Overmix;
 
 //TODO: not needed, can be done with QString directly
 static QString numberZeroFill( int number, int digits ){

diff --git a/src/aligners/AnimationSaver.hpp b/src/aligners/AnimationSaver.hpp
@@ -24,6 +24,8 @@
 #include <vector>
 #include <utility>
 
+namespace Overmix{
+
 class ImageEx;
 
 class AnimationSaver{
@@ -60,4 +62,6 @@ class AnimationSaver{
 		void write();
 };
 
+}
+
 #endif
diff --git a/src/aligners/AnimationSeparator.cpp b/src/aligners/AnimationSeparator.cpp
@@ -27,6 +27,7 @@
 #include "../debug.hpp"
 
 using namespace std;
+using namespace Overmix;
 
 
 class AnimFrame{

diff --git a/src/aligners/AnimationSeparator.hpp b/src/aligners/AnimationSeparator.hpp
@@ -20,6 +20,8 @@
 
 #include "AImageAligner.hpp"
 
+namespace Overmix{
+
 class AnimationSeparator : public AImageAligner{
 	private:
 		double find_threshold( AProcessWatcher* watcher );
@@ -29,4 +31,6 @@ class AnimationSeparator : public AImageAligner{
 		virtual void align( AProcessWatcher* watcher=nullptr ) override;
 };
 
+}
+
 #endif
diff --git a/src/aligners/AverageAligner.cpp b/src/aligners/AverageAligner.cpp
@@ -19,6 +19,8 @@
 #include "AverageAligner.hpp"
 #include "../renders/AverageRender.hpp"
 
+using namespace Overmix;
+
 void AverageAligner::align( AProcessWatcher* watcher ){
 	if( count() == 0 )
 		return;

diff --git a/src/aligners/AverageAligner.hpp b/src/aligners/AverageAligner.hpp
@@ -20,11 +20,15 @@
 
 #include "AImageAligner.hpp"
 
+namespace Overmix{
+
 class AverageAligner : public AImageAligner{
 	public:
 		AverageAligner( AContainer& container, AlignMethod method, double scale=1.0 )
 			:	AImageAligner( container, method, scale ){ }
 		virtual void align( AProcessWatcher* watcher=nullptr ) override;
 };
 
+}
+
 #endif
diff --git a/src/aligners/FakeAligner.hpp b/src/aligners/FakeAligner.hpp
@@ -20,10 +20,14 @@
 
 #include "AImageAligner.hpp"
 
+namespace Overmix{
+
 class FakeAligner : public AImageAligner{
 	public:
 		FakeAligner( AContainer& container ) : AImageAligner( container, ALIGN_BOTH, 1.0 ){ }
 		virtual void align( AProcessWatcher* ) override{ resetPosition(); }
 };
 
+}
+
 #endif
diff --git a/src/aligners/FrameAligner.cpp b/src/aligners/FrameAligner.cpp
@@ -22,6 +22,8 @@
 #include "../containers/ImageContainer.hpp"
 #include "../containers/FrameContainer.hpp"
 
+using namespace Overmix;
+
 void FrameAligner::align( AProcessWatcher* watcher ){
 	auto frames = getFrames();
 	auto base_point = minPoint();

diff --git a/src/aligners/FrameAligner.hpp b/src/aligners/FrameAligner.hpp
@@ -20,11 +20,15 @@
 
 #include "AImageAligner.hpp"
 
+namespace Overmix{
+
 class FrameAligner : public AImageAligner{
 	public:
 		FrameAligner( AContainer& container, AlignMethod method, double scale=1.0 )
 			:	AImageAligner( container, method, scale ){ }
 		virtual void align( AProcessWatcher* watcher=nullptr ) override;
 };
 
+}
+
 #endif
diff --git a/src/aligners/ImageAligner.cpp b/src/aligners/ImageAligner.cpp
@@ -25,6 +25,8 @@
 #include <QDebug>
 #include <cmath>
 
+using namespace Overmix;
+
 
 void ImageAligner::on_add(){
 	//Compare this one against all other images

diff --git a/src/aligners/ImageAligner.hpp b/src/aligners/ImageAligner.hpp
@@ -20,6 +20,8 @@
 
 #include "AImageAligner.hpp"
 
+namespace Overmix{
+
 class ImageAligner : public AImageAligner{
 	protected:
 		std::vector<ImageOffset> offsets;
@@ -39,4 +41,6 @@ class ImageAligner : public AImageAligner{
 
 };
 
+}
+
 #endif
diff --git a/src/aligners/LayeredAligner.cpp b/src/aligners/LayeredAligner.cpp
@@ -19,6 +19,8 @@
 #include "LayeredAligner.hpp"
 #include "AverageAligner.hpp"
 
+using namespace Overmix;
+
 /*
 class InternAligner : public AverageAligner{
 	protected:

diff --git a/src/aligners/LayeredAligner.hpp b/src/aligners/LayeredAligner.hpp
@@ -20,11 +20,15 @@
 
 #include "AImageAligner.hpp"
 
+namespace Overmix{
+
 class LayeredAligner : public AImageAligner{
 	public:
 		LayeredAligner( AContainer& container, AlignMethod method, double scale=1.0 )
 			:	AImageAligner( container, method, scale ){ }
 		virtual void align( AProcessWatcher* watcher=nullptr ) override;
 };
 
+}
+
 #endif
diff --git a/src/aligners/LinearAligner.cpp b/src/aligners/LinearAligner.cpp
@@ -18,6 +18,8 @@
 
 #include "LinearAligner.hpp"
 
+using namespace Overmix;
+
 struct LinearFunc{
 	double x1 = 0.0, x2 = 0.0, xy = 0.0, y1 = 0.0;
 	unsigned n = 0;

diff --git a/src/aligners/LinearAligner.hpp b/src/aligners/LinearAligner.hpp
@@ -20,11 +20,15 @@
 
 #include "AImageAligner.hpp"
 
+namespace Overmix{
+
 class LinearAligner : public AImageAligner{
 	public:
 		LinearAligner( AContainer& container, AlignMethod method )
 			:	AImageAligner( container, method, 1.0 ){ }
 		virtual void align( AProcessWatcher* watcher=nullptr ) override;
 };
 
+}
+
 #endif
diff --git a/src/aligners/RecursiveAligner.cpp b/src/aligners/RecursiveAligner.cpp
@@ -22,6 +22,7 @@
 
 #include <limits>
 using namespace std;
+using namespace Overmix;
 
 static void copyLine( Plane& plane_out, const Plane& plane_in, unsigned y_out, unsigned y_in ){
 	auto out = plane_out.scan_line( y_out );
@@ -66,7 +67,7 @@ static Plane mergeVertical( const Plane& p1, const Plane& p2, int offset ){
 	return out;
 }
 
-class ImageGetter{
+class Overmix::ImageGetter{
 	private:
 		Plane p, a;
 		unsigned val;

diff --git a/src/aligners/RecursiveAligner.hpp b/src/aligners/RecursiveAligner.hpp
@@ -21,6 +21,8 @@
 #include "AImageAligner.hpp"
 #include <utility>
 
+namespace Overmix{
+
 class ImageGetter;
 
 class RecursiveAligner : public AImageAligner{
@@ -37,4 +39,6 @@ class RecursiveAligner : public AImageAligner{
 		virtual void align( AProcessWatcher* watcher=nullptr ) override;
 };
 
+}
+
 #endif
diff --git a/src/aligners/SuperResAligner.cpp b/src/aligners/SuperResAligner.cpp
@@ -19,6 +19,8 @@
 #include "SuperResAligner.hpp"
 #include "../renders/RobustSrRender.hpp"
 
+using namespace Overmix;
+
 
 void SuperResAligner::align( AProcessWatcher* watcher ){
 	auto base = RobustSrRender( local_scale ).render( *this, watcher );

diff --git a/src/aligners/SuperResAligner.hpp b/src/aligners/SuperResAligner.hpp
@@ -20,6 +20,8 @@
 
 #include "AImageAligner.hpp"
 
+namespace Overmix{
+
 class SuperResAligner : public AImageAligner{
 	private:
 		double local_scale;
@@ -29,4 +31,6 @@ class SuperResAligner : public AImageAligner{
 		virtual void align( AProcessWatcher* watcher=nullptr ) override;
 };
 
+}
+
 #endif
diff --git a/src/color.cpp b/src/color.cpp
@@ -19,6 +19,8 @@
 
 #include <vector>
 
+using namespace Overmix;
+
 static std::vector<color_type> generate_gamma(){
 	std::vector<color_type> temp( UINT16_MAX );