From 288d3884969624037bd201ef78540c06643807e8 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 5 May 2011 14:02:45 +0200 Subject: [PATCH] special directory for stuff we want to move from widgets to gui Create a special to_be_moved directory, that will contain files that are to be moved from QtWidgets to QtGui. This will allow us to do a first split of the libraries rather fast and we can then start pulling in these classes one by one. --- src/gui/gui.pro | 3 +++ src/gui/guikernel/guikernel.pri | 13 +----------- src/gui/guiutil/guiutil.pri | 10 ++++++++++ src/gui/{guikernel => to_be_moved}/qdnd.cpp | 0 src/gui/{guikernel => to_be_moved}/qdnd_p.h | 0 .../{guikernel => to_be_moved}/qdnd_qpa.cpp | 0 src/gui/{guikernel => to_be_moved}/qdrag.cpp | 0 src/gui/{guikernel => to_be_moved}/qdrag.h | 0 .../{guikernel => to_be_moved}/qkeymapper.cpp | 0 .../{guikernel => to_be_moved}/qkeymapper_p.h | 0 .../qkeymapper_qpa.cpp | 0 .../{text => to_be_moved}/qlinecontrol.cpp | 0 .../{text => to_be_moved}/qlinecontrol_p.h | 0 .../{guikernel => to_be_moved}/qshortcut.cpp | 0 .../{guikernel => to_be_moved}/qshortcut.h | 0 .../qshortcutmap.cpp | 0 .../qshortcutmap_p.h | 0 .../{text => to_be_moved}/qtextcontrol.cpp | 0 .../{text => to_be_moved}/qtextcontrol_p.h | 0 .../{text => to_be_moved}/qtextcontrol_p_p.h | 0 src/gui/to_be_moved/to_be_moved.pri | 20 +++++++++++++++++++ 21 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 src/gui/guiutil/guiutil.pri rename src/gui/{guikernel => to_be_moved}/qdnd.cpp (100%) rename src/gui/{guikernel => to_be_moved}/qdnd_p.h (100%) rename src/gui/{guikernel => to_be_moved}/qdnd_qpa.cpp (100%) rename src/gui/{guikernel => to_be_moved}/qdrag.cpp (100%) rename src/gui/{guikernel => to_be_moved}/qdrag.h (100%) rename src/gui/{guikernel => to_be_moved}/qkeymapper.cpp (100%) rename src/gui/{guikernel => to_be_moved}/qkeymapper_p.h (100%) rename src/gui/{guikernel => to_be_moved}/qkeymapper_qpa.cpp (100%) rename src/gui/{text => to_be_moved}/qlinecontrol.cpp (100%) rename src/gui/{text => to_be_moved}/qlinecontrol_p.h (100%) rename src/gui/{guikernel => to_be_moved}/qshortcut.cpp (100%) rename src/gui/{guikernel => to_be_moved}/qshortcut.h (100%) rename src/gui/{guikernel => to_be_moved}/qshortcutmap.cpp (100%) rename src/gui/{guikernel => to_be_moved}/qshortcutmap_p.h (100%) rename src/gui/{text => to_be_moved}/qtextcontrol.cpp (100%) rename src/gui/{text => to_be_moved}/qtextcontrol_p.h (100%) rename src/gui/{text => to_be_moved}/qtextcontrol_p_p.h (100%) create mode 100644 src/gui/to_be_moved/to_be_moved.pri diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 488378b0c6..c146a9b472 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -33,6 +33,9 @@ include(text/text.pri) include(painting/painting.pri) include(guiutil/guiutil.pri) +# to be moved into QtGui +include(to_be_moved/to_be_moved.pri) + #modules include(animation/animation.pri) include(kernel/kernel.pri) diff --git a/src/gui/guikernel/guikernel.pri b/src/gui/guikernel/guikernel.pri index 23cb385f9e..7f24adf56c 100644 --- a/src/gui/guikernel/guikernel.pri +++ b/src/gui/guikernel/guikernel.pri @@ -8,30 +8,21 @@ KERNEL_P= guikernel HEADERS += \ guikernel/qclipboard.h \ guikernel/qcursor.h \ - guikernel/qdrag.h \ - guikernel/qdnd_p.h \ guikernel/qevent.h \ guikernel/qevent_p.h \ guikernel/qkeysequence.h \ + guikernel/qkeysequence_p.h \ guikernel/qmime.h \ guikernel/qsessionmanager.h \ - guikernel/qshortcut.h \ - guikernel/qshortcutmap_p.h \ guikernel/qwindowdefs.h \ - guikernel/qkeymapper_p.h SOURCES += \ guikernel/qclipboard.cpp \ guikernel/qcursor.cpp \ - guikernel/qdrag.cpp \ - guikernel/qdnd.cpp \ guikernel/qevent.cpp \ guikernel/qkeysequence.cpp \ guikernel/qmime.cpp \ - guikernel/qshortcut.cpp \ - guikernel/qshortcutmap.cpp \ guikernel/qguivariant.cpp \ - guikernel/qkeymapper.cpp \ qpa { HEADERS += \ @@ -60,10 +51,8 @@ qpa { SOURCES += \ guikernel/qclipboard_qpa.cpp \ guikernel/qcursor_qpa.cpp \ - guikernel/qdnd_qpa.cpp \ guikernel/qgenericpluginfactory_qpa.cpp \ guikernel/qgenericplugin_qpa.cpp \ - guikernel/qkeymapper_qpa.cpp \ guikernel/qeventdispatcher_qpa.cpp \ guikernel/qwindowsysteminterface_qpa.cpp \ guikernel/qplatformintegration_qpa.cpp \ diff --git a/src/gui/guiutil/guiutil.pri b/src/gui/guiutil/guiutil.pri new file mode 100644 index 0000000000..95ec2cfc0f --- /dev/null +++ b/src/gui/guiutil/guiutil.pri @@ -0,0 +1,10 @@ +# Qt util module + +HEADERS += \ + guiutil/qdesktopservices.h \ + guiutil/qhexstring_p.h \ + guiutil/qvalidator.h + +SOURCES += \ + guiutil/qdesktopservices.cpp \ + guiutil/qvalidator.cpp diff --git a/src/gui/guikernel/qdnd.cpp b/src/gui/to_be_moved/qdnd.cpp similarity index 100% rename from src/gui/guikernel/qdnd.cpp rename to src/gui/to_be_moved/qdnd.cpp diff --git a/src/gui/guikernel/qdnd_p.h b/src/gui/to_be_moved/qdnd_p.h similarity index 100% rename from src/gui/guikernel/qdnd_p.h rename to src/gui/to_be_moved/qdnd_p.h diff --git a/src/gui/guikernel/qdnd_qpa.cpp b/src/gui/to_be_moved/qdnd_qpa.cpp similarity index 100% rename from src/gui/guikernel/qdnd_qpa.cpp rename to src/gui/to_be_moved/qdnd_qpa.cpp diff --git a/src/gui/guikernel/qdrag.cpp b/src/gui/to_be_moved/qdrag.cpp similarity index 100% rename from src/gui/guikernel/qdrag.cpp rename to src/gui/to_be_moved/qdrag.cpp diff --git a/src/gui/guikernel/qdrag.h b/src/gui/to_be_moved/qdrag.h similarity index 100% rename from src/gui/guikernel/qdrag.h rename to src/gui/to_be_moved/qdrag.h diff --git a/src/gui/guikernel/qkeymapper.cpp b/src/gui/to_be_moved/qkeymapper.cpp similarity index 100% rename from src/gui/guikernel/qkeymapper.cpp rename to src/gui/to_be_moved/qkeymapper.cpp diff --git a/src/gui/guikernel/qkeymapper_p.h b/src/gui/to_be_moved/qkeymapper_p.h similarity index 100% rename from src/gui/guikernel/qkeymapper_p.h rename to src/gui/to_be_moved/qkeymapper_p.h diff --git a/src/gui/guikernel/qkeymapper_qpa.cpp b/src/gui/to_be_moved/qkeymapper_qpa.cpp similarity index 100% rename from src/gui/guikernel/qkeymapper_qpa.cpp rename to src/gui/to_be_moved/qkeymapper_qpa.cpp diff --git a/src/gui/text/qlinecontrol.cpp b/src/gui/to_be_moved/qlinecontrol.cpp similarity index 100% rename from src/gui/text/qlinecontrol.cpp rename to src/gui/to_be_moved/qlinecontrol.cpp diff --git a/src/gui/text/qlinecontrol_p.h b/src/gui/to_be_moved/qlinecontrol_p.h similarity index 100% rename from src/gui/text/qlinecontrol_p.h rename to src/gui/to_be_moved/qlinecontrol_p.h diff --git a/src/gui/guikernel/qshortcut.cpp b/src/gui/to_be_moved/qshortcut.cpp similarity index 100% rename from src/gui/guikernel/qshortcut.cpp rename to src/gui/to_be_moved/qshortcut.cpp diff --git a/src/gui/guikernel/qshortcut.h b/src/gui/to_be_moved/qshortcut.h similarity index 100% rename from src/gui/guikernel/qshortcut.h rename to src/gui/to_be_moved/qshortcut.h diff --git a/src/gui/guikernel/qshortcutmap.cpp b/src/gui/to_be_moved/qshortcutmap.cpp similarity index 100% rename from src/gui/guikernel/qshortcutmap.cpp rename to src/gui/to_be_moved/qshortcutmap.cpp diff --git a/src/gui/guikernel/qshortcutmap_p.h b/src/gui/to_be_moved/qshortcutmap_p.h similarity index 100% rename from src/gui/guikernel/qshortcutmap_p.h rename to src/gui/to_be_moved/qshortcutmap_p.h diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/to_be_moved/qtextcontrol.cpp similarity index 100% rename from src/gui/text/qtextcontrol.cpp rename to src/gui/to_be_moved/qtextcontrol.cpp diff --git a/src/gui/text/qtextcontrol_p.h b/src/gui/to_be_moved/qtextcontrol_p.h similarity index 100% rename from src/gui/text/qtextcontrol_p.h rename to src/gui/to_be_moved/qtextcontrol_p.h diff --git a/src/gui/text/qtextcontrol_p_p.h b/src/gui/to_be_moved/qtextcontrol_p_p.h similarity index 100% rename from src/gui/text/qtextcontrol_p_p.h rename to src/gui/to_be_moved/qtextcontrol_p_p.h diff --git a/src/gui/to_be_moved/to_be_moved.pri b/src/gui/to_be_moved/to_be_moved.pri new file mode 100644 index 0000000000..9967dd82c0 --- /dev/null +++ b/src/gui/to_be_moved/to_be_moved.pri @@ -0,0 +1,20 @@ +HEADERS += \ + to_be_moved/qlinecontrol_p.h \ + to_be_moved/qtextcontrol_p.h \ + to_be_moved/qtextcontrol_p_p.h \ + to_be_moved/qshortcut.h \ + to_be_moved/qshortcutmap_p.h \ + to_be_moved/qdrag.h \ + to_be_moved/qdnd_p.h \ + to_be_moved/qkeymapper_p.h + +SOURCES += \ + to_be_moved/qlinecontrol.cpp \ + to_be_moved/qtextcontrol.cpp \ + to_be_moved/qshortcut.cpp \ + to_be_moved/qshortcutmap.cpp \ + to_be_moved/qdrag.cpp \ + to_be_moved/qdnd.cpp \ + to_be_moved/qdnd_qpa.cpp \ + to_be_moved/qkeymapper.cpp \ + to_be_moved/qkeymapper_qpa.cpp \