Hello community, here is the log from the commit of package kcompletion for openSUSE:Factory checked in at 2015-03-16 09:27:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcompletion (Old) and /work/SRC/openSUSE:Factory/.kcompletion.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcompletion" Changes: -------- --- /work/SRC/openSUSE:Factory/kcompletion/kcompletion.changes 2015-02-16 17:30:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kcompletion.new/kcompletion.changes 2015-03-16 09:27:42.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Mar 7 16:58:35 UTC 2015 - [email protected] + +- Update to 5.8.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.8.0.php +- Use pkgconfig(Qt5Widgets) instead of kconfig-devel and + kwidgetsaddons-devel for devel package requires + +------------------------------------------------------------------- Old: ---- kcompletion-5.7.0.tar.xz New: ---- kcompletion-5.8.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcompletion.spec ++++++ --- /var/tmp/diff_new_pack.HRENM5/_old 2015-03-16 09:27:43.000000000 +0100 +++ /var/tmp/diff_new_pack.HRENM5/_new 2015-03-16 09:27:43.000000000 +0100 @@ -17,13 +17,13 @@ %define lname libKF5Completion5 -%define _tar_path 5.7 +%define _tar_path 5.8 Name: kcompletion Version: %{_tar_path}.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.7.0 +BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{kf5_version} BuildRequires: kf5-filesystem @@ -56,8 +56,7 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: kconfig-devel >= %{kf5_version} -Requires: kwidgetsaddons-devel >= %{kf5_version} +Requires: pkgconfig(Qt5Widgets) >= 5.2.0 %description devel KCompletion provides widgets with advanced completion support as well as a ++++++ kcompletion-5.7.0.tar.xz -> kcompletion-5.8.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcompletion-5.7.0/CMakeLists.txt new/kcompletion-5.8.0/CMakeLists.txt --- old/kcompletion-5.7.0/CMakeLists.txt 2015-02-08 16:13:03.000000000 +0100 +++ new/kcompletion-5.8.0/CMakeLists.txt 2015-03-07 15:38:59.000000000 +0100 @@ -3,7 +3,7 @@ project(KCompletion) # ECM setup -find_package(ECM 1.7.0 REQUIRED NO_MODULE) +find_package(ECM 1.8.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) @@ -17,8 +17,8 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.7.0") # handled by release scripts -set(KF5_DEP_VERSION "5.7.0") # handled by release scripts +set(KF5_VERSION "5.8.0") # handled by release scripts +set(KF5_DEP_VERSION "5.8.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCOMPLETION VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcompletion_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcompletion-5.7.0/KF5CompletionConfig.cmake.in new/kcompletion-5.8.0/KF5CompletionConfig.cmake.in --- old/kcompletion-5.7.0/KF5CompletionConfig.cmake.in 2015-02-08 16:13:03.000000000 +0100 +++ new/kcompletion-5.8.0/KF5CompletionConfig.cmake.in 2015-03-07 15:38:59.000000000 +0100 @@ -1,7 +1,6 @@ @PACKAGE_INIT@ -find_dependency(KF5Config "@KF5_DEP_VERSION@") -find_dependency(KF5WidgetsAddons "@KF5_DEP_VERSION@") +find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) include("${CMAKE_CURRENT_LIST_DIR}/KF5CompletionTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcompletion-5.7.0/po/bs/kcompletion5_qt.po new/kcompletion-5.8.0/po/bs/kcompletion5_qt.po --- old/kcompletion-5.7.0/po/bs/kcompletion5_qt.po 2015-02-08 16:13:03.000000000 +0100 +++ new/kcompletion-5.8.0/po/bs/kcompletion5_qt.po 2015-03-07 15:38:59.000000000 +0100 @@ -1,123 +1,74 @@ -# translation of kdelibs4.po to bosanski -# Marko Rosic <[email protected]>, 2003. -# Toplica Tanaskovic <[email protected]>, 2003, 2004, 2005. -# Chusslove Illich <[email protected]>, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010. -# Dalibor Djuric <[email protected]>, 2009, 2010. -# Dalibor Djuric <[email protected]>, 2010. -# KDE 4 <[email protected]>, 2011. -# Bosnian translation of kdelibs4 -# Initially converted from translation of kdelibs4.po by -# Samir Ribić <[email protected]> msgid "" msgstr "" -"Project-Id-Version: kdelibs4\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2013-12-21 17:26+0000\n" -"Last-Translator: Ademovic Saudin <[email protected]>\n" -"Language-Team: bosanski <[email protected]>\n" -"Language: bosnian\n" +"Project-Id-Version: kde5\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2015-02-24 20:07+0100\n" +"Last-Translator: Samir Ribić <[email protected]>\n" +"Language-Team: Bosnian\n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Qt-Contexts: true\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Launchpad (build 16872)\n" -"X-Launchpad-Export-Date: 2013-12-22 05:52+0000\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" -"X-Environment: kde\n" -"X-Qt-Contexts: true\n" #: khistorycombobox.cpp:203 -#, fuzzy -#| msgid "Clear &History" msgctxt "KHistoryComboBox|" msgid "Clear &History" msgstr "Očisti &istorijat" #: klineedit.cpp:154 -#, fuzzy -#| msgid "1" msgctxt "KLineEdit|Italic placeholder text in line edits: 0 no, 1 yes" msgid "1" msgstr "1" #: klineedit.cpp:224 -#, fuzzy -#| msgctxt "@action:button Clear current text in the line edit" -#| msgid "Clear text" msgctxt "KLineEdit|@action:button Clear current text in the line edit" msgid "Clear text" -msgstr "Očisti tekst" +msgstr "Obriši tekst" #: klineedit.cpp:1111 -#, fuzzy -#| msgid "C&lear" msgctxt "KLineEdit|" msgid "C&lear" msgstr "&Očisti" #: klineedit.cpp:1125 -#, fuzzy -#| msgctxt "@action" -#| msgid "Text Completion" msgctxt "KLineEdit|@title:menu" msgid "Text Completion" msgstr "Dopuna teksta" #: klineedit.cpp:1132 -#, fuzzy -#| msgctxt "No border line" -#| msgid "None" msgctxt "KLineEdit|@item:inmenu Text Completion" msgid "None" -msgstr "nijedna" +msgstr "Ništa" #: klineedit.cpp:1133 -#, fuzzy -#| msgctxt "@item:inmenu Text Completion" -#| msgid "Manual" msgctxt "KLineEdit|@item:inmenu Text Completion" msgid "Manual" -msgstr "ručno" +msgstr "ručni" #: klineedit.cpp:1134 -#, fuzzy -#| msgctxt "@item:inmenu Text Completion" -#| msgid "Automatic" msgctxt "KLineEdit|@item:inmenu Text Completion" msgid "Automatic" -msgstr "automatski" +msgstr "Automatski" #: klineedit.cpp:1135 -#, fuzzy -#| msgctxt "@item:inmenu Text Completion" -#| msgid "Dropdown List" msgctxt "KLineEdit|@item:inmenu Text Completion" msgid "Dropdown List" msgstr "padajući spisak" #: klineedit.cpp:1136 -#, fuzzy -#| msgctxt "@item:inmenu Text Completion" -#| msgid "Short Automatic" msgctxt "KLineEdit|@item:inmenu Text Completion" msgid "Short Automatic" msgstr "kratko automatski" #: klineedit.cpp:1137 -#, fuzzy -#| msgctxt "@item:inmenu Text Completion" -#| msgid "Dropdown List && Automatic" msgctxt "KLineEdit|@item:inmenu Text Completion" msgid "Dropdown List && Automatic" msgstr "padajući spisak i automatski" #: klineedit.cpp:1167 -#, fuzzy -#| msgctxt "Encodings menu" -#| msgid "Default" msgctxt "KLineEdit|@item:inmenu Text Completion" msgid "Default" -msgstr "podrazumijevano" +msgstr "Podrazumijevano" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcompletion-5.7.0/po/fr/kcompletion5_qt.po new/kcompletion-5.8.0/po/fr/kcompletion5_qt.po --- old/kcompletion-5.7.0/po/fr/kcompletion5_qt.po 2015-02-08 16:13:03.000000000 +0100 +++ new/kcompletion-5.8.0/po/fr/kcompletion5_qt.po 2015-03-07 15:38:59.000000000 +0100 @@ -24,10 +24,10 @@ "PO-Revision-Date: 2014-03-16 18:32+0100\n" "Last-Translator: Sebastien Renard <[email protected]>\n" "Language-Team: French <[email protected]>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" "X-Environment: kde\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcompletion-5.7.0/src/kcombobox.h new/kcompletion-5.8.0/src/kcombobox.h --- old/kcompletion-5.7.0/src/kcombobox.h 2015-02-08 16:13:03.000000000 +0100 +++ new/kcompletion-5.8.0/src/kcombobox.h 2015-03-07 15:38:59.000000000 +0100 @@ -57,15 +57,15 @@ * KCombobox by default creates a completion object when you invoke the * completionObject(bool) member function for the first time or * explicitly use setCompletionObject(KCompletion*, bool) to assign your - * own completion object. Additionally, to make this widget more functional, + * own completion object. Additionally, to make this widget more functional, * KComboBox will by default handle text rotation and completion events * internally whenever a completion object is created through either one of the - * methods mentioned above. If you do not need this functionality, simply use + * methods mentioned above. If you do not need this functionality, simply use * KCompletionBase::setHandleSignals(bool) or alternatively set the boolean * parameter in the @p setCompletionObject call to false. * * Beware: The completion object can be deleted on you, especially if a call - * such as setEditable(false) is made. Store the pointer at your own risk, + * such as setEditable(false) is made. Store the pointer at your own risk, * and consider using QPointer<KCompletion>. * * The default key bindings for completion and rotation are determined from the @@ -263,10 +263,10 @@ int cursorPosition() const; /** - * Re-implemented from QComboBox. + * Reimplemented from QComboBox. * * If @p true, the completion mode will be set to automatic. - * Otherwise, it is defaulted to the global setting. This + * Otherwise, it is defaulted to the global setting. This * method has been replaced by the more comprehensive * setCompletionMode(). * @@ -275,10 +275,10 @@ virtual void setAutoCompletion(bool autocomplete); /** - * Re-implemented from QComboBox. + * Reimplemented from QComboBox. * * Returns @p true if the current completion mode is set - * to automatic. See its more comprehensive replacement + * to automatic. See its more comprehensive replacement * completionMode(). * * @return @p true when completion mode is automatic. @@ -369,7 +369,7 @@ KCompletionBox *completionBox(bool create = true); /** - * Re-implemented for internal reasons. API remains unaffected. + * Reimplemented for internal reasons. API remains unaffected. * Note that QComboBox::setLineEdit is not virtual in Qt4, do not * use a KComboBox in a QComboBox pointer. * @@ -380,7 +380,7 @@ virtual void setLineEdit(QLineEdit *); /** - * Re-implemented so that setEditable(true) creates a KLineEdit + * Reimplemented so that setEditable(true) creates a KLineEdit * instead of QLineEdit. * * Note that QComboBox::setEditable is not virtual, so do not @@ -399,7 +399,7 @@ /** * Emitted when the user presses the Enter key. * - * The argument is the current text being edited. This signal is just like + * The argument is the current text being edited. This signal is just like * returnPressed() except that it contains the current text as its argument. * * Note that this signal is only emitted when the @@ -447,7 +447,7 @@ * * The signal allows you to add your own entries into the context menu. * Note that you <em>must not</em> store the pointer to the QPopupMenu since it is - * created and deleted on demand. Otherwise, you can crash your app. + * created and deleted on demand. Otherwise, you can crash your app. * * @param contextMenu the context menu about to be displayed */ @@ -462,7 +462,7 @@ * Depending on the value of the argument, this function either * iterates through the history list of this widget or all the * possible matches in whenever multiple matches result from a - * text completion request. Note that the all-possible-match + * text completion request. Note that the all-possible-match * iteration will not work if there are no previous matches, i.e. * no text has been completed and the *nix shell history list * rotation is only available if the insertion policy for this @@ -480,13 +480,13 @@ * This function is an implementation for * KCompletionBase::setCompletedText. */ - virtual void setCompletedText(const QString &); + void setCompletedText(const QString &) Q_DECL_OVERRIDE; /** * Sets @p items into the completion box if completionMode() is * CompletionPopup. The popup will be shown immediately. */ - void setCompletedItems(const QStringList &items, bool autosubject = true); + void setCompletedItems(const QStringList &items, bool autosubject = true) Q_DECL_OVERRIDE; /** * Selects the first item that matches @p item. @@ -502,11 +502,11 @@ * Completes text according to the completion mode. * * Note: this method is not invoked if the completion mode is - * set to @p CompletionNone. Also if the mode is set to @p CompletionShell + * set to @p CompletionNone. Also if the mode is set to @p CompletionShell * and multiple matches are found, this method will complete the * text to the first match with a beep to indicate that there are - * more matches. Then any successive completion key event iterates - * through the remaining matches. This way the rotation functionality + * more matches. Then any successive completion key event iterates + * through the remaining matches. This way the rotation functionality * is left to iterate through the list as usual. */ virtual void makeCompletion(const QString &); @@ -522,7 +522,7 @@ */ virtual void setCompletedText(const QString &text, bool marked); - virtual QSize minimumSizeHint() const; + QSize minimumSizeHint() const Q_DECL_OVERRIDE; private: const QScopedPointer<KComboBoxPrivate> d_ptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcompletion-5.7.0/src/kcompletion.h new/kcompletion-5.8.0/src/kcompletion.h --- old/kcompletion-5.7.0/src/kcompletion.h 2015-02-08 16:13:03.000000000 +0100 +++ new/kcompletion-5.8.0/src/kcompletion.h 2015-03-07 15:38:59.000000000 +0100 @@ -395,8 +395,8 @@ * When reaching the last item, the list is rotated, so it will return * the first match and a sound is emitted (depending on * soundsEnabled()). - * @return the next item from the list of matching items. When there is no - * match, QString() is returned and a sound is emitted + * @return the next item from the list of matching items. When there is no + * match, QString() is returned and a sound is emitted. */ QString nextMatch(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcompletion-5.7.0/src/kcompletion_p.h new/kcompletion-5.8.0/src/kcompletion_p.h --- old/kcompletion-5.7.0/src/kcompletion_p.h 2015-02-08 16:13:03.000000000 +0100 +++ new/kcompletion-5.8.0/src/kcompletion_p.h 2015-03-07 15:38:59.000000000 +0100 @@ -181,8 +181,8 @@ } /* We want to handle a list of KCompTreeNodes on our own, to not - need to use QValueList<>. And to make it even faster we don't - use an accessor, but just a public member. */ + need to use QValueList<>. And to make it even faster we don't + use an accessor, but just a public member. */ KCompTreeNode *m_next; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcompletion-5.7.0/src/kcompletionbase.h new/kcompletion-5.8.0/src/kcompletionbase.h --- old/kcompletion-5.7.0/src/kcompletionbase.h 2015-02-08 16:13:03.000000000 +0100 +++ new/kcompletion-5.8.0/src/kcompletionbase.h 2015-03-07 15:38:59.000000000 +0100 @@ -32,9 +32,9 @@ * into widgets. * * This is a convenience class that provides the basic functions - * needed to add text completion support into widgets. All that + * needed to add text completion support into widgets. All that * is required is an implementation for the pure virtual function - * setCompletedText(). Refer to KLineEdit or KComboBox + * setCompletedText(). Refer to KLineEdit or KComboBox * to see how easily such support can be added using this as a base * class. * @@ -48,7 +48,7 @@ Q_DECLARE_PRIVATE(KCompletionBase) /** * Constants that represent the items whose shortcut - * key binding is programmable. The default key bindings + * key binding is programmable. The default key bindings * for these items are defined in KStandardShortcut. */ enum KeyBindingType { @@ -104,7 +104,7 @@ * Sets up the completion object to be used. * * This method assigns the completion object and sets it up to automatically - * handle the completion and rotation signals internally. You should use + * handle the completion and rotation signals internally. You should use * this function if you want to share one completion object among your * widgets or need to use a customized completion object. * @@ -124,7 +124,7 @@ * * This function simply assigns a boolean value that * indicates whether it should handle rotation and - * completion events or not. Note that this does not + * completion events or not. Note that this does not * stop the object from emitting signals when these * events occur. * @@ -162,18 +162,18 @@ * Invoking this function with @p enable set to @p false will * cause the completion and rotation signals not to be emitted. * However, unlike setting the completion object to @p NULL - * using setCompletionObject, disabling the emition of + * using setCompletionObject, disabling the emission of * the signals through this method does not affect the current * completion object. * - * There is no need to invoke this function by default. When a + * There is no need to invoke this function by default. When a * completion object is created through completionObject or * setCompletionObject, these signals are set to emit - * automatically. Also note that disabling this signals will not + * automatically. Also note that disabling this signals will not * necessarily interfere with the objects' ability to handle these - * events internally. See setHandleSignals. + * events internally. See setHandleSignals. * - * @param enable if false, disables the emition of completion and rotation signals. + * @param enable if false, disables the emission of completion and rotation signals. */ void setEnableSignals(bool enable); @@ -194,7 +194,7 @@ /** * Sets whether the object emits rotation signals. * - * @param emitRotationSignals if false, disables the emition of rotation signals. + * @param emitRotationSignals if false, disables the emission of rotation signals. */ void setEmitSignals(bool emitRotationSignals); @@ -223,13 +223,13 @@ * signal defined by the inheriting widget will be activated. * If the default value or 0 is specified by the second * parameter, then the key binding as defined in the global - * setting should be used. This method returns false + * setting should be used. This method returns false * when @p key is negative or the supplied key binding conflicts * with another one set for another feature. * * NOTE: To use a modifier key (Shift, Ctrl, Alt) as part of * the key binding simply @p sum up the values of the - * modifier and the actual key. For example, to use CTRL+E, supply + * modifier and the actual key. For example, to use CTRL+E, supply * @p "Qt::CtrlButton + Qt::Key_E" as the second argument to this * function. * @@ -248,7 +248,7 @@ * Returns the key binding used for the specified item. * * This method returns the key binding used to activate - * the feature given by @p item. If the binding + * the feature given by @p item. If the binding * contains modifier key(s), the sum of the modifier key * and the actual key code is returned. * @@ -287,7 +287,7 @@ * all inheriting classes. * * This function is intended to allow external completion - * implementations to set completed text appropriately. It + * implementations to set completed text appropriately. It * is mostly relevant when the completion mode is set to * CompletionAuto and CompletionManual modes. See * KCompletionBase::setCompletedText. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcompletion-5.7.0/src/kcompletionbox.h new/kcompletion-5.8.0/src/kcompletionbox.h --- old/kcompletion-5.7.0/src/kcompletionbox.h 2015-02-08 16:13:03.000000000 +0100 +++ new/kcompletion-5.8.0/src/kcompletionbox.h 2015-03-07 15:38:59.000000000 +0100 @@ -64,10 +64,10 @@ */ ~KCompletionBox(); - virtual QSize sizeHint() const; + QSize sizeHint() const Q_DECL_OVERRIDE; /** - * @returns true if selecting an item results in the emition of the selected() signal. + * @returns true if selecting an item results in the emission of the selected() signal. */ bool activateOnSelect() const; @@ -180,10 +180,10 @@ void end(); /** - * Re-implemented for internal reasons. API is unaffected. + * Reimplemented for internal reasons. API is unaffected. * Call it only if you really need it (i.e. the widget was hidden before) to have better performance. */ - virtual void setVisible(bool visible); + void setVisible(bool visible) Q_DECL_OVERRIDE; Q_SIGNALS: /** @@ -194,7 +194,7 @@ /** * Emitted whenever the user chooses to ignore the available - * selections and close the this box. + * selections and closes this box. */ void userCancelled(const QString &); @@ -227,7 +227,7 @@ * Reimplemented from QListWidget to get events from the viewport (to hide * this widget on mouse-click, Escape-presses, etc. */ - virtual bool eventFilter(QObject *, QEvent *); + bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; /** * The preferred global coordinate at which the completion box's top left corner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcompletion-5.7.0/src/khistorycombobox.h new/kcompletion-5.8.0/src/khistorycombobox.h --- old/kcompletion-5.7.0/src/khistorycombobox.h 2015-02-08 16:13:03.000000000 +0100 +++ new/kcompletion-5.8.0/src/khistorycombobox.h 2015-03-07 15:38:59.000000000 +0100 @@ -225,12 +225,12 @@ /** * Handling key-events, the shortcuts to rotate the items. */ - virtual void keyPressEvent(QKeyEvent *); + void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; /** * Handling wheel-events, to rotate the items. */ - virtual void wheelEvent(QWheelEvent *ev); + void wheelEvent(QWheelEvent *ev) Q_DECL_OVERRIDE; /** * Inserts @p items into the combo, honoring pixmapProvider() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcompletion-5.7.0/src/klineedit.h new/kcompletion-5.8.0/src/klineedit.h --- old/kcompletion-5.7.0/src/klineedit.h 2015-02-08 16:13:03.000000000 +0100 +++ new/kcompletion-5.8.0/src/klineedit.h 2015-03-07 15:38:59.000000000 +0100 @@ -55,12 +55,12 @@ * modes on the fly based on their preference. * * To support these new features KLineEdit also emits a few more - * additional signals. These are: completion( const QString& ), + * additional signals. These are: completion( const QString& ), * textRotation( KeyBindingType ), and returnPressed( const QString& ). * The completion signal can be connected to a slot that will assist the - * user in filling out the remaining text. The text rotation signal is + * user in filling out the remaining text. The text rotation signal is * intended to be used to iterate through the list of all possible matches - * whenever there is more than one match for the entered text. The + * whenever there is more than one match for the entered text. The * @p returnPressed( const QString& ) signals are the same as QLineEdit's * except it provides the current text in the widget as its argument whenever * appropriate. @@ -68,15 +68,15 @@ * This widget by default creates a completion object when you invoke * the completionObject( bool ) member function for the first time or * use setCompletionObject( KCompletion*, bool ) to assign your own - * completion object. Additionally, to make this widget more functional, + * completion object. Additionally, to make this widget more functional, * KLineEdit will by default handle the text rotation and completion * events internally when a completion object is created through either one - * of the methods mentioned above. If you do not need this functionality, + * of the methods mentioned above. If you do not need this functionality, * simply use KCompletionBase::setHandleSignals( bool ) or set the * boolean parameter in the above functions to false. * * The default key-bindings for completion and rotation is determined - * from the global settings in KStandardShortcut. These values, however, + * from the global settings in KStandardShortcut. These values, however, * can be overridden locally by invoking KCompletionBase::setKeyBinding(). * The values can easily be reverted back to the default setting, by simply * calling useGlobalSettings(). An alternate method would be to default @@ -95,7 +95,7 @@ * and is done to give visual distinction between the three different modes: * disabled, read-only, and read-write. * - * KLineEdit has also a password mode which depends of globals KDE settings. Use + * KLineEdit has also a password mode which depends of globals KDE settings. Use * KLineEdit::setPasswordMode instead of QLineEdit::echoMode property to have a password field. * * \b Usage \n @@ -198,14 +198,14 @@ void setUrl(const QUrl &url); /** - * Re-implemented from KCompletionBase for internal reasons. + * Reimplemented from KCompletionBase for internal reasons. * * This function is re-implemented in order to make sure that * the EchoMode is acceptable before we set the completion mode. * * See KCompletionBase::setCompletionMode */ - virtual void setCompletionMode(KCompletion::CompletionMode mode); + void setCompletionMode(KCompletion::CompletionMode mode) Q_DECL_OVERRIDE; /** * Disables completion modes by makeing them non-checkable. @@ -291,7 +291,7 @@ /** * Reimplemented for internal reasons, the API is not affected. */ - virtual void setCompletionObject(KCompletion *, bool handle = true); + void setCompletionObject(KCompletion *, bool handle = true) Q_DECL_OVERRIDE; /** * Reimplemented for internal reasons, the API is not affected. @@ -397,7 +397,7 @@ /** * Emitted when the user presses the return key. * - * The argument is the current text. Note that this + * The argument is the current text. Note that this * signal is @em not emitted if the widget's @p EchoMode is set to * QLineEdit::EchoMode. */ @@ -494,7 +494,7 @@ /** * See KCompletionBase::setCompletedText. */ - virtual void setCompletedText(const QString &); + void setCompletedText(const QString &) Q_DECL_OVERRIDE; /** * Same as the above function except it allows you to temporarily @@ -504,7 +504,7 @@ * @param items list of completion matches to be shown in the completion box. * @param autoSuggest true if you want automatic text completion (suggestion) enabled. */ - void setCompletedItems(const QStringList &items, bool autoSuggest = true); + void setCompletedItems(const QStringList &items, bool autoSuggest = true) Q_DECL_OVERRIDE; /** * Squeezes @p text into the line edit. @@ -513,7 +513,7 @@ void setSqueezedText(const QString &text); /** - * Re-implemented to enable text squeezing. API is not affected. + * Reimplemented to enable text squeezing. API is not affected. */ virtual void setText(const QString &); @@ -547,54 +547,54 @@ protected: /** - * Re-implemented for internal reasons. API not affected. + * Reimplemented for internal reasons. API not affected. */ - virtual bool event(QEvent *); + bool event(QEvent *) Q_DECL_OVERRIDE; /** - * Re-implemented for internal reasons. API not affected. + * Reimplemented for internal reasons. API not affected. * * See QLineEdit::resizeEvent(). */ - virtual void resizeEvent(QResizeEvent *); + void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; /** - * Re-implemented for internal reasons. API not affected. + * Reimplemented for internal reasons. API not affected. * * See QLineEdit::keyPressEvent(). */ - virtual void keyPressEvent(QKeyEvent *); + void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; /** - * Re-implemented for internal reasons. API not affected. + * Reimplemented for internal reasons. API not affected. * * See QLineEdit::mousePressEvent(). */ - virtual void mousePressEvent(QMouseEvent *); + void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; /** - * Re-implemented for internal reasons. API not affected. + * Reimplemented for internal reasons. API not affected. * * See QLineEdit::mouseReleaseEvent(). */ - virtual void mouseReleaseEvent(QMouseEvent *); + void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; /** - * Re-implemented for internal reasons. API not affected. + * Reimplemented for internal reasons. API not affected. * * See QWidget::mouseDoubleClickEvent(). */ - virtual void mouseDoubleClickEvent(QMouseEvent *); + void mouseDoubleClickEvent(QMouseEvent *) Q_DECL_OVERRIDE; /** - * Re-implemented for internal reasons. API not affected. + * Reimplemented for internal reasons. API not affected. * * See QLineEdit::contextMenuEvent(). */ - virtual void contextMenuEvent(QContextMenuEvent *); + void contextMenuEvent(QContextMenuEvent *) Q_DECL_OVERRIDE; /** - * Re-implemented for internal reasons. API not affected. + * Reimplemented for internal reasons. API not affected. * * See QLineEdit::createStandardContextMenu(). */ @@ -621,7 +621,7 @@ */ bool autoSuggest() const; - virtual void paintEvent(QPaintEvent *ev); + void paintEvent(QPaintEvent *ev) Q_DECL_OVERRIDE; private: const QScopedPointer<KLineEditPrivate> d_ptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcompletion-5.7.0/src/kzoneallocator_p.h new/kcompletion-5.8.0/src/kzoneallocator_p.h --- old/kcompletion-5.7.0/src/kzoneallocator_p.h 2015-02-08 16:13:03.000000000 +0100 +++ new/kcompletion-5.8.0/src/kzoneallocator_p.h 2015-03-07 15:38:59.000000000 +0100 @@ -36,9 +36,9 @@ * Memory allocator for large groups of small objects. * This should be used for large groups of objects that are created and * destroyed together. When used carefully for this purpose it is faster - * and more memory efficient than malloc. Additionally to a usual obstack - * like allocator you can also free the objects individually. Because it - * does no compaction it still is faster than malloc()/free(). Depending + * and more memory efficient than malloc. Additionally to a usual obstack + * like allocator you can also free the objects individually. Because it + * does no compaction it still is faster than malloc()/free(). Depending * on the exact usage pattern that might come at the expense of some * memory though. * @author Waldo Bastian <[email protected]>, Michael Matz <[email protected]> @@ -67,9 +67,9 @@ /** * Gives back a block returned by allocate() to the zone * allocator, and possibly deallocates the block holding it (when it's - * empty). The first deallocate() after many allocate() calls + * empty). The first deallocate() after many allocate() calls * (or the first at all) builds an internal data structure for speeding - * up deallocation. The consistency of that structure is maintained + * up deallocation. The consistency of that structure is maintained * from then on (by allocate() and deallocate()) unless many * more objects are allocated without any intervening deallocation, in * which case it's thrown away and rebuilt at the next deallocate(). @@ -77,9 +77,9 @@ * The effect of this is, that such initial deallocate() calls take * more time then the normal calls, and that after this list is built, i.e. * generally if deallocate() is used at all, also allocate() is a - * little bit slower. This means, that if you want to squeeze out the last + * little bit slower. This means, that if you want to squeeze out the last * bit performance you would want to use KZoneAllocator as an obstack, i.e. - * just use the functions allocate() and free_since(). All the + * just use the functions allocate() and free_since(). All the * remaining memory is returned to the system if the zone allocator * is destroyed. * @param ptr Pointer as returned by allocate(). @@ -100,9 +100,9 @@ * alloc.free_since (remember_me); * \endcode * Note, that we don't need to remember all the pointers to the 12-byte - * objects for freeing them. The free_since() does deallocate them + * objects for freeing them. The free_since() does deallocate them * all at once. - * @param ptr Pointer as returned by allocate(). It acts like + * @param ptr Pointer as returned by allocate(). It acts like * a kind of mark of a certain position in the stack of all objects, * off which you can throw away everything above that mark. */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
