From 532f394ac521199490ff0fa1864df133c934408d Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 17 May 2011 14:40:34 +0200 Subject: [PATCH] Designer: Make some interfaces needed for IDE integration public. QDesignerNewFormWidgetInterface QDesignerSettingsInterface QDesignerOptionsPageInterface --- .../src/components/formeditor/embeddedoptionspage.h | 2 +- .../src/components/formeditor/formeditor_optionspage.h | 2 +- .../src/components/formeditor/templateoptionspage.h | 2 +- .../src/components/propertyeditor/propertyeditor.cpp | 2 +- src/designer/src/components/taskmenu/listwidgeteditor.cpp | 2 +- .../src/components/widgetbox/widgetboxtreewidget.cpp | 3 +-- src/designer/src/designer/appfontdialog.cpp | 3 ++- src/designer/src/designer/preferencesdialog.cpp | 4 ++-- src/designer/src/designer/qdesigner_appearanceoptions.h | 3 ++- src/designer/src/designer/qdesigner_settings.cpp | 3 ++- src/designer/src/lib/sdk/abstractformeditor.cpp | 9 ++++++--- src/designer/src/lib/sdk/abstractnewformwidget.cpp | 2 +- .../{abstractnewformwidget_p.h => abstractnewformwidget.h} | 11 ----------- .../sdk/{abstractoptionspage_p.h => abstractoptionspage.h} | 11 ----------- .../lib/sdk/{abstractsettings_p.h => abstractsettings.h} | 13 +------------ src/designer/src/lib/sdk/sdk.pri | 6 +++--- src/designer/src/lib/shared/actioneditor.cpp | 2 +- src/designer/src/lib/shared/newformwidget_p.h | 2 +- src/designer/src/lib/shared/plaintexteditor.cpp | 2 +- src/designer/src/lib/shared/previewconfigurationwidget.cpp | 8 ++------ src/designer/src/lib/shared/previewmanager.cpp | 2 +- src/designer/src/lib/shared/qdesigner_qsettings_p.h | 3 ++- src/designer/src/lib/shared/qtresourceeditordialog.cpp | 5 +++-- src/designer/src/lib/shared/qtresourceview.cpp | 2 +- src/designer/src/lib/shared/richtexteditor.cpp | 2 +- src/designer/src/lib/shared/shared_settings.cpp | 6 ++++-- src/designer/src/lib/shared/stylesheeteditor.cpp | 2 +- 27 files changed, 43 insertions(+), 71 deletions(-) rename src/designer/src/lib/sdk/{abstractnewformwidget_p.h => abstractnewformwidget.h} (90%) rename src/designer/src/lib/sdk/{abstractoptionspage_p.h => abstractoptionspage.h} (89%) rename src/designer/src/lib/sdk/{abstractsettings_p.h => abstractsettings.h} (89%) diff --git a/src/designer/src/components/formeditor/embeddedoptionspage.h b/src/designer/src/components/formeditor/embeddedoptionspage.h index 7947c37..792496c 100644 --- a/src/designer/src/components/formeditor/embeddedoptionspage.h +++ b/src/designer/src/components/formeditor/embeddedoptionspage.h @@ -42,7 +42,7 @@ #ifndef EMBEDDEDOPTIONSPAGE_H #define EMBEDDEDOPTIONSPAGE_H -#include +#include #include #include diff --git a/src/designer/src/components/formeditor/formeditor_optionspage.h b/src/designer/src/components/formeditor/formeditor_optionspage.h index d7d169b..b1f0f42 100644 --- a/src/designer/src/components/formeditor/formeditor_optionspage.h +++ b/src/designer/src/components/formeditor/formeditor_optionspage.h @@ -42,7 +42,7 @@ #ifndef FORMEDITOR_OPTIONSPAGE_H #define FORMEDITOR_OPTIONSPAGE_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/designer/src/components/formeditor/templateoptionspage.h b/src/designer/src/components/formeditor/templateoptionspage.h index 98d468c..ea1c29b 100644 --- a/src/designer/src/components/formeditor/templateoptionspage.h +++ b/src/designer/src/components/formeditor/templateoptionspage.h @@ -42,7 +42,7 @@ #ifndef QDESIGNER_TEMPLATEOPTIONS_H #define QDESIGNER_TEMPLATEOPTIONS_H -#include +#include #include #include diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp index 9f298d0..31ef2da 100644 --- a/src/designer/src/components/propertyeditor/propertyeditor.cpp +++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp @@ -59,7 +59,7 @@ #include #include #include -#include +#include // shared #include #include diff --git a/src/designer/src/components/taskmenu/listwidgeteditor.cpp b/src/designer/src/components/taskmenu/listwidgeteditor.cpp index 7c81ea4..e1259f1 100644 --- a/src/designer/src/components/taskmenu/listwidgeteditor.cpp +++ b/src/designer/src/components/taskmenu/listwidgeteditor.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp index f4b567b..cbb6244 100644 --- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp +++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp @@ -45,7 +45,6 @@ // shared #include #include -#include #include #include #include @@ -54,7 +53,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/designer/src/designer/appfontdialog.cpp b/src/designer/src/designer/appfontdialog.cpp index 00b91fa..10ec254 100644 --- a/src/designer/src/designer/appfontdialog.cpp +++ b/src/designer/src/designer/appfontdialog.cpp @@ -42,7 +42,8 @@ #include "appfontdialog.h" #include -#include + +#include #include #include diff --git a/src/designer/src/designer/preferencesdialog.cpp b/src/designer/src/designer/preferencesdialog.cpp index a27e366..f847bae 100644 --- a/src/designer/src/designer/preferencesdialog.cpp +++ b/src/designer/src/designer/preferencesdialog.cpp @@ -43,9 +43,9 @@ #include "ui_preferencesdialog.h" #include "qdesigner_appearanceoptions.h" -#include - +#include #include + #include #include diff --git a/src/designer/src/designer/qdesigner_appearanceoptions.h b/src/designer/src/designer/qdesigner_appearanceoptions.h index a6e4f9a..2c7fda1 100644 --- a/src/designer/src/designer/qdesigner_appearanceoptions.h +++ b/src/designer/src/designer/qdesigner_appearanceoptions.h @@ -45,7 +45,8 @@ #include "designer_enums.h" #include "qdesigner_toolwindow.h" -#include +#include + #include #include #include diff --git a/src/designer/src/designer/qdesigner_settings.cpp b/src/designer/src/designer/qdesigner_settings.cpp index 89bec14..b5a4e02 100644 --- a/src/designer/src/designer/qdesigner_settings.cpp +++ b/src/designer/src/designer/qdesigner_settings.cpp @@ -44,8 +44,9 @@ #include "qdesigner_toolwindow.h" #include "qdesigner_workbench.h" +#include + #include -#include #include #include diff --git a/src/designer/src/lib/sdk/abstractformeditor.cpp b/src/designer/src/lib/sdk/abstractformeditor.cpp index 8cc4b56..6110a93 100644 --- a/src/designer/src/lib/sdk/abstractformeditor.cpp +++ b/src/designer/src/lib/sdk/abstractformeditor.cpp @@ -42,10 +42,9 @@ #include "abstractformeditor.h" #include "abstractdialoggui_p.h" #include "abstractintrospection_p.h" -#include "abstractsettings_p.h" -#include "abstractoptionspage_p.h" -#include +#include +#include #include #include #include @@ -55,6 +54,8 @@ #include #include #include +#include + #include #include #include @@ -65,6 +66,8 @@ #include #include +#include + // Must be done outside of the Qt namespace static void initResources() { diff --git a/src/designer/src/lib/sdk/abstractnewformwidget.cpp b/src/designer/src/lib/sdk/abstractnewformwidget.cpp index 42d4343..983affb 100644 --- a/src/designer/src/lib/sdk/abstractnewformwidget.cpp +++ b/src/designer/src/lib/sdk/abstractnewformwidget.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "abstractnewformwidget_p.h" +#include "abstractnewformwidget.h" #include QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/sdk/abstractnewformwidget_p.h b/src/designer/src/lib/sdk/abstractnewformwidget.h similarity index 90% rename from src/designer/src/lib/sdk/abstractnewformwidget_p.h rename to src/designer/src/lib/sdk/abstractnewformwidget.h index db0c740..dc45acb 100644 --- a/src/designer/src/lib/sdk/abstractnewformwidget_p.h +++ b/src/designer/src/lib/sdk/abstractnewformwidget.h @@ -39,17 +39,6 @@ ** ****************************************************************************/ -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of Qt Designer. This header -// file may change from version to version without notice, or even be removed. -// -// We mean it. -// - #ifndef ABSTRACTNEWFORMWIDGET_H #define ABSTRACTNEWFORMWIDGET_H diff --git a/src/designer/src/lib/sdk/abstractoptionspage_p.h b/src/designer/src/lib/sdk/abstractoptionspage.h similarity index 89% rename from src/designer/src/lib/sdk/abstractoptionspage_p.h rename to src/designer/src/lib/sdk/abstractoptionspage.h index f6c54ae..b7da312 100644 --- a/src/designer/src/lib/sdk/abstractoptionspage_p.h +++ b/src/designer/src/lib/sdk/abstractoptionspage.h @@ -39,17 +39,6 @@ ** ****************************************************************************/ -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of Qt Designer. This header -// file may change from version to version without notice, or even be removed. -// -// We mean it. -// - #ifndef ABSTRACTOPTIONSPAGE_P_H #define ABSTRACTOPTIONSPAGE_P_H diff --git a/src/designer/src/lib/sdk/abstractsettings_p.h b/src/designer/src/lib/sdk/abstractsettings.h similarity index 89% rename from src/designer/src/lib/sdk/abstractsettings_p.h rename to src/designer/src/lib/sdk/abstractsettings.h index 6637d1a..652be5f 100644 --- a/src/designer/src/lib/sdk/abstractsettings_p.h +++ b/src/designer/src/lib/sdk/abstractsettings.h @@ -39,23 +39,12 @@ ** ****************************************************************************/ -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of Qt Designer. This header -// file may change from version to version without notice, or even be removed. -// -// We mean it. -// - #ifndef ABSTRACTSETTINGS_P_H #define ABSTRACTSETTINGS_P_H #include -#include +#include QT_BEGIN_HEADER diff --git a/src/designer/src/lib/sdk/sdk.pri b/src/designer/src/lib/sdk/sdk.pri index c6a474b..725edeb 100644 --- a/src/designer/src/lib/sdk/sdk.pri +++ b/src/designer/src/lib/sdk/sdk.pri @@ -4,7 +4,7 @@ INCLUDEPATH += $$PWD HEADERS += $$PWD/abstractformeditor.h \ $$PWD/abstractintrospection_p.h \ - $$PWD/abstractsettings_p.h \ + $$PWD/abstractsettings.h \ $$PWD/abstractformeditorplugin.h \ $$PWD/abstractresourcebrowser.h \ $$PWD/abstractintegration.h \ @@ -19,7 +19,7 @@ HEADERS += $$PWD/abstractformeditor.h \ $$PWD/abstractobjectinspector.h \ $$PWD/abstractactioneditor.h \ $$PWD/abstractlanguage.h \ - $$PWD/abstractoptionspage_p.h \ + $$PWD/abstractoptionspage.h \ $$PWD/propertysheet.h \ $$PWD/dynamicpropertysheet.h \ $$PWD/membersheet.h \ @@ -31,7 +31,7 @@ HEADERS += $$PWD/abstractformeditor.h \ $$PWD/abstractpromotioninterface.h \ $$PWD/abstractdialoggui_p.h \ $$PWD/script_p.h \ - $$PWD/abstractnewformwidget_p.h + $$PWD/abstractnewformwidget.h SOURCES += $$PWD/abstractformeditor.cpp \ $$PWD/abstractintrospection.cpp \ diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp index 5551584..9db7ad7 100644 --- a/src/designer/src/lib/shared/actioneditor.cpp +++ b/src/designer/src/lib/shared/actioneditor.cpp @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/designer/src/lib/shared/newformwidget_p.h b/src/designer/src/lib/shared/newformwidget_p.h index 940b11c..a840c9a 100644 --- a/src/designer/src/lib/shared/newformwidget_p.h +++ b/src/designer/src/lib/shared/newformwidget_p.h @@ -56,7 +56,7 @@ #include "shared_global_p.h" #include "deviceprofile_p.h" -#include +#include #include #include diff --git a/src/designer/src/lib/shared/plaintexteditor.cpp b/src/designer/src/lib/shared/plaintexteditor.cpp index 748cecc..88b0b57 100644 --- a/src/designer/src/lib/shared/plaintexteditor.cpp +++ b/src/designer/src/lib/shared/plaintexteditor.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include "plaintexteditor_p.h" -#include "abstractsettings_p.h" +#include #include #include diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp index 2b4506a..a65c3af 100644 --- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp +++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp @@ -39,15 +39,9 @@ ** ****************************************************************************/ -/* It is possible to link the skins as resources into Designer by specifying: - * QVFB_ROOT=$$QT_SOURCE_TREE/tools/qvfb - * RESOURCES += $$QVFB_ROOT/ClamshellPhone.qrc $$QVFB_ROOT/TouchScreenPhone.qrc ... - * in lib/shared/shared.pri. However, this exceeds a limit of Visual Studio 6. */ - #include "previewconfigurationwidget_p.h" #include "ui_previewconfigurationwidget.h" #include "previewmanager_p.h" -#include "abstractsettings_p.h" #include "shared_settings_p.h" #include @@ -55,6 +49,8 @@ #include +#include + #include #include #include diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp index 3857b78..47a732a 100644 --- a/src/designer/src/lib/shared/previewmanager.cpp +++ b/src/designer/src/lib/shared/previewmanager.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ -#include "abstractsettings_p.h" #include "previewmanager_p.h" #include "qdesigner_formbuilder_p.h" #include "shared_settings_p.h" @@ -53,6 +52,7 @@ #include #include #include +#include #include #include diff --git a/src/designer/src/lib/shared/qdesigner_qsettings_p.h b/src/designer/src/lib/shared/qdesigner_qsettings_p.h index e0586cc..81284b6 100644 --- a/src/designer/src/lib/shared/qdesigner_qsettings_p.h +++ b/src/designer/src/lib/shared/qdesigner_qsettings_p.h @@ -53,9 +53,10 @@ #ifndef QDESIGNER_QSETTINGS_H #define QDESIGNER_QSETTINGS_H -#include "abstractsettings_p.h" #include "shared_global_p.h" +#include + #include QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qtresourceeditordialog.cpp b/src/designer/src/lib/shared/qtresourceeditordialog.cpp index 59a12de..1f6838e 100644 --- a/src/designer/src/lib/shared/qtresourceeditordialog.cpp +++ b/src/designer/src/lib/shared/qtresourceeditordialog.cpp @@ -39,8 +39,6 @@ ** ****************************************************************************/ -#include "abstractsettings_p.h" -#include "abstractformeditor.h" #include "qtresourceeditordialog_p.h" #include "ui_qtresourceeditordialog.h" #include "qtresourcemodel_p.h" @@ -48,6 +46,9 @@ #include +#include +#include + #include #include #include diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp index 0400273..c6addf0 100644 --- a/src/designer/src/lib/shared/qtresourceview.cpp +++ b/src/designer/src/lib/shared/qtresourceview.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ -#include "abstractsettings_p.h" #include "qtresourceview_p.h" #include "qtresourcemodel_p.h" #include "qtresourceeditordialog_p.h" @@ -47,6 +46,7 @@ #include "filterwidget_p.h" // For FilterWidget #include +#include #include #include diff --git a/src/designer/src/lib/shared/richtexteditor.cpp b/src/designer/src/lib/shared/richtexteditor.cpp index c2cdb20..fa23baf 100644 --- a/src/designer/src/lib/shared/richtexteditor.cpp +++ b/src/designer/src/lib/shared/richtexteditor.cpp @@ -43,11 +43,11 @@ #include "htmlhighlighter_p.h" #include "iconselector_p.h" #include "ui_addlinkdialog.h" -#include "abstractsettings_p.h" #include "iconloader_p.h" #include +#include #include #include diff --git a/src/designer/src/lib/shared/shared_settings.cpp b/src/designer/src/lib/shared/shared_settings.cpp index 20b49fd..bf976bc 100644 --- a/src/designer/src/lib/shared/shared_settings.cpp +++ b/src/designer/src/lib/shared/shared_settings.cpp @@ -43,8 +43,10 @@ #include "grid_p.h" #include "previewmanager_p.h" #include "qdesigner_utils_p.h" -#include -#include + +#include +#include + #include #include #include diff --git a/src/designer/src/lib/shared/stylesheeteditor.cpp b/src/designer/src/lib/shared/stylesheeteditor.cpp index 72e7c10..d96fe55 100644 --- a/src/designer/src/lib/shared/stylesheeteditor.cpp +++ b/src/designer/src/lib/shared/stylesheeteditor.cpp @@ -46,13 +46,13 @@ #include "qtgradientviewdialog.h" #include "qtgradientutils.h" #include "qdesigner_utils_p.h" -#include "abstractsettings_p.h" #include #include #include #include #include +#include #include #include -- 2.7.4