From 42d18a3a09d4ed26403c22e803ae9a0d12c46c58 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 30 Apr 2016 03:11:11 +0100 Subject: [PATCH] Remove namespace --- app/AboutDialog.cpp | 4 +--- app/AboutDialog.h | 4 ---- app/ConfigureFormatDialog.cpp | 4 +--- app/ConfigureFormatDialog.h | 4 ---- app/DialogSubWindowSelector.cpp | 4 ---- app/DialogSubWindowSelector.h | 4 ---- app/FramePropertiesDock.cpp | 4 +--- app/FramePropertiesDock.h | 4 ---- app/GridManager.cpp | 4 ---- app/GridManager.h | 4 ---- app/HistogramWidget.cpp | 4 +--- app/HistogramWidget.h | 6 +----- app/ModuleHandleDock.cpp | 4 +--- app/ModuleHandleDock.h | 4 ---- app/ModulesHandle.cpp | 4 +--- app/ModulesHandle.h | 4 ---- app/ModulesHandleOptDialog.cpp | 4 +--- app/ModulesHandleOptDialog.h | 4 ---- app/PlaYUVerApp.cpp | 4 +--- app/PlaYUVerApp.h | 4 ---- app/PlaYUVerAppAdaptor.cpp | 4 +--- app/PlaYUVerAppAdaptor.h | 4 ---- app/PlaYUVerAppDefs.h | 4 +--- app/PlaYUVerAppModuleIf.cpp | 4 +--- app/PlaYUVerAppModuleIf.h | 4 ---- app/PlaYUVerMdiSubWindow.cpp | 4 +--- app/PlaYUVerMdiSubWindow.h | 4 ---- app/PlaYUVerSubWindowHandle.cpp | 4 +--- app/PlaYUVerSubWindowHandle.h | 4 ---- app/PlotSubWindow.cpp | 4 +--- app/PlotSubWindow.h | 4 ---- app/ProgressBar.cpp | 4 +--- app/ProgressBar.h | 4 ---- app/QualityHandle.cpp | 4 +--- app/QualityHandle.h | 4 ---- app/QualityMeasurementSidebar.cpp | 4 +--- app/QualityMeasurementSidebar.h | 4 ---- app/SeekStreamDialog.cpp | 4 +--- app/SeekStreamDialog.h | 4 ---- app/SubWindowAbstract.cpp | 4 +--- app/SubWindowAbstract.h | 4 ---- app/VideoHandle.cpp | 4 +--- app/VideoHandle.h | 4 ---- app/VideoSubWindow.cpp | 17 ----------------- app/VideoSubWindow.h | 8 ++------ app/ViewArea.cpp | 4 ---- app/ViewArea.h | 4 ---- app/WidgetFrameNumber.cpp | 4 +--- app/WidgetFrameNumber.h | 4 ---- app/main.cpp | 2 -- .../modules/AbsoluteFrameDifference_APIv2.cpp | 4 +--- .../modules/AbsoluteFrameDifference_APIv2.h | 4 ---- examples/modules/FrameBinarization_APIv1.cpp | 4 +--- examples/modules/FrameBinarization_APIv1.h | 4 ---- lib/LibMemory.h | 4 +--- lib/PlaYUVerCmdParser.cpp | 4 +--- lib/PlaYUVerCmdParser.h | 6 +++--- lib/PlaYUVerDefs.h | 4 +--- lib/PlaYUVerFrame.cpp | 4 +--- lib/PlaYUVerFrame.h | 4 ---- lib/PlaYUVerFramePixelFormats.cpp | 4 +--- lib/PlaYUVerFramePixelFormats.h | 4 +--- lib/PlaYUVerModuleIf.h | 4 ---- lib/PlaYUVerPixel.cpp | 4 +--- lib/PlaYUVerPixel.h | 4 ---- lib/PlaYUVerProgramOptions.cpp | 4 +--- lib/PlaYUVerProgramOptions.h | 4 ---- lib/PlaYUVerStream.cpp | 4 +--- lib/PlaYUVerStream.h | 4 ---- lib/PlaYUVerStreamHandlerIf.h | 5 ----- lib/StreamHandlerLibav.cpp | 4 +--- lib/StreamHandlerLibav.h | 4 ---- lib/StreamHandlerOpenCV.cpp | 4 +--- lib/StreamHandlerOpenCV.h | 4 ---- lib/StreamHandlerPortableMap.cpp | 4 +--- lib/StreamHandlerPortableMap.h | 4 ---- lib/StreamHandlerRaw.cpp | 4 +--- lib/StreamHandlerRaw.h | 5 ----- modules/AbsoluteFrameDifference.cpp | 4 +--- modules/AbsoluteFrameDifference.h | 4 ---- modules/DisparityStereoBM.cpp | 4 +--- modules/DisparityStereoBM.h | 4 ---- modules/DisparityStereoSGBM.cpp | 4 +--- modules/DisparityStereoSGBM.h | 4 ---- modules/DisparityStereoVar.cpp | 4 +--- modules/DisparityStereoVar.h | 4 ---- modules/EightBitsSampling.cpp | 4 +--- modules/EightBitsSampling.h | 4 ---- modules/FilterComponent.cpp | 4 +--- modules/FilterComponent.h | 4 ---- modules/FrameBinarization.cpp | 4 +--- modules/FrameBinarization.h | 4 ---- modules/FrameCrop.cpp | 4 +--- modules/FrameCrop.h | 4 ---- modules/FrameDifference.cpp | 4 +--- modules/FrameDifference.h | 4 ---- modules/FrameMask.cpp | 4 +--- modules/FrameMask.h | 4 ---- modules/FrameShift.cpp | 4 +--- modules/FrameShift.h | 4 ---- modules/LumaAverage.cpp | 6 ------ modules/LumaAverage.h | 4 ---- modules/PlaYUVerModuleFactory.cpp | 4 +--- modules/PlaYUVerModuleFactory.h | 9 --------- modules/SetChromaHalfScale.cpp | 4 +--- modules/SetChromaHalfScale.h | 4 ---- modules/WeightedPSNR.cpp | 4 +--- modules/WeightedPSNR.h | 4 ---- tools/PlaYUVerTools.cpp | 4 +--- tools/PlaYUVerTools.h | 4 ---- tools/PlaYUVerToolsCmdParser.cpp | 4 +--- tools/PlaYUVerToolsCmdParser.h | 4 ---- tools/main.cpp | 2 -- 113 files changed, 58 insertions(+), 420 deletions(-) diff --git a/app/AboutDialog.cpp b/app/AboutDialog.cpp index c59d839..4774895 100644 --- a/app/AboutDialog.cpp +++ b/app/AboutDialog.cpp @@ -32,8 +32,6 @@ #include #include -namespace plaYUVer -{ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) @@ -79,4 +77,4 @@ AboutDialog::AboutDialog(QWidget *parent) setWindowTitle(tr("About %1").arg(QApplication::applicationName())); } -} // NAMESPACE + diff --git a/app/AboutDialog.h b/app/AboutDialog.h index 9c2ee60..d1a6cf9 100644 --- a/app/AboutDialog.h +++ b/app/AboutDialog.h @@ -28,8 +28,6 @@ #include -namespace plaYUVer -{ class AboutDialog : public QDialog { @@ -39,6 +37,4 @@ public: AboutDialog(QWidget *parent = 0); }; -} // NAMESPACE - #endif // __ABOUTDIALOG_H__ diff --git a/app/ConfigureFormatDialog.cpp b/app/ConfigureFormatDialog.cpp index 5affd47..0d717be 100644 --- a/app/ConfigureFormatDialog.cpp +++ b/app/ConfigureFormatDialog.cpp @@ -26,8 +26,6 @@ #include "lib/PlaYUVerFrame.h" #include "lib/PlaYUVerStream.h" -namespace plaYUVer -{ ConfigureFormatDialog::ConfigureFormatDialog( QWidget *parent ) : QDialog( parent ) @@ -386,4 +384,4 @@ Void ConfigureFormatDialog::slotBitsChange( Int idx ) } } -} // NAMESPACE + diff --git a/app/ConfigureFormatDialog.h b/app/ConfigureFormatDialog.h index f27e776..89edce5 100644 --- a/app/ConfigureFormatDialog.h +++ b/app/ConfigureFormatDialog.h @@ -37,8 +37,6 @@ class QPixmap; class QColor; -namespace plaYUVer -{ /** * @@ -76,6 +74,4 @@ private: }; -} // NAMESPACE - #endif // __CONFIGUREFORMATDIALOG_H__ diff --git a/app/DialogSubWindowSelector.cpp b/app/DialogSubWindowSelector.cpp index b5fd694..2bf40c3 100644 --- a/app/DialogSubWindowSelector.cpp +++ b/app/DialogSubWindowSelector.cpp @@ -28,8 +28,6 @@ #include "DialogSubWindowSelector.h" #include "VideoSubWindow.h" -namespace plaYUVer -{ DialogSubWindowSelector::DialogSubWindowSelector( QWidget *parent, PlaYUVerSubWindowHandle *windowManager, UInt uiCategory, Int minWindowsSelected, Int maxWindowsSelected ) : @@ -244,5 +242,3 @@ Void DialogSubWindowSelector::removeAllSubWindow() m_apcSelectedSubWindowList.clear(); update(); } - -} // Namespace SCode diff --git a/app/DialogSubWindowSelector.h b/app/DialogSubWindowSelector.h index d8f189e..c281b91 100644 --- a/app/DialogSubWindowSelector.h +++ b/app/DialogSubWindowSelector.h @@ -41,8 +41,6 @@ class QColor; class QCheckBox; class QGroupBox; -namespace plaYUVer -{ class PlaYUVerSubWindowHandle; class SubWindowAbstract; @@ -91,6 +89,4 @@ private Q_SLOTS: }; -} // NAMESPACE - #endif // __DIALOGSUBWINDOWSELECTOR_H__ diff --git a/app/FramePropertiesDock.cpp b/app/FramePropertiesDock.cpp index 544db11..8e56ad7 100644 --- a/app/FramePropertiesDock.cpp +++ b/app/FramePropertiesDock.cpp @@ -27,8 +27,6 @@ #include #include "FramePropertiesDock.h" -namespace plaYUVer -{ FramePropertiesDock::FramePropertiesDock( QWidget* parent, Bool* pbMainPlaySwitch ) : QWidget( parent ), @@ -617,5 +615,5 @@ Void FramePropertiesDock::slotUpdateIntervRange( Int range ) maxInterv->blockSignals( false ); } -} // NAMESPACE + diff --git a/app/FramePropertiesDock.h b/app/FramePropertiesDock.h index 0aa5374..45caaca 100644 --- a/app/FramePropertiesDock.h +++ b/app/FramePropertiesDock.h @@ -37,8 +37,6 @@ #include "lib/PlaYUVerFrame.h" #include "HistogramWidget.h" -namespace plaYUVer -{ class FramePropertiesDock: public QWidget { @@ -130,6 +128,4 @@ private Q_SLOTS: }; -} // NAMESPACE - #endif // __FRAMEPROPERTIESDOCK_H__ diff --git a/app/GridManager.cpp b/app/GridManager.cpp index 87c2355..01a5dba 100644 --- a/app/GridManager.cpp +++ b/app/GridManager.cpp @@ -34,8 +34,6 @@ #include "GridManager.h" -namespace plaYUVer -{ //////////////////////////////////////////////////////////////////////////////// // Constructor @@ -266,5 +264,3 @@ bool GridManager::isNear( const QPoint &pos ) { return isNear( pos.x(), pos.y() ); } - -} // NameSpace plaYUVer diff --git a/app/GridManager.h b/app/GridManager.h index 83c10d7..ea9d0bb 100644 --- a/app/GridManager.h +++ b/app/GridManager.h @@ -36,8 +36,6 @@ class QPoint; class QBitmap; class QPainter; -namespace plaYUVer -{ /** * @@ -102,6 +100,4 @@ private: QPoint m_nearPos; }; -} // NameSpace plaYUVer - #endif // __GRIDMANAGER_H__ diff --git a/app/HistogramWidget.cpp b/app/HistogramWidget.cpp index c2521c4..c470a25 100644 --- a/app/HistogramWidget.cpp +++ b/app/HistogramWidget.cpp @@ -31,8 +31,6 @@ #include #include "HistogramWidget.h" -namespace plaYUVer -{ class HistogramWorker: public QThread { @@ -1100,5 +1098,5 @@ Void HistogramWidget::slotMaxValueChanged( int max ) } } -} // NAMESPACE + diff --git a/app/HistogramWidget.h b/app/HistogramWidget.h index c4b0f6f..f58b3df 100644 --- a/app/HistogramWidget.h +++ b/app/HistogramWidget.h @@ -34,8 +34,6 @@ class QEvent; -namespace plaYUVer -{ class HistogramWorker; class HistogramWidgetPrivate; @@ -172,9 +170,7 @@ private: HistogramWidgetPrivate* d; }; -} - // NAMESPACE -Q_DECLARE_OPERATORS_FOR_FLAGS( plaYUVer::HistogramWidget::HistogramOptions ) +Q_DECLARE_OPERATORS_FOR_FLAGS( HistogramWidget::HistogramOptions ) #endif // __HISTOGRAMWIDGET_H__ diff --git a/app/ModuleHandleDock.cpp b/app/ModuleHandleDock.cpp index a524c66..df6d31f 100644 --- a/app/ModuleHandleDock.cpp +++ b/app/ModuleHandleDock.cpp @@ -27,8 +27,6 @@ #include "PlaYUVerAppModuleIf.h" #include "ModulesHandle.h" -namespace plaYUVer -{ ModuleHandleDock::ModuleHandleDock( QWidget* parent, PlaYUVerAppModuleIf* moduleIf ) : QWidget( parent ), @@ -90,5 +88,5 @@ QSize ModuleHandleDock::sizeHint() const return currSize; } -} // NAMESPACE + diff --git a/app/ModuleHandleDock.h b/app/ModuleHandleDock.h index 6f3514d..a8bfa3a 100644 --- a/app/ModuleHandleDock.h +++ b/app/ModuleHandleDock.h @@ -35,8 +35,6 @@ #endif -namespace plaYUVer -{ class PlaYUVerAppModuleIf; @@ -64,6 +62,4 @@ public Q_SLOTS: }; -} // NAMESPACE - #endif // __MODULEHANDLEDOCK_H__ diff --git a/app/ModulesHandle.cpp b/app/ModulesHandle.cpp index 0ddf6fa..f9fb0b9 100644 --- a/app/ModulesHandle.cpp +++ b/app/ModulesHandle.cpp @@ -32,8 +32,6 @@ #include "ModulesHandleOptDialog.h" #include "modules/PlaYUVerModuleFactory.h" -namespace plaYUVer -{ ModulesHandle::ModulesHandle( QWidget* parent, PlaYUVerSubWindowHandle *windowManager, VideoHandle *moduleVideo ) : QWidget( parent ), @@ -594,5 +592,5 @@ Void ModulesHandle::customEvent( QEvent *event ) } } -} // NAMESPACE + diff --git a/app/ModulesHandle.h b/app/ModulesHandle.h index 1fabdcb..f72892c 100644 --- a/app/ModulesHandle.h +++ b/app/ModulesHandle.h @@ -39,8 +39,6 @@ #include "PlaYUVerAppDefs.h" #include "lib/PlaYUVerFrame.h" -namespace plaYUVer -{ class VideoHandle; class PlaYUVerSubWindowHandle; @@ -116,7 +114,5 @@ private Q_SLOTS: }; -} // NAMESPACE - #endif // __MODULESHANDLE_H__ diff --git a/app/ModulesHandleOptDialog.cpp b/app/ModulesHandleOptDialog.cpp index 711c074..6dbeea3 100644 --- a/app/ModulesHandleOptDialog.cpp +++ b/app/ModulesHandleOptDialog.cpp @@ -30,8 +30,6 @@ #include #include -namespace plaYUVer -{ class OpionConfiguration: public QWidget { @@ -147,4 +145,4 @@ Int ModulesHandleOptDialog::runConfiguration() return QDialog::Accepted; } -} // NAMESPACE + diff --git a/app/ModulesHandleOptDialog.h b/app/ModulesHandleOptDialog.h index e44fdc0..cfdfda1 100644 --- a/app/ModulesHandleOptDialog.h +++ b/app/ModulesHandleOptDialog.h @@ -31,8 +31,6 @@ #include #include -namespace plaYUVer -{ class OpionConfiguration; @@ -51,6 +49,4 @@ private: QVector m_apcOptionList; }; -} // NAMESPACE - #endif // __MODULEHANDLEOPTDIALOG_H__ diff --git a/app/PlaYUVerApp.cpp b/app/PlaYUVerApp.cpp index 0dea8b6..dac2832 100644 --- a/app/PlaYUVerApp.cpp +++ b/app/PlaYUVerApp.cpp @@ -46,8 +46,6 @@ #define SYNCHRONISED_ZOON 1 -namespace plaYUVer -{ PlaYUVerApp::PlaYUVerApp() : m_pcCurrentSubWindow( NULL ), @@ -922,4 +920,4 @@ Void PlaYUVerApp::writeSettings() m_pcWindowHandle->writeSettings(); } -} // NAMESPACE + diff --git a/app/PlaYUVerApp.h b/app/PlaYUVerApp.h index 2d333ca..a83d450 100644 --- a/app/PlaYUVerApp.h +++ b/app/PlaYUVerApp.h @@ -54,8 +54,6 @@ class QActionGroup; class QAction; class QSignalMapper; -namespace plaYUVer -{ class PlaYUVerCmdParser; class PlaYUVerStream; @@ -237,7 +235,5 @@ private: AboutDialog* m_pcAboutDialog; }; -} // NAMESPACE - #endif // __PLAYUVERAPP_H__ diff --git a/app/PlaYUVerAppAdaptor.cpp b/app/PlaYUVerAppAdaptor.cpp index aaafa15..32801d8 100644 --- a/app/PlaYUVerAppAdaptor.cpp +++ b/app/PlaYUVerAppAdaptor.cpp @@ -26,8 +26,6 @@ #include "PlaYUVerAppAdaptor.h" #include "PlaYUVerApp.h" -namespace plaYUVer -{ PlaYUVerAppAdaptor::PlaYUVerAppAdaptor( PlaYUVerApp *app ) : QDBusAbstractAdaptor( app ), @@ -64,4 +62,4 @@ bool PlaYUVerAppAdaptor::loadFile( const QString& filename ) return true; } -} // NAMESPACE + diff --git a/app/PlaYUVerAppAdaptor.h b/app/PlaYUVerAppAdaptor.h index df7cd13..ab1f6c9 100644 --- a/app/PlaYUVerAppAdaptor.h +++ b/app/PlaYUVerAppAdaptor.h @@ -32,8 +32,6 @@ #include #include -namespace plaYUVer -{ #define PLAYUVER_DBUS_SESSION_NAME "org.pixlra.PlaYUVer.application" #define PLAYUVER_DBUS_PATH "/MainApplication" @@ -81,7 +79,5 @@ private: PlaYUVerApp *m_app; }; -} // NAMESPACE - #endif // __PlaYUVerAppAdaptor_H__ diff --git a/app/PlaYUVerAppDefs.h b/app/PlaYUVerAppDefs.h index 0c1af91..7d7f4b8 100644 --- a/app/PlaYUVerAppDefs.h +++ b/app/PlaYUVerAppDefs.h @@ -27,8 +27,6 @@ #include "lib/PlaYUVerDefs.h" -namespace plaYUVer -{ // ==================================================================================================================== // Qt compatibility redefinition @@ -42,6 +40,6 @@ namespace plaYUVer #endif -} // NAMESPACE + #endif // __PLAYUVERAPPDEFS_H__ diff --git a/app/PlaYUVerAppModuleIf.cpp b/app/PlaYUVerAppModuleIf.cpp index 00f60ef..65f0119 100644 --- a/app/PlaYUVerAppModuleIf.cpp +++ b/app/PlaYUVerAppModuleIf.cpp @@ -26,8 +26,6 @@ #include "VideoSubWindow.h" #include "VideoSubWindow.h" -namespace plaYUVer -{ PlaYUVerAppModuleIf::PlaYUVerAppModuleIf( QObject* parent, QAction* action, PlaYUVerModuleIf* module ) : m_bIsRunning( false ), @@ -219,5 +217,5 @@ Void PlaYUVerAppModuleIf::destroy() } -} // NAMESPACE + diff --git a/app/PlaYUVerAppModuleIf.h b/app/PlaYUVerAppModuleIf.h index f43f4be..58c6cbe 100644 --- a/app/PlaYUVerAppModuleIf.h +++ b/app/PlaYUVerAppModuleIf.h @@ -37,8 +37,6 @@ class QAction; -namespace plaYUVer -{ //#define PLAYUVER_THREADED_MODULES @@ -119,7 +117,5 @@ protected: virtual void run(); }; -} // NAMESPACE - #endif // __PLAYUVERAPPMODULESIF_H__ diff --git a/app/PlaYUVerMdiSubWindow.cpp b/app/PlaYUVerMdiSubWindow.cpp index 5783032..04aef7b 100644 --- a/app/PlaYUVerMdiSubWindow.cpp +++ b/app/PlaYUVerMdiSubWindow.cpp @@ -26,8 +26,6 @@ #include "PlaYUVerMdiSubWindow.h" #include "SubWindowAbstract.h" -namespace plaYUVer -{ PlaYUVerMdiSubWindow::PlaYUVerMdiSubWindow( QWidget *parent ) : QMdiSubWindow( parent ) @@ -51,4 +49,4 @@ Void PlaYUVerMdiSubWindow::closeEvent( QCloseEvent *event ) event->accept(); } -} // NAMESPACE + diff --git a/app/PlaYUVerMdiSubWindow.h b/app/PlaYUVerMdiSubWindow.h index aa1e202..e43b759 100644 --- a/app/PlaYUVerMdiSubWindow.h +++ b/app/PlaYUVerMdiSubWindow.h @@ -30,8 +30,6 @@ #include -namespace plaYUVer -{ class PlaYUVerMdiSubWindow: public QMdiSubWindow { @@ -48,7 +46,5 @@ protected: void closeEvent( QCloseEvent *event ); }; -} // NAMESPACE - #endif // __PLAYUVERMDISUBWINDOW_H__ diff --git a/app/PlaYUVerSubWindowHandle.cpp b/app/PlaYUVerSubWindowHandle.cpp index 07aa6fc..799839e 100644 --- a/app/PlaYUVerSubWindowHandle.cpp +++ b/app/PlaYUVerSubWindowHandle.cpp @@ -27,8 +27,6 @@ #include "PlaYUVerMdiSubWindow.h" #include "SubWindowAbstract.h" -namespace plaYUVer -{ class PlaYUVerMdiArea: public QMdiArea { @@ -578,4 +576,4 @@ Void PlaYUVerSubWindowHandle::writeSettings() appSettings.setValue( "SubWindowManager/SubWindowMode", m_iWindowMode ); } -} // NAMESPACE + diff --git a/app/PlaYUVerSubWindowHandle.h b/app/PlaYUVerSubWindowHandle.h index c167b74..614995e 100644 --- a/app/PlaYUVerSubWindowHandle.h +++ b/app/PlaYUVerSubWindowHandle.h @@ -33,8 +33,6 @@ #include #endif -namespace plaYUVer -{ class PlaYUVerApp; class SubWindowAbstract; @@ -128,6 +126,4 @@ Q_SIGNALS: }; -} // NAMESPACE - #endif // __PLAYUVERSUBWINDOWHANDLE_H__ diff --git a/app/PlotSubWindow.cpp b/app/PlotSubWindow.cpp index 8c1cb61..2fe23e9 100644 --- a/app/PlotSubWindow.cpp +++ b/app/PlotSubWindow.cpp @@ -25,8 +25,6 @@ #include "PlotSubWindow.h" #include "qcustomplot.h" -namespace plaYUVer -{ Void PlotSubWindow::definePlotColors() { @@ -241,4 +239,4 @@ Void PlotSubWindow::addPlot( const QVector &arrayX, const QVector #include -namespace plaYUVer -{ ProgressBar::ProgressBar( QWidget *parent, UInt maxValue ) : QWidget( parent ), @@ -61,4 +59,4 @@ Void ProgressBar::incrementProgress( UInt increment ) m_pcProgressBar->setValue( m_uiProgress ); update(); } -} // NAMESPACE + diff --git a/app/ProgressBar.h b/app/ProgressBar.h index bbdb0e5..e13184f 100644 --- a/app/ProgressBar.h +++ b/app/ProgressBar.h @@ -31,8 +31,6 @@ class QProgressBar; -namespace plaYUVer -{ class ProgressBar: public QWidget { @@ -49,6 +47,4 @@ private: QProgressBar* m_pcProgressBar; }; -} // NAMESPACE - #endif // __PROGRESSBAR_H__ diff --git a/app/QualityHandle.cpp b/app/QualityHandle.cpp index 10135c3..bb44c07 100644 --- a/app/QualityHandle.cpp +++ b/app/QualityHandle.cpp @@ -34,8 +34,6 @@ #include "QtConcurrent/qtconcurrentrun.h" #endif -namespace plaYUVer -{ QualityHandle::QualityHandle( QWidget* parent, PlaYUVerSubWindowHandle* windowManager ) : m_pcParet( parent ), @@ -330,5 +328,5 @@ Void QualityHandle::slotPlotQualitySeveral() } } -} // NAMESPACE + diff --git a/app/QualityHandle.h b/app/QualityHandle.h index 0c3e69a..328173d 100644 --- a/app/QualityHandle.h +++ b/app/QualityHandle.h @@ -36,8 +36,6 @@ #include "QFuture" #include "QualityMeasurementSidebar.h" -namespace plaYUVer -{ class PlaYUVerSubWindowHandle; class VideoSubWindow; @@ -94,6 +92,4 @@ private Q_SLOTS: void slotPlotQualitySeveral(); }; -} // NAMESPACE - #endif // __QUALITYMEASUREMENTSIDEBAR_H__ diff --git a/app/QualityMeasurementSidebar.cpp b/app/QualityMeasurementSidebar.cpp index fbceab4..59fd21b 100644 --- a/app/QualityMeasurementSidebar.cpp +++ b/app/QualityMeasurementSidebar.cpp @@ -27,8 +27,6 @@ #include "QualityMeasurementSidebar.h" #include "VideoSubWindow.h" -namespace plaYUVer -{ QualityMeasurementSidebar::QualityMeasurementSidebar( QWidget* parent, PlaYUVerSubWindowHandle *windowManager ) : QWidget( parent ), @@ -260,5 +258,5 @@ Void QualityMeasurementSidebar::slotQualityMetricChanged( Int idx ) //updateQualityMetric( idx ); } -} // NAMESPACE + diff --git a/app/QualityMeasurementSidebar.h b/app/QualityMeasurementSidebar.h index 8acd0c6..5d93cd5 100644 --- a/app/QualityMeasurementSidebar.h +++ b/app/QualityMeasurementSidebar.h @@ -37,8 +37,6 @@ #include "lib/PlaYUVerFrame.h" #include "HistogramWidget.h" -namespace plaYUVer -{ class PlaYUVerSubWindowHandle; class VideoSubWindow; @@ -87,6 +85,4 @@ private Q_SLOTS: }; -} // NAMESPACE - #endif // __QUALITYMEASUREMENTSIDEBAR_H__ diff --git a/app/SeekStreamDialog.cpp b/app/SeekStreamDialog.cpp index 20b3026..5221b72 100644 --- a/app/SeekStreamDialog.cpp +++ b/app/SeekStreamDialog.cpp @@ -30,8 +30,6 @@ #include #include -namespace plaYUVer -{ SeekStreamDialog::SeekStreamDialog( PlaYUVerStream *pcCurrStream, QWidget *parent ) : QDialog( parent, Qt::Dialog | Qt::WindowTitleHint ), @@ -83,4 +81,4 @@ Int SeekStreamDialog::runDialog() return m_iSelectedFrameNum; } -} // NAMESPACE + diff --git a/app/SeekStreamDialog.h b/app/SeekStreamDialog.h index 43e4c41..7eff039 100644 --- a/app/SeekStreamDialog.h +++ b/app/SeekStreamDialog.h @@ -31,8 +31,6 @@ #include #include -namespace plaYUVer -{ /** * @@ -49,6 +47,4 @@ private: Int m_iSelectedFrameNum; }; -} // NAMESPACE - #endif // __MODULEHANDLEOPTDIALOG_H__ diff --git a/app/SubWindowAbstract.cpp b/app/SubWindowAbstract.cpp index 730c585..d5197d1 100644 --- a/app/SubWindowAbstract.cpp +++ b/app/SubWindowAbstract.cpp @@ -30,8 +30,6 @@ #include "SubWindowAbstract.h" #include "PlaYUVerMdiSubWindow.h" -namespace plaYUVer -{ SubWindowAbstract::SubWindowAbstract( QWidget * parent, UInt category ) : QWidget( parent ), @@ -115,4 +113,4 @@ Void SubWindowAbstract::closeSubWindow() m_cSubWindow->close(); } -} // NAMESPACE + diff --git a/app/SubWindowAbstract.h b/app/SubWindowAbstract.h index 2352dfd..c8c90fb 100644 --- a/app/SubWindowAbstract.h +++ b/app/SubWindowAbstract.h @@ -48,8 +48,6 @@ class QHBoxLayout; class QFocusEvent; class QCloseEvent; -namespace plaYUVer -{ class PlaYUVerMdiSubWindow; @@ -175,7 +173,5 @@ public Q_SLOTS: }; -} // NAMESPACE - #endif // __SUBWINDOWABSTRACT_H__ diff --git a/app/VideoHandle.cpp b/app/VideoHandle.cpp index 0ca0c55..27871eb 100644 --- a/app/VideoHandle.cpp +++ b/app/VideoHandle.cpp @@ -41,8 +41,6 @@ #include #endif -namespace plaYUVer -{ VideoHandle::VideoHandle( QWidget* parent, PlaYUVerSubWindowHandle* windowManager ) : m_pcParet( parent ), @@ -776,5 +774,5 @@ Void VideoHandle::toggleGrid( Bool checked ) } } -} // NAMESPACE + diff --git a/app/VideoHandle.h b/app/VideoHandle.h index 0a2b99a..5fa5699 100644 --- a/app/VideoHandle.h +++ b/app/VideoHandle.h @@ -42,8 +42,6 @@ class QLabel; class QSlider; class QElapsedTimer; -namespace plaYUVer -{ class PlaYUVerSubWindowHandle; class SubWindowAbstract; @@ -150,6 +148,4 @@ private Q_SLOTS: }; -} // NAMESPACE - #endif // __VIDEOHANDLE_H__ diff --git a/app/VideoSubWindow.cpp b/app/VideoSubWindow.cpp index 449758e..3f2e68c 100644 --- a/app/VideoSubWindow.cpp +++ b/app/VideoSubWindow.cpp @@ -32,8 +32,6 @@ #include "QtConcurrent/qtconcurrentrun.h" #endif -namespace plaYUVer -{ /** * \brief Functions to control data stream from stream information @@ -946,18 +944,3 @@ Void VideoSubWindow::updatePixelValueStatusBar( const QPoint& pos ) } } } - -//Void VideoSubWindow::closeEvent( QCloseEvent *event ) -//{ -// Bool bAccept = m_bIsPlaying ? false : true; -// if( bAccept ) -// { -// event->accept(); -// } -// else -// { -// event->ignore(); -// } -//} - -}// NAMESPACE diff --git a/app/VideoSubWindow.h b/app/VideoSubWindow.h index 48e97a4..7de26cb 100644 --- a/app/VideoSubWindow.h +++ b/app/VideoSubWindow.h @@ -38,8 +38,6 @@ class QScrollArea; -namespace plaYUVer -{ class VideoInformation; class VideoSubWindow; @@ -263,10 +261,8 @@ public Q_SLOTS: void updatePixelValueStatusBar( const QPoint& pos ); }; -} // NAMESPACE - -Q_DECLARE_METATYPE( plaYUVer::PlaYUVerStreamInfo ); -Q_DECLARE_METATYPE( plaYUVer::PlaYUVerStreamInfoVector ); +Q_DECLARE_METATYPE( PlaYUVerStreamInfo ); +Q_DECLARE_METATYPE( PlaYUVerStreamInfoVector ); #endif // __VIDEOSUBWINDOW_H__ diff --git a/app/ViewArea.cpp b/app/ViewArea.cpp index 6f76928..f5a991c 100644 --- a/app/ViewArea.cpp +++ b/app/ViewArea.cpp @@ -39,8 +39,6 @@ #include "ViewArea.h" #include "GridManager.h" -namespace plaYUVer -{ static const QColor selectionColor = Qt::cyan; static const QColor imageMaskColor = Qt::green; @@ -1091,5 +1089,3 @@ Void ViewArea::updateMask( const QRect &rect ) ; } } - -} // NameSpace plaYUVer diff --git a/app/ViewArea.h b/app/ViewArea.h index 88eb48f..0b61acc 100644 --- a/app/ViewArea.h +++ b/app/ViewArea.h @@ -36,8 +36,6 @@ #include "GridManager.h" #include "lib/PlaYUVerFrame.h" -namespace plaYUVer -{ class PlaYUVerStream; @@ -208,6 +206,4 @@ private: }; -} // NameSpace plaYUVer - #endif // __VIEWAREA_H__ diff --git a/app/WidgetFrameNumber.cpp b/app/WidgetFrameNumber.cpp index fe711e5..4f7f4b0 100644 --- a/app/WidgetFrameNumber.cpp +++ b/app/WidgetFrameNumber.cpp @@ -31,8 +31,6 @@ #endif #include "WidgetFrameNumber.h" -namespace plaYUVer -{ WidgetFrameNumber::WidgetFrameNumber( QWidget *parent ) : QWidget( parent ) @@ -69,5 +67,5 @@ Void WidgetFrameNumber::clear() m_pcTotalFrameNumLabel->setText( "-" ); } -} // NAMESPACE + diff --git a/app/WidgetFrameNumber.h b/app/WidgetFrameNumber.h index a8afede..93619bf 100644 --- a/app/WidgetFrameNumber.h +++ b/app/WidgetFrameNumber.h @@ -35,8 +35,6 @@ #include #endif -namespace plaYUVer -{ class WidgetFrameNumber: public QWidget { @@ -51,6 +49,4 @@ private: }; -} // NAMESPACE - #endif // __WIDGETFRAMENUMBER_H__ diff --git a/app/main.cpp b/app/main.cpp index 73a7895..6f6cfee 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -34,8 +34,6 @@ #include "fvupdater.h" #endif -using namespace plaYUVer; - #if _WIN32 #pragma comment(linker, "/SUBSYSTEM:windows /ENTRY:mainCRTStartup") #endif diff --git a/examples/modules/AbsoluteFrameDifference_APIv2.cpp b/examples/modules/AbsoluteFrameDifference_APIv2.cpp index fecf27b..6b45546 100644 --- a/examples/modules/AbsoluteFrameDifference_APIv2.cpp +++ b/examples/modules/AbsoluteFrameDifference_APIv2.cpp @@ -25,8 +25,6 @@ #include "AbsoluteFrameDifference_APIv2.h" #include -namespace plaYUVer -{ REGISTER_CLASS_MAKER( AbsoluteFrameDifference ) @@ -80,5 +78,5 @@ Void AbsoluteFrameDifference::destroy() m_pcFrameDifference = NULL; } -} // NAMESPACE + diff --git a/examples/modules/AbsoluteFrameDifference_APIv2.h b/examples/modules/AbsoluteFrameDifference_APIv2.h index d685c97..a1e987b 100644 --- a/examples/modules/AbsoluteFrameDifference_APIv2.h +++ b/examples/modules/AbsoluteFrameDifference_APIv2.h @@ -29,8 +29,6 @@ #include -namespace plaYUVer -{ class AbsoluteFrameDifference: public PlaYUVerModuleIf { @@ -50,7 +48,5 @@ public: }; -} // NAMESPACE - #endif // __FRAMEDIFFERENCE_H__ diff --git a/examples/modules/FrameBinarization_APIv1.cpp b/examples/modules/FrameBinarization_APIv1.cpp index 37b17bb..6fee1ee 100644 --- a/examples/modules/FrameBinarization_APIv1.cpp +++ b/examples/modules/FrameBinarization_APIv1.cpp @@ -24,8 +24,6 @@ #include "FrameBinarization_APIv1.h" -namespace plaYUVer -{ REGISTER_CLASS_MAKER( FrameBinarization ) @@ -71,5 +69,5 @@ Void FrameBinarization::destroy() m_pcBinFrame = NULL; } -} // NAMESPACE + diff --git a/examples/modules/FrameBinarization_APIv1.h b/examples/modules/FrameBinarization_APIv1.h index e7f4cdf..1de89cf 100644 --- a/examples/modules/FrameBinarization_APIv1.h +++ b/examples/modules/FrameBinarization_APIv1.h @@ -27,8 +27,6 @@ #include "PlaYUVerModuleIf.h" -namespace plaYUVer -{ class FrameBinarization: public PlaYUVerModuleIf { @@ -48,7 +46,5 @@ public: }; -} // NAMESPACE - #endif // __FRAMEBINARIZATION_H__ diff --git a/lib/LibMemory.h b/lib/LibMemory.h index b7ab838..c3e1076 100644 --- a/lib/LibMemory.h +++ b/lib/LibMemory.h @@ -30,8 +30,6 @@ #include #include -namespace plaYUVer -{ typedef void Void; typedef char Char; @@ -233,6 +231,6 @@ Void freeMem3ImageComponents( T*** array3D ) } } -} // NAMESPACE + #endif // __LIBMEMORY_H__ diff --git a/lib/PlaYUVerCmdParser.cpp b/lib/PlaYUVerCmdParser.cpp index da0832f..07e5172 100644 --- a/lib/PlaYUVerCmdParser.cpp +++ b/lib/PlaYUVerCmdParser.cpp @@ -30,8 +30,6 @@ #include "PlaYUVerCmdParser.h" #include "PlaYUVerFrame.h" -namespace plaYUVer -{ PlaYUVerCmdParser::PlaYUVerCmdParser() { @@ -139,4 +137,4 @@ Bool PlaYUVerCmdParser::checkListingOpts() return bRet; } -} // NAMESPACE + diff --git a/lib/PlaYUVerCmdParser.h b/lib/PlaYUVerCmdParser.h index 3bc5246..95f21d6 100644 --- a/lib/PlaYUVerCmdParser.h +++ b/lib/PlaYUVerCmdParser.h @@ -25,8 +25,8 @@ #include "PlaYUVerDefs.h" #include "PlaYUVerProgramOptions.h" -namespace plaYUVer -{ +#ifndef __PLAYUVERCMDPARSER_H__ +#define __PLAYUVERCMDPARSER_H__ class PlaYUVerCmdParser { @@ -53,4 +53,4 @@ private: Void listModules(); }; -} // NAMESPACE +#endif // __PLAYUVERCMDPARSER_H__ diff --git a/lib/PlaYUVerDefs.h b/lib/PlaYUVerDefs.h index e0e3fcc..e029da2 100644 --- a/lib/PlaYUVerDefs.h +++ b/lib/PlaYUVerDefs.h @@ -29,8 +29,6 @@ #include #include -namespace plaYUVer -{ // ==================================================================================================================== // Basic type redefinition @@ -134,6 +132,6 @@ inline std::string uppercase( const std::string& in ) return out; } -} // NAMESPACE + #endif // __PLAYUVERDEFS_H__ diff --git a/lib/PlaYUVerFrame.cpp b/lib/PlaYUVerFrame.cpp index d9f54d3..48ef1cd 100644 --- a/lib/PlaYUVerFrame.cpp +++ b/lib/PlaYUVerFrame.cpp @@ -36,8 +36,6 @@ #include "StreamHandlerOpenCV.h" #endif -namespace plaYUVer -{ std::vector PlaYUVerFrame::supportedColorSpacesListNames() { @@ -1172,5 +1170,5 @@ Double PlaYUVerFrame::getSSIM( PlaYUVerFrame* Org, Int component ) return dSSIM; } -} // NAMESPACE + diff --git a/lib/PlaYUVerFrame.h b/lib/PlaYUVerFrame.h index 320c1f6..2eb4fb6 100644 --- a/lib/PlaYUVerFrame.h +++ b/lib/PlaYUVerFrame.h @@ -39,8 +39,6 @@ namespace cv class Mat; } -namespace plaYUVer -{ struct PlaYUVerPixFmtDescriptor; @@ -339,6 +337,4 @@ private: Void FrametoRGB8Pixfc(); }; -} // NAMESPACE - #endif // __PLAYUVERFRAME_H__ diff --git a/lib/PlaYUVerFramePixelFormats.cpp b/lib/PlaYUVerFramePixelFormats.cpp index aff995a..3ee8b12 100644 --- a/lib/PlaYUVerFramePixelFormats.cpp +++ b/lib/PlaYUVerFramePixelFormats.cpp @@ -36,8 +36,6 @@ #endif #include "PlaYUVerFramePixelFormats.h" -namespace plaYUVer -{ /* ************************************************************** @@ -319,4 +317,4 @@ PlaYUVerPixFmtDescriptor g_PlaYUVerPixFmtDescriptorsList[PLAYUVER_NUMBER_FORMATS RGB24, BGR24, }; -} // NAMESPACE + diff --git a/lib/PlaYUVerFramePixelFormats.h b/lib/PlaYUVerFramePixelFormats.h index ed90e4e..5dfe062 100644 --- a/lib/PlaYUVerFramePixelFormats.h +++ b/lib/PlaYUVerFramePixelFormats.h @@ -30,8 +30,6 @@ #include "PlaYUVerFrame.h" #include "PlaYUVerPixel.h" -namespace plaYUVer -{ #define CHROMA_RESAMPLING( X ) ( ( ( X + 1 ) >> 1 ) << 1 ) @@ -147,6 +145,6 @@ typedef struct PlaYUVerPixFmtDescriptor #define PLAYUVER_NUMBER_FORMATS 7 extern PlaYUVerPixFmtDescriptor g_PlaYUVerPixFmtDescriptorsList[PLAYUVER_NUMBER_FORMATS]; -} // NAMESPACE + #endif // __PLAYUVERFRAMEPIXELFORMATS_H__ diff --git a/lib/PlaYUVerModuleIf.h b/lib/PlaYUVerModuleIf.h index ce614dd..b7cf31f 100644 --- a/lib/PlaYUVerModuleIf.h +++ b/lib/PlaYUVerModuleIf.h @@ -31,8 +31,6 @@ #include "PlaYUVerProgramOptions.h" #include -namespace plaYUVer -{ #define REGISTER_CLASS_MAKER(X) \ extern "C" PlaYUVerModuleIf* Maker() { return new X; } @@ -156,7 +154,5 @@ public: }; -} // NAMESPACE - #endif // __PLAYUVERMODULESIF_H__ diff --git a/lib/PlaYUVerPixel.cpp b/lib/PlaYUVerPixel.cpp index 7bd7051..dc91280 100644 --- a/lib/PlaYUVerPixel.cpp +++ b/lib/PlaYUVerPixel.cpp @@ -28,8 +28,6 @@ #include "PlaYUVerFrame.h" #include "PlaYUVerPixel.h" -namespace plaYUVer -{ PlaYUVerPixel::PlaYUVerPixel() { @@ -101,4 +99,4 @@ PlaYUVerPixel PlaYUVerPixel::ConvertPixel( ColorSpace eOutputSpace ) return outPixel; } -} // NAMESPACE + diff --git a/lib/PlaYUVerPixel.h b/lib/PlaYUVerPixel.h index 72b024f..34f43bf 100644 --- a/lib/PlaYUVerPixel.h +++ b/lib/PlaYUVerPixel.h @@ -32,8 +32,6 @@ #include #include "PlaYUVerDefs.h" -namespace plaYUVer -{ #define CLAMP_YUV2RGB(X) X = X < 0 ? 0 : X > 255 ? 255 : X; #define YUV2RGB( iY, iU, iV, iR, iG, iB ) \ @@ -143,6 +141,4 @@ private: }; -} // NAMESPACE - #endif // __PLAYUVERPIXEL_H__ diff --git a/lib/PlaYUVerProgramOptions.cpp b/lib/PlaYUVerProgramOptions.cpp index a7ee257..b63ac32 100644 --- a/lib/PlaYUVerProgramOptions.cpp +++ b/lib/PlaYUVerProgramOptions.cpp @@ -48,8 +48,6 @@ using namespace std; -namespace plaYUVer -{ Options::Options( const std::string& name ) { @@ -491,5 +489,5 @@ Void Options::doHelp( ostream& out, unsigned columns ) } } -} // NAMESPACE + diff --git a/lib/PlaYUVerProgramOptions.h b/lib/PlaYUVerProgramOptions.h index b1ce0b9..b45792d 100644 --- a/lib/PlaYUVerProgramOptions.h +++ b/lib/PlaYUVerProgramOptions.h @@ -47,8 +47,6 @@ #include #include "PlaYUVerDefs.h" -namespace plaYUVer -{ struct Options; @@ -381,6 +379,4 @@ private: Options& parent; }; -} // NAMESPACE - #endif // __PROGRAMOPTIONS_H__ diff --git a/lib/PlaYUVerStream.cpp b/lib/PlaYUVerStream.cpp index dc80121..d55a141 100644 --- a/lib/PlaYUVerStream.cpp +++ b/lib/PlaYUVerStream.cpp @@ -39,8 +39,6 @@ #include "StreamHandlerOpenCV.h" #endif -namespace plaYUVer -{ std::vector PlaYUVerStream::supportedReadFormats() { @@ -605,4 +603,4 @@ Bool PlaYUVerStream::seekInput( UInt64 new_frame_num ) return true; } -} // NAMESPACE + diff --git a/lib/PlaYUVerStream.h b/lib/PlaYUVerStream.h index c382a70..c785740 100644 --- a/lib/PlaYUVerStream.h +++ b/lib/PlaYUVerStream.h @@ -32,8 +32,6 @@ #include #include "PlaYUVerFrame.h" -namespace plaYUVer -{ class LibOpenCVHandler; class PlaYUVerStreamHandlerIf; @@ -166,6 +164,4 @@ private: }; -} // NAMESPACE - #endif // __PLAYUVERSTREAM_H__ diff --git a/lib/PlaYUVerStreamHandlerIf.h b/lib/PlaYUVerStreamHandlerIf.h index 1271b8b..952b232 100644 --- a/lib/PlaYUVerStreamHandlerIf.h +++ b/lib/PlaYUVerStreamHandlerIf.h @@ -29,8 +29,6 @@ #include "PlaYUVerStream.h" #include "PlaYUVerFrame.h" -namespace plaYUVer -{ #define REGISTER_STREAM_HANDLER(X) \ public: \ @@ -97,8 +95,5 @@ protected: std::string m_strCodecName; }; - -} // NAMESPACE - #endif // __PLAYUVERSTREAMHANDLERIF_H__ diff --git a/lib/StreamHandlerLibav.cpp b/lib/StreamHandlerLibav.cpp index 42bc15c..700a42a 100644 --- a/lib/StreamHandlerLibav.cpp +++ b/lib/StreamHandlerLibav.cpp @@ -29,8 +29,6 @@ #include "PlaYUVerFramePixelFormats.h" #include "LibMemory.h" -namespace plaYUVer -{ std::vector StreamHandlerLibav::supportedReadFormats() { @@ -381,4 +379,4 @@ Bool StreamHandlerLibav::seek( UInt64 iFrameNum ) return true; } -} // NAMESPACE + diff --git a/lib/StreamHandlerLibav.h b/lib/StreamHandlerLibav.h index 512f674..68cb592 100644 --- a/lib/StreamHandlerLibav.h +++ b/lib/StreamHandlerLibav.h @@ -51,8 +51,6 @@ extern "C" #include "PlaYUVerStream.h" #include "PlaYUVerStreamHandlerIf.h" -namespace plaYUVer -{ class StreamHandlerLibav: public PlaYUVerStreamHandlerIf { @@ -103,6 +101,4 @@ private: Bool decodeVideoPkt(); }; -} // NAMESPACE - #endif // __LIBAVCONTEXTHANDLE_H__ diff --git a/lib/StreamHandlerOpenCV.cpp b/lib/StreamHandlerOpenCV.cpp index bb305a9..10635c4 100644 --- a/lib/StreamHandlerOpenCV.cpp +++ b/lib/StreamHandlerOpenCV.cpp @@ -31,8 +31,6 @@ using namespace cv; -namespace plaYUVer -{ std::vector StreamHandlerOpenCV::supportedReadFormats() { @@ -155,4 +153,4 @@ Bool StreamHandlerOpenCV::write( PlaYUVerFrame* pcFrame ) return bRet; } -} // NAMESPACE + diff --git a/lib/StreamHandlerOpenCV.h b/lib/StreamHandlerOpenCV.h index cc177d9..3a29b66 100644 --- a/lib/StreamHandlerOpenCV.h +++ b/lib/StreamHandlerOpenCV.h @@ -38,8 +38,6 @@ namespace cv class VideoCapture; } -namespace plaYUVer -{ class PlaYUVerFrame; @@ -70,6 +68,4 @@ private: cv::Mat* pcMat; }; -} // NAMESPACE - #endif // __STREAMHANDLEROPENCV_H__ diff --git a/lib/StreamHandlerPortableMap.cpp b/lib/StreamHandlerPortableMap.cpp index e1f4e0f..6ff1600 100644 --- a/lib/StreamHandlerPortableMap.cpp +++ b/lib/StreamHandlerPortableMap.cpp @@ -30,8 +30,6 @@ #include "PlaYUVerFramePixelFormats.h" #include "LibMemory.h" -namespace plaYUVer -{ Bool StreamHandlerPortableMap::openHandler( std::string strFilename, Bool bInput ) { @@ -141,4 +139,4 @@ Bool StreamHandlerPortableMap::write( PlaYUVerFrame* pcFrame ) return true; } -} // NAMESPACE + diff --git a/lib/StreamHandlerPortableMap.h b/lib/StreamHandlerPortableMap.h index 666d219..5bb8829 100644 --- a/lib/StreamHandlerPortableMap.h +++ b/lib/StreamHandlerPortableMap.h @@ -33,8 +33,6 @@ #include "PlaYUVerStream.h" #include "PlaYUVerStreamHandlerIf.h" -namespace plaYUVer -{ class PlaYUVerFrame; @@ -60,6 +58,4 @@ private: Int m_iMaxValue; }; -} // NAMESPACE - #endif // __STREAMHANDLERPORTABLEMAP_H__ diff --git a/lib/StreamHandlerRaw.cpp b/lib/StreamHandlerRaw.cpp index 47e6adb..0781313 100644 --- a/lib/StreamHandlerRaw.cpp +++ b/lib/StreamHandlerRaw.cpp @@ -29,8 +29,6 @@ #include "PlaYUVerFramePixelFormats.h" #include "LibMemory.h" -namespace plaYUVer -{ Bool PlaYUVerRawHandler::openHandler( std::string strFilename, Bool bInput ) { @@ -96,4 +94,4 @@ Bool PlaYUVerRawHandler::write( PlaYUVerFrame* pcFrame ) return true; } -} // NAMESPACE + diff --git a/lib/StreamHandlerRaw.h b/lib/StreamHandlerRaw.h index 13f806b..4ad8bc6 100644 --- a/lib/StreamHandlerRaw.h +++ b/lib/StreamHandlerRaw.h @@ -28,8 +28,6 @@ #include "PlaYUVerDefs.h" #include "PlaYUVerStreamHandlerIf.h" -namespace plaYUVer -{ /** * \class PlaYUVerRawHandler @@ -58,8 +56,5 @@ public: }; - -} // NAMESPACE - #endif // __STREAMHANDLERRAW_H__ diff --git a/modules/AbsoluteFrameDifference.cpp b/modules/AbsoluteFrameDifference.cpp index 28d5add..0792e57 100644 --- a/modules/AbsoluteFrameDifference.cpp +++ b/modules/AbsoluteFrameDifference.cpp @@ -25,8 +25,6 @@ #include "AbsoluteFrameDifference.h" #include -namespace plaYUVer -{ AbsoluteFrameDifference::AbsoluteFrameDifference() { @@ -83,5 +81,5 @@ Void AbsoluteFrameDifference::destroy() m_pcFrameDifference = NULL; } -} // NAMESPACE + diff --git a/modules/AbsoluteFrameDifference.h b/modules/AbsoluteFrameDifference.h index 39f51de..5f2aa34 100644 --- a/modules/AbsoluteFrameDifference.h +++ b/modules/AbsoluteFrameDifference.h @@ -29,8 +29,6 @@ #include -namespace plaYUVer -{ class AbsoluteFrameDifference: public PlaYUVerModuleIf { @@ -50,7 +48,5 @@ public: }; -} // NAMESPACE - #endif // __FRAMEDIFFERENCE_H__ diff --git a/modules/DisparityStereoBM.cpp b/modules/DisparityStereoBM.cpp index eed79a6..ffdbae7 100644 --- a/modules/DisparityStereoBM.cpp +++ b/modules/DisparityStereoBM.cpp @@ -26,8 +26,6 @@ #include "DisparityStereoBM.h" -namespace plaYUVer -{ DisparityStereoBM::DisparityStereoBM() { @@ -110,5 +108,5 @@ Void DisparityStereoBM::destroy() m_pcDisparityFrame = NULL; } -} // NAMESPACE + diff --git a/modules/DisparityStereoBM.h b/modules/DisparityStereoBM.h index 32f863b..247d5d8 100644 --- a/modules/DisparityStereoBM.h +++ b/modules/DisparityStereoBM.h @@ -31,8 +31,6 @@ #include -namespace plaYUVer -{ class DisparityStereoBM: public PlaYUVerModuleIf { @@ -59,7 +57,5 @@ public: Void destroy(); }; -} // NAMESPACE - #endif // __DISPARITYSTEREOBM_H__ diff --git a/modules/DisparityStereoSGBM.cpp b/modules/DisparityStereoSGBM.cpp index a34dbe4..064dc1a 100644 --- a/modules/DisparityStereoSGBM.cpp +++ b/modules/DisparityStereoSGBM.cpp @@ -26,8 +26,6 @@ #include "DisparityStereoSGBM.h" -namespace plaYUVer -{ DisparityStereoSGBM::DisparityStereoSGBM() { @@ -117,5 +115,5 @@ Void DisparityStereoSGBM::destroy() m_pcDisparityFrame = NULL; } -} // NAMESPACE + diff --git a/modules/DisparityStereoSGBM.h b/modules/DisparityStereoSGBM.h index a1adfbd..074b816 100644 --- a/modules/DisparityStereoSGBM.h +++ b/modules/DisparityStereoSGBM.h @@ -43,8 +43,6 @@ #include -namespace plaYUVer -{ class DisparityStereoSGBM: public PlaYUVerModuleIf { @@ -72,7 +70,5 @@ public: Void destroy(); }; -} // NAMESPACE - #endif // __DISPARITYSTEREOSGBM_H__ diff --git a/modules/DisparityStereoVar.cpp b/modules/DisparityStereoVar.cpp index 55159ef..b1e8764 100644 --- a/modules/DisparityStereoVar.cpp +++ b/modules/DisparityStereoVar.cpp @@ -26,8 +26,6 @@ #include "DisparityStereoVar.h" -namespace plaYUVer -{ DisparityStereoVar::DisparityStereoVar() { @@ -85,5 +83,5 @@ Void DisparityStereoVar::destroy() m_pcDisparityFrame = NULL; } -} // NAMESPACE + diff --git a/modules/DisparityStereoVar.h b/modules/DisparityStereoVar.h index 57872d6..66c1f85 100644 --- a/modules/DisparityStereoVar.h +++ b/modules/DisparityStereoVar.h @@ -31,8 +31,6 @@ #include -namespace plaYUVer -{ class DisparityStereoVar: public PlaYUVerModuleIf { @@ -52,7 +50,5 @@ public: Void destroy(); }; -} // NAMESPACE - #endif // __DISPARITYSTEREOVAR_H__ diff --git a/modules/EightBitsSampling.cpp b/modules/EightBitsSampling.cpp index 0f3ea38..e77635e 100644 --- a/modules/EightBitsSampling.cpp +++ b/modules/EightBitsSampling.cpp @@ -24,8 +24,6 @@ #include "EightBitsSampling.h" -namespace plaYUVer -{ EightBitsSampling::EightBitsSampling() { @@ -82,5 +80,5 @@ Void EightBitsSampling::destroy() m_pcSubSampledFrame = NULL; } -} // NAMESPACE + diff --git a/modules/EightBitsSampling.h b/modules/EightBitsSampling.h index becc81c..d643436 100644 --- a/modules/EightBitsSampling.h +++ b/modules/EightBitsSampling.h @@ -27,8 +27,6 @@ #include "lib/PlaYUVerModuleIf.h" -namespace plaYUVer -{ class EightBitsSampling: public PlaYUVerModuleIf { @@ -47,7 +45,5 @@ public: }; -} // NAMESPACE - #endif // __EIGHTBITSSAMPLING_H__ diff --git a/modules/FilterComponent.cpp b/modules/FilterComponent.cpp index b4e704a..0e88faa 100644 --- a/modules/FilterComponent.cpp +++ b/modules/FilterComponent.cpp @@ -26,8 +26,6 @@ #include #include "FilterComponent.h" -namespace plaYUVer -{ FilterComponentModule::FilterComponentModule() { @@ -132,5 +130,5 @@ PlaYUVerFrame* FilterComponentChromaV::process( std::vector apcF return filterComponent( apcFrameList[0], CHROMA_V ); } -} // NAMESPACE + diff --git a/modules/FilterComponent.h b/modules/FilterComponent.h index 454bffd..3f623b9 100644 --- a/modules/FilterComponent.h +++ b/modules/FilterComponent.h @@ -27,8 +27,6 @@ #include "lib/PlaYUVerModuleIf.h" -namespace plaYUVer -{ class FilterComponentModule: public PlaYUVerModuleIf { @@ -83,7 +81,5 @@ public: PlaYUVerFrame* process( std::vector apcFrameList ); }; -} // NAMESPACE - #endif // __FILTERFRAME_H__ diff --git a/modules/FrameBinarization.cpp b/modules/FrameBinarization.cpp index 559169c..5afacac 100644 --- a/modules/FrameBinarization.cpp +++ b/modules/FrameBinarization.cpp @@ -24,8 +24,6 @@ #include "FrameBinarization.h" -namespace plaYUVer -{ FrameBinarization::FrameBinarization() { @@ -69,5 +67,5 @@ Void FrameBinarization::destroy() m_pcBinFrame = NULL; } -} // NAMESPACE + diff --git a/modules/FrameBinarization.h b/modules/FrameBinarization.h index b2e4b31..3d472ef 100644 --- a/modules/FrameBinarization.h +++ b/modules/FrameBinarization.h @@ -27,8 +27,6 @@ #include "lib/PlaYUVerModuleIf.h" -namespace plaYUVer -{ class FrameBinarization: public PlaYUVerModuleIf { @@ -48,7 +46,5 @@ public: }; -} // NAMESPACE - #endif // __FRAMEBINARIZATION_H__ diff --git a/modules/FrameCrop.cpp b/modules/FrameCrop.cpp index 34f1ab3..2c57a64 100644 --- a/modules/FrameCrop.cpp +++ b/modules/FrameCrop.cpp @@ -24,8 +24,6 @@ #include "FrameCrop.h" -namespace plaYUVer -{ FrameCrop::FrameCrop() { @@ -77,5 +75,5 @@ Void FrameCrop::destroy() m_pcCropedFrame = NULL; } -} // NAMESPACE + diff --git a/modules/FrameCrop.h b/modules/FrameCrop.h index 08a8958..df8bf8b 100644 --- a/modules/FrameCrop.h +++ b/modules/FrameCrop.h @@ -27,8 +27,6 @@ #include "lib/PlaYUVerModuleIf.h" -namespace plaYUVer -{ class FrameCrop: public PlaYUVerModuleIf { @@ -51,7 +49,5 @@ public: }; -} // NAMESPACE - #endif // __FRAMECROP_H__ diff --git a/modules/FrameDifference.cpp b/modules/FrameDifference.cpp index 766014a..dd4deaa 100644 --- a/modules/FrameDifference.cpp +++ b/modules/FrameDifference.cpp @@ -25,8 +25,6 @@ #include "FrameDifference.h" #include -namespace plaYUVer -{ FrameDifference::FrameDifference() { @@ -105,5 +103,5 @@ Void FrameDifference::destroy() m_pcFrameDifference = NULL; } -} // NAMESPACE + diff --git a/modules/FrameDifference.h b/modules/FrameDifference.h index 9cf5c27..cb497ca 100644 --- a/modules/FrameDifference.h +++ b/modules/FrameDifference.h @@ -29,8 +29,6 @@ #include -namespace plaYUVer -{ class FrameDifference: public PlaYUVerModuleIf { @@ -53,7 +51,5 @@ public: }; -} // NAMESPACE - #endif // __FRAMEDIFFERENCE_H__ diff --git a/modules/FrameMask.cpp b/modules/FrameMask.cpp index 6b93f8d..d29cd7b 100644 --- a/modules/FrameMask.cpp +++ b/modules/FrameMask.cpp @@ -26,8 +26,6 @@ #include class be; -namespace plaYUVer -{ FrameMask::FrameMask() { @@ -134,5 +132,5 @@ Void FrameMask::destroy() m_pcFrameProcessed = NULL; } -} // NAMESPACE + diff --git a/modules/FrameMask.h b/modules/FrameMask.h index 4205ea6..1a2cd56 100644 --- a/modules/FrameMask.h +++ b/modules/FrameMask.h @@ -29,8 +29,6 @@ #include -namespace plaYUVer -{ class FrameMask: public PlaYUVerModuleIf { @@ -52,8 +50,6 @@ public: }; -} // NAMESPACE - #endif // __FRAMEMASK_H__ diff --git a/modules/FrameShift.cpp b/modules/FrameShift.cpp index a91ca70..257d599 100644 --- a/modules/FrameShift.cpp +++ b/modules/FrameShift.cpp @@ -24,8 +24,6 @@ #include "FrameShift.h" -namespace plaYUVer -{ FrameShift::FrameShift() { @@ -146,5 +144,5 @@ Void FrameShift::destroy() m_pcProcessedFrame = NULL; } -} // NAMESPACE + diff --git a/modules/FrameShift.h b/modules/FrameShift.h index 28aa0e1..4e79c19 100644 --- a/modules/FrameShift.h +++ b/modules/FrameShift.h @@ -27,8 +27,6 @@ #include "lib/PlaYUVerModuleIf.h" -namespace plaYUVer -{ class FrameShift: public PlaYUVerModuleIf { @@ -50,7 +48,5 @@ public: }; -} // NAMESPACE - #endif // __FrameShift_H__ diff --git a/modules/LumaAverage.cpp b/modules/LumaAverage.cpp index c4988fe..22dcf68 100644 --- a/modules/LumaAverage.cpp +++ b/modules/LumaAverage.cpp @@ -24,9 +24,6 @@ #include "LumaAverage.h" -namespace plaYUVer -{ - LumaAverage::LumaAverage() { /* Module Definition */ @@ -62,6 +59,3 @@ Void LumaAverage::destroy() } -} -// NAMESPACE - diff --git a/modules/LumaAverage.h b/modules/LumaAverage.h index ccc5628..6b5889a 100644 --- a/modules/LumaAverage.h +++ b/modules/LumaAverage.h @@ -28,8 +28,6 @@ #include "lib/PlaYUVerModuleIf.h" -namespace plaYUVer -{ class LumaAverage: public PlaYUVerModuleIf { @@ -47,7 +45,5 @@ public: }; -} // NAMESPACE - #endif // __LUMAAVERAGE_H__ diff --git a/modules/PlaYUVerModuleFactory.cpp b/modules/PlaYUVerModuleFactory.cpp index e8b4f74..668aa29 100644 --- a/modules/PlaYUVerModuleFactory.cpp +++ b/modules/PlaYUVerModuleFactory.cpp @@ -31,8 +31,6 @@ #include "PlaYUVerModuleFactory.h" #include "ModulesListHeader.h" -namespace plaYUVer -{ PlaYUVerModuleFactory::PlaYUVerModuleFactory() { @@ -85,4 +83,4 @@ PlaYUVerModuleIf *PlaYUVerModuleFactory::CreateModule( const char* moduleName ) return NULL; } -} // NAMESPACE + diff --git a/modules/PlaYUVerModuleFactory.h b/modules/PlaYUVerModuleFactory.h index c2d0243..56bb0a1 100644 --- a/modules/PlaYUVerModuleFactory.h +++ b/modules/PlaYUVerModuleFactory.h @@ -29,8 +29,6 @@ #include #include "lib/PlaYUVerModuleIf.h" -namespace plaYUVer -{ #define REGISTER_MODULE(X) Register( "X", &(X::Create) ); @@ -67,12 +65,5 @@ public: } }; -//// typedef to make it easier to set up our factory -//typedef PlaYUVerModuleIf *PlaYUVerModuleMaker(); -//// our global factory -//extern std::map > PlaYUVerModuleFactory; - -}// NAMESPACE - #endif // __PLAYUVERMODULESFACTORY_H__ diff --git a/modules/SetChromaHalfScale.cpp b/modules/SetChromaHalfScale.cpp index 2d37b42..3919a98 100644 --- a/modules/SetChromaHalfScale.cpp +++ b/modules/SetChromaHalfScale.cpp @@ -24,8 +24,6 @@ #include "SetChromaHalfScale.h" -namespace plaYUVer -{ SetChromaHalfScale::SetChromaHalfScale() { @@ -71,5 +69,5 @@ Void SetChromaHalfScale::destroy() m_pcProcessedFrame = NULL; } -} // NAMESPACE + diff --git a/modules/SetChromaHalfScale.h b/modules/SetChromaHalfScale.h index 041d3ba..1b0f69e 100644 --- a/modules/SetChromaHalfScale.h +++ b/modules/SetChromaHalfScale.h @@ -27,8 +27,6 @@ #include "lib/PlaYUVerModuleIf.h" -namespace plaYUVer -{ class SetChromaHalfScale: public PlaYUVerModuleIf { @@ -47,7 +45,5 @@ public: }; -} // NAMESPACE - #endif // __CHROMA128_H__ diff --git a/modules/WeightedPSNR.cpp b/modules/WeightedPSNR.cpp index 44f5fc1..84cb02d 100644 --- a/modules/WeightedPSNR.cpp +++ b/modules/WeightedPSNR.cpp @@ -26,8 +26,6 @@ #include #include -namespace plaYUVer -{ WeightedPSNR::WeightedPSNR() { @@ -121,5 +119,5 @@ Void WeightedPSNR::destroy() } -} // NAMESPACE + diff --git a/modules/WeightedPSNR.h b/modules/WeightedPSNR.h index c5a3a5b..dd91602 100644 --- a/modules/WeightedPSNR.h +++ b/modules/WeightedPSNR.h @@ -29,8 +29,6 @@ #include -namespace plaYUVer -{ class WeightedPSNR: public PlaYUVerModuleIf { @@ -50,7 +48,5 @@ public: }; -} // NAMESPACE - #endif // __WEIGHTEDPSNR_H__ diff --git a/tools/PlaYUVerTools.cpp b/tools/PlaYUVerTools.cpp index 5c3c58f..70dcf7c 100644 --- a/tools/PlaYUVerTools.cpp +++ b/tools/PlaYUVerTools.cpp @@ -28,8 +28,6 @@ #include "lib/PlaYUVerModuleIf.h" #include "modules/PlaYUVerModuleFactory.h" -namespace plaYUVer -{ PlaYUVerTools::PlaYUVerTools() { @@ -502,4 +500,4 @@ Int PlaYUVerTools::ModuleOperation() return 0; } -} // NAMESPACE + diff --git a/tools/PlaYUVerTools.h b/tools/PlaYUVerTools.h index 3b9cb3a..11fa035 100644 --- a/tools/PlaYUVerTools.h +++ b/tools/PlaYUVerTools.h @@ -31,8 +31,6 @@ #include "lib/PlaYUVerStream.h" #include "PlaYUVerToolsCmdParser.h" -namespace plaYUVer -{ class PlaYUVerModuleIf; @@ -83,6 +81,4 @@ private: Int ModuleOperation(); }; -} // NAMESPACE - #endif // __PLAYUVERTOOLS_H__ diff --git a/tools/PlaYUVerToolsCmdParser.cpp b/tools/PlaYUVerToolsCmdParser.cpp index 9855d12..36203bf 100644 --- a/tools/PlaYUVerToolsCmdParser.cpp +++ b/tools/PlaYUVerToolsCmdParser.cpp @@ -30,8 +30,6 @@ #include "lib/PlaYUVerModuleIf.h" #include "modules/PlaYUVerModuleFactory.h" -namespace plaYUVer -{ PlaYUVerToolsCmdParser::PlaYUVerToolsCmdParser() { @@ -187,4 +185,4 @@ Void PlaYUVerToolsCmdParser::listModuleHelp() } } -} // NAMESPACE + diff --git a/tools/PlaYUVerToolsCmdParser.h b/tools/PlaYUVerToolsCmdParser.h index c2bcf5b..67deeb1 100644 --- a/tools/PlaYUVerToolsCmdParser.h +++ b/tools/PlaYUVerToolsCmdParser.h @@ -29,8 +29,6 @@ #include "lib/PlaYUVerDefs.h" #include "lib/PlaYUVerCmdParser.h" -namespace plaYUVer -{ class PlaYUVerStream; @@ -93,6 +91,4 @@ private: }; -} // NAMESPACE - #endif // __PLAYUVERTOOLSCMDPARSER_H__ diff --git a/tools/main.cpp b/tools/main.cpp index 3683bc9..6a4088e 100644 --- a/tools/main.cpp +++ b/tools/main.cpp @@ -25,8 +25,6 @@ #include "PlaYUVerTools.h" -using namespace plaYUVer; - int main( int argc, char *argv[] ) { Int iRet = 0;