Moved iconview widget to src/widget folders.

Signed-off-by: Michele Calgaro <[email protected]>

13 files changed, 15 insertions, 62 deletions

diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html
index 5aefb57..17b08bd 100644
--- a/doc/html/qglobal-h.html
+++ b/doc/html/qglobal-h.html
@@ -823,9 +823,6 @@ class QDataStream;
 #ifndef QT_MODULE_DIALOGS
 # define QT_NO_DIALOG
 #endif
-#ifndef QT_MODULE_ICONVIEW
-# define QT_NO_ICONVIEW
-#endif
 #ifndef QT_MODULE_WORKSPACE
 # define QT_NO_WORKSPACE
 #endif
diff --git a/doc/html/qiconview-h.html b/doc/html/qiconview-h.html
index 1c06cdb..a5d1be6 100644
--- a/doc/html/qiconview-h.html
+++ b/doc/html/qiconview-h.html
@@ -91,12 +91,6 @@ body { background: #ffffff; color: black; }
 
 #ifndef QT_NO_ICONVIEW
 
-#if !defined( QT_MODULE_ICONVIEW ) || defined( QT_INTERNAL_ICONVIEW )
-#define QM_EXPORT_ICONVIEW
-#else
-#define QM_EXPORT_ICONVIEW Q_EXPORT
-#endif
-
 class QIconView;
 class QPainter;
 class QMimeSource;
@@ -114,7 +108,7 @@ class QIconDragPrivate;
 
 #ifndef QT_NO_DRAGANDDROP
 
-class QM_EXPORT_ICONVIEW QIconDragItem
+class Q_EXPORT QIconDragItem
 {
 public:
     QIconDragItem();
@@ -128,7 +122,7 @@ private:
 
 };
 
-class QM_EXPORT_ICONVIEW QIconDrag : public QDragObject
+class Q_EXPORT QIconDrag : public QDragObject
 {
     Q_OBJECT
 public:
@@ -158,7 +152,7 @@ private:
 class QIconViewToolTip;
 class QIconViewItemPrivate;
 
-class QM_EXPORT_ICONVIEW QIconViewItem : public Qt
+class Q_EXPORT QIconViewItem : public Qt
 {
     friend class QIconView;
     friend class QIconViewToolTip;
@@ -301,7 +295,7 @@ private:
 
 class QIconViewPrivate;          /* don't touch */
 
-class QM_EXPORT_ICONVIEW QIconView : public QScrollView
+class Q_EXPORT QIconView : public QScrollView
 {
     friend class QIconViewItem;
     friend class QIconViewPrivate;
diff --git a/examples/demo/demo.pro b/examples/demo/demo.pro
index 3413fcd..fa49ef0 100644
--- a/examples/demo/demo.pro
+++ b/examples/demo/demo.pro
@@ -3,7 +3,6 @@ TARGET		= demo
 
 CONFIG		+= qt warn_off release
 unix:LIBS	+= -lm
-DEFINES		+= QT_INTERNAL_ICONVIEW
 DEFINES		+= QT_INTERNAL_WORKSPACE
 DEFINES		+= QT_INTERNAL_CANVAS
 INCLUDEPATH	+= .
diff --git a/include/qiconview.h b/include/qiconview.h
index 3d6ae55..b927951 120000
--- a/include/qiconview.h
+++ b/include/qiconview.h
@@ -1 +1 @@
-../src/iconview/qiconview.h
\ No newline at end of file
+../src/widgets/qiconview.h
\ No newline at end of file
diff --git a/src/iconview/qt_iconview.pri b/src/iconview/qt_iconview.pri
deleted file mode 100644
index 198885e..0000000
--- a/src/iconview/qt_iconview.pri
+++ /dev/null
@@ -1,6 +0,0 @@
-# Qt iconview module
-
-iconview {
-	HEADERS += $$ICONVIEW_H/qiconview.h
-	SOURCES += $$ICONVIEW_CPP/qiconview.cpp
-}
diff --git a/src/qt.pro b/src/qt.pro
index 2716a8b..97867f2 100644
--- a/src/qt.pro
+++ b/src/qt.pro
@@ -31,7 +31,6 @@ WIDGETS_CPP	= widgets
 SQL_CPP	        = sql
 TABLE_CPP	= table
 DIALOGS_CPP	= dialogs
-ICONVIEW_CPP	= iconview
 NETWORK_CPP	= network
 OPENGL_CPP	= opengl
 TOOLS_CPP	= tools
@@ -49,7 +48,6 @@ win32 {
 		WIDGETS_H	= $$WIDGETS_CPP
 		TABLE_H		= $$TABLE_CPP
 		DIALOGS_H	= $$DIALOGS_CPP
-		ICONVIEW_H	= $$ICONVIEW_CPP
 		NETWORK_H	= $$NETWORK_CPP
 		OPENGL_H	= $$OPENGL_CPP
 		TOOLS_H		= $$TOOLS_CPP
@@ -66,7 +64,6 @@ win32 {
 		WIDGETS_H	= $$WIN_ALL_H
 		TABLE_H		= $$WIN_ALL_H
 		DIALOGS_H	= $$WIN_ALL_H
-		ICONVIEW_H	= $$WIN_ALL_H
 		NETWORK_H	= $$WIN_ALL_H
 		OPENGL_H	= $$WIN_ALL_H
 		TOOLS_H		= $$WIN_ALL_H
@@ -95,7 +92,6 @@ unix {
 	SQL_H		= $$SQL_CPP
 	TABLE_H		= $$TABLE_CPP
 	DIALOGS_H	= $$DIALOGS_CPP
-	ICONVIEW_H	= $$ICONVIEW_CPP
 	NETWORK_H	= $$NETWORK_CPP
 	OPENGL_H	= $$OPENGL_CPP
 	TOOLS_H		= $$TOOLS_CPP
@@ -117,7 +113,7 @@ embedded {
 }
 
 DEPENDPATH += ;$$NETWORK_H;$$KERNEL_H;$$WIDGETS_H;$$INPUTMETHOD_H;$$SQL_H;$$TABLE_H;$$DIALOGS_H;
-DEPENDPATH += $$ICONVIEW_H;$$OPENGL_H;$$TOOLS_H;$$CODECS_H;$$WORKSPACE_H;$$XML_H;
+DEPENDPATH += $$OPENGL_H;$$TOOLS_H;$$CODECS_H;$$WORKSPACE_H;$$XML_H;
 DEPENDPATH += $$CANVAS_H;$$STYLES_H
 embedded:DEPENDPATH += ;$$EMBEDDED_H
 
@@ -149,7 +145,6 @@ embedded:include($$KERNEL_CPP/qt_qws.pri)
 include($$KERNEL_CPP/qt_kernel.pri)
 include($$WIDGETS_CPP/qt_widgets.pri)
 include($$DIALOGS_CPP/qt_dialogs.pri)
-include($$ICONVIEW_CPP/qt_iconview.pri)
 include($$WORKSPACE_CPP/qt_workspace.pri)
 include($$INPUTMETHOD_CPP/qt_inputmethod.pri)
 include($$NETWORK_CPP/qt_network.pri)
diff --git a/src/qt_professional.pri b/src/qt_professional.pri
index 93b7136..3f4746d 100644
--- a/src/qt_professional.pri
+++ b/src/qt_professional.pri
@@ -46,21 +46,6 @@
 	DEFINES     *= QT_MODULE_WORKSPACE
 }
 
-!iconview:contains( DEFINES, QT_INTERNAL_ICONVIEW ) {
-	CONFIG += iconview
-	ICONVIEW_CPP = $$QT_SOURCE_TREE/src/iconview
-	win32 {
-		WIN_ALL_H = $$QT_SOURCE_TREE/include
-		ICONVIEW_H = $$WIN_ALL_H
-	}
-	unix {
-		ICONVIEW_H = $$ICONVIEW_CPP
-	}
-	INCLUDEPATH += $$QT_SOURCE_TREE/src/iconview
-	include( $$QT_SOURCE_TREE/src/iconview/qt_iconview.pri )
-	DEFINES     *= QT_MODULE_ICONVIEW
-}
-
 !canvas:contains( DEFINES, QT_INTERNAL_CANVAS ) {
 	CONFIG += canvas
 	CANVAS_CPP = $$QT_SOURCE_TREE/src/canvas
diff --git a/src/tools/qglobal.h b/src/tools/qglobal.h
index a62d19a..62de654 100644
--- a/src/tools/qglobal.h
+++ b/src/tools/qglobal.h
@@ -789,12 +789,6 @@ class QDataStream;
 #ifndef QT_MODULE_DIALOGS
 # define QT_NO_DIALOG
 #endif
-#ifndef QT_MODULE_ICONVIEW
-# define QT_NO_ICONVIEW
-#endif
-#ifndef QT_MODULE_WORKSPACE
-# define QT_NO_WORKSPACE
-#endif
 #ifndef QT_MODULE_NETWORK
 #define QT_NO_NETWORK
 #endif
diff --git a/src/iconview/qiconview.cpp b/src/widgets/qiconview.cpp
index 101582b..a05ec34 100644
--- a/src/iconview/qiconview.cpp
+++ b/src/widgets/qiconview.cpp
@@ -166,7 +166,7 @@ static QPixmap *get_qiv_buffer_pixmap( const QSize &s )
 
 #ifndef QT_NO_DRAGANDDROP
 
-class QM_EXPORT_ICONVIEW QIconDragData
+class Q_EXPORT QIconDragData
 {
 public:
     QIconDragData();
@@ -184,7 +184,7 @@ public:
     bool operator==( const QIconDragData &i ) const;
 };
 
-class QM_EXPORT_ICONVIEW QIconDragDataItem
+class Q_EXPORT QIconDragDataItem
 {
 public:
     QIconDragDataItem() {}
diff --git a/src/iconview/qiconview.h b/src/widgets/qiconview.h
index 4504690..48736d6 100644
--- a/src/iconview/qiconview.h
+++ b/src/widgets/qiconview.h
@@ -55,12 +55,6 @@
 
 #ifndef QT_NO_ICONVIEW
 
-#if !defined( QT_MODULE_ICONVIEW ) || defined( QT_INTERNAL_ICONVIEW )
-#define QM_EXPORT_ICONVIEW
-#else
-#define QM_EXPORT_ICONVIEW Q_EXPORT
-#endif
-
 class QIconView;
 class QPainter;
 class QMimeSource;
@@ -78,7 +72,7 @@ class QIconDragPrivate;
 
 #ifndef QT_NO_DRAGANDDROP
 
-class QM_EXPORT_ICONVIEW QIconDragItem
+class Q_EXPORT QIconDragItem
 {
 public:
     QIconDragItem();
@@ -92,7 +86,7 @@ private:
 
 };
 
-class QM_EXPORT_ICONVIEW QIconDrag : public QDragObject
+class Q_EXPORT QIconDrag : public QDragObject
 {
     Q_OBJECT
 public:
@@ -122,7 +116,7 @@ private:
 class QIconViewToolTip;
 class QIconViewItemPrivate;
 
-class QM_EXPORT_ICONVIEW QIconViewItem : public Qt
+class Q_EXPORT QIconViewItem : public Qt
 {
     friend class QIconView;
     friend class QIconViewToolTip;
@@ -269,7 +263,7 @@ private:
 
 class QIconViewPrivate;          /* don't touch */
 
-class QM_EXPORT_ICONVIEW QIconView : public QScrollView
+class Q_EXPORT QIconView : public QScrollView
 {
     friend class QIconViewItem;
     friend class QIconViewPrivate;
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index 6e2564c..c83ee40 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -2351,7 +2351,7 @@ void QListViewItem::ignoreDoubleClick()
     item \a i, similar to the QWidget::enterEvent() function.
 */
 
-// ### bug here too? see qiconview.cppp onItem/onViewport
+// ### bug here too? see qiconview.cpp onItem/onViewport
 
 /*!
     \fn void  QListView::onViewport()
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index a4917e9..774d3df 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -20,6 +20,7 @@ widgets {
 		  $$WIDGETS_H/qheader.h \
 		  $$WIDGETS_H/qhgroupbox.h \
 		  $$WIDGETS_H/qhbox.h \
+		  $$WIDGETS_H/qiconview.h \
 		  $$WIDGETS_H/qlabel.h \
 		  $$WIDGETS_H/qlcdnumber.h \
 		  $$WIDGETS_H/qlineedit.h \
@@ -81,6 +82,7 @@ widgets {
 		  $$WIDGETS_CPP/qheader.cpp \
 		  $$WIDGETS_CPP/qhgroupbox.cpp \
 		  $$WIDGETS_CPP/qhbox.cpp \
+		  $$WIDGETS_CPP/qiconview.cpp \
 		  $$WIDGETS_CPP/qlabel.cpp \
 		  $$WIDGETS_CPP/qlcdnumber.cpp \
 		  $$WIDGETS_CPP/qlineedit.cpp \
diff --git a/tools/designer/designer/designer.pro b/tools/designer/designer/designer.pro
index 24c7b46..91de514 100644
--- a/tools/designer/designer/designer.pro
+++ b/tools/designer/designer/designer.pro
@@ -12,7 +12,6 @@ TARGET	= designercore
 DEFINES	+= DESIGNER
 DEFINES += QT_INTERNAL_XML
 DEFINES += QT_INTERNAL_WORKSPACE
-DEFINES += QT_INTERNAL_ICONVIEW
 DEFINES += QT_INTERNAL_TABLE
 table:win32-msvc:DEFINES+=QM_TEMPLATE_EXTERN_TABLE=extern