Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove some Q3 support remains

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-01-11 12:43:48 +02:00
parent 2298738735
commit 85ba1c5877
15 changed files with 1 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/global/qconfig.h.cmake
View file

@ -80,7 +80,6 @@
#cmakedefine QT_NO_PRINTDIALOG
#cmakedefine QT_NO_PRINTPREVIEWDIALOG
#cmakedefine QT_NO_PROGRESSDIALOG
#cmakedefine QT_NO_TABDIALOG
#cmakedefine QT_NO_WIZARD
/* File I/O */

5
src/core/global/qfeatures.h
View file

@ -639,11 +639,6 @@
#define QT_NO_SVG
#endif
// Q3TabDialog
#if !defined(QT_NO_TABDIALOG) && (defined(QT_NO_TABBAR))
#define QT_NO_TABDIALOG
#endif
// QTextCodecPlugin
#if !defined(QT_NO_TEXTCODECPLUGIN) && (defined(QT_NO_TEXTCODEC) || defined(QT_NO_LIBRARY))
#define QT_NO_TEXTCODECPLUGIN

7
src/core/global/qfeatures.txt
View file

@ -651,13 +651,6 @@ Requires: COMBOBOX SPINBOX STACKEDWIDGET
Name: QInputDialog
SeeAlso: ???
Feature: TABDIALOG
Description: Supports a stack of tabbed widgets.
Section: Dialogs
Requires: TABBAR
Name: Q3TabDialog
SeeAlso: ???
Feature: ERRORMESSAGE
Description: Supports an error message display dialog.
Section: Dialogs

1
src/core/kernel/qcoreapplication.h
View file

@ -190,7 +190,6 @@ private:
friend class QApplication;
friend class QApplicationPrivate;
friend class QETWidget;
friend class Q3AccelManager;
friend class QShortcutMap;
friend class QWidget;
friend class QWidgetPrivate;

1
src/core/kernel/qcoreevent.h
View file

@ -308,7 +308,6 @@ private:
friend class QThreadData;
friend class QApplication;
friend class QApplicationPrivate;
friend class Q3AccelManager;
friend class QShortcutMap;
friend class QETWidget;
friend class QGraphicsView;

28
src/gui/image/qpicture.cpp
View file

@ -828,26 +828,6 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
}
painter->setBrush(brush);
break;
// #ifdef Q_Q3PAINTER
// case QPicturePrivate::PdcSetTabStops:
// s >> i_16;
// painter->setTabStops(i_16);
// break;
// case QPicturePrivate::PdcSetTabArray:
// s >> i_16;
// if (i_16 == 0) {
// painter->setTabArray(0);
// } else {
// int *ta = new int[i_16];
// for (int i=0; i<i_16; i++) {
// s >> i1_16;
// ta[i] = i1_16;
// }
// painter->setTabArray(ta);
// delete [] ta;
// }
// break;
// #endif
case QPicturePrivate::PdcSetVXform:
s >> i_8;
painter->setViewTransformEnabled(i_8);
@ -884,14 +864,6 @@ bool QPicture::exec(QPainter *painter, QDataStream &s, int nrecords)
// i_8 is always false due to updateXForm() in qpaintengine_pic.cpp
painter->setTransform(matrix * worldMatrix, i_8);
break;
// #ifdef Q_Q3PAINTER
// case QPicturePrivate::PdcSaveWMatrix:
// painter->saveWorldMatrix();
// break;
// case QPicturePrivate::PdcRestoreWMatrix:
// painter->restoreWorldMatrix();
// break;
// #endif
case QPicturePrivate::PdcSetClip:
s >> i_8;
painter->setClipping(i_8);

1
src/gui/image/qpicture.h
View file

@ -110,7 +110,6 @@ private:
QExplicitlySharedDataPointer<QPicturePrivate> d_ptr;
friend class QPicturePaintEngine;
friend class Q3Picture;
friend class QAlphaPaintEngine;
friend class QPreviewPaintEngine;

1
src/gui/kernel/qapplication.h
View file

@ -325,7 +325,6 @@ private:
friend class QWidget;
friend class QWidgetPrivate;
friend class QETWidget;
friend class Q3AccelManager;
friend class QTranslator;
friend class QWidgetAnimator;
#ifndef QT_NO_SHORTCUT

1
src/gui/kernel/qkeysequence.h
View file

@ -200,7 +200,6 @@ private:
friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QKeySequence &ks);
friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QKeySequence &ks);
friend class Q3AccelManager;
friend class QShortcutMap;
friend class QShortcut;

1
src/gui/painting/qpainter.h
View file

@ -468,7 +468,6 @@ public:
private:
Q_DISABLE_COPY(QPainter)
friend class Q3Painter;
QScopedPointer<QPainterPrivate> d_ptr;

2
src/gui/styles/qstyle.cpp
View file

@ -1149,7 +1149,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
\value SC_ToolButton Tool button (see also QToolButton).
\value SC_ToolButtonMenu Sub-control for opening a popup menu in a
tool button; see also Q3PopupMenu.
tool button; see also QMenu.
\value SC_TitleBarSysMenu System menu button (i.e., restore, close, etc.).
\value SC_TitleBarMinButton Minimize button.

2
src/gui/text/qfont.h
View file

@ -58,7 +58,6 @@ QT_BEGIN_NAMESPACE
class QFontPrivate; /* don't touch */
class QStringList;
class QVariant;
class Q3TextFormatCollection;
class Q_GUI_EXPORT QFont
{
@ -310,7 +309,6 @@ private:
friend class QApplication;
friend class QWidget;
friend class QWidgetPrivate;
friend class Q3TextFormatCollection;
friend class QTextLayout;
friend class QTextEngine;
friend class QStackTextEngine;

1
src/gui/widgets/qmenu.h
View file

@ -194,7 +194,6 @@ private:
friend class QMenuBar;
friend class QMenuBarPrivate;
friend class QTornOffMenu;
friend class Q3PopupMenu;
friend class QComboBox;
friend class QAction;
friend class QToolButtonPrivate;

1
src/gui/widgets/qtabwidget.h
View file

@ -174,7 +174,6 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_removeTab(int))
Q_PRIVATE_SLOT(d_func(), void _q_tabMoved(int, int))
void setUpLayout(bool = false);
friend class Q3TabDialog;
};
#endif // QT_NO_TABWIDGET

3
src/plugins/accessible/widgets/main.cpp
View file

@ -109,7 +109,6 @@ QStringList AccessibleFactory::keys() const
list << QLatin1String("QStatusBar");
list << QLatin1String("QProgressBar");
list << QLatin1String("QMenuBar");
list << QLatin1String("Q3PopupMenu");
list << QLatin1String("QMenu");
list << QLatin1String("QHeaderView");
list << QLatin1String("QTabBar");
@ -253,8 +252,6 @@ QAccessibleInterface *AccessibleFactory::create(const QString &classname, QObjec
#ifndef QT_NO_MENU
} else if (classname == QLatin1String("QMenu")) {
iface = new QAccessibleMenu(widget);
} else if (classname == QLatin1String("Q3PopupMenu")) {
iface = new QAccessibleMenu(widget);
#endif
#ifndef QT_NO_ITEMVIEWS
#ifdef Q_WS_X11