From fd0bf7ab281e3c1d8af99b910d58e915b79da8b7 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Wed, 12 Nov 2014 03:49:15 +0000 Subject: [PATCH] Change some include --- app/CMakeLists.txt | 2 +- app/ConfigureFormatDialog.cpp | 4 ++-- app/ConfigureFormatDialog.h | 2 +- app/DialogSubWindowSelector.h | 2 +- app/GridManager.h | 2 +- app/HistogramWidget.cpp | 2 -- app/HistogramWidget.h | 4 ++-- app/ModuleHandleDock.h | 2 +- app/ModulesHandle.h | 4 ++-- app/PlaYUVerAppModuleIf.h | 6 +++--- app/PlaYUVerFrameStatistics.cpp | 2 +- app/PlaYUVerFrameStatistics.h | 4 ++-- app/PlaYUVerSettings.h | 2 +- app/PropertiesSidebar.cpp | 2 -- app/PropertiesSidebar.h | 6 +++--- app/QualityMeasurementSidebar.cpp | 2 +- app/QualityMeasurementSidebar.h | 5 ++--- app/SubWindowHandle.h | 4 ++-- app/ViewArea.cpp | 1 - app/ViewArea.h | 4 ++-- app/WidgetFrameNumber.cpp | 1 - app/WidgetFrameNumber.h | 2 +- app/main.cpp | 2 +- app/plaYUVerApp.cpp | 2 +- app/plaYUVerApp.h | 2 +- modules/CMakeLists.txt | 8 ++++---- modules/DisparityStereoVar.cpp | 1 - modules/DisparityStereoVar.h | 3 --- modules/FilterComponent.cpp | 1 - modules/FilterComponent.h | 6 ------ modules/FrameDifference.cpp | 3 --- modules/FrameDifference.h | 4 ---- modules/MeasurePSNR.cpp | 3 --- modules/MeasurePSNR.h | 6 ------ modules/PlaYUVerModuleIf.h | 8 +++----- 35 files changed, 39 insertions(+), 75 deletions(-) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 7954528..0864231 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -3,7 +3,7 @@ ### # This is hard way - please fix -INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ../lib ../modules ${CMAKE_BINARY_DIR}/modules ) +INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/modules ${CMAKE_BINARY_DIR}/modules ) set(plaYUver_App_SRCS # Main diff --git a/app/ConfigureFormatDialog.cpp b/app/ConfigureFormatDialog.cpp index a5bc019..a72e561 100644 --- a/app/ConfigureFormatDialog.cpp +++ b/app/ConfigureFormatDialog.cpp @@ -23,8 +23,8 @@ */ #include "ConfigureFormatDialog.h" -#include "PlaYUVerFrame.h" -#include "PlaYUVerStream.h" +#include "lib/PlaYUVerFrame.h" +#include "lib/PlaYUVerStream.h" namespace plaYUVer { diff --git a/app/ConfigureFormatDialog.h b/app/ConfigureFormatDialog.h index c3d564e..74f1458 100644 --- a/app/ConfigureFormatDialog.h +++ b/app/ConfigureFormatDialog.h @@ -26,7 +26,7 @@ #define __CONFIGUREFORMATDIALOG_H__ #include "config.h" -#include "PlaYUVerDefs.h" +#include "lib/PlaYUVerDefs.h" #if( QT_VERSION_PLAYUVER == 5 ) #include #elif( QT_VERSION_PLAYUVER == 4 ) diff --git a/app/DialogSubWindowSelector.h b/app/DialogSubWindowSelector.h index b059cbc..8eaab1a 100644 --- a/app/DialogSubWindowSelector.h +++ b/app/DialogSubWindowSelector.h @@ -26,7 +26,7 @@ #define __DIALOGSUBWINDOWSELECTOR_H__ #include "config.h" -#include "PlaYUVerDefs.h" +#include "lib/PlaYUVerDefs.h" #if( QT_VERSION_PLAYUVER == 5 ) #include #elif( QT_VERSION_PLAYUVER == 4 ) diff --git a/app/GridManager.h b/app/GridManager.h index 2a7be7b..d2092a6 100644 --- a/app/GridManager.h +++ b/app/GridManager.h @@ -27,7 +27,7 @@ #define __GRIDMANAGER_H__ #include "config.h" -#include "PlaYUVerDefs.h" +#include "lib/PlaYUVerDefs.h" #include #include #include diff --git a/app/HistogramWidget.cpp b/app/HistogramWidget.cpp index 42c1f91..8bde041 100644 --- a/app/HistogramWidget.cpp +++ b/app/HistogramWidget.cpp @@ -27,13 +27,11 @@ // - Optimizar paintEvent. Parece haver codigo redundante !! #include "config.h" -#include "PlaYUVerDefs.h" #include #include #include #include "HistogramWidget.h" #include "PlaYUVerFrameStatistics.h" -#include "PlaYUVerFrame.h" namespace plaYUVer { diff --git a/app/HistogramWidget.h b/app/HistogramWidget.h index 866939f..2be2377 100644 --- a/app/HistogramWidget.h +++ b/app/HistogramWidget.h @@ -27,10 +27,10 @@ #define __HISTOGRAMWIDGET_H__ #include "config.h" -#include "PlaYUVerDefs.h" +#include "lib/PlaYUVerDefs.h" #include #include -#include "PlaYUVerFrame.h" +#include "lib/PlaYUVerFrame.h" #include "PlaYUVerFrameStatistics.h" class QEvent; diff --git a/app/ModuleHandleDock.h b/app/ModuleHandleDock.h index 7dd3715..b2f87b4 100644 --- a/app/ModuleHandleDock.h +++ b/app/ModuleHandleDock.h @@ -26,7 +26,7 @@ #define __MODULEHANDLEDOCK_H__ #include "config.h" -#include "PlaYUVerDefs.h" +#include "lib/PlaYUVerDefs.h" #if( QT_VERSION_PLAYUVER == 5 ) #include #elif( QT_VERSION_PLAYUVER == 4 ) diff --git a/app/ModulesHandle.h b/app/ModulesHandle.h index 0cf263b..dcb0c79 100644 --- a/app/ModulesHandle.h +++ b/app/ModulesHandle.h @@ -25,7 +25,6 @@ #define __MODULESHANDLE_H__ #include "config.h" -#include "PlaYUVerDefs.h" #include #include @@ -37,7 +36,8 @@ #include #endif #include "PlaYUVerAppModuleIf.h" -#include "PlaYUVerFrame.h" +#include "lib/PlaYUVerDefs.h" +#include "lib/PlaYUVerFrame.h" namespace plaYUVer { diff --git a/app/PlaYUVerAppModuleIf.h b/app/PlaYUVerAppModuleIf.h index 3395291..bf60d2e 100644 --- a/app/PlaYUVerAppModuleIf.h +++ b/app/PlaYUVerAppModuleIf.h @@ -26,11 +26,11 @@ #define __PLAYUVERAPPMODULESIF_H__ #include "config.h" -#include "PlaYUVerDefs.h" +#include "lib/PlaYUVerDefs.h" #include #include -#include "PlaYUVerFrame.h" -#include "PlaYUVerStream.h" +#include "lib/PlaYUVerFrame.h" +#include "lib/PlaYUVerStream.h" #include "ModuleHandleDock.h" #include "PlaYUVerModuleIf.h" diff --git a/app/PlaYUVerFrameStatistics.cpp b/app/PlaYUVerFrameStatistics.cpp index f8c17d3..5b91466 100644 --- a/app/PlaYUVerFrameStatistics.cpp +++ b/app/PlaYUVerFrameStatistics.cpp @@ -29,7 +29,7 @@ #include #include "PlaYUVerFrameStatistics.h" -#include "LibMemory.h" +#include "lib/LibMemory.h" namespace plaYUVer { diff --git a/app/PlaYUVerFrameStatistics.h b/app/PlaYUVerFrameStatistics.h index 00942eb..c38443f 100644 --- a/app/PlaYUVerFrameStatistics.h +++ b/app/PlaYUVerFrameStatistics.h @@ -26,9 +26,9 @@ #ifndef __PLAYUVERFRAMESTATISTICS_H_ #define __PLAYUVERFRAMESTATISTICS_H_ -#include "PlaYUVerDefs.h" #include -#include "PlaYUVerFrame.h" +#include "lib/PlaYUVerFrame.h" +#include "lib/PlaYUVerDefs.h" class QObject; diff --git a/app/PlaYUVerSettings.h b/app/PlaYUVerSettings.h index be54915..3cf6f80 100644 --- a/app/PlaYUVerSettings.h +++ b/app/PlaYUVerSettings.h @@ -26,7 +26,7 @@ #define __PLAYUVERSETTINGS_H__ #include "config.h" -#include "PlaYUVerDefs.h" +#include "lib/PlaYUVerDefs.h" #include #include "GridManager.h" #include "SubWindowHandle.h" diff --git a/app/PropertiesSidebar.cpp b/app/PropertiesSidebar.cpp index c80f398..2c39f99 100644 --- a/app/PropertiesSidebar.cpp +++ b/app/PropertiesSidebar.cpp @@ -22,8 +22,6 @@ * \brief Main side bar definition */ -#include "config.h" -#include "PlaYUVerDefs.h" #include #include #include diff --git a/app/PropertiesSidebar.h b/app/PropertiesSidebar.h index 7691df0..b716f3d 100644 --- a/app/PropertiesSidebar.h +++ b/app/PropertiesSidebar.h @@ -26,15 +26,15 @@ #define __PROPERTIESSIDEBAR_H__ #include "config.h" -#include "PlaYUVerDefs.h" +#include "lib/PlaYUVerDefs.h" #if( QT_VERSION_PLAYUVER == 5 ) #include #elif( QT_VERSION_PLAYUVER == 4 ) #include #include #endif -#include "PlaYUVerStream.h" -#include "PlaYUVerFrame.h" +#include "lib/PlaYUVerStream.h" +#include "lib/PlaYUVerFrame.h" #include "HistogramWidget.h" namespace plaYUVer diff --git a/app/QualityMeasurementSidebar.cpp b/app/QualityMeasurementSidebar.cpp index d420ee8..4720601 100644 --- a/app/QualityMeasurementSidebar.cpp +++ b/app/QualityMeasurementSidebar.cpp @@ -22,7 +22,7 @@ * \brief Definition of the quality measurement sidebar */ -#include "PlaYUVerDefs.h" +#include "lib/PlaYUVerDefs.h" #include #include "QualityMeasurementSidebar.h" #include "SubWindowHandle.h" diff --git a/app/QualityMeasurementSidebar.h b/app/QualityMeasurementSidebar.h index 8e342cf..0522524 100644 --- a/app/QualityMeasurementSidebar.h +++ b/app/QualityMeasurementSidebar.h @@ -26,15 +26,14 @@ #define __QUALITYMEASUREMENTSIDEBAR_H__ #include "config.h" -#include "PlaYUVerDefs.h" #if( QT_VERSION_PLAYUVER == 5 ) #include #elif( QT_VERSION_PLAYUVER == 4 ) #include #include #endif -#include "PlaYUVerStream.h" -#include "PlaYUVerFrame.h" +#include "lib/PlaYUVerStream.h" +#include "lib/PlaYUVerFrame.h" #include "HistogramWidget.h" namespace plaYUVer diff --git a/app/SubWindowHandle.h b/app/SubWindowHandle.h index 55aa4c6..91b42ed 100644 --- a/app/SubWindowHandle.h +++ b/app/SubWindowHandle.h @@ -26,13 +26,13 @@ #define __SUBWINDOWHANDLE_H__ #include "config.h" -#include "PlaYUVerDefs.h" +#include "lib/PlaYUVerDefs.h" #if( QT_VERSION_PLAYUVER == 5 ) #include #elif( QT_VERSION_PLAYUVER == 4 ) #include #endif -#include "PlaYUVerStream.h" +#include "lib/PlaYUVerStream.h" #include "ViewArea.h" #include "ModulesHandle.h" diff --git a/app/ViewArea.cpp b/app/ViewArea.cpp index 0579095..e62bcf1 100644 --- a/app/ViewArea.cpp +++ b/app/ViewArea.cpp @@ -37,7 +37,6 @@ #include "ViewArea.h" #include "GridManager.h" -#include "PlaYUVerStream.h" namespace plaYUVer { diff --git a/app/ViewArea.h b/app/ViewArea.h index 1c0b0eb..70988b5 100644 --- a/app/ViewArea.h +++ b/app/ViewArea.h @@ -27,13 +27,13 @@ #define __VIEWAREA_H__ #include "config.h" -#include "PlaYUVerDefs.h" +#include "lib/PlaYUVerDefs.h" #include #include #include #include #include "GridManager.h" -#include "PlaYUVerFrame.h" +#include "lib/PlaYUVerFrame.h" namespace plaYUVer { diff --git a/app/WidgetFrameNumber.cpp b/app/WidgetFrameNumber.cpp index 90eda14..c17a642 100644 --- a/app/WidgetFrameNumber.cpp +++ b/app/WidgetFrameNumber.cpp @@ -23,7 +23,6 @@ */ #include "config.h" -#include "PlaYUVerDefs.h" #include #if( QT_VERSION_PLAYUVER == 5 ) #include diff --git a/app/WidgetFrameNumber.h b/app/WidgetFrameNumber.h index 6f0e192..e7571ef 100644 --- a/app/WidgetFrameNumber.h +++ b/app/WidgetFrameNumber.h @@ -27,7 +27,7 @@ #include "config.h" -#include "PlaYUVerDefs.h" +#include "lib/PlaYUVerDefs.h" #include #if( QT_VERSION_PLAYUVER == 5 ) #include diff --git a/app/main.cpp b/app/main.cpp index f437c96..ce24c8f 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -25,7 +25,7 @@ #include #include "config.h" #include "plaYUVerApp.h" -#include "PlaYUVerStream.h" +#include "lib/PlaYUVerStream.h" #ifdef USE_FERVOR #include "fvupdater.h" #endif diff --git a/app/plaYUVerApp.cpp b/app/plaYUVerApp.cpp index 22338a9..250b82e 100644 --- a/app/plaYUVerApp.cpp +++ b/app/plaYUVerApp.cpp @@ -23,7 +23,7 @@ */ #include "plaYUVerApp.h" -#include "PlaYUVerStream.h" +#include "lib/PlaYUVerStream.h" #include "DialogSubWindowSelector.h" #ifdef USE_FERVOR #include "fvupdater.h" diff --git a/app/plaYUVerApp.h b/app/plaYUVerApp.h index ec13b8f..9f4cee2 100644 --- a/app/plaYUVerApp.h +++ b/app/plaYUVerApp.h @@ -26,7 +26,7 @@ #define __PLAYUVERAPP_H__ #include "config.h" -#include "PlaYUVerDefs.h" +#include "lib/PlaYUVerDefs.h" #if( QT_VERSION_PLAYUVER == 5 ) #include #elif( QT_VERSION_PLAYUVER == 4 ) diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 1541460..329d4fb 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -2,7 +2,7 @@ ### CMakeLists for playuver modules component ### -INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/lib ) +INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ) # set(plaYUver_Mod_SRCS # PlaYUVerModuleIf.cpp @@ -30,9 +30,9 @@ ADD_MODULE( FilterComponentChromaU "FilterComponent" ) ADD_MODULE( FilterComponentChromaV "FilterComponent" ) ADD_MODULE( FrameDifference "FrameDifference" ) ADD_MODULE( MeasurePSNR "MeasurePSNR" ) -# IF( USE_OPENCV ) -# ADD_MODULE( DisparityStereoVar "DisparityStereoVar" ) -# ENDIF() +IF( USE_OPENCV ) + ADD_MODULE( DisparityStereoVar "DisparityStereoVar" ) +ENDIF() # diff --git a/modules/DisparityStereoVar.cpp b/modules/DisparityStereoVar.cpp index ca5c5ff..2b75788 100644 --- a/modules/DisparityStereoVar.cpp +++ b/modules/DisparityStereoVar.cpp @@ -25,7 +25,6 @@ #include #include "DisparityStereoVar.h" -#include "PlaYUVerFrame.h" namespace plaYUVer { diff --git a/modules/DisparityStereoVar.h b/modules/DisparityStereoVar.h index b9e829c..6e6457d 100644 --- a/modules/DisparityStereoVar.h +++ b/modules/DisparityStereoVar.h @@ -25,10 +25,7 @@ #ifndef __DISPARITYSTEREOVAR_H__ #define __DISPARITYSTEREOVAR_H__ -#include "PlaYUVerDefs.h" #include -#include -#include "PlaYUVerFrame.h" #include "PlaYUVerModuleIf.h" #include diff --git a/modules/FilterComponent.cpp b/modules/FilterComponent.cpp index fecf005..cb4ab8e 100644 --- a/modules/FilterComponent.cpp +++ b/modules/FilterComponent.cpp @@ -23,7 +23,6 @@ */ #include - #include "FilterComponent.h" namespace plaYUVer diff --git a/modules/FilterComponent.h b/modules/FilterComponent.h index 55ce151..427ec74 100644 --- a/modules/FilterComponent.h +++ b/modules/FilterComponent.h @@ -25,14 +25,8 @@ #ifndef __FILTERCOMPONENT_H__ #define __FILTERCOMPONENT_H__ -#include "PlaYUVerDefs.h" -#include -#include -#include "PlaYUVerFrame.h" #include "PlaYUVerModuleIf.h" -#include - namespace plaYUVer { diff --git a/modules/FrameDifference.cpp b/modules/FrameDifference.cpp index d1f6c64..cd0abd2 100644 --- a/modules/FrameDifference.cpp +++ b/modules/FrameDifference.cpp @@ -22,10 +22,7 @@ * \brief Frame Difference module */ -#include - #include "FrameDifference.h" -#include "PlaYUVerFrame.h" namespace plaYUVer { diff --git a/modules/FrameDifference.h b/modules/FrameDifference.h index 2060eed..88441fa 100644 --- a/modules/FrameDifference.h +++ b/modules/FrameDifference.h @@ -25,10 +25,6 @@ #ifndef __FRAMEDIFFERENCE_H__ #define __FRAMEDIFFERENCE_H__ -#include "PlaYUVerDefs.h" -#include -#include -#include "PlaYUVerFrame.h" #include "PlaYUVerModuleIf.h" #include diff --git a/modules/MeasurePSNR.cpp b/modules/MeasurePSNR.cpp index e69d4bf..065a51d 100644 --- a/modules/MeasurePSNR.cpp +++ b/modules/MeasurePSNR.cpp @@ -22,10 +22,7 @@ * \brief Frame Difference module */ -#include - #include "MeasurePSNR.h" -#include "PlaYUVerFrame.h" namespace plaYUVer { diff --git a/modules/MeasurePSNR.h b/modules/MeasurePSNR.h index b8c594b..9764d3e 100644 --- a/modules/MeasurePSNR.h +++ b/modules/MeasurePSNR.h @@ -25,14 +25,8 @@ #ifndef __MEASUREPSNR_H__ #define __MEASUREPSNR_H__ -#include "PlaYUVerDefs.h" -#include -#include -#include "PlaYUVerFrame.h" #include "PlaYUVerModuleIf.h" -#include - namespace plaYUVer { diff --git a/modules/PlaYUVerModuleIf.h b/modules/PlaYUVerModuleIf.h index 137681a..715491b 100644 --- a/modules/PlaYUVerModuleIf.h +++ b/modules/PlaYUVerModuleIf.h @@ -25,11 +25,9 @@ #ifndef __PLAYUVERMODULESIF_H__ #define __PLAYUVERMODULESIF_H__ -#include "PlaYUVerDefs.h" -#include -#include -#include "PlaYUVerFrame.h" -#include "PlaYUVerStream.h" +#include "lib/PlaYUVerDefs.h" +#include "lib/PlaYUVerFrame.h" +#include "lib/PlaYUVerStream.h" namespace plaYUVer {