diff --git a/plugins/textshape/dialogs/LanguageTab.h b/plugins/textshape/dialogs/LanguageTab.h --- a/plugins/textshape/dialogs/LanguageTab.h +++ b/plugins/textshape/dialogs/LanguageTab.h @@ -29,7 +29,7 @@ Q_OBJECT public: - explicit LanguageTab(/*KSpell2::Loader::Ptr loader = KSpell2::Loader::Ptr()*/bool uniqueFormat, QWidget* parent = 0, Qt::WFlags fl = 0); + explicit LanguageTab(/*KSpell2::Loader::Ptr loader = KSpell2::Loader::Ptr()*/bool uniqueFormat, QWidget* parent = 0, Qt::WindowFlags fl = 0); ~LanguageTab(); QString language() const; diff --git a/plugins/textshape/dialogs/LanguageTab.cpp b/plugins/textshape/dialogs/LanguageTab.cpp --- a/plugins/textshape/dialogs/LanguageTab.cpp +++ b/plugins/textshape/dialogs/LanguageTab.cpp @@ -26,7 +26,7 @@ #include #include -LanguageTab::LanguageTab(/*KSpell2::Loader::Ptr loader,*/bool uniqueFormat, QWidget* parent, Qt::WFlags fl) +LanguageTab::LanguageTab(/*KSpell2::Loader::Ptr loader,*/bool uniqueFormat, QWidget* parent, Qt::WindowFlags fl) : QWidget(parent), m_uniqueFormat(uniqueFormat) { diff --git a/sheets/dialogs/ConditionalDialog.h b/sheets/dialogs/ConditionalDialog.h --- a/sheets/dialogs/ConditionalDialog.h +++ b/sheets/dialogs/ConditionalDialog.h @@ -45,7 +45,7 @@ Q_OBJECT public: - explicit ConditionalWidget(QWidget * parent = 0, const char * name = 0, Qt::WFlags fl = 0); + explicit ConditionalWidget(QWidget * parent = 0, const char * name = 0, Qt::WindowFlags fl = 0); ~ConditionalWidget(); KComboBox * m_condition_1; diff --git a/sheets/dialogs/ConditionalDialog.cpp b/sheets/dialogs/ConditionalDialog.cpp --- a/sheets/dialogs/ConditionalDialog.cpp +++ b/sheets/dialogs/ConditionalDialog.cpp @@ -47,7 +47,7 @@ using namespace Calligra::Sheets; -ConditionalWidget::ConditionalWidget(QWidget* parent, const char* /*name*/, Qt::WFlags fl) +ConditionalWidget::ConditionalWidget(QWidget* parent, const char* /*name*/, Qt::WindowFlags fl) : QWidget(parent, fl) { QGridLayout * Form1Layout = new QGridLayout(this); diff --git a/sheets/functions/datetime.cpp b/sheets/functions/datetime.cpp --- a/sheets/functions/datetime.cpp +++ b/sheets/functions/datetime.cpp @@ -246,7 +246,7 @@ // modDate is currently in Date format QDate date = modDate.asDate(calc->settings()); - date.setYMD(date.year(), date.month(), date.daysInMonth()); + date.setDate(date.year(), date.month(), date.daysInMonth()); return Value(date, calc->settings()); } @@ -454,8 +454,8 @@ return Value(0); if ((date1.month() != 1) || (date1.day() != 1)) - date1.setYMD(date1.year() + 1, 1, 1); - date2.setYMD(date2.year(), 1, 1); + date1.setDate(date1.year() + 1, 1, 1); + date2.setDate(date2.year(), 1, 1); return Value(date2.year() - date1.year()); } @@ -483,10 +483,10 @@ // type is now non-zero // the number of full months in between, starting on 1/XX/XXXX if (date1.month() == 12) - date1.setYMD(date1.year() + 1, 1, 1); + date1.setDate(date1.year() + 1, 1, 1); else - date1.setYMD(date1.year(), date1.month() + 1, 1); - date2.setYMD(date2.year(), date2.month(), 1); + date1.setDate(date1.year(), date1.month() + 1, 1); + date2.setDate(date2.year(), date2.month(), 1); int months = (date2.year() - date1.year()) * 12; months += date2.month() - date1.month();