Add new Defines file to include app specific stuff and edit the necessary files

This commit is contained in:
2015-03-09 01:57:59 +00:00
parent 5a6ed66eef
commit b0e3bb662a
26 changed files with 75 additions and 28 deletions
+1 -1
View File
@@ -54,7 +54,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget *parent ) :
standardResolutionSizes.append( QSize( uiWidth, uiHeight) );
}
setObjectName( QStringLiteral( "ConfigureFormat" ) );
setObjectName( "ConfigureFormat" );
resize( 400, 370 );
setWindowTitle( "Configure Resolution" );
+1 -1
View File
@@ -26,7 +26,7 @@
#define __CONFIGUREFORMATDIALOG_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )
+1 -1
View File
@@ -26,7 +26,7 @@
#define __DIALOGSUBWINDOWSELECTOR_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )
+1 -1
View File
@@ -26,7 +26,7 @@
#define __FRAMEPROPERTIESSIDEBAR_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )
+6 -6
View File
@@ -27,7 +27,7 @@
#define __GRIDMANAGER_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#include <QRect>
#include <QColor>
#include <QPen>
@@ -56,23 +56,23 @@ public:
void drawGrid( QPixmap &image, const QRect& area, QPainter *painter );
/**
* @returns a QRect defined by the grid that contains the point (x, y).
* @returns a QRect defined by the grid that contains the point (x, y).
*/
QRect rectContains( int x, int y ) const;
/**
* This is an overloaded member function, provided for convenience.
* @returns a QRect defined by the grid that contains the QPoint pos.
* @returns a QRect defined by the grid that contains the QPoint pos.
*/
QRect rectContains( const QPoint &pos ) const;
/**
* @returns @c true if the point (x, y) is over a grid crossing, otherwise
* @returns @c true if the point (x, y) is over a grid crossing, otherwise
* returns @c false
*/
bool contains( int x, int y );
/**
* @returns @c true if the point (x, y) is near a grid crossing, otherwise
* @returns @c true if the point (x, y) is near a grid crossing, otherwise
* returns @c false.
* @see @p nearPos()
*/
@@ -80,7 +80,7 @@ public:
/**
* This is an overloaded member function, provided for convenience.
* @returns @c true if the given point is near a grid crossing, otherwise
* @returns @c true if the given point is near a grid crossing, otherwise
* returns @c false.
* @see @p nearPos()
*/
+1 -1
View File
@@ -27,7 +27,7 @@
#define __HISTOGRAMWIDGET_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#include <QWidget>
#include <QColor>
#include "lib/PlaYUVerFrame.h"
+1 -1
View File
@@ -26,7 +26,7 @@
#define __MODULEHANDLEDOCK_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )
+1 -1
View File
@@ -36,7 +36,7 @@
#include <QtGui>
#endif
#include "PlaYUVerAppModuleIf.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#include "lib/PlaYUVerFrame.h"
namespace plaYUVer
+47
View File
@@ -0,0 +1,47 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014-2015 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
* \file PlaYUVerAppDefs.h
* \brief Define types for PlaYUVerApp
*/
#ifndef __PLAYUVERAPPDEFS_H__
#define __PLAYUVERAPPDEFS_H__
#include "lib/PlaYUVerDefs.h"
namespace plaYUVer
{
// ====================================================================================================================
// Qt compatibility redefinition
// ====================================================================================================================
#ifndef QStringLiteral
// no lambdas, not GCC, or GCC in C++98 mode with 4-byte wchar_t
// fallback, return a temporary QString
// source code is assumed to be encoded in UTF-8
# define QStringLiteral(str) QString::fromUtf8("" str "", sizeof(str) - 1)
#endif
} // NAMESPACE
#endif // __PLAYUVERAPPDEFS_H__
+1 -1
View File
@@ -26,7 +26,7 @@
#define __PLAYUVERAPPMODULESIF_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#include <iostream>
#include <cstdio>
#include "lib/PlaYUVerFrame.h"
+1 -1
View File
@@ -26,7 +26,7 @@
#define __PLAYUVERMDISUBWINDOW_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )
+1 -1
View File
@@ -26,7 +26,7 @@
#define __PLAYUVERSUBWINDOWHANDLE_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )
+1 -1
View File
@@ -26,7 +26,7 @@
#define __PLOTWINDOWHANDLE_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )
+1 -1
View File
@@ -26,7 +26,7 @@
#define __QUALITYMEASUREMENT_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#include <QtCore>
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
-1
View File
@@ -22,7 +22,6 @@
* \brief Definition of the quality measurement sidebar
*/
#include "lib/PlaYUVerDefs.h"
#include <QtGui>
#include "PlaYUVerSubWindowHandle.h"
#include "QualityMeasurementSidebar.h"
+1
View File
@@ -26,6 +26,7 @@
#define __QUALITYMEASUREMENTSIDEBAR_H__
#include "config.h"
#include "PlaYUVerAppDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )
+1 -1
View File
@@ -26,7 +26,7 @@
#define __SETTINGS_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#include <QtCore>
#include "GridManager.h"
#include "VideoSubWindow.h"
+1 -1
View File
@@ -26,7 +26,7 @@
#define __SUBWINDOWHANDLE_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )
-1
View File
@@ -22,7 +22,6 @@
* \brief Class to handle video playback
*/
#include "lib/PlaYUVerDefs.h"
#include <QtGui>
#include "PlaYUVerSubWindowHandle.h"
#include "VideoHandle.h"
+1
View File
@@ -26,6 +26,7 @@
#define __VIDEOHANDLE_H__
#include "config.h"
#include "PlaYUVerAppDefs.h"
#include <QtCore>
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
+1 -1
View File
@@ -26,7 +26,7 @@
#define __VIDEOSUBWINDOW_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )
+1 -1
View File
@@ -27,7 +27,7 @@
#define __VIEWAREA_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#include <QWidget>
#include <QPixmap>
#include <QBitmap>
+1 -1
View File
@@ -27,7 +27,7 @@
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#include <QtCore>
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
+1 -1
View File
@@ -23,7 +23,7 @@
*/
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#include <QApplication>
#include "plaYUVerApp.h"
#include "SubWindowHandle.h"
+1 -1
View File
@@ -851,7 +851,7 @@ Void plaYUVerApp::checkRecentFileActions()
Int i = 0;
while( i < m_aRecentFileStreamInfo.size() )
{
if( !QFileInfo::exists( m_aRecentFileStreamInfo.at( i ).m_cFilename ) )
if( !QFileInfo( m_aRecentFileStreamInfo.at( i ).m_cFilename ).exists() )
{
m_aRecentFileStreamInfo.remove( i );
continue;
+1 -1
View File
@@ -26,7 +26,7 @@
#define __PLAYUVERAPP_H__
#include "config.h"
#include "lib/PlaYUVerDefs.h"
#include "PlaYUVerAppDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )