From kde-commits Wed Aug 31 23:06:35 2011 From: Jaroslaw Staniek Date: Wed, 31 Aug 2011 23:06:35 +0000 To: kde-commits Subject: [calligra] kexi/formeditor: fix for 2cbbee8c (Port from Message-Id: <20110831230635.35392A60C9 () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=131483203032091 Git commit 426c7a6880c3179445f5fed4faa2eb51459ad45e by Jaroslaw Staniek. Committed on 01/09/2011 at 00:14. Pushed by staniek into branch 'master'. fix for 2cbbee8c (Port from KEditListBox to KEditListWidget) on KDE<4.6 M +10 -1 kexi/formeditor/widgetfactory.cpp http://commits.kde.org/calligra/426c7a6880c3179445f5fed4faa2eb51459ad45e diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp index 74dbc96..145d513 100644 --- a/kexi/formeditor/widgetfactory.cpp +++ b/kexi/formeditor/widgetfactory.cpp @@ -21,6 +21,7 @@ #include "widgetfactory.h" +#include #include #include //#ifdef KEXI_KTEXTEDIT @@ -29,7 +30,11 @@ #include //#endif #include -#include +#if KDE_IS_VERSION(4,5,90) +# include +#else +# include +#endif //2.0#include #include @@ -128,7 +133,11 @@ bool WidgetFactory::editList(QWidget *w, QStringList &list) const dialog.setWindowTitle(i18n("Edit Contents of %1", w->objectName())); dialog.setButtons(KDialog::Ok | KDialog::Cancel); +#if KDE_IS_VERSION(4,5,90) KEditListWidget *edit = new KEditListWidget(&dialog); +#else + KEditListBox *edit = new KEditListBox(&dialog); +#endif edit->setObjectName("editlist"); dialog.setMainWidget(edit); edit->insertStringList(list);