From 3e8b53a46ce8c54de17b0ae6bf5a6fa3eacaa143 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 4 May 2011 13:08:02 +0200 Subject: [PATCH] moving some more files around. --- src/gui/image/image.pri | 9 --------- src/gui/kernel/kernel.pri | 13 +++++++++++-- src/gui/{image => kernel}/qicon.cpp | 0 src/gui/{image => kernel}/qicon.h | 0 src/gui/{image => kernel}/qicon_p.h | 0 src/gui/{image => kernel}/qiconengine.cpp | 0 src/gui/{image => kernel}/qiconengine.h | 0 src/gui/{image => kernel}/qiconengineplugin.cpp | 0 src/gui/{image => kernel}/qiconengineplugin.h | 0 src/gui/{image => kernel}/qiconloader.cpp | 0 src/gui/{image => kernel}/qiconloader_p.h | 0 src/gui/{widgets => text}/qlinecontrol.cpp | 0 src/gui/{widgets => text}/qlinecontrol_p.h | 0 src/gui/text/text.pri | 6 ++++-- src/gui/widgets/widgets.pri | 2 -- 15 files changed, 15 insertions(+), 15 deletions(-) rename src/gui/{image => kernel}/qicon.cpp (100%) rename src/gui/{image => kernel}/qicon.h (100%) rename src/gui/{image => kernel}/qicon_p.h (100%) rename src/gui/{image => kernel}/qiconengine.cpp (100%) rename src/gui/{image => kernel}/qiconengine.h (100%) rename src/gui/{image => kernel}/qiconengineplugin.cpp (100%) rename src/gui/{image => kernel}/qiconengineplugin.h (100%) rename src/gui/{image => kernel}/qiconloader.cpp (100%) rename src/gui/{image => kernel}/qiconloader_p.h (100%) rename src/gui/{widgets => text}/qlinecontrol.cpp (100%) rename src/gui/{widgets => text}/qlinecontrol_p.h (100%) diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index e970fb05a1..f9e0fa449a 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -5,11 +5,6 @@ HEADERS += \ image/qbitmap.h \ - image/qicon.h \ - image/qicon_p.h \ - image/qiconloader_p.h \ - image/qiconengine.h \ - image/qiconengineplugin.h \ image/qimage.h \ image/qimage_p.h \ image/qimageiohandler.h \ @@ -36,8 +31,6 @@ HEADERS += \ SOURCES += \ image/qbitmap.cpp \ - image/qicon.cpp \ - image/qiconloader.cpp \ image/qimage.cpp \ image/qimageiohandler.cpp \ image/qimagereader.cpp \ @@ -50,8 +43,6 @@ SOURCES += \ image/qpixmapdata.cpp \ image/qpixmapdatafactory.cpp \ image/qpixmapfilter.cpp \ - image/qiconengine.cpp \ - image/qiconengineplugin.cpp \ image/qmovie.cpp \ image/qpixmap_raster.cpp \ image/qpixmap_blitter.cpp \ diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index c2559b1225..d32533dbc1 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -16,7 +16,12 @@ HEADERS += \ kernel/qdesktopwidget.h \ kernel/qformlayout.h \ kernel/qgridlayout.h \ - kernel/qlayout.h \ + kernel/qicon.h \ + kernel/qicon_p.h \ + kernel/qiconloader_p.h \ + kernel/qiconengine.h \ + kernel/qiconengineplugin.h \ + kernel/qlayout.h \ kernel/qlayout_p.h \ kernel/qlayoutengine_p.h \ kernel/qlayoutitem.h \ @@ -46,7 +51,11 @@ SOURCES += \ kernel/qboxlayout.cpp \ kernel/qformlayout.cpp \ kernel/qgridlayout.cpp \ - kernel/qlayout.cpp \ + kernel/qicon.cpp \ + kernel/qiconloader.cpp \ + kernel/qiconengine.cpp \ + kernel/qiconengineplugin.cpp \ + kernel/qlayout.cpp \ kernel/qlayoutengine.cpp \ kernel/qlayoutitem.cpp \ kernel/qpalette.cpp \ diff --git a/src/gui/image/qicon.cpp b/src/gui/kernel/qicon.cpp similarity index 100% rename from src/gui/image/qicon.cpp rename to src/gui/kernel/qicon.cpp diff --git a/src/gui/image/qicon.h b/src/gui/kernel/qicon.h similarity index 100% rename from src/gui/image/qicon.h rename to src/gui/kernel/qicon.h diff --git a/src/gui/image/qicon_p.h b/src/gui/kernel/qicon_p.h similarity index 100% rename from src/gui/image/qicon_p.h rename to src/gui/kernel/qicon_p.h diff --git a/src/gui/image/qiconengine.cpp b/src/gui/kernel/qiconengine.cpp similarity index 100% rename from src/gui/image/qiconengine.cpp rename to src/gui/kernel/qiconengine.cpp diff --git a/src/gui/image/qiconengine.h b/src/gui/kernel/qiconengine.h similarity index 100% rename from src/gui/image/qiconengine.h rename to src/gui/kernel/qiconengine.h diff --git a/src/gui/image/qiconengineplugin.cpp b/src/gui/kernel/qiconengineplugin.cpp similarity index 100% rename from src/gui/image/qiconengineplugin.cpp rename to src/gui/kernel/qiconengineplugin.cpp diff --git a/src/gui/image/qiconengineplugin.h b/src/gui/kernel/qiconengineplugin.h similarity index 100% rename from src/gui/image/qiconengineplugin.h rename to src/gui/kernel/qiconengineplugin.h diff --git a/src/gui/image/qiconloader.cpp b/src/gui/kernel/qiconloader.cpp similarity index 100% rename from src/gui/image/qiconloader.cpp rename to src/gui/kernel/qiconloader.cpp diff --git a/src/gui/image/qiconloader_p.h b/src/gui/kernel/qiconloader_p.h similarity index 100% rename from src/gui/image/qiconloader_p.h rename to src/gui/kernel/qiconloader_p.h diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/text/qlinecontrol.cpp similarity index 100% rename from src/gui/widgets/qlinecontrol.cpp rename to src/gui/text/qlinecontrol.cpp diff --git a/src/gui/widgets/qlinecontrol_p.h b/src/gui/text/qlinecontrol_p.h similarity index 100% rename from src/gui/widgets/qlinecontrol_p.h rename to src/gui/text/qlinecontrol_p.h diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index ba6ddb32f0..7a9aee62fd 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -9,7 +9,8 @@ HEADERS += \ text/qfontmetrics.h \ text/qfont_p.h \ text/qfontsubset_p.h \ - text/qtextcontrol_p.h \ + text/qlinecontrol_p.h \ + text/qtextcontrol_p.h \ text/qtextcontrol_p_p.h \ text/qtextengine_p.h \ text/qtextlayout.h \ @@ -51,7 +52,8 @@ SOURCES += \ text/qfontsubset.cpp \ text/qfontmetrics.cpp \ text/qfontdatabase.cpp \ - text/qtextcontrol.cpp \ + text/qlinecontrol.cpp \ + text/qtextcontrol.cpp \ text/qtextengine.cpp \ text/qtextlayout.cpp \ text/qtextformat.cpp \ diff --git a/src/gui/widgets/widgets.pri b/src/gui/widgets/widgets.pri index 4cbcbe3983..9797d6c717 100644 --- a/src/gui/widgets/widgets.pri +++ b/src/gui/widgets/widgets.pri @@ -30,7 +30,6 @@ HEADERS += \ widgets/qlcdnumber.h \ widgets/qlineedit.h \ widgets/qlineedit_p.h \ - widgets/qlinecontrol_p.h \ widgets/qmainwindow.h \ widgets/qmainwindowlayout_p.h \ widgets/qmdiarea.h \ @@ -103,7 +102,6 @@ SOURCES += \ widgets/qlcdnumber.cpp \ widgets/qlineedit_p.cpp \ widgets/qlineedit.cpp \ - widgets/qlinecontrol.cpp \ widgets/qmainwindow.cpp \ widgets/qmainwindowlayout.cpp \ widgets/qmdiarea.cpp \