Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove compat leftovers

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-02-23 16:57:30 +00:00
parent 7c10059163
commit bdaedf3e86
8 changed files with 7 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
src/core/global/qnamespace.qdoc
View file

@ -558,33 +558,6 @@
\omitvalue DockWidgetArea_Mask
*/
/*!
\enum Qt::BackgroundMode
\compat
\value FixedColor
\value FixedPixmap
\value NoBackground
\value PaletteForeground
\value PaletteButton
\value PaletteLight
\value PaletteMidlight
\value PaletteDark
\value PaletteMid
\value PaletteText
\value PaletteBrightText
\value PaletteBase
\value PaletteBackground
\value PaletteShadow
\value PaletteHighlight
\value PaletteHighlightedText
\value PaletteButtonText
\value PaletteLink
\value PaletteLinkVisited
\value X11ParentRelative
*/
/*!
\enum Qt::ImageConversionFlag
@ -691,21 +664,6 @@
\sa QSize::scale(), QImage::scaled()
*/
/*! \typedef Qt::ScaleMode
\compat
Use Qt::AspectRatioMode instead.
The enum values have been renamed as follows:
\table
\row \i Old enum value \i New enum value
\row \i Qt::ScaleFree \i Qt::IgnoreAspectRatio
\row \i Qt::ScaleMin \i Qt::KeepAspectRatio
\row \i Qt::ScaleMax \i Qt::KeepAspectRatioByExpanding
\endtable
*/
/*! \enum Qt::TransformationMode
This enum type defines whether image transformations (e.g.,
@ -1587,26 +1545,6 @@
This enum is defined in the \c <QTextDocument> header file.
*/
/*!
\enum Qt::ButtonState_enum
\compat
\value ShiftButton
\value ControlButton
\value AltButton
\value MetaButton
\value Keypad
\value KeyButtonMask
Use Qt::KeyboardModifier instead.
*/
/*!
\typedef Qt::ButtonState
\compat
Use Qt::KeyboardModifier instead.
*/
/*!
\enum Qt::CheckState
@ -1989,44 +1927,6 @@
On X11 this value is used to do a move.
*/
/*! \typedef Qt::ToolBarDock
\compat
Use Qt::Dock instead.
*/
/*!
\enum Qt::Dock
\compat
Each dock window can be in one of the following positions:
\value DockUnmanaged not managed by a Q3MainWindow.
\value DockTornOff the dock window floats as its own top level
window which always stays on top of the main window.
\value DockTop above the central widget, below the menu bar.
\value DockBottom below the central widget, above the status bar.
\value DockRight to the right of the central widget.
\value DockLeft to the left of the central widget.
\value DockMinimized the dock window is not shown (this is
effectively a 'hidden' dock area); the handles of all minimized
dock windows are drawn in one row below the menu bar.
\omitvalue Bottom
\omitvalue Left
\omitvalue Minimized
\omitvalue Right
\omitvalue Top
\omitvalue TornOff
\omitvalue Unmanaged
*/
/*!
\enum Qt::AnchorAttribute
@ -2126,19 +2026,6 @@
as the intersection of closed shapes.
*/
/*!
\enum Qt::PaintUnit
\compat
\value PixelUnit
\value LoMetricUnit Obsolete
\value HiMetricUnit Obsolete
\value LoEnglishUnit Obsolete
\value HiEnglishUnit Obsolete
\value TwipsUnit Obsolete
*/
/*!
\enum Qt::TextFormat
@ -2263,13 +2150,6 @@
\omitvalue whatsThisCursor
*/
/*!
\typedef Qt::TextFlags
\compat
Use Qt::TextFlag instead.
*/
/*!
\enum Qt::LayoutDirection

1
src/designer/components/formeditor/qdesigner_resource.cpp
View file

@ -420,7 +420,6 @@ QDesignerResource::QDesignerResource(FormWindow *formWindow) :
m_internal_to_qt.insert(QLatin1String("QDesignerMenuBar"), QLatin1String("QMenuBar"));
m_internal_to_qt.insert(QLatin1String("QDesignerMenu"), QLatin1String("QMenu"));
m_internal_to_qt.insert(QLatin1String("QDesignerDockWidget"), QLatin1String("QDockWidget"));
m_internal_to_qt.insert(QLatin1String("QDesignerQ3WidgetStack"), QLatin1String("Q3WidgetStack"));
// invert
QHash<QString, QString>::const_iterator cend = m_internal_to_qt.constEnd();

4
src/designer/shared/layoutinfo.cpp
View file

@ -221,7 +221,7 @@ QLayout *LayoutInfo::managedLayout(const QDesignerFormEditorInterface *core, QLa
/* This code exists mainly for the Q3GroupBox class, for which
* widget->layout() returns an internal VBoxLayout. */
const QDesignerMetaDataBaseItemInterface *item = metaDataBase->item(layout);
if (item == 0) {
if (!item) {
layout = layout->findChild<QLayout*>();
item = metaDataBase->item(layout);
}
@ -233,7 +233,7 @@ QLayout *LayoutInfo::managedLayout(const QDesignerFormEditorInterface *core, QLa
// Is it a a dummy grid placeholder created by Designer?
bool LayoutInfo::isEmptyItem(QLayoutItem *item)
{
if (item == 0) {
if (!item) {
qDebug() << "** WARNING Zero-item passed on to isEmptyItem(). This indicates a layout inconsistency.";
return true;
}

4
src/designer/shared/widgetdatabase.cpp
View file

@ -274,7 +274,6 @@ WidgetDataBase::WidgetDataBase(QDesignerFormEditorInterface *core, QObject *pare
append(new WidgetDataBaseItem(QString::fromUtf8("QDesignerMenu")));
append(new WidgetDataBaseItem(QString::fromUtf8("QDesignerMenuBar")));
append(new WidgetDataBaseItem(QString::fromUtf8("QDesignerDockWidget")));
append(new WidgetDataBaseItem(QString::fromUtf8("QDesignerQ3WidgetStack")));
append(new WidgetDataBaseItem(QString::fromUtf8("QAction")));
append(new WidgetDataBaseItem(QString::fromUtf8("QButtonGroup")));
@ -298,7 +297,6 @@ WidgetDataBase::WidgetDataBase(QDesignerFormEditorInterface *core, QObject *pare
item(indexOfClassName(QLatin1String("QMainWindow")))->setContainer(true);
item(indexOfClassName(QLatin1String("QDockWidget")))->setContainer(true);
item(indexOfClassName(QLatin1String("QDesignerDockWidget")))->setContainer(true);
item(indexOfClassName(QLatin1String("QDesignerQ3WidgetStack")))->setContainer(true);
item(indexOfClassName(QLatin1String("QMdiArea")))->setContainer(true);
item(indexOfClassName(QLatin1String("QWorkspace")))->setContainer(true);
item(indexOfClassName(QLatin1String("QWizard")))->setContainer(true);
@ -499,7 +497,7 @@ static inline bool suitableForNewForm(const QString &className)
return false;
if (className == QLatin1String("QSplitter"))
return false;
if (className.startsWith(QLatin1String("QDesigner")) || className.startsWith(QLatin1String("Q3")) || className.startsWith(QLatin1String("QLayout")))
if (className.startsWith(QLatin1String("QDesigner")) || className.startsWith(QLatin1String("QLayout")))
return false;
return true;
}

4
src/designer/shared/widgetfactory.cpp
View file

@ -255,7 +255,7 @@ QWidget* WidgetFactory::createCustomWidget(const QString &className, QWidget *p
// over.
if (mo && mo->className() == className)
mo = mo->superClass();
while (mo != 0) {
while (mo) {
if (core()->widgetDataBase()->indexOfClassName(mo->className()) != -1) {
wdb->item(widgetInfoIndex)->setExtends(mo->className());
break;
@ -384,7 +384,7 @@ QWidget *WidgetFactory::createWidget(const QString &widgetName, QWidget *parentW
QString baseClass = item->extends();
if (baseClass.isEmpty()) {
// Currently happens in the case of Q3-Support widgets
baseClass =fallBackBaseClass;
baseClass = fallBackBaseClass;
}
if (QWidget *promotedWidget = createWidget(baseClass, parentWidget)) {
promoteWidget(core(), promotedWidget, widgetName);

2
src/gui/kernel/qwidget.cpp
View file

@ -2456,7 +2456,7 @@ Qt::WindowStates QWidget::windowState() const
The function sets the window state on child widgets similar to
setWindowState(). The difference is that the window state changed
event has the isOverride() flag set. It exists mainly to keep
Q3Workspace working.
QWorkspace working.
*/
void QWidget::overrideWindowState(Qt::WindowStates newstate)
{

2
src/gui/widgets/qframe.cpp
View file

@ -477,7 +477,7 @@ void QFrame::paintEvent(QPaintEvent *)
/*!
\internal
Mostly for the sake of Q3Frame
Used in QLabel and QLCDNumber
*/
void QFrame::drawFrame(QPainter *p)
{

29
tests/auto/qvariant/tst_qvariant.cpp
View file

@ -140,9 +140,6 @@ private slots:
void toString_data();
void toString();
void toCString_data();
void toCString();
void toDate_data();
void toDate();
@ -1287,32 +1284,6 @@ void tst_QVariant::toString()
QCOMPARE( str, result );
}
void tst_QVariant::toCString_data()
{
#ifdef QT3_SUPPORT
QTest::addColumn<QVariant>("value");
QTest::addColumn<Q3CString>("result");
QTest::newRow( "qstring" ) << QVariant( Q3CString( "Test" ) ) << Q3CString( "Test" );
QTest::newRow( "qcstring") << QVariant( Q3CString( "Test\0" ) ) << Q3CString( "Test" );
#endif
}
void tst_QVariant::toCString()
{
#ifdef QT3_SUPPORT
QFETCH( QVariant, value );
QFETCH( Q3CString, result );
QVERIFY( value.isValid() );
Q3CString str = value.toCString();
QCOMPARE( str, result );
#else
QSKIP("Qt not build with Qt3Support", SkipAll);
#endif
}
void tst_QVariant::toDate_data()
{
QTest::addColumn<QVariant>("value");