AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the remaining traces of QT3_SUPPORT

Browse Source 
The only place that now still knows about it is moc,
so it can still parse old headers.

Change-Id: Iafec080f99c67560974e9ebc0cbfb27d9a4b2d6f
Reviewed-on: http://codereview.qt-project.org/5755
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Lars Knoll 2011-09-28 22:20:06 +02:00 committed by Qt by Nokia
parent 302b3c7d07
commit 3fd9398052
34 changed files with 8 additions and 736 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -6385,9 +6385,6 @@ if [ "$PLATFORM_QWS" = "yes" ]; then
QMakeVar set QT_CFLAGS_DIRECTFB "$QT_CFLAGS_DIRECTFB"
QMakeVar set QT_LIBS_DIRECTFB "$QT_LIBS_DIRECTFB"
fi
if [ "$CFG_QT3SUPPORT" = "yes" ]; then
QMakeVar set QT_DEFINES_DIRECTFB "QT3_SUPPORT"
fi
"$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/directfb "DirectFB" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DIRECTFB $QT_LIBS_DIRECTFB
if [ $? != "0" ]; then

6
src/corelib/global/qglobal.h
View File

@ -1078,11 +1078,7 @@ redefine to built-in booleans to make autotests work properly */
/* moc compats (signals/slots) */
#ifndef QT_MOC_COMPAT
# if defined(QT3_SUPPORT)
# define QT_MOC_COMPAT QT3_SUPPORT
# else
# define QT_MOC_COMPAT
# endif
# define QT_MOC_COMPAT
#else
# undef QT_MOC_COMPAT
# define QT_MOC_COMPAT

3
src/gui/accessible/qaccessible.h
View File

@ -164,9 +164,6 @@ public:
Offscreen = 0x00010000,
Sizeable = 0x00020000,
Movable = 0x00040000,
#ifdef QT3_SUPPORT
Moveable = Movable,
#endif
SelfVoicing = 0x00080000,
Focusable = 0x00100000,
Selectable = 0x00200000,

115
src/gui/util/qvalidator.cpp
View File

