Merge branch 'master' of ssh://bitbucket.org/smil3y/katie

This commit is contained in:
Ivailo Monev 2024-05-20 10:53:18 +03:00
commit 9ead9c9837
2 changed files with 8 additions and 17 deletions

View file

@ -3,7 +3,7 @@
# https://wiki.archlinux.org/index.php/Arch_package_guidelines # https://wiki.archlinux.org/index.php/Arch_package_guidelines
pkgname=katie-git pkgname=katie-git
pkgver=4.14.0.r8227.97fea3078 pkgver=4.14.0.r8300.df212f180
pkgrel=1 pkgrel=1
pkgdesc='C++ toolkit derived from the Qt 4.8 framework' pkgdesc='C++ toolkit derived from the Qt 4.8 framework'
arch=('i486' 'i686' 'pentium4' 'x86_64' 'arm') arch=('i486' 'i686' 'pentium4' 'x86_64' 'arm')

View file

@ -48,13 +48,11 @@ static std::unique_ptr<QItemEditorFactory> q_default_factory(nullptr);
\since 4.2 \since 4.2
\ingroup model-view \ingroup model-view
When editing data in an item view, editors are created and When editing data in an item view, editors are created and displayed by a
displayed by a delegate. QItemDelegate, which is the delegate by delegate. QItemDelegate, which is the delegate by default installed on
default installed on Katie's item views, uses a QItemEditorFactory to Katie's item views, uses a QItemEditorFactory to create editors for it.
create editors for it. A default unique instance provided by A default unique instance provided by QItemEditorFactory is used by all
QItemEditorFactory is used by all item delegates. If you set a item delegates.
new default factory with setDefaultFactory(), the new factory will
be used by existing and new delegates.
A factory has specialized editors for particular QVariant data type A factory has specialized editors for particular QVariant data type
(All Katie models store their data in \l{QVariant}s). (All Katie models store their data in \l{QVariant}s).
@ -79,8 +77,6 @@ static std::unique_ptr<QItemEditorFactory> q_default_factory(nullptr);
\row \o QFont \o QFontComboBox \row \o QFont \o QFontComboBox
\endtable \endtable
Additional editors can be registered with the registerEditor() function.
\sa QItemDelegate, {Model/View Programming}, {Color Editor Factory Example} \sa QItemDelegate, {Model/View Programming}, {Color Editor Factory Example}
*/ */
@ -92,10 +88,8 @@ QItemEditorFactory::QItemEditorFactory()
} }
/*! /*!
Creates an editor widget with the given \a parent for the specified \a type of data, Creates an editor widget with the given \a parent for the specified
and returns it as a QWidget. \a variant and returns it as a QWidget.
\sa registerEditor()
*/ */
QWidget *QItemEditorFactory::createEditor(const QVariant &variant, QWidget *parent) const QWidget *QItemEditorFactory::createEditor(const QVariant &variant, QWidget *parent) const
{ {
@ -235,7 +229,6 @@ const QItemEditorFactory *QItemEditorFactory::defaultFactory()
} }
#ifndef QT_NO_LINEEDIT #ifndef QT_NO_LINEEDIT
QExpandingLineEdit::QExpandingLineEdit(QWidget *parent) QExpandingLineEdit::QExpandingLineEdit(QWidget *parent)
: QLineEdit(parent), originalWidth(-1), widgetOwnsGeometry(false) : QLineEdit(parent), originalWidth(-1), widgetOwnsGeometry(false)
{ {
@ -293,7 +286,6 @@ void QExpandingLineEdit::resizeToContents()
resize(newWidth, height()); resize(newWidth, height());
} }
} }
#endif // QT_NO_LINEEDIT #endif // QT_NO_LINEEDIT
#ifndef QT_NO_COMBOBOX #ifndef QT_NO_COMBOBOX
@ -313,7 +305,6 @@ bool QBooleanComboBox::value() const
{ {
return (currentIndex() == 1); return (currentIndex() == 1);
} }
#endif // QT_NO_COMBOBOX #endif // QT_NO_COMBOBOX
QT_END_NAMESPACE QT_END_NAMESPACE