Major changes on code

Remove Qt4 support
Change include headers
Change the include of QCustomPlot lib and updated code based on upstream
This commit is contained in:
2017-12-06 03:11:02 +00:00
parent 73d843abf5
commit 430bdc09cd
66 changed files with 38551 additions and 29387 deletions
+9 -20
View File
@@ -28,10 +28,7 @@
#include <QCheckBox>
#include <QGroupBox>
DialogSubWindowSelector::DialogSubWindowSelector( QWidget* parent,
PlaYUVerSubWindowHandle* windowManager,
UInt uiCategory,
Int minWindowsSelected,
DialogSubWindowSelector::DialogSubWindowSelector( QWidget* parent, PlaYUVerSubWindowHandle* windowManager, UInt uiCategory, Int minWindowsSelected,
Int maxWindowsSelected )
: QDialog( parent )
, m_uiCategory( uiCategory )
@@ -87,8 +84,7 @@ DialogSubWindowSelector::DialogSubWindowSelector( QWidget* parent,
QString currSubWindowName;
QCheckBox* windowCheckBox;
m_apcSubWindowList = m_pcMainWindowManager->findSubWindow( m_uiCategory );
for( Int i = 0; i < m_apcSubWindowList.size(); i++ )
{
for( Int i = 0; i < m_apcSubWindowList.size(); i++ ) {
subWindow = m_apcSubWindowList.at( i );
currSubWindowName = subWindow->getWindowName();
windowCheckBox = new QCheckBox( currSubWindowName, this );
@@ -112,8 +108,7 @@ Void DialogSubWindowSelector::updateSubWindowList()
/**
* Remove all check boxes
*/
for( Int i = 0; i < pcLayout->count(); i++ )
{
for( Int i = 0; i < pcLayout->count(); i++ ) {
pcLayoutItem = pcLayout->itemAt( i );
if( pcLayoutItem )
{
@@ -122,8 +117,7 @@ Void DialogSubWindowSelector::updateSubWindowList()
}
}
for( Int i = 0; i < m_apcSelectedSubWindowList.size(); i++ )
{
for( Int i = 0; i < m_apcSelectedSubWindowList.size(); i++ ) {
iIdx = m_apcSubWindowList.indexOf( m_apcSelectedSubWindowList.at( i ) );
if( iIdx >= 0 )
{
@@ -131,8 +125,7 @@ Void DialogSubWindowSelector::updateSubWindowList()
m_pcGroupCheckBox->layout()->addWidget( windowCheckBox );
}
}
for( Int i = 0; i < m_apcWindowsListCheckBox.size(); i++ )
{
for( Int i = 0; i < m_apcWindowsListCheckBox.size(); i++ ) {
if( !m_apcSelectedSubWindowList.contains( m_apcSubWindowList.at( i ) ) )
m_pcGroupCheckBox->layout()->addWidget( m_apcWindowsListCheckBox.at( i ) );
}
@@ -179,8 +172,7 @@ Void DialogSubWindowSelector::update()
}
if( m_apcSelectedSubWindowList.size() >= m_iMaxSlectedWindows )
{
for( Int i = 0; i < m_apcWindowsListCheckBox.size(); i++ )
{
for( Int i = 0; i < m_apcWindowsListCheckBox.size(); i++ ) {
if( m_apcSelectedSubWindowList.contains( m_apcSubWindowList.at( i ) ) )
{
m_apcWindowsListCheckBox.at( i )->setEnabled( true );
@@ -193,8 +185,7 @@ Void DialogSubWindowSelector::update()
}
else
{
for( Int i = 0; i < m_apcWindowsListCheckBox.size(); i++ )
{
for( Int i = 0; i < m_apcWindowsListCheckBox.size(); i++ ) {
m_apcWindowsListCheckBox.at( i )->setEnabled( true );
}
}
@@ -222,8 +213,7 @@ Void DialogSubWindowSelector::toggleSubWindow( Int idx )
Void DialogSubWindowSelector::addAllSubWindow()
{
m_apcSelectedSubWindowList.clear();
for( Int i = 0; i < m_apcWindowsListCheckBox.size(); i++ )
{
for( Int i = 0; i < m_apcWindowsListCheckBox.size(); i++ ) {
m_apcWindowsListCheckBox.at( i )->setChecked( true );
}
update();
@@ -231,8 +221,7 @@ Void DialogSubWindowSelector::addAllSubWindow()
Void DialogSubWindowSelector::removeAllSubWindow()
{
for( Int i = 0; i < m_apcWindowsListCheckBox.size(); i++ )
{
for( Int i = 0; i < m_apcWindowsListCheckBox.size(); i++ ) {
m_apcWindowsListCheckBox.at( i )->setChecked( false );
}
m_apcSelectedSubWindowList.clear();