Hello community, here is the log from the commit of package ktextwidgets for openSUSE:Factory checked in at 2014-04-02 17:22:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktextwidgets (Old) and /work/SRC/openSUSE:Factory/.ktextwidgets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktextwidgets" Changes: -------- --- /work/SRC/openSUSE:Factory/ktextwidgets/ktextwidgets.changes 2014-03-10 12:18:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ktextwidgets.new/ktextwidgets.changes 2014-04-02 17:22:38.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:52 UTC 2014 - [email protected] + +- Update to 4.98.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta1.php + +------------------------------------------------------------------- Old: ---- ktextwidgets-4.97.0.tar.xz New: ---- ktextwidgets-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktextwidgets.spec ++++++ --- /var/tmp/diff_new_pack.ioZXoX/_old 2014-04-02 17:22:39.000000000 +0200 +++ /var/tmp/diff_new_pack.ioZXoX/_new 2014-04-02 17:22:39.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5TextWidgets5 Name: ktextwidgets -Version: 4.97.0 +Version: 4.98.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.11 +BuildRequires: extra-cmake-modules >= 0.0.12 BuildRequires: fdupes BuildRequires: kcompletion-devel >= %{_kf5_version} BuildRequires: kconfig-devel >= %{_kf5_version} ++++++ ktextwidgets-4.97.0.tar.xz -> ktextwidgets-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.97.0/CMakeLists.txt new/ktextwidgets-4.98.0/CMakeLists.txt --- old/ktextwidgets-4.97.0/CMakeLists.txt 2014-03-01 12:51:40.000000000 +0100 +++ new/ktextwidgets-4.98.0/CMakeLists.txt 2014-03-28 19:17:34.000000000 +0100 @@ -3,7 +3,7 @@ project(KTextWidgets) # ECM setup -find_package(ECM 0.0.11 REQUIRED NO_MODULE) +find_package(ECM 0.0.12 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(KDEInstallDirs) @@ -15,7 +15,7 @@ include(ECMGenerateHeaders) include(ECMPackageConfigHelpers) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KTEXTWIDGETS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.97.0/src/Messages.sh new/ktextwidgets-4.98.0/src/Messages.sh --- old/ktextwidgets-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/ktextwidgets-4.98.0/src/Messages.sh 2014-03-28 19:17:34.000000000 +0100 @@ -0,0 +1,18 @@ +#!/bin/sh + +# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources. +# The results are stored in a pseudo .cpp file to be picked up by xgettext. +lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` +if [ -n "$lst" ] ; then + $EXTRACTRC $lst >> rc.cpp +fi + +# If your framework contains tips-of-the-day, call preparetips as well. +if [ -f "data/tips" ] ; then + ( cd data && $PREPARETIPS > ../tips.cpp ) +fi + +# Extract strings from all source files. +# If your framework depends on KI18n, use $XGETTEXT. If it uses Qt translation +# system, use $EXTRACT_TR_STRINGS. +$XGETTEXT `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/ktextwidgets5.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.97.0/src/findreplace/kfind.h new/ktextwidgets-4.98.0/src/findreplace/kfind.h --- old/ktextwidgets-4.97.0/src/findreplace/kfind.h 2014-03-01 12:51:40.000000000 +0100 +++ new/ktextwidgets-4.98.0/src/findreplace/kfind.h 2014-03-28 19:17:34.000000000 +0100 @@ -59,8 +59,8 @@ * this, SLOT( slotFindNext() ) ); * \endcode * - * If you are using a non-modal find dialog (the recommended new way - * in KDE-3.2), you should call right away m_find->closeFindNextDialog(). + * If you are using a non-modal find dialog (recommended), + * you should call right away m_find->closeFindNextDialog(). * * Then initialize the variables determining the "current position" * (to the cursor, if the option FromCursor is set, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.97.0/src/kregexpeditor/kregexpeditorinterface.h new/ktextwidgets-4.98.0/src/kregexpeditor/kregexpeditorinterface.h --- old/ktextwidgets-4.97.0/src/kregexpeditor/kregexpeditorinterface.h 2014-03-01 12:51:40.000000000 +0100 +++ new/ktextwidgets-4.98.0/src/kregexpeditor/kregexpeditorinterface.h 2014-03-28 19:17:34.000000000 +0100 @@ -148,13 +148,7 @@ * This method allows for future changes that will not break binary * compatibility. DO NOT USE! * - * KDE has a policy of keeping binary compatibility for all major - * version of KDE. This means that new methods can not be added to this - * API before KDE version 4.0. - * - * This method is an escape door for that. - * - * Conclusion: You should not use this method in this version of KDE! + * See http://techbase.kde.org/Policies/Binary_Compatibility_Issues_With_C++ */ virtual void doSomething(const QString& method, void *arguments) = 0; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.97.0/src/widgets/ktextedit.cpp new/ktextwidgets-4.98.0/src/widgets/ktextedit.cpp --- old/ktextwidgets-4.97.0/src/widgets/ktextedit.cpp 2014-03-01 12:51:40.000000000 +0100 +++ new/ktextwidgets-4.98.0/src/widgets/ktextedit.cpp 2014-03-28 19:17:34.000000000 +0100 @@ -80,14 +80,6 @@ KConfig sonnetKConfig(QLatin1String("sonnetrc")); KConfigGroup group(&sonnetKConfig, "Spelling"); checkSpellingEnabled = group.readEntry("checkerEnabledByDefault", false); - - // i18n: Placeholder text in text edit widgets is the text appearing - // before any user input, briefly explaining to the user what to type - // (e.g. "Enter message"). - // By default the text is set in italic, which may not be appropriate - // for some languages and scripts (e.g. for CJK ideographs). - QString metaMsg = i18nc("Italic placeholder text in line edits: 0 no, 1 yes", "1"); - italicizePlaceholder = (metaMsg.trimmed() != QString(QLatin1Char('0'))); } ~Private() @@ -129,8 +121,6 @@ void slotAllowTab(); void menuActivated(QAction *action); - QRect clickMessageRect() const; - void init(); void checkSpelling(bool force); @@ -138,8 +128,6 @@ QAction *autoSpellCheckAction; QAction *allowTab; QAction *spellCheckAction; - QString clickMessage; - bool italicizePlaceholder : 1; bool customPalette : 1; bool checkSpellingEnabled : 1; @@ -303,13 +291,6 @@ lastReplacedPosition = replacementIndex; } -QRect KTextEdit::Private::clickMessageRect() const -{ - int margin = int(parent->document()->documentMargin()); - QRect rect = parent->viewport()->rect().adjusted(margin, margin, -margin, -margin); - return parent->fontMetrics().boundingRect(rect, Qt::AlignTop | Qt::TextWordWrap, clickMessage); -} - void KTextEdit::Private::init() { KCursor::setAutoHideCursor(parent, true, false); @@ -1004,49 +985,6 @@ } } -void KTextEdit::setClickMessage(const QString &msg) -{ - if (msg != d->clickMessage) { - if (!d->clickMessage.isEmpty()) { - viewport()->update(d->clickMessageRect()); - } - d->clickMessage = msg; - if (!d->clickMessage.isEmpty()) { - viewport()->update(d->clickMessageRect()); - } - } -} - -QString KTextEdit::clickMessage() const -{ - return d->clickMessage; -} - -void KTextEdit::paintEvent(QPaintEvent *ev) -{ - QTextEdit::paintEvent(ev); - - if (!d->clickMessage.isEmpty() && document()->isEmpty()) { - QPainter p(viewport()); - - QFont f = font(); - f.setItalic(d->italicizePlaceholder); - p.setFont(f); - - QColor color(palette().color(viewport()->foregroundRole())); - color.setAlphaF(0.5); - p.setPen(color); - - QRect cr = d->clickMessageRect(); - p.drawText(cr, Qt::AlignTop | Qt::TextWordWrap, d->clickMessage); - } -} - -void KTextEdit::focusOutEvent(QFocusEvent *ev) -{ - QTextEdit::focusOutEvent(ev); -} - void KTextEdit::showAutoCorrectButton(bool show) { d->showAutoCorrectionButton = show; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktextwidgets-4.97.0/src/widgets/ktextedit.h new/ktextwidgets-4.98.0/src/widgets/ktextedit.h --- old/ktextwidgets-4.97.0/src/widgets/ktextedit.h 2014-03-01 12:51:40.000000000 +0100 +++ new/ktextwidgets-4.98.0/src/widgets/ktextedit.h 2014-03-28 19:17:34.000000000 +0100 @@ -48,7 +48,9 @@ class KTEXTWIDGETS_EXPORT KTextEdit : public QTextEdit //krazy:exclude=qclasses { Q_OBJECT + #ifndef KTEXTWIDGETS_NO_DEPRECATED Q_PROPERTY(QString clickMessage READ clickMessage WRITE setClickMessage) + #endif Q_PROPERTY(bool checkSpellingEnabled READ checkSpellingEnabled WRITE setCheckSpellingEnabled) Q_PROPERTY(QString spellCheckingLanguage READ spellCheckingLanguage WRITE setSpellCheckingLanguage) @@ -186,15 +188,19 @@ * This makes the text edit display a grayed-out hinting text as long as * the user didn't enter any text. It is often used as indication about * the purpose of the text edit. - * @since 4.4 + * @deprecated since 5.0, use QTextEdit::setPlaceholderText instead */ - void setClickMessage(const QString &msg); +#ifndef KTEXTWIDGETS_NO_DEPRECATED + inline KTEXTWIDGETS_DEPRECATED void setClickMessage(const QString &msg) {setPlaceholderText(msg);} +#endif /** * @return the message set with setClickMessage - * @since 4.4 + * @deprecated since 5.0, use QTextEdit::placeholderText instead */ - QString clickMessage() const; +#ifndef KTEXTWIDGETS_NO_DEPRECATED + inline KTEXTWIDGETS_DEPRECATED QString clickMessage() const {return placeholderText();} +#endif /** * @since 4.10 @@ -329,12 +335,6 @@ virtual bool event(QEvent *); /** - * Reimplemented to paint clickMessage. - */ - virtual void paintEvent(QPaintEvent *); - virtual void focusOutEvent(QFocusEvent *); - - /** * Reimplemented for internal reasons */ virtual void keyPressEvent(QKeyEvent *); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