@ -215,20 +215,6 @@ QValidator::QValidator(QObject * parent)
{
}
#ifdef QT3_SUPPORT
/*!
\obsolete
Sets up the validator. The \a parent and \a name parameters are
passed on to the QObject constructor.
*/
QValidator::QValidator(QObject * parent, const char *name)
: QObject(*new QValidatorPrivate, parent)
{
setObjectName(QString::fromAscii(name));
}
#endif
/*!
Destroys the validator, freeing any storage and other resources
used.
@ -360,40 +346,6 @@ QIntValidator::QIntValidator(int minimum, int maximum,
}
#ifdef QT3_SUPPORT
/*!
\obsolete
Constructs a validator with a \a parent object and a \a name that
accepts all integers.
*/
QIntValidator::QIntValidator(QObject * parent, const char *name)
: QValidator(parent)
{
setObjectName(QString::fromAscii(name));
b = INT_MIN;
t = INT_MAX;
}
/*!
\obsolete
Constructs a validator called \a name with a \a parent, that
accepts integers from \a minimum to \a maximum inclusive.
*/
QIntValidator::QIntValidator(int minimum, int maximum,
QObject * parent, const char* name)
: QValidator(parent)
{
setObjectName(QString::fromAscii(name));
b = minimum;
t = maximum;
}
#endif
/*!
Destroys the validator.
*/
@ -640,42 +592,6 @@ QDoubleValidator::QDoubleValidator(double bottom, double top, int decimals,
dec = decimals;
}
#ifdef QT3_SUPPORT
/*!
\obsolete
Constructs a validator object with a \a parent object and a \a name
that accepts any double.
*/
QDoubleValidator::QDoubleValidator(QObject * parent, const char *name)
: QValidator(*new QDoubleValidatorPrivate , parent)
{
setObjectName(QString::fromAscii(name));
b = -HUGE_VAL;
t = HUGE_VAL;
dec = 1000;
}
/*!
\obsolete
Constructs a validator object with a \a parent object, called \a
name. This validator will accept doubles from \a bottom to \a top
inclusive, with up to \a decimals digits after the decimal point.
*/
QDoubleValidator::QDoubleValidator(double bottom, double top, int decimals,
QObject * parent, const char* name)
: QValidator(*new QDoubleValidatorPrivate, parent)
{
setObjectName(QString::fromAscii(name));
b = bottom;
t = top;
dec = decimals;
}
#endif
/*!
Destroys the validator.
@ -920,37 +836,6 @@ QRegExpValidator::QRegExpValidator(const QRegExp& rx, QObject *parent)
{
}
#ifdef QT3_SUPPORT
/*!
\obsolete
Constructs a validator with a \a parent object and \a name that accepts
any string (including an empty one) as valid.
*/
QRegExpValidator::QRegExpValidator(QObject *parent, const char *name)
: QValidator(parent), r(QString::fromLatin1(".*"))
{
setObjectName(QString::fromAscii(name));
}
/*!
\obsolete
Constructs a validator with a \a parent object and a \a name that
accepts all strings that match the regular expression \a rx.
The match is made against the entire string; e.g. if the regexp is
\bold{[A-Fa-f0-9]+} it will be treated as \bold{^[A-Fa-f0-9]+$}.
*/
QRegExpValidator::QRegExpValidator(const QRegExp& rx, QObject *parent,
const char *name)
: QValidator(parent), r(rx)
{
setObjectName(QString::fromAscii(name));
}
#endif
/*!
Destroys the validator.

24
src/gui/util/qvalidator.h
View File

@ -68,10 +68,6 @@ public:
Invalid,
Intermediate,
Acceptable
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
, Valid = Intermediate
#endif
};
void setLocale(const QLocale &locale);
@ -80,10 +76,6 @@ public:
virtual State validate(QString &, int &) const = 0;
virtual void fixup(QString &) const;
#ifdef QT3_SUPPORT
public:
QT3_SUPPORT_CONSTRUCTOR QValidator(QObject * parent, const char *name);
#endif
protected:
QValidator(QObjectPrivate &d, QObject *parent);
QValidator(QValidatorPrivate &d, QObject *parent);
@ -116,11 +108,6 @@ public:
Q_SIGNALS:
void bottomChanged(int bottom);
void topChanged(int top);
#ifdef QT3_SUPPORT
public:
QT3_SUPPORT_CONSTRUCTOR QIntValidator(QObject * parent, const char *name);
QT3_SUPPORT_CONSTRUCTOR QIntValidator(int bottom, int top, QObject * parent, const char *name);
#endif
private:
Q_DISABLE_COPY(QIntValidator)
@ -170,12 +157,6 @@ Q_SIGNALS:
void decimalsChanged(int decimals);
void notationChanged(QDoubleValidator::Notation notation);
#ifdef QT3_SUPPORT
public:
QT3_SUPPORT_CONSTRUCTOR QDoubleValidator(QObject * parent, const char *name);
QT3_SUPPORT_CONSTRUCTOR QDoubleValidator(double bottom, double top, int decimals,
QObject * parent, const char *name);
#endif
private:
Q_DECLARE_PRIVATE(QDoubleValidator)
Q_DISABLE_COPY(QDoubleValidator)
@ -203,11 +184,6 @@ public:
Q_SIGNALS:
void regExpChanged(const QRegExp& regExp);
#ifdef QT3_SUPPORT
public:
QT3_SUPPORT_CONSTRUCTOR QRegExpValidator(QObject *parent, const char *name);
QT3_SUPPORT_CONSTRUCTOR QRegExpValidator(const QRegExp& rx, QObject *parent, const char *name);
#endif
private:
Q_DISABLE_COPY(QRegExpValidator)

55
src/opengl/qgl.cpp
View File

@ -4684,61 +4684,6 @@ QPaintEngine *QGLWidget::paintEngine() const
return qt_qgl_paint_engine();
}
#ifdef QT3_SUPPORT
/*!
\overload
\obsolete
*/
QGLWidget::QGLWidget(QWidget *parent, const char *name,
const QGLWidget* shareWidget, Qt::WindowFlags f)
: QWidget(*(new QGLWidgetPrivate), parent, f | Qt::MSWindowsOwnDC)
{
Q_D(QGLWidget);
if (name)
setObjectName(QString::fromAscii(name));
setAttribute(Qt::WA_PaintOnScreen);
setAttribute(Qt::WA_NoSystemBackground);
setAutoFillBackground(true); // for compatibility
d->init(new QGLContext(QGLFormat::defaultFormat(), this), shareWidget);
}
/*!
\overload
\obsolete
*/
QGLWidget::QGLWidget(const QGLFormat &format, QWidget *parent,
const char *name, const QGLWidget* shareWidget,
Qt::WindowFlags f)
: QWidget(*(new QGLWidgetPrivate), parent, f | Qt::MSWindowsOwnDC)
{
Q_D(QGLWidget);
if (name)
setObjectName(QString::fromAscii(name));
setAttribute(Qt::WA_PaintOnScreen);
setAttribute(Qt::WA_NoSystemBackground);
setAutoFillBackground(true); // for compatibility
d->init(new QGLContext(format, this), shareWidget);
}
/*!
\overload
\obsolete
*/
QGLWidget::QGLWidget(QGLContext *context, QWidget *parent,
const char *name, const QGLWidget *shareWidget, Qt::WindowFlags f)
: QWidget(*(new QGLWidgetPrivate), parent, f | Qt::MSWindowsOwnDC)
{
Q_D(QGLWidget);
if (name)
setObjectName(QString::fromAscii(name));
setAttribute(Qt::WA_PaintOnScreen);
setAttribute(Qt::WA_NoSystemBackground);
setAutoFillBackground(true); // for compatibility
d->init(context, shareWidget);
}
#endif // QT3_SUPPORT
typedef GLubyte * (*qt_glGetStringi)(GLenum, GLuint);
#ifndef GL_NUM_EXTENSIONS

15
src/opengl/qgl.h
View File

@ -82,13 +82,6 @@ QT_BEGIN_NAMESPACE
QT_MODULE(OpenGL)
#ifdef QT3_SUPPORT
#define QGL_VERSION 460
#define QGL_VERSION_STR "4.6"
inline QT3_SUPPORT const char *qGLVersion() {
return QGL_VERSION_STR;
}
#endif
#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
class QGLCmap;
@ -410,14 +403,6 @@ public:
const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0);
explicit QGLWidget(const QGLFormat& format, QWidget* parent=0,
const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0);
#ifdef QT3_SUPPORT
QT3_SUPPORT_CONSTRUCTOR QGLWidget(QWidget* parent, const char* name,
const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0);
QT3_SUPPORT_CONSTRUCTOR QGLWidget(QGLContext *context, QWidget* parent, const char* name,
const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0);
QT3_SUPPORT_CONSTRUCTOR QGLWidget(const QGLFormat& format, QWidget* parent, const char* name,
const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0);
#endif
~QGLWidget();
void qglColor(const QColor& c) const;

6
src/printsupport/dialogs/qprintdialog.h
View File

@ -96,12 +96,6 @@ public:
#endif
void done(int result);
#if defined (Q_OS_UNIX) && defined (QT3_SUPPORT)
QT3_SUPPORT void setPrinter(QPrinter *, bool = false);
QT3_SUPPORT QPrinter *printer() const;
QT3_SUPPORT void addButton(QPushButton *button);
#endif
void setOption(PrintDialogOption option, bool on = true);
bool testOption(PrintDialogOption option) const;
void setOptions(PrintDialogOptions options);

31
src/printsupport/dialogs/qprintdialog.qdoc
View File

@ -25,34 +25,3 @@
**
****************************************************************************/
#ifdef QT3_SUPPORT
/*!
\fn QPrinter *QPrintDialog::printer() const
Returns a pointer to the printer this dialog configures, or 0 if
this dialog does not operate on any printer.
This function is available for Unix platforms only.
*/
/*!
\fn void QPrintDialog::setPrinter(QPrinter *printer, bool pickupSettings)
Sets this dialog to configure printer \a printer, or no printer if \a printer
is null. If \a pickupSettings is true, the dialog reads most of
its settings from \a printer. If \a pickupSettings is false (the
default) the dialog keeps its old settings.
This function is available for Unix platforms only.
*/
/*!
\fn void QPrintDialog::addButton(QPushButton *button)
Adds the \a button to the layout of the print dialog. The added
buttons are arranged from the left to the right below the
last groupbox of the printdialog.
This function is available for Unix platforms only.
*/
#endif

7
src/printsupport/dialogs/qprintdialog_mac.mm
View File

@ -378,13 +378,6 @@ int QPrintDialog::exec()
return result();
}
#ifdef QT3_SUPPORT
QPrinter *QPrintDialog::printer() const
{
Q_D(const QPrintDialog);
return d->printer;
}
#endif
/*!
\reimp

26
src/printsupport/dialogs/qprintdialog_unix.cpp
View File

@ -627,32 +627,6 @@ void QPrintDialog::accept()
QDialog::accept();
}
#ifdef QT3_SUPPORT
QPrinter *QPrintDialog::printer() const
{
Q_D(const QPrintDialog);
return d->printer;
}
void QPrintDialog::setPrinter(QPrinter *printer, bool pickupSettings)
{
if (!printer)
return;
Q_D(QPrintDialog);
d->printer = printer;
if (pickupSettings)
d->applyPrinterProperties(printer);
}
void QPrintDialog::addButton(QPushButton *button)
{
Q_D(QPrintDialog);
d->buttons->addButton(button, QDialogButtonBox::HelpRole);
}
#endif // QT3_SUPPORT
#if defined (Q_OS_UNIX)
/*! \internal

2
src/tools/uic/uic.pro
View File

@ -6,8 +6,6 @@ DEFINES += QT_UIC
INCLUDEPATH += .
DEPENDPATH += .
!contains(QT_CONFIG, gui-qt3support):DEFINES += QT_NO_QT3_SUPPORT
include(uic.pri)
include(cpp/cpp.pri)

22
src/widgets/kernel/qapplication.cpp
View File

@ -3607,24 +3607,6 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
if (!receiver->isWidgetType()) {
res = d->notify_helper(receiver, e);
} else switch (e->type()) {
#if defined QT3_SUPPORT && !defined(QT_NO_SHORTCUT)
case QEvent::Accel:
{
if (d->use_compat()) {
QKeyEvent* key = static_cast<QKeyEvent*>(e);
res = d->notify_helper(receiver, e);
if (!res && !key->isAccepted())
res = d->qt_dispatchAccelEvent(static_cast<QWidget *>(receiver), key);
// next lines are for compatibility with Qt <= 3.0.x: old
// QAccel was listening on toplevel widgets
if (!res && !key->isAccepted() && !static_cast<QWidget *>(receiver)->isWindow())
res = d->notify_helper(static_cast<QWidget *>(receiver)->window(), e);
}
break;
}
#endif //QT3_SUPPORT && !QT_NO_SHORTCUT
case QEvent::ShortcutOverride:
case QEvent::KeyPress:
case QEvent::KeyRelease:
@ -3640,10 +3622,6 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
}
QKeyEvent* key = static_cast<QKeyEvent*>(e);
#if defined QT3_SUPPORT && !defined(QT_NO_SHORTCUT)
if (d->use_compat() && d->qt_tryComposeUnicode(static_cast<QWidget*>(receiver), key))
break;
#endif
if (key->type()==QEvent::KeyPress) {
#ifndef QT_NO_SHORTCUT
// Try looking for a Shortcut before sending key events

8
src/widgets/kernel/qlayout.h
View File

@ -79,12 +79,6 @@ public:
SetFixedSize,
SetMaximumSize,
SetMinAndMaxSize
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
, Auto = SetDefaultConstraint,
FreeResize = SetNoConstraint,
Minimum = SetMinimumSize,
Fixed = SetFixedSize
#endif
};
QLayout(QWidget *parent);
@ -173,12 +167,10 @@ private:
//### support old includes
#if 1 //def QT3_SUPPORT
QT_BEGIN_INCLUDE_NAMESPACE
#include <QtWidgets/qboxlayout.h>
#include <QtWidgets/qgridlayout.h>
QT_END_INCLUDE_NAMESPACE
#endif
QT_END_NAMESPACE

160
src/widgets/kernel/qsizepolicy.qdoc
View File

@ -367,163 +367,3 @@
\sa setControlType(), controlType()
*/
#ifdef QT3_SUPPORT
/*!
\typedef QSizePolicy::SizeType
\compat
Use the QSizePolicy::Policy enum instead.
*/
/*!
\enum QSizePolicy::ExpandData
\compat
Use the Qt::Orientations enum instead.
\value NoDirection Use 0 instead.
\value Horizontally Use Qt::Horizontal instead.
\value Vertically Use Qt::Vertical instead.
\value BothDirections Use Qt::Horizontal | Qt::Vertical instead.
*/
/*!
\fn bool QSizePolicy::mayShrinkHorizontally() const
Use the horizontalPolicy() function combined with the
QSizePolicy::PolicyFlag enum instead.
\oldcode
bool policy = mayShrinkHorizontally();
\newcode
bool policy = horizontalPolicy() & QSizePolicy::ShrinkFlag;
\endcode
*/
/*!
\fn bool QSizePolicy::mayShrinkVertically() const
Use the verticalPolicy() function combined with the
QSizePolicy::PolicyFlag enum instead.
\oldcode
bool policy = mayShrinkVertically();
\newcode
bool policy = verticalPolicy() & QSizePolicy::ShrinkFlag;
\endcode
*/
/*!
\fn bool QSizePolicy::mayGrowHorizontally() const
Use the horizontalPolicy() function combined with the
QSizePolicy::PolicyFlag enum instead.
\oldcode
bool policy = mayGrowHorizontally();
\newcode
bool policy = horizontalPolicy() & QSizePolicy::GrowFlag;
\endcode
*/
/*!
\fn bool QSizePolicy::mayGrowVertically() const
Use the verticalPolicy() function combined with the
QSizePolicy::PolicyFlag enum instead.
\oldcode
bool policy = mayGrowVertically();
\newcode
bool policy = verticalPolicy() & QSizePolicy::GrowFlag;
\endcode
*/
/*!
\fn Qt::QSizePolicy::Orientations QSizePolicy::expanding() const
Use expandingDirections() instead.
*/
/*!
\fn QSizePolicy::QSizePolicy(Policy horizontal, Policy vertical, bool dependent)
Use the QSizePolicy() constructor and the setHeightForWidth()
function instead.
\oldcode
QSizePolicy *policy = new QSizePolicy(horizontal, vertical, dependent);
\newcode
QSizePolicy *policy = new QSizePolicy(horizontal, vertical);
policy->setHeightForWidth(dependent);
\endcode
*/
/*!
\fn QSizePolicy::QSizePolicy(Policy horizontal, Policy vertical, uchar horizontalStretch,
uchar verticalStretch, bool dependent)
Use the QSizePolicy() constructor and call the
setHorizontalStretch(), setVerticalStretch(), and
setHeightForWidth() functions instead.
\oldcode
QSizePolicy *policy = new QSizePolicy(horizontal, vertical,
horizontalStretch, verticalStretch,
dependent);
\newcode
QSizePolicy *policy = new QSizePolicy(horizontal, vertical);
policy->setHorizontalStretch(horizontalStretch);
policy->setVerticalStretch(verticalStretch);
policy->setHeightForWidth(dependent);
\endcode
*/
/*!
\fn QSizePolicy::Policy QSizePolicy::horData() const
Use horizontalPolicy() instead.
*/
/*!
\fn QSizePolicy::Policy QSizePolicy::verData() const
Use verticalPolicy() instead.
*/
/*!
\fn void QSizePolicy::setHorData(Policy policy)
Use setHorizontalPolicy() instead.
*/
/*!
\fn void QSizePolicy::setVerData(Policy policy)
Use setVerticalPolicy() instead.
*/
/*!
\fn uint QSizePolicy::horStretch() const
Use horizontalStretch() instead.
*/
/*!
\fn uint QSizePolicy::verStretch() const
Use verticalStretch() instead.
*/
/*!
\fn void QSizePolicy::setHorStretch(uchar stretch)
Use setHorizontalStretch() instead.
*/
/*!
\fn void QSizePolicy::setVerStretch(uchar stretch)
Use setVerticalStretch() instead.
*/
#endif

51
src/widgets/kernel/qwidget.cpp
View File

@ -1807,9 +1807,6 @@ void QWidgetPrivate::propagatePaletteChange()
wd->resolvePalette();
}
}
#if defined(QT3_SUPPORT)
q->paletteChange(q->palette()); // compatibility
#endif
}
/*
@ -3228,46 +3225,6 @@ void QWidget::setAcceptDrops(bool on)
}
/*!
\fn void QWidget::enabledChange(bool)
\internal
\obsolete
*/
/*!
\fn void QWidget::paletteChange(const QPalette &)
\internal
\obsolete
*/
/*!
\fn void QWidget::fontChange(const QFont &)
\internal
\obsolete
*/
/*!
\fn void QWidget::windowActivationChange(bool)
\internal
\obsolete
*/
/*!
\fn void QWidget::languageChange()
\obsolete
*/
/*!
\fn void QWidget::styleChange(QStyle& style)
\internal
\obsolete
*/
/*!
Disables widget input events if \a disable is true; otherwise
@ -11008,14 +10965,6 @@ void QWidget::stackUnder(QWidget* w)
QApplication::sendEvent(this, &e);
}
void QWidget::styleChange(QStyle&) { }
void QWidget::enabledChange(bool) { } // compat
void QWidget::paletteChange(const QPalette &) { } // compat
void QWidget::fontChange(const QFont &) { } // compat
void QWidget::windowActivationChange(bool) { } // compat
void QWidget::languageChange() { } // compat
/*!
\enum QWidget::BackgroundOrigin

9
src/widgets/kernel/qwidget.h
View File

@ -806,15 +806,6 @@ private:
#endif
QWidgetData *data;
protected:
virtual void styleChange(QStyle&); // compat
virtual void enabledChange(bool); // compat
virtual void paletteChange(const QPalette &); // compat
virtual void fontChange(const QFont &); // compat
virtual void windowActivationChange(bool); // compat
virtual void languageChange(); // compat
};
Q_DECLARE_OPERATORS_FOR_FLAGS(QWidget::RenderFlags)

9
src/widgets/platforms/mac/qapplication_mac.mm
View File

@ -1350,15 +1350,6 @@ bool qt_wstate_iconified(WId)
extern QWidget * mac_mouse_grabber;
extern QWidget * mac_keyboard_grabber;
#ifdef QT3_SUPPORT
void QApplication::setMainWidget(QWidget *mainWidget)
{
QApplicationPrivate::main_widget = mainWidget;
if (QApplicationPrivate::main_widget && windowIcon().isNull()
&& QApplicationPrivate::main_widget->testAttribute(Qt::WA_SetWindowIcon))
setWindowIcon(QApplicationPrivate::main_widget->windowIcon());
}
#endif
#ifndef QT_NO_CURSOR
/*****************************************************************************

30
src/widgets/platforms/mac/qkeymapper_mac.cpp
View File

@ -970,36 +970,10 @@ QKeyMapper::sendKeyEvent(QWidget *widget, bool grab,
quint32 nativeModifiers, bool *isAccepted)
{
Q_UNUSED(count);
Q_UNUSED(grab);
if (widget && widget->isEnabled()) {
bool key_event = true;
#if defined(QT3_SUPPORT) && !defined(QT_NO_SHORTCUT)
if (type == QEvent::KeyPress && !grab
&& QApplicationPrivate::instance()->use_compat()) {
QKeyEventEx accel_ev(type, code, modifiers,
text, autorepeat, qMax(1, int(text.length())),
nativeScanCode, nativeVirtualKey, nativeModifiers);
if (QApplicationPrivate::instance()->qt_tryAccelEvent(widget, &accel_ev)) {
#if defined(DEBUG_KEY_BINDINGS) || defined(DEBUG_KEY_BINDINGS_MODIFIERS)
qDebug("KeyEvent: %s::%s consumed Accel: %s",
widget ? widget->metaObject()->className() : "none",
widget ? widget->objectName().toLatin1().constData() : "",
text.toLatin1().constData());
#endif
key_event = false;
} else {
if (accel_ev.isAccepted()) {
#if defined(DEBUG_KEY_BINDINGS) || defined(DEBUG_KEY_BINDINGS_MODIFIERS)
qDebug("KeyEvent: %s::%s overrode Accel: %s",
widget ? widget->metaObject()->className() : "none",
widget ? widget->objectName().toLatin1().constData() : "",
text.toLatin1().constData());
#endif
}
}
}
#else
Q_UNUSED(grab);
#endif // QT3_SUPPORT && !QT_NO_SHORTCUT
if (key_event) {
#if defined(DEBUG_KEY_BINDINGS) || defined(DEBUG_KEY_BINDINGS_MODIFIERS)
qDebug("KeyEvent: Sending %s to %s::%s: %s 0x%08x%s",

3
src/widgets/platforms/mac/qwidget_mac.mm
View File

@ -1381,9 +1381,6 @@ OSStatus QWidgetPrivate::qt_widget_event(EventHandlerCallRef er, EventRef event,
qrgn.translate(redirectionOffset);
QPaintEvent e(qrgn);
widget->d_func()->dirtyOnWidget = QRegion();
#ifdef QT3_SUPPORT
e.setErased(true);
#endif
QApplication::sendSpontaneousEvent(widget, &e);
if (!redirectionOffset.isNull())
widget->d_func()->restoreRedirected();

16
src/widgets/platforms/win/qkeymapper_win.cpp
View File

@ -1168,24 +1168,8 @@ bool QKeyMapper::sendKeyEvent(QWidget *widget, bool grab,
quint32 nativeScanCode, quint32 nativeVirtualKey, quint32 nativeModifiers,
bool *)
{
#if defined(Q_OS_WINCE)
Q_UNUSED(grab);
#endif
Q_UNUSED(count);
#if defined QT3_SUPPORT && !defined(QT_NO_SHORTCUT)
if (type == QEvent::KeyPress
&& !grab
&& QApplicationPrivate::instance()->use_compat()) {
// send accel events if the keyboard is not grabbed
QKeyEventEx a(type, code, modifiers,
text, autorepeat, qMax(1, int(text.length())),
nativeScanCode, nativeVirtualKey, nativeModifiers);
if (QApplicationPrivate::instance()->qt_tryAccelEvent(widget, &a))
return true;
}
#else
Q_UNUSED(grab);
#endif
if (!widget->isEnabled())
return false;

12
src/widgets/platforms/x11/qkeymapper_x11.cpp
View File

@ -1708,18 +1708,6 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *keyWidget, const XEvent *even
curr_autorep = autor ? event->xkey.keycode : 0;
}
#if defined QT3_SUPPORT && !defined(QT_NO_SHORTCUT)
// process accelerators before doing key compression
if (type == QEvent::KeyPress && !grab
&& QApplicationPrivate::instance()->use_compat()) {
// send accel events if the keyboard is not grabbed
QKeyEventEx a(type, code, modifiers, text, autor, qMax(qMax(count,1), int(text.length())),
event->xkey.keycode, keysym, event->xkey.state);
if (QApplicationPrivate::instance()->qt_tryAccelEvent(keyWidget, &a))
return true;
}
#endif
#ifndef QT_NO_IM
QInputContext *qic = keyWidget->inputContext();
#endif

48
src/widgets/styles/qmacstyle_mac.mm
View File

@ -389,9 +389,6 @@ static inline bool isTreeView(const QWidget *widget)
{
return (widget && widget->parentWidget() &&
(qobject_cast<const QTreeView *>(widget->parentWidget())
#ifdef QT3_SUPPORT
|| widget->parentWidget()->inherits("Q3ListView")
#endif
));
}
@ -518,17 +515,9 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg
ct = QStyle::CT_ProgressBar;
else if (qobject_cast<const QLineEdit *>(widg))
ct = QStyle::CT_LineEdit;
else if (qobject_cast<const QHeaderView *>(widg)
#ifdef QT3_SUPPORT
|| widg->inherits("Q3Header")
#endif
)
else if (qobject_cast<const QHeaderView *>(widg))
ct = QStyle::CT_HeaderSection;
else if (qobject_cast<const QMenuBar *>(widg)
#ifdef QT3_SUPPORT
|| widg->inherits("Q3MenuBar")
#endif
)
else if (qobject_cast<const QMenuBar *>(widg))
ct = QStyle::CT_MenuBar;
else if (qobject_cast<const QSizeGrip *>(widg))
ct = QStyle::CT_SizeGrip;
@ -1476,11 +1465,7 @@ bool QMacStylePrivate::addWidget(QWidget *w)
startAnimate(AquaPushButton, btn);
return true;
} else {
bool isProgressBar = (qobject_cast<QProgressBar *>(w)
#ifdef QT3_SUPPORT
|| w->inherits("Q3ProgressBar")
#endif
);
bool isProgressBar = (qobject_cast<QProgressBar *>(w));
if (isProgressBar) {
w->installEventFilter(this);
startAnimate(AquaProgressBar, w);
@ -1499,11 +1484,7 @@ void QMacStylePrivate::removeWidget(QWidget *w)
QPushButton *btn = qobject_cast<QPushButton *>(w);
if (btn && btn == defaultButton) {
stopAnimate(AquaPushButton, btn);
} else if (qobject_cast<QProgressBar *>(w)
#ifdef QT3_SUPPORT
|| w->inherits("Q3ProgressBar")
#endif
) {
} else if (qobject_cast<QProgressBar *>(w)) {
stopAnimate(AquaProgressBar, w);
}
}
@ -1548,21 +1529,6 @@ void QMacStylePrivate::timerEvent(QTimerEvent *)
pb->update();
}
}
#ifdef QT3_SUPPORT
else {
// Watch me now...
QVariant progress = maybeProgress->property("progress");
QVariant totalSteps = maybeProgress->property("totalSteps");
if (progress.isValid() && totalSteps.isValid()) {
int intProgress = progress.toInt();
int intTotalSteps = totalSteps.toInt();
if (intTotalSteps == 0 || intProgress > 0 && intProgress < intTotalSteps) {
if (doAnimate(AquaProgressBar))
maybeProgress->update();
}
}
}
#endif
++i;
}
}
@ -2012,9 +1978,6 @@ int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QW
|| (qobject_cast<const QMainWindow*>(widget->parentWidget())
&& static_cast<QMainWindow *>(widget->parentWidget())->centralWidget() == widget))
&& (qobject_cast<const QAbstractScrollArea *>(widget)
#ifdef QT3_SUPPORT
|| widget->inherits("QScrollView")
#endif
|| widget->inherits("QWorkspaceChild")))
ret = 0;
else
@ -2378,9 +2341,6 @@ int QMacStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w
case SH_ScrollView_FrameOnlyAroundContents:
if (w && (w->isWindow() || !w->parentWidget() || w->parentWidget()->isWindow())
&& (w->inherits("QWorkspaceChild")
#ifdef QT3_SUPPORT
|| w->inherits("QScrollView")
#endif
))
ret = true;
else

9
src/widgets/widgets/qcombobox.h
View File

@ -124,15 +124,6 @@ public:
InsertAfterCurrent,
InsertBeforeCurrent,
InsertAlphabetically
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
,
NoInsertion = NoInsert,
AtTop = InsertAtTop,
AtCurrent = InsertAtCurrent,
AtBottom = InsertAtBottom,
AfterCurrent = InsertAfterCurrent,
BeforeCurrent = InsertBeforeCurrent
#endif
};
InsertPolicy insertPolicy() const;

13
src/widgets/widgets/qframe.h
View File

@ -83,15 +83,6 @@ public:
HLine = 0x0004, // horizontal line
VLine = 0x0005, // vertical line
StyledPanel = 0x0006 // rectangular panel depending on the GUI style
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
,PopupPanel = StyledPanel, // rectangular panel depending on the GUI style
MenuBarPanel = StyledPanel,
ToolBarPanel = StyledPanel,
LineEditPanel = StyledPanel,
TabWidgetPanel = StyledPanel,
GroupBoxPanel = StyledPanel
#endif
};
enum Shadow {
Plain = 0x0010, // plain line
@ -102,10 +93,6 @@ public:
enum StyleMask {
Shadow_Mask = 0x00f0, // mask for the shadow
Shape_Mask = 0x000f // mask for the shape
#if defined(QT3_SUPPORT)
,MShadow = Shadow_Mask,
MShape = Shape_Mask
#endif
};
Shape frameShape() const;

8
src/widgets/widgets/qlabel.cpp
View File

@ -1427,14 +1427,6 @@ Qt::LayoutDirection QLabelPrivate::textDirection() const
return text.isRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight;
}
/*!
\fn void QLabel::setAlignment(Qt::AlignmentFlag flag)
\internal
Without this function, a call to e.g. setAlignment(Qt::AlignTop)
results in the \c QT3_SUPPORT function setAlignment(int) being called,
rather than setAlignment(Qt::Alignment).
*/
// Returns the rect that is available for us to draw the document
QRect QLabelPrivate::documentRect() const

3
src/widgets/widgets/qlcdnumber.h
View File

@ -73,9 +73,6 @@ public:
enum Mode {
Hex, Dec, Oct, Bin
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
, HEX = Hex, DEC = Dec, OCT = Oct, BIN = Bin
#endif
};
enum SegmentStyle {
Outline, Filled, Flat

9
src/widgets/widgets/qslider.h
View File

@ -70,15 +70,6 @@ public:
TicksBelow = 2,
TicksRight = TicksBelow,
TicksBothSides = 3
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
,NoMarks = NoTicks,
Above = TicksAbove,
Left = TicksAbove,
Below = TicksBelow,
Right = TicksRight,
Both = TicksBothSides
#endif
};
explicit QSlider(QWidget *parent = 0);

2
src/widgets/widgets/qsplitter.cpp
View File

@ -1673,7 +1673,6 @@ void QSplitter::setStretchFactor(int index, int stretch)
}
//#ifdef QT3_SUPPORT
#ifndef QT_NO_TEXTSTREAM
/*!
\relates QSplitter
@ -1706,7 +1705,6 @@ QTextStream& operator>>(QTextStream& ts, QSplitter& splitter)
return ts;
}
#endif // QT_NO_TEXTSTREAM
//#endif // QT3_SUPPORT
QT_END_NAMESPACE

2
src/widgets/widgets/qsplitter.h
View File

@ -133,12 +133,10 @@ private:
friend class QSplitterHandle;
};
//#ifdef QT3_SUPPORT
#ifndef QT_NO_TEXTSTREAM
Q_WIDGETS_EXPORT QTextStream& operator<<(QTextStream&, const QSplitter&);
Q_WIDGETS_EXPORT QTextStream& operator>>(QTextStream&, QSplitter&);
#endif
//#endif
class QSplitterHandlePrivate;
class Q_WIDGETS_EXPORT QSplitterHandle : public QWidget

4
src/widgets/widgets/qtabbar.h
View File

@ -80,10 +80,6 @@ public:
enum Shape { RoundedNorth, RoundedSouth, RoundedWest, RoundedEast,
TriangularNorth, TriangularSouth, TriangularWest, TriangularEast
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
, RoundedAbove = RoundedNorth, RoundedBelow = RoundedSouth,
TriangularAbove = TriangularNorth, TriangularBelow = TriangularSouth
#endif
};
enum ButtonPosition {

6
src/widgets/widgets/qtabwidget.h
View File

@ -109,11 +109,7 @@ public:
int indexOf(QWidget *widget) const;
int count() const;
enum TabPosition { North, South, West, East
#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
, Top = North, Bottom = South
#endif
};
enum TabPosition { North, South, West, East };
TabPosition tabPosition() const;
void setTabPosition(TabPosition);

5
src/widgets/widgets/qtextbrowser.h
View File

@ -118,11 +118,6 @@ protected:
virtual bool focusNextPrevChild(bool next);
virtual void paintEvent(QPaintEvent *e);
#if defined(QT3_SUPPORT)
public:
QT3_SUPPORT_CONSTRUCTOR QTextBrowser(QWidget *parent, const char *name);
#endif
private:
Q_DISABLE_COPY(QTextBrowser)
Q_DECLARE_PRIVATE(QTextBrowser)

22
src/widgets/widgets/qtextedit.h
View File

@ -104,28 +104,6 @@ public:
Q_DECLARE_FLAGS(AutoFormatting, AutoFormattingFlag)
#if defined(QT3_SUPPORT)
enum CursorAction {
MoveBackward,
MoveForward,
MoveWordBackward,
MoveWordForward,
MoveUp,
MoveDown,
MoveLineStart,
MoveLineEnd,
MoveHome,
MoveEnd,
MovePageUp,
MovePageDown
#if !defined(Q_MOC_RUN)
,
MovePgUp = MovePageUp,
MovePgDown = MovePageDown
#endif
};
#endif
explicit QTextEdit(QWidget *parent = 0);
explicit QTextEdit(const QString &text, QWidget *parent = 0);
virtual ~QTextEdit();