Commit 57ecb7d4 authored by Guillaume Pasero's avatar Guillaume Pasero

COMP: conflict on windows with GetOpenFileName/GetSaveFileName from Commdlg.h

parent 01c325b0
......@@ -118,7 +118,7 @@ GetExistingDirectory( QWidget * p = 0,
*/
QString
OTBQtAdapters_EXPORT
GetOpenFileName( QWidget * p =0,
GetOpenFilename( QWidget * p =0,
const QString & caption = QString(),
const QString & dir = QString(),
const QString & filter = QString(),
......@@ -145,7 +145,7 @@ GetOpenFileName( QWidget * p =0,
*/
QStringList
OTBQtAdapters_EXPORT
GetOpenFileNames( QWidget * p =0,
GetOpenFilenames( QWidget * p =0,
const QString & caption = QString(),
const QString & dir = QString(),
const QString & filter = QString(),
......@@ -172,7 +172,7 @@ GetOpenFileNames( QWidget * p =0,
*/
QString
OTBQtAdapters_EXPORT
GetSaveFileName( QWidget * p =0,
GetSaveFilename( QWidget * p =0,
const QString & caption = QString(),
const QString & dir = QString(),
const QString & filter = QString(),
......
......@@ -95,7 +95,7 @@ GetExistingDirectory( QWidget * p,
/*****************************************************************************/
QString
GetOpenFileName( QWidget * p,
GetOpenFilename( QWidget * p,
const QString& caption,
const QString& dir,
const QString& filter,
......@@ -129,7 +129,7 @@ GetOpenFileName( QWidget * p,
/*****************************************************************************/
QStringList
GetOpenFileNames( QWidget * p,
GetOpenFilenames( QWidget * p,
const QString & caption,
const QString & dir,
const QString & filter,
......@@ -163,7 +163,7 @@ GetOpenFileNames( QWidget * p,
/*****************************************************************************/
QString
GetSaveFileName( QWidget * p,
GetSaveFilename( QWidget * p,
const QString & caption,
const QString & dir,
const QString & filter,
......
......@@ -98,14 +98,14 @@ QtFileSelectionWidget
QString filename(
m_IOMode == IO_MODE_INPUT
? GetOpenFileName(
? otb::GetOpenFilename(
this,
QString(),
m_Input->text(),
tr( "All files (*)" ),
NULL,
QFileDialog::ReadOnly )
: GetSaveFileName(
: otb::GetSaveFilename(
this,
QString(),
m_Input->text(),
......
......@@ -86,7 +86,7 @@ QtWidgetComplexInputImageParameter
assert( m_Input!=NULL );
QString filename(
GetOpenFileName(
otb::GetOpenFilename(
this,
QString(),
m_Input->text(),
......
......@@ -93,7 +93,7 @@ QtWidgetComplexOutputImageParameter
assert( m_Input!=NULL );
QString filename(
GetSaveFileName(
otb::GetSaveFilename(
this,
QString(),
m_Input->text(),
......
......@@ -88,7 +88,7 @@ QtWidgetInputFilenameParameter
assert( m_Input!=NULL );
QString filename(
GetOpenFileName(
otb::GetOpenFilename(
this,
QString(),
m_Input->text(),
......
......@@ -96,7 +96,7 @@ QtWidgetInputImageParameter
assert( m_Input!=NULL );
QString filename(
GetOpenFileName(
otb::GetOpenFilename(
this,
QString(),
m_Input->text(),
......
......@@ -87,7 +87,7 @@ QtWidgetInputProcessXMLParameter
assert( m_Input!=NULL );
QString filename(
GetOpenFileName(
otb::GetOpenFilename(
this,
QString(),
m_Input->text(),
......
......@@ -88,7 +88,7 @@ QtWidgetInputVectorDataParameter
assert( m_Input!=NULL );
QString filename(
GetOpenFileName(
otb::GetOpenFilename(
this,
QString(),
m_Input->text(),
......
......@@ -257,7 +257,7 @@ ListEditWidget
{
if (multi)
{
output = GetOpenFileNames(
output = otb::GetOpenFilenames(
this,
tr( "Select input filename..." ),
filePath,
......@@ -268,7 +268,7 @@ ListEditWidget
else
{
output.push_back(
GetOpenFileName(
otb::GetOpenFilename(
this,
tr( "Select input filename..." ),
filePath,
......@@ -281,7 +281,7 @@ ListEditWidget
else
{
output.push_back(
GetSaveFileName(
otb::GetSaveFilename(
this,
tr( "Select output filename..." ),
filePath,
......
......@@ -83,7 +83,7 @@ QtWidgetOutputFilenameParameter
assert( m_Input!=NULL );
QString filename(
GetSaveFileName(
otb::GetSaveFilename(
this,
QString(),
m_Input->text(),
......
......@@ -98,7 +98,7 @@ QtWidgetOutputImageParameter
assert( m_Input!=NULL );
QString filename(
GetSaveFileName(
otb::GetSaveFilename(
this,
QString(),
m_Input->text(),
......
......@@ -82,7 +82,7 @@ QtWidgetOutputProcessXMLParameter
assert( m_Input!=NULL );
QString filename(
GetSaveFileName(
otb::GetSaveFilename(
this,
QString(),
m_Input->text(),
......
......@@ -78,7 +78,7 @@ QtWidgetOutputVectorDataParameter
assert( m_Input!=NULL );
QString filename(
GetSaveFileName(
otb::GetSaveFilename(
this,
QString(),
m_Input->text(),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment