remove redundant DECLARE_COMPAT_WIDGET() macro definition

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/designer/shared/widgetdatabase.cpp b/src/designer/shared/widgetdatabase.cpp
index 743be02..61ee943 100644 (file)
--- a/src/designer/shared/widgetdatabase.cpp
+++ b/src/designer/shared/widgetdatabase.cpp
@@ -262,12 +262,10 @@ WidgetDataBase::WidgetDataBase(QDesignerFormEditorInterface *core, QObject *pare
       m_core(core)
 {
 #define DECLARE_LAYOUT(L, C)
-#define DECLARE_COMPAT_WIDGET(W, C) DECLARE_WIDGET(W, C)
 #define DECLARE_WIDGET(W, C) append(new WidgetDataBaseItem(QString::fromUtf8(#W)));
 
 #include "widgets.table"
 
-#undef DECLARE_COMPAT_WIDGET
 #undef DECLARE_LAYOUT
 #undef DECLARE_WIDGET
 #undef DECLARE_WIDGET_1

diff --git a/src/designer/shared/widgetfactory.cpp b/src/designer/shared/widgetfactory.cpp
index c34526d..48cc6ff 100644 (file)
--- a/src/designer/shared/widgetfactory.cpp
+++ b/src/designer/shared/widgetfactory.cpp
@@ -366,13 +366,11 @@ QWidget *WidgetFactory::createWidget(const QString &widgetName, QWidget *parentW
         }
 
 #define DECLARE_LAYOUT(L, C)
-#define DECLARE_COMPAT_WIDGET(W, C) /*DECLARE_WIDGET(W, C)*/
 #define DECLARE_WIDGET(W, C) else if (!qstrcmp(widgetNameC, #W)) { Q_ASSERT(w == 0); w = new W(parentWidget); }
 #define DECLARE_WIDGET_1(W, C) else if (!qstrcmp(widgetNameC, #W)) { Q_ASSERT(w == 0); w = new W(0, parentWidget); }
 
 #include "widgets.table"
 
-#undef DECLARE_COMPAT_WIDGET
 #undef DECLARE_LAYOUT
 #undef DECLARE_WIDGET
 #undef DECLARE_WIDGET_1

diff --git a/src/uitools/formbuilder.cpp b/src/uitools/formbuilder.cpp
index 7fcbc68..2d42860 100644 (file)
--- a/src/uitools/formbuilder.cpp
+++ b/src/uitools/formbuilder.cpp
@@ -199,13 +199,11 @@ QWidget *QFormBuilder::createWidget(const QString &widgetName, QWidget *parentWi
         }
 
 #define DECLARE_LAYOUT(L, C)
-#define DECLARE_COMPAT_WIDGET(W, C)
 #define DECLARE_WIDGET(W, C) else if (!qstrcmp(widgetNameC, #W)) { Q_ASSERT(w == 0); w = new W(parentWidget); }
 #define DECLARE_WIDGET_1(W, C) else if (!qstrcmp(widgetNameC, #W)) { Q_ASSERT(w == 0); w = new W(0, parentWidget); }
 
 #include "widgets.table"
 
-#undef DECLARE_COMPAT_WIDGET
 #undef DECLARE_LAYOUT
 #undef DECLARE_WIDGET
 #undef DECLARE_WIDGET_1
@@ -254,8 +252,6 @@ QLayout *QFormBuilder::createLayout(const QString &layoutName, QObject *parent,
     Q_ASSERT(parentWidget || parentLayout);
 
 #define DECLARE_WIDGET(W, C)
-#define DECLARE_COMPAT_WIDGET(W, C)
-
 #define DECLARE_LAYOUT(L, C) \
     if (layoutName == QLatin1String(#L)) { \
         Q_ASSERT(l == 0); \
@@ -267,7 +263,6 @@ QLayout *QFormBuilder::createLayout(const QString &layoutName, QObject *parent,
 #include "widgets.table"
 
 #undef DECLARE_LAYOUT
-#undef DECLARE_COMPAT_WIDGET
 #undef DECLARE_WIDGET
 
     if (l) {