Resolve merge conflict.

This commit is contained in:
Luis Lucas committed 2014-01-28 02:10:39 +00:00
commit f7212d4f90
2 files changed
+3 -4

No files matched your search

+2 -3
View File
@@ -34,9 +34,6 @@ ConfigureResolutionDialog::ConfigureResolutionDialog( QWidget *parent ) :
setStandardResolutionSizes();
if( objectName().isEmpty() )
setObjectName( QStringLiteral( "ConfigureResolution" ) );
// Config dialog
setObjectName( QStringLiteral( "ConfigureResolution" ) );
@@ -162,6 +159,8 @@ ConfigureResolutionDialog::ConfigureResolutionDialog( QWidget *parent ) :
connect( dialogButtonOkCancel, SIGNAL( accepted() ), this, SLOT( accept() ) );
connect( dialogButtonOkCancel, SIGNAL( rejected() ), this, SLOT( reject() ) );
QMetaObject::connectSlotsByName(this);
}
void ConfigureResolutionDialog::StandardResolutionSelection()
+1 -1
View File
@@ -70,7 +70,7 @@ ImageInterface::~ImageInterface()
bool ImageInterface::loadFile( const QString &fileName )
{
ConfigureResolutionDialog resolutionDialog;
ConfigureResolutionDialog resolutionDialog(this);
if( resolutionDialog.exec() == QDialog::Rejected )
{