diff -Nru kcompletion-5.15.0/CMakeLists.txt kcompletion-5.18.0/CMakeLists.txt --- kcompletion-5.15.0/CMakeLists.txt 2015-10-05 07:55:16.000000000 +0000 +++ kcompletion-5.18.0/CMakeLists.txt 2016-01-02 16:26:01.000000000 +0000 @@ -4,7 +4,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.15.0 NO_MODULE) +find_package(ECM 5.18.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -21,8 +21,8 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.15.0") # handled by release scripts -set(KF5_DEP_VERSION "5.15.0") # handled by release scripts +set(KF5_VERSION "5.18.0") # handled by release scripts +set(KF5_DEP_VERSION "5.18.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCOMPLETION VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcompletion_version.h" diff -Nru kcompletion-5.15.0/debian/changelog kcompletion-5.18.0/debian/changelog --- kcompletion-5.15.0/debian/changelog 2015-11-03 14:34:31.000000000 +0000 +++ kcompletion-5.18.0/debian/changelog 2016-03-07 22:18:48.000000000 +0000 @@ -1,3 +1,25 @@ +kcompletion (5.18.0-0ubuntu1) xenial; urgency=medium + + [ Scarlett Clark ] + * New upstream release Xenial + + [ Philip Muškovac ] + * New upstream release + + -- Philip Muškovac Mon, 07 Mar 2016 23:18:48 +0100 + +kcompletion (5.16.0-1) unstable; urgency=medium + + * New upstream release (5.16.0). + + -- Maximiliano Curia Mon, 30 Nov 2015 12:12:18 +0100 + +kcompletion (5.15.0-1) unstable; urgency=medium + + * New upstream release (5.15.0). + + -- Maximiliano Curia Fri, 09 Oct 2015 19:16:20 +0200 + kcompletion (5.15.0-0ubuntu2) xenial; urgency=medium * Fix autopackagetests by adding allow-stderr to the requirements. @@ -14,18 +36,36 @@ -- Jonathan Riddell Wed, 07 Oct 2015 13:43:59 +0100 +kcompletion (5.14.0-1) unstable; urgency=medium + + * New upstream release (5.14.0). + + -- Maximiliano Curia Tue, 15 Sep 2015 13:48:59 +0200 + kcompletion (5.14.0-0ubuntu1) wily; urgency=medium * new upstream release -- Clive Johnston Thu, 17 Sep 2015 13:10:58 +0100 +kcompletion (5.13.0-1) unstable; urgency=medium + + * New upstream release (5.13.0). + + -- Maximiliano Curia Sun, 30 Aug 2015 14:40:51 +0200 + kcompletion (5.13.0-0ubuntu1) wily; urgency=medium * new upstream release -- Jonathan Riddell Mon, 10 Aug 2015 12:52:16 +0200 +kcompletion (5.12.0-1) unstable; urgency=medium + + * New upstream release (5.12.0). + + -- Maximiliano Curia Thu, 09 Jul 2015 12:43:29 +0200 + kcompletion (5.12.0-0ubuntu1) wily; urgency=medium * New upstream release diff -Nru kcompletion-5.15.0/debian/control kcompletion-5.18.0/debian/control --- kcompletion-5.15.0/debian/control 2015-11-03 14:07:19.000000000 +0000 +++ kcompletion-5.18.0/debian/control 2016-03-07 22:18:48.000000000 +0000 @@ -5,9 +5,9 @@ Uploaders: Maximiliano Curia Build-Depends: cmake (>= 2.8.12), debhelper (>= 9), - extra-cmake-modules (>= 5.15.0~), - libkf5config-dev (>= 5.15.0~), - libkf5widgetsaddons-dev (>= 5.15.0~), + extra-cmake-modules (>= 5.18.0~), + libkf5config-dev (>= 5.18.0~), + libkf5widgetsaddons-dev (>= 5.18.0~), pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.4), qttools5-dev (>= 5.4), @@ -15,7 +15,6 @@ xauth, xvfb Standards-Version: 3.9.6 -XS-Testsuite: autopkgtest Homepage: https://projects.kde.org/projects/frameworks/kcompletion Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/frameworks/kcompletion.git Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kcompletion.git @@ -24,8 +23,8 @@ Section: libdevel Architecture: any Depends: libkf5completion5 (= ${binary:Version}), - libkf5config-dev (>= 5.15.0~), - libkf5widgetsaddons-dev (>= 5.15.0~), + libkf5config-dev (>= 5.16.0~), + libkf5widgetsaddons-dev (>= 5.16.0~), ${misc:Depends} Description: development files for kcompletion KCompletion provides widgets with advanced completion support as well as a diff -Nru kcompletion-5.15.0/debian/rules kcompletion-5.18.0/debian/rules --- kcompletion-5.15.0/debian/rules 2015-11-03 14:02:07.000000000 +0000 +++ kcompletion-5.18.0/debian/rules 2016-03-07 22:18:48.000000000 +0000 @@ -1,8 +1,6 @@ #!/usr/bin/make -f # -*- makefile -*- -export QT_SELECT=5 - include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk override_dh_strip: diff -Nru kcompletion-5.15.0/po/ca@valencia/kcompletion5_qt.po kcompletion-5.18.0/po/ca@valencia/kcompletion5_qt.po --- kcompletion-5.15.0/po/ca@valencia/kcompletion5_qt.po 2015-10-05 07:55:16.000000000 +0000 +++ kcompletion-5.18.0/po/ca@valencia/kcompletion5_qt.po 2016-01-02 16:26:01.000000000 +0000 @@ -1,28 +1,27 @@ -# Translation of kcompletion5.po to Catalan -# Copyright (C) 1998-2014 This_file_is_part_of_KDE +# Translation of kcompletion5_qt.po to Catalan (Valencian) +# Copyright (C) 2014 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Sebastià Pla i Sanz , 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006. -# Antoni Bella Pérez , 2003, 2006, 2011, 2012, 2013. +# Sebastià Pla i Sanz , 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. +# Antoni Bella Pérez , 2003, 2006, 2011, 2012, 2013, 2014. # Albert Astals Cid , 2004, 2005, 2007. -# Sebastia Pla Sanz , 2006, 2007. # Josep Ma. Ferrer , 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Robert Millan , 2009. # Orestes Mas , 2010. msgid "" msgstr "" -"Project-Id-Version: kcompletion5\n" +"Project-Id-Version: kcompletion5_qt\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2014-03-30 12:02+0200\n" -"Last-Translator: Josep Ma. Ferrer \n" +"PO-Revision-Date: 2014-06-24 19:55+0200\n" +"Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" "X-Qt-Contexts: true\n" @@ -50,7 +49,7 @@ #: klineedit.cpp:1117 msgctxt "KLineEdit|@title:menu" msgid "Text Completion" -msgstr "Compleció de text" +msgstr "Compleció del text" #: klineedit.cpp:1124 msgctxt "KLineEdit|@item:inmenu Text Completion" @@ -80,7 +79,7 @@ #: klineedit.cpp:1129 msgctxt "KLineEdit|@item:inmenu Text Completion" msgid "Dropdown List && Automatic" -msgstr "Llista desplegable automàtica" +msgstr "Llista desplegable i automàtica" #: klineedit.cpp:1159 msgctxt "KLineEdit|@item:inmenu Text Completion" diff -Nru kcompletion-5.15.0/po/el/kcompletion5_qt.po kcompletion-5.18.0/po/el/kcompletion5_qt.po --- kcompletion-5.15.0/po/el/kcompletion5_qt.po 2015-10-05 07:55:16.000000000 +0000 +++ kcompletion-5.18.0/po/el/kcompletion5_qt.po 2016-01-02 16:26:01.000000000 +0000 @@ -15,111 +15,79 @@ # Dimitrios Glentadakis , 2010, 2011, 2012, 2013, 2014. # nikos, 2011. # Stelios , 2012, 2013. +# Dimitris Kardarakos , 2015. 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: 2014-01-04 09:52+0100\n" -"Last-Translator: Dimitrios Glentadakis \n" +"PO-Revision-Date: 2015-11-04 15:37+0200\n" +"Last-Translator: Dimitris Kardarakos \n" "Language-Team: Greek \n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" #: khistorycombobox.cpp:203 -#, fuzzy -#| msgid "Clear &History" msgctxt "KHistoryComboBox|" msgid "Clear &History" msgstr "Καθαρισμός &ιστορικού" #: 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 "Καθαρισμός κειμένου" #: klineedit.cpp:1103 -#, fuzzy -#| msgid "C&lear" msgctxt "KLineEdit|" msgid "C&lear" -msgstr "Κα&θαρισμός" +msgstr "&Καθαρισμός" #: klineedit.cpp:1117 -#, fuzzy -#| msgctxt "@action" -#| msgid "Text Completion" msgctxt "KLineEdit|@title:menu" msgid "Text Completion" msgstr "Συμπλήρωση κειμένου" #: klineedit.cpp:1124 -#, fuzzy -#| msgctxt "No border line" -#| msgid "None" msgctxt "KLineEdit|@item:inmenu Text Completion" msgid "None" msgstr "Καμία" #: klineedit.cpp:1125 -#, fuzzy -#| msgctxt "@item:inmenu Text Completion" -#| msgid "Manual" msgctxt "KLineEdit|@item:inmenu Text Completion" msgid "Manual" -msgstr "Χειροκίνητη" +msgstr "Χειροκίνητα" #: klineedit.cpp:1126 -#, fuzzy -#| msgctxt "@item:inmenu Text Completion" -#| msgid "Automatic" msgctxt "KLineEdit|@item:inmenu Text Completion" msgid "Automatic" -msgstr "Αυτόματη" +msgstr "Αυτόματα" #: klineedit.cpp:1127 -#, fuzzy -#| msgctxt "@item:inmenu Text Completion" -#| msgid "Dropdown List" msgctxt "KLineEdit|@item:inmenu Text Completion" msgid "Dropdown List" msgstr "Κυλιόμενη λίστα" #: klineedit.cpp:1128 -#, fuzzy -#| msgctxt "@item:inmenu Text Completion" -#| msgid "Short Automatic" msgctxt "KLineEdit|@item:inmenu Text Completion" msgid "Short Automatic" msgstr "Σύντομη αυτόματη" #: klineedit.cpp:1129 -#, fuzzy -#| msgctxt "@item:inmenu Text Completion" -#| msgid "Dropdown List && Automatic" msgctxt "KLineEdit|@item:inmenu Text Completion" msgid "Dropdown List && Automatic" -msgstr "Κυλιόμενη λίστα && αυτόματη" +msgstr "Κυλιόμενη λίστα && αυτόματα" #: klineedit.cpp:1159 -#, fuzzy -#| msgctxt "Encodings menu" -#| msgid "Default" msgctxt "KLineEdit|@item:inmenu Text Completion" msgid "Default" -msgstr "Προκαθορισμένο" +msgstr "Προκαθορισμένα" diff -Nru kcompletion-5.15.0/po/fr/kcompletion5_qt.po kcompletion-5.18.0/po/fr/kcompletion5_qt.po --- kcompletion-5.15.0/po/fr/kcompletion5_qt.po 2015-10-05 07:55:16.000000000 +0000 +++ kcompletion-5.18.0/po/fr/kcompletion5_qt.po 2016-01-02 16:26:01.000000000 +0000 @@ -24,10 +24,10 @@ "PO-Revision-Date: 2014-03-16 18:32+0100\n" "Last-Translator: Sebastien Renard \n" "Language-Team: French \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 -Nru kcompletion-5.15.0/po/gd/kcompletion5_qt.po kcompletion-5.18.0/po/gd/kcompletion5_qt.po --- kcompletion-5.15.0/po/gd/kcompletion5_qt.po 2015-10-05 07:55:16.000000000 +0000 +++ kcompletion-5.18.0/po/gd/kcompletion5_qt.po 2016-01-02 16:26:01.000000000 +0000 @@ -1,8 +1,10 @@ # GunChleoc , 2014. msgid "" msgstr "" -"PO-Revision-Date: 2014-11-25 13:26+0100\n" -"Last-Translator: GunChleoc \n" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2015-11-04 15:11+0000\n" +"Last-Translator: Michael Bauer \n" "Language-Team: Fòram na Gàidhlig\n" "Language: gd\n" "MIME-Version: 1.0\n" @@ -10,7 +12,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : " "(n > 2 && n < 20) ? 2 : 3;\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Poedit 1.8.4\n" "X-Qt-Contexts: true\n" #: khistorycombobox.cpp:203 diff -Nru kcompletion-5.15.0/po/nb/kcompletion5_qt.po kcompletion-5.18.0/po/nb/kcompletion5_qt.po --- kcompletion-5.15.0/po/nb/kcompletion5_qt.po 2015-10-05 07:55:16.000000000 +0000 +++ kcompletion-5.18.0/po/nb/kcompletion5_qt.po 2016-01-02 16:26:01.000000000 +0000 @@ -1,3 +1,5 @@ +# Translation of kcompletion5_qt to Norwegian Bokmål +# # Knut Yrvin , 2002, 2003, 2004, 2005. # Bjørn Steensrud , 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Eskild Hustvedt , 2004, 2005. diff -Nru kcompletion-5.15.0/po/se/kcompletion5_qt.po kcompletion-5.18.0/po/se/kcompletion5_qt.po --- kcompletion-5.15.0/po/se/kcompletion5_qt.po 2015-10-05 07:55:16.000000000 +0000 +++ kcompletion-5.18.0/po/se/kcompletion5_qt.po 2016-01-02 16:26:01.000000000 +0000 @@ -1,3 +1,5 @@ +# Translation of kcompletion5_qt to Northern Sami +# # Børre Gaup , 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012. msgid "" msgstr "" diff -Nru kcompletion-5.15.0/src/kcompletionbox.cpp kcompletion-5.18.0/src/kcompletionbox.cpp --- kcompletion-5.15.0/src/kcompletionbox.cpp 2015-10-05 07:55:16.000000000 +0000 +++ kcompletion-5.18.0/src/kcompletionbox.cpp 2016-01-02 16:26:01.000000000 +0000 @@ -70,8 +70,8 @@ q->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); q->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - q->connect(q, SIGNAL(itemDoubleClicked(QListWidgetItem*)), - SLOT(slotActivated(QListWidgetItem*))); + q->connect(q, &QListWidget::itemDoubleClicked, + q, &KCompletionBox::slotActivated); q->connect(q, SIGNAL(itemClicked(QListWidgetItem*)), SLOT(_k_itemClicked(QListWidgetItem*))); } diff -Nru kcompletion-5.15.0/src/kcompletion.cpp kcompletion-5.18.0/src/kcompletion.cpp --- kcompletion-5.15.0/src/kcompletion.cpp 2015-10-05 07:55:16.000000000 +0000 +++ kcompletion-5.18.0/src/kcompletion.cpp 2016-01-02 16:26:01.000000000 +0000 @@ -49,7 +49,7 @@ int index = item.lastIndexOf(QLatin1Char(':')); if (index > 0) { bool ok; - weight = item.mid(index + 1).toUInt(&ok); + weight = item.midRef(index + 1).toUInt(&ok); if (!ok) { weight = 0; } diff -Nru kcompletion-5.15.0/src/khistorycombobox.cpp kcompletion-5.18.0/src/khistorycombobox.cpp --- kcompletion-5.15.0/src/khistorycombobox.cpp 2015-10-05 07:55:16.000000000 +0000 +++ kcompletion-5.18.0/src/khistorycombobox.cpp 2016-01-02 16:26:01.000000000 +0000 @@ -199,7 +199,7 @@ Q_Q(KHistoryComboBox); if (menu) { menu->addSeparator(); - QAction *clearHistory = menu->addAction(QIcon::fromTheme("edit-clear-history"), + QAction *clearHistory = menu->addAction(QIcon::fromTheme(QStringLiteral("edit-clear-history")), KHistoryComboBox::tr("Clear &History"), q, SLOT(_k_clear())); if (!q->count()) { diff -Nru kcompletion-5.15.0/src/klineedit.cpp kcompletion-5.18.0/src/klineedit.cpp --- kcompletion-5.15.0/src/klineedit.cpp 2015-10-05 07:55:16.000000000 +0000 +++ kcompletion-5.18.0/src/klineedit.cpp 2016-01-02 16:26:01.000000000 +0000 @@ -219,7 +219,7 @@ } d->clearButton = new KLineEditButton(this); - d->clearButton->setObjectName("KLineEditButton"); + d->clearButton->setObjectName(QStringLiteral("KLineEditButton")); d->clearButton->setCursor(Qt::ArrowCursor); d->clearButton->setToolTip(tr("Clear text", "@action:button Clear current text in the line edit")); @@ -300,7 +300,7 @@ const int buttonWidth = clearButton->sizeHint().width(); const QSize newButtonSize(buttonWidth, geom.height()); const QFontMetrics fm(q->font()); - const int em = fm.width("m"); + const int em = fm.width(QStringLiteral("m")); // make sure we have enough room for the clear button // no point in showing it if we can't also see a few characters as well @@ -346,7 +346,7 @@ mode = KCompletion::CompletionNone; // Override the request. } - if (!KAuthorized::authorize("lineedit_text_completion")) { + if (!KAuthorized::authorize(QStringLiteral("lineedit_text_completion"))) { mode = KCompletion::CompletionNone; } @@ -535,7 +535,7 @@ if (textWidth > labelWidth) { // start with the dots only - QString squeezedText = "..."; + QString squeezedText = QStringLiteral("..."); int squeezedWidth = fm.width(squeezedText); // estimate how many letters we can add to the dots on both sides @@ -577,7 +577,7 @@ } else { q->QLineEdit::setText(fullText); - q->setToolTip(""); + q->setToolTip(QLatin1String("")); QToolTip::showText(q->pos(), QString()); // hide } @@ -1100,9 +1100,9 @@ separatorAction = actionList.at(idx); } if (separatorAction) { - QAction *clearAllAction = new QAction(QIcon::fromTheme("edit-clear"), tr("C&lear"), this); + QAction *clearAllAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-clear")), tr("C&lear"), this); clearAllAction->setShortcuts(QKeySequence::keyBindings(QKeySequence::DeleteCompleteLine)); - connect(clearAllAction, SIGNAL(triggered(bool)), SLOT(clear())); + connect(clearAllAction, &QAction::triggered, this, &QLineEdit::clear); if (text().isEmpty()) { clearAllAction->setEnabled(false); } @@ -1113,8 +1113,8 @@ // If a completion object is present and the input // widget is not read-only, show the Text Completion // menu item. - if (compObj() && !isReadOnly() && KAuthorized::authorize("lineedit_text_completion")) { - QMenu *subMenu = popup->addMenu(QIcon::fromTheme("text-completion"), tr("Text Completion", "@title:menu")); + if (compObj() && !isReadOnly() && KAuthorized::authorize(QStringLiteral("lineedit_text_completion"))) { + QMenu *subMenu = popup->addMenu(QIcon::fromTheme(QStringLiteral("text-completion")), tr("Text Completion", "@title:menu")); connect(subMenu, SIGNAL(triggered(QAction*)), this, SLOT(_k_completionMenuActivated(QAction*))); @@ -1307,8 +1307,8 @@ if (handleSignals()) { connect(d->completionBox, SIGNAL(currentTextChanged(QString)), SLOT(_k_completionBoxTextChanged(QString))); - connect(d->completionBox, SIGNAL(userCancelled(QString)), - SLOT(userCancelled(QString))); + connect(d->completionBox, &KCompletionBox::userCancelled, + this, &KLineEdit::userCancelled); connect(d->completionBox, SIGNAL(activated(QString)), SIGNAL(completionBoxActivated(QString))); connect(d->completionBox, SIGNAL(activated(QString)), @@ -1417,7 +1417,7 @@ // but doesn't dare force as "stronger than kaction shortcuts"... else if (e->matches(QKeySequence::SelectAll)) { return true; - } else if (qApp->platformName() == "xcb" && (key == Qt::CTRL + Qt::Key_E || key == Qt::CTRL + Qt::Key_U)) { + } else if (qApp->platformName() == QLatin1String("xcb") && (key == Qt::CTRL + Qt::Key_E || key == Qt::CTRL + Qt::Key_U)) { return true; } @@ -1496,7 +1496,7 @@ Q_D(KLineEdit); if (create && !d->completionBox) { setCompletionBox(new KCompletionBox(this)); - d->completionBox->setObjectName("completion box"); + d->completionBox->setObjectName(QStringLiteral("completion box")); d->completionBox->setFont(font()); } @@ -1639,10 +1639,10 @@ if (passwordMode) { KConfigGroup cg(KSharedConfig::openConfig(), "Passwords"); const QString val = cg.readEntry("EchoMode", "OneStar"); - if (val == "NoEcho") { + if (val == QLatin1String("NoEcho")) { setEchoMode(NoEcho); } else { - d->threeStars = (val == "ThreeStars"); + d->threeStars = (val == QLatin1String("ThreeStars")); setEchoMode(Password); } } else { diff -Nru kcompletion-5.15.0/tests/kcomboboxtest.cpp kcompletion-5.18.0/tests/kcomboboxtest.cpp --- kcompletion-5.15.0/tests/kcomboboxtest.cpp 2015-10-05 07:55:16.000000000 +0000 +++ kcompletion-5.18.0/tests/kcomboboxtest.cpp 2016-01-02 16:26:01.000000000 +0000 @@ -99,12 +99,12 @@ // Create an exit button hbox = new QHBoxLayout(); m_btnExit = new QPushButton("E&xit", this); - QObject::connect(m_btnExit, SIGNAL(clicked()), SLOT(quitApp())); + QObject::connect(m_btnExit, &QAbstractButton::clicked, this, &KComboBoxTest::quitApp); hbox->addWidget(m_btnExit); // Create a disable button... m_btnEnable = new QPushButton("Disa&ble", this); - QObject::connect(m_btnEnable, SIGNAL(clicked()), SLOT(slotDisable())); + QObject::connect(m_btnEnable, &QAbstractButton::clicked, this, &KComboBoxTest::slotDisable); hbox->addWidget(m_btnEnable); vbox->addLayout(hbox); @@ -145,7 +145,7 @@ m_konqc->setCurrentIndex(m_konqc->count() - 1); m_timer = new QTimer(this); - connect(m_timer, SIGNAL(timeout()), SLOT(slotTimeout())); + connect(m_timer, &QTimer::timeout, this, &KComboBoxTest::slotTimeout); } KComboBoxTest::~KComboBoxTest() diff -Nru kcompletion-5.15.0/tests/kcompletionuitest.cpp kcompletion-5.18.0/tests/kcompletionuitest.cpp --- kcompletion-5.15.0/tests/kcompletionuitest.cpp 2015-10-05 07:55:16.000000000 +0000 +++ kcompletion-5.18.0/tests/kcompletionuitest.cpp 2016-01-02 16:26:01.000000000 +0000 @@ -77,7 +77,7 @@ PushButton1 = new QPushButton(GroupBox1); PushButton1->setObjectName(QStringLiteral("PushButton1")); PushButton1->setText(QStringLiteral("Add")); - connect(PushButton1, SIGNAL(clicked()), SLOT(slotAdd())); + connect(PushButton1, &QAbstractButton::clicked, this, &Form1::slotAdd); Layout2->addWidget(PushButton1); Layout9->addLayout(Layout2); @@ -90,7 +90,7 @@ PushButton1_4 = new QPushButton(GroupBox1); PushButton1_4->setObjectName(QStringLiteral("PushButton1_4")); PushButton1_4->setText(QStringLiteral("Remove")); - connect(PushButton1_4, SIGNAL(clicked()), SLOT(slotRemove())); + connect(PushButton1_4, &QAbstractButton::clicked, this, &Form1::slotRemove); Layout3->addWidget(PushButton1_4); Layout9->addLayout(Layout3); @@ -100,8 +100,8 @@ ListBox1 = new QListWidget(GroupBox1); Layout8->addWidget(ListBox1); - connect(ListBox1, SIGNAL(currentRowChanged(int)), - SLOT(slotHighlighted(int))); + connect(ListBox1, &QListWidget::currentRowChanged, + this, &Form1::slotHighlighted); ListBox1->setToolTip(QStringLiteral("Contains the contents of the completion object.\n:x is the weighting, i.e. how often an item has been inserted")); Layout7 = new QVBoxLayout; @@ -111,14 +111,14 @@ PushButton1_3 = new QPushButton(GroupBox1); PushButton1_3->setObjectName(QStringLiteral("PushButton1_3")); PushButton1_3->setText(QStringLiteral("Completion items")); - connect(PushButton1_3, SIGNAL(clicked()), SLOT(slotList())); + connect(PushButton1_3, &QAbstractButton::clicked, this, &Form1::slotList); Layout7->addWidget(PushButton1_3); PushButton1_2 = new QPushButton(GroupBox1); PushButton1_2->setObjectName(QStringLiteral("PushButton1_2")); PushButton1_2->setText(QStringLiteral("Clear")); - connect(PushButton1_2, SIGNAL(clicked()), - edit->completionObject(), SLOT(clear())); + connect(PushButton1_2, &QAbstractButton::clicked, + edit->completionObject(), &KCompletion::clear); Layout7->addWidget(PushButton1_2); Layout8->addLayout(Layout7); Layout9->addLayout(Layout8); diff -Nru kcompletion-5.15.0/tests/klineedittest.cpp kcompletion-5.18.0/tests/klineedittest.cpp --- kcompletion-5.15.0/tests/klineedittest.cpp 2015-10-05 07:55:16.000000000 +0000 +++ kcompletion-5.18.0/tests/klineedittest.cpp 2016-01-02 16:26:01.000000000 +0000 @@ -48,29 +48,29 @@ // horizontal button layout m_btnExit = new QPushButton("E&xit", this); - connect(m_btnExit, SIGNAL(clicked()), SLOT(quitApp())); + connect(m_btnExit, &QAbstractButton::clicked, this, &KLineEditTest::quitApp); m_btnReadOnly = new QPushButton("&Read Only", this); m_btnReadOnly->setCheckable(true); - connect(m_btnReadOnly, SIGNAL(toggled(bool)), SLOT(slotReadOnly(bool))); + connect(m_btnReadOnly, &QAbstractButton::toggled, this, &KLineEditTest::slotReadOnly); m_btnPassword = new QPushButton("&Password", this); m_btnPassword->setCheckable(true); - connect(m_btnPassword, SIGNAL(toggled(bool)), SLOT(slotPassword(bool))); + connect(m_btnPassword, &QAbstractButton::toggled, this, &KLineEditTest::slotPassword); m_btnEnable = new QPushButton("Dis&able", this); m_btnEnable->setCheckable(true); - connect(m_btnEnable, SIGNAL(toggled(bool)), SLOT(slotEnable(bool))); + connect(m_btnEnable, &QAbstractButton::toggled, this, &KLineEditTest::slotEnable); m_btnHide = new QPushButton("Hi&de", this); - connect(m_btnHide, SIGNAL(clicked()), SLOT(slotHide())); + connect(m_btnHide, &QAbstractButton::clicked, this, &KLineEditTest::slotHide); m_btnPlaceholderText = new QPushButton("Place Holder Text", this); m_btnPlaceholderText->setCheckable(true); - connect(m_btnPlaceholderText, SIGNAL(toggled(bool)), SLOT(slotPlaceholderText(bool))); + connect(m_btnPlaceholderText, &QAbstractButton::toggled, this, &KLineEditTest::slotPlaceholderText); QPushButton *btnStyle = new QPushButton("Stylesheet", this); - connect(btnStyle, SIGNAL(clicked()), SLOT(slotSetStyleSheet())); + connect(btnStyle, &QAbstractButton::clicked, this, &KLineEditTest::slotSetStyleSheet); QHBoxLayout *buttonLayout = new QHBoxLayout(); buttonLayout->addWidget(m_btnExit);