SVN commit 551489 by mlaurent: Fix compile M +3 -1 csvdialog.cpp M +5 -4 csvexportdialog.cpp --- trunk/koffice/filters/kspread/csv/csvdialog.cpp #551488:551489 @@ -41,7 +41,7 @@ #include CSVDialog::CSVDialog(QWidget* parent, QByteArray& fileArray, const QString /*seperator*/) - : KDialog(parent, QString::null, KDialog::Ok|KDialog::Cancel), + : KDialog(parent), m_adjustRows(false), m_adjustCols(false), m_startRow(0), @@ -55,7 +55,9 @@ m_dialog(new DialogUI(this)), m_codec( QTextCodec::codecForName( "UTF-8" ) ) { + // ???????????????????????? default button == no but we don't add it ! setDefaultButton(KDialog::No); + setButtons( KDialog::Ok|KDialog::Cancel ); setCaption( i18n( "Import" ) ); kapp->restoreOverrideCursor(); --- trunk/koffice/filters/kspread/csv/csvexportdialog.cpp #551488:551489 @@ -48,11 +48,12 @@ using namespace KSpread; CSVExportDialog::CSVExportDialog( QWidget * parent ) - : KDialog( parent, QString::null, KDialog::Ok | KDialog::Cancel ), + : KDialog( parent), m_dialog( new ExportDialogUI( this ) ), m_delimiter( "," ), m_textquote('"') { + setButtons( KDialog::Ok | KDialog::Cancel ); setDefaultButton(KDialog::No); kapp->restoreOverrideCursor(); @@ -68,7 +69,7 @@ m_dialog->comboBoxEncoding->insertStringList(encodings); - setButtonBoxOrientation ( Qt::Vertical ); + setButtonsOrientation ( Qt::Vertical ); setMainWidget(m_dialog); @@ -184,11 +185,11 @@ { enableButtonOK( true ); - //Erase "Other Delimiter" text box if the user has selected one of + //Erase "Other Delimiter" text box if the user has selected one of //the standard options instead (comma, semicolon, tab or space) if (id != 4) m_dialog->m_delimiterEdit->setText(""); - + switch (id) { case 0: // comma