diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-21 14:42:46 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-21 14:42:46 +0200 |
| commit | 7b3b6b5afaaf1db1bfbfa9b56fa7b955a61344bd (patch) | |
| tree | 8be0d601853d021434e03cef9a9cfd64b3708e92 /src/corelib/kernel/qobject.cpp | |
| parent | 070fc2f694beaa56fc191f1a3f6a1b9812f4ed35 (diff) | |
| parent | 56defa4725508608a85e2813b85af3a7fcefefa0 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
examples/opengl/cube/main.cpp
examples/widgets/applicationicon/main.cpp
examples/widgets/orientation/main.cpp
src/gui/image/qicon.cpp
src/gui/image/qimage.h
src/gui/image/qpixmap.h
src/gui/image/qpixmap_mac.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qpalette.cpp
src/gui/kernel/qwidget.cpp
src/gui/styles/qmacstyle_mac.mm
src/gui/widgets/qmenubar.cpp
src/gui/widgets/qslider.cpp
src/opengl/qwindowsurface_gl.cpp
tests/auto/qvariant/qvariant.pro
tests/benchmarks/corelib/kernel/qobject/qobject.pro
tests/benchmarks/gui/animation/qanimation/qanimation.pro
tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro
tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro
tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro
tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro
tests/benchmarks/gui/image/qimagereader/qimagereader.pro
tests/benchmarks/gui/itemviews/qtableview/qtableview.pro
tests/benchmarks/gui/kernel/qapplication/qapplication.pro
tests/benchmarks/gui/kernel/qwidget/qwidget.pro
tests/benchmarks/gui/painting/qpainter/qpainter.pro
tests/benchmarks/gui/painting/qtbench/qtbench.pro
tests/benchmarks/gui/painting/qtracebench/qtracebench.pro
tests/benchmarks/gui/text/qtext/qtext.pro
Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 08236a3fec..a282ae007c 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3775,67 +3775,6 @@ QDebug operator<<(QDebug dbg, const QObject *o) { #endif /*! - \fn void QObject::insertChild(QObject *object) - - Use setParent() instead, i.e., call object->setParent(this). -*/ - -/*! - \fn void QObject::removeChild(QObject *object) - - Use setParent() instead, i.e., call object->setParent(0). -*/ - -/*! - \fn bool QObject::isA(const char *className) const - - Compare \a className with the object's metaObject()->className() instead. -*/ - -/*! - \fn const char *QObject::className() const - - Use metaObject()->className() instead. -*/ - -/*! - \fn const char *QObject::name() const - - Use objectName() instead. -*/ - -/*! - \fn const char *QObject::name(const char *defaultName) const - - Use objectName() instead. -*/ - -/*! - \fn void QObject::setName(const char *name) - - Use setObjectName() instead. -*/ - -/*! - \fn bool QObject::checkConnectArgs(const char *signal, const - QObject *object, const char *method) - - Use QMetaObject::checkConnectArgs() instead. -*/ - -/*! - \fn QByteArray QObject::normalizeSignalSlot(const char *signalSlot) - - Use QMetaObject::normalizedSignature() instead. -*/ - -/*! - \fn const char *QMetaObject::superClassName() const - - \internal -*/ - -/*! \macro Q_CLASSINFO(Name, Value) \relates QObject |