TDE
/
qt3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/qt3
0
0
Fork 0
Code Issues Releases Wiki Activity

Moved iconview widget to src/widget folders.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/2/head
Michele Calgaro 9 years ago
parent 8b9ae3fbf8
commit a0a411065d
13 changed files with 15 additions and 62 deletions
Show Stats Download Patch File Download Diff File

3
doc/html/qglobal-h.html
Unescape View File

@ -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

14
doc/html/qiconview-h.html
Unescape View File

@ -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;

1
examples/demo/demo.pro
Unescape View File

@ -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 += .

2
include/qiconview.h
Unescape View File

@ -1 +1 @@
../src/iconview/qiconview.h
../src/widgets/qiconview.h

6
src/iconview/qt_iconview.pri
Unescape View File

@ -1,6 +0,0 @@
# Qt iconview module
iconview {
HEADERS += $$ICONVIEW_H/qiconview.h
SOURCES += $$ICONVIEW_CPP/qiconview.cpp
}

7
src/qt.pro
Unescape View File

@ -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)

15
src/qt_professional.pri
Unescape View File

@ -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

6
src/tools/qglobal.h
Unescape View File

@ -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

4
src/iconview/qiconview.cpp → src/widgets/qiconview.cpp
Unescape View File

@ -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() {}

14
src/iconview/qiconview.h → src/widgets/qiconview.h
Unescape View File

@ -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;

2
src/widgets/qlistview.cpp
Unescape View File

@ -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()

2
src/widgets/qt_widgets.pri
Unescape View File

@ -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 \

1
tools/designer/designer/designer.pro
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save