Hello community, here is the log from the commit of package kldap for openSUSE:Factory checked in at 2016-01-10 13:05:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kldap (Old) and /work/SRC/openSUSE:Factory/.kldap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kldap" Changes: -------- --- /work/SRC/openSUSE:Factory/kldap/kldap.changes 2015-12-17 15:54:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kldap.new/kldap.changes 2016-01-10 13:05:37.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Dec 13 13:21:25 UTC 2015 - [email protected] + +- Update to KDE Applications 15.12.0 + * KDE Applications 15.12.0 + * https://www.kde.org/announcements/announce-applications-15.12.0.php + * boo#958887 + + +------------------------------------------------------------------- Old: ---- kldap-15.08.3.tar.xz New: ---- kldap-15.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kldap.spec ++++++ --- /var/tmp/diff_new_pack.h29Kf9/_old 2016-01-10 13:05:38.000000000 +0100 +++ /var/tmp/diff_new_pack.h29Kf9/_new 2016-01-10 13:05:38.000000000 +0100 @@ -17,7 +17,7 @@ Name: kldap -Version: 15.08.3 +Version: 15.12.0 Release: 0 %define kf5_version 5.1.0 Summary: KDE PIM Libraries ++++++ kldap-15.08.3.tar.xz -> kldap-15.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/CMakeLists.txt new/kldap-15.12.0/CMakeLists.txt --- old/kldap-15.08.3/CMakeLists.txt 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/CMakeLists.txt 2015-11-14 11:16:08.000000000 +0100 @@ -3,7 +3,7 @@ project(KLdap) # ECM setup -find_package(ECM 5.12.0 CONFIG REQUIRED) +find_package(ECM 5.14.0 CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${KLdap_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) include(GenerateExportHeader) @@ -15,7 +15,7 @@ include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings) - +include(ECMQtDeclareLoggingCategory) set(KF5_VERSION "5.12.0") set(KLDAP_LIB_VERSION "4.80.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/CMakeLists.txt new/kldap-15.12.0/src/CMakeLists.txt --- old/kldap-15.08.3/src/CMakeLists.txt 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/CMakeLists.txt 2015-11-14 11:16:08.000000000 +0100 @@ -36,7 +36,6 @@ ########### next target ############### set(kldap_LIB_SRCS - ldap_debug.cpp ber.cpp ldif.cpp ldapurl.cpp @@ -54,6 +53,7 @@ ldapstructureproxymodel.cpp ldapattributeproxymodel.cpp ) +ecm_qt_declare_logging_category(kldap_LIB_SRCS HEADER ldap_debug.h IDENTIFIER LDAP_LOG CATEGORY_NAME log_ldap) add_library(KF5Ldap ${kldap_LIB_SRCS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ber.cpp new/kldap-15.12.0/src/ber.cpp --- old/kldap-15.08.3/src/ber.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ber.cpp 2015-11-14 11:16:08.000000000 +0100 @@ -57,7 +57,7 @@ using namespace KLDAP; -class Ber::BerPrivate +class Q_DECL_HIDDEN Ber::BerPrivate { public: #ifdef LDAP_FOUND @@ -124,7 +124,7 @@ return ret; } -int Ber::printf(const QString &format, ...) +int Ber::printf(QString format, ...) { char fmt[2]; va_list args; @@ -221,7 +221,7 @@ return ret; } -int Ber::scanf(const QString &format, ...) +int Ber::scanf(QString format, ...) { char fmt[2]; va_list args; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ber.h new/kldap-15.12.0/src/ber.h --- old/kldap-15.08.3/src/ber.h 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ber.h 2015-11-14 11:16:08.000000000 +0100 @@ -115,8 +115,8 @@ * </li> * </ul> */ - int printf(const QString &format, ...); - int scanf(const QString &format, ...); + int printf(QString format, ...); // Passing by-value since it's used by va_start + int scanf(QString format, ...); unsigned int peekTag(int &size); unsigned int skipTag(int &size); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldap_debug.cpp new/kldap-15.12.0/src/ldap_debug.cpp --- old/kldap-15.08.3/src/ldap_debug.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldap_debug.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2014 Laurent Montel <[email protected]> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "ldap_debug.h" -Q_LOGGING_CATEGORY(LDAP_LOG, "log_ldap") - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldap_debug.h new/kldap-15.12.0/src/ldap_debug.h --- old/kldap-15.08.3/src/ldap_debug.h 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldap_debug.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2014 Laurent Montel <[email protected]> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef LDAP_DEBUG_H -#define LDAP_DEBUG_H - -#include <QLoggingCategory> -Q_DECLARE_LOGGING_CATEGORY(LDAP_LOG) - -#endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapattributeproxymodel.cpp new/kldap-15.12.0/src/ldapattributeproxymodel.cpp --- old/kldap-15.08.3/src/ldapattributeproxymodel.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapattributeproxymodel.cpp 2015-11-14 11:16:08.000000000 +0100 @@ -27,7 +27,7 @@ using namespace KLDAP; -class LdapAttributeProxyModel::LdapAttributeProxyModelPrivate +class Q_DECL_HIDDEN LdapAttributeProxyModel::LdapAttributeProxyModelPrivate { public: LdapAttributeProxyModelPrivate(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapconfigwidget.cpp new/kldap-15.12.0/src/ldapconfigwidget.cpp --- old/kldap-15.08.3/src/ldapconfigwidget.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapconfigwidget.cpp 2015-11-14 11:16:08.000000000 +0100 @@ -39,7 +39,7 @@ using namespace KLDAP; -class LdapConfigWidget::Private +class Q_DECL_HIDDEN LdapConfigWidget::Private { public: Private(LdapConfigWidget *parent) @@ -101,7 +101,7 @@ if (mFeatures & W_USER) { label = new QLabel(i18n("User:"), mParent); mUser = new QLineEdit(mParent); - mUser->setObjectName(QLatin1String("kcfg_ldapuser")); + mUser->setObjectName(QStringLiteral("kcfg_ldapuser")); mainLayout->addWidget(label, row, 0); mainLayout->addWidget(mUser, row, 1, 1, 3); @@ -111,7 +111,7 @@ if (mFeatures & W_BINDDN) { label = new QLabel(i18n("Bind DN:"), mParent); mBindDn = new QLineEdit(mParent); - mBindDn->setObjectName(QLatin1String("kcfg_ldapbinddn")); + mBindDn->setObjectName(QStringLiteral("kcfg_ldapbinddn")); mainLayout->addWidget(label, row, 0); mainLayout->addWidget(mBindDn, row, 1, 1, 3); @@ -121,7 +121,7 @@ if (mFeatures & W_REALM) { label = new QLabel(i18n("Realm:"), mParent); mRealm = new QLineEdit(mParent); - mRealm->setObjectName(QLatin1String("kcfg_ldaprealm")); + mRealm->setObjectName(QStringLiteral("kcfg_ldaprealm")); mainLayout->addWidget(label, row, 0); mainLayout->addWidget(mRealm, row, 1, 1, 3); @@ -131,7 +131,7 @@ if (mFeatures & W_PASS) { label = new QLabel(i18n("Password:"), mParent); mPassword = new QLineEdit(mParent); - mPassword->setObjectName(QLatin1String("kcfg_ldappassword")); + mPassword->setObjectName(QStringLiteral("kcfg_ldappassword")); mPassword->setEchoMode(QLineEdit::Password); mainLayout->addWidget(label, row, 0); @@ -142,8 +142,8 @@ if (mFeatures & W_HOST) { label = new QLabel(i18n("Host:"), mParent); mHost = new QLineEdit(mParent); - mHost->setObjectName(QLatin1String("kcfg_ldaphost")); - mParent->connect(mHost, SIGNAL(textChanged(QString)), SIGNAL(hostNameChanged(QString))); + mHost->setObjectName(QStringLiteral("kcfg_ldaphost")); + mParent->connect(mHost, &QLineEdit::textChanged, mParent, &LdapConfigWidget::hostNameChanged); mainLayout->addWidget(label, row, 0); mainLayout->addWidget(mHost, row, 1, 1, 3); row++; @@ -154,7 +154,7 @@ label = new QLabel(i18n("Port:"), mParent); mPort = new QSpinBox(mParent); mPort->setRange(0, 65535); - mPort->setObjectName(QLatin1String("kcfg_ldapport")); + mPort->setObjectName(QStringLiteral("kcfg_ldapport")); mPort->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred)); mPort->setValue(389); @@ -167,7 +167,7 @@ label = new QLabel(i18n("LDAP version:"), mParent); mVersion = new QSpinBox(mParent); mVersion->setRange(2, 3); - mVersion->setObjectName(QLatin1String("kcfg_ldapver")); + mVersion->setObjectName(QStringLiteral("kcfg_ldapver")); mVersion->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred)); mVersion->setValue(3); mainLayout->addWidget(label, row, col); @@ -182,7 +182,7 @@ label = new QLabel(i18n("Size limit:"), mParent); mSizeLimit = new QSpinBox(mParent); mSizeLimit->setRange(0, 9999999); - mSizeLimit->setObjectName(QLatin1String("kcfg_ldapsizelimit")); + mSizeLimit->setObjectName(QStringLiteral("kcfg_ldapsizelimit")); mSizeLimit->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred)); mSizeLimit->setValue(0); mSizeLimit->setSpecialValueText(i18nc("default ldap size limit", "Default")); @@ -195,7 +195,7 @@ label = new QLabel(i18n("Time limit:"), mParent); mTimeLimit = new QSpinBox(mParent); mTimeLimit->setRange(0, 9999999); - mTimeLimit->setObjectName(QLatin1String("kcfg_ldaptimelimit")); + mTimeLimit->setObjectName(QStringLiteral("kcfg_ldaptimelimit")); mTimeLimit->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred)); mTimeLimit->setValue(0); mTimeLimit->setSuffix(i18n(" sec")); @@ -211,7 +211,7 @@ label = new QLabel(i18n("Page size:"), mParent); mPageSize = new QSpinBox(mParent); mPageSize->setRange(0, 9999999); - mPageSize->setObjectName(QLatin1String("kcfg_ldappagesize")); + mPageSize->setObjectName(QStringLiteral("kcfg_ldappagesize")); mPageSize->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred)); mPageSize->setValue(0); mPageSize->setSpecialValueText(i18n("No paging")); @@ -222,7 +222,7 @@ if (mFeatures & W_DN) { label = new QLabel(i18nc("Distinguished Name", "DN:"), mParent); mDn = new QLineEdit(mParent); - mDn->setObjectName(QLatin1String("kcfg_ldapdn")); + mDn->setObjectName(QStringLiteral("kcfg_ldapdn")); mainLayout->addWidget(label, row, 0); mainLayout->addWidget(mDn, row, 1, 1, 1); @@ -238,7 +238,7 @@ if (mFeatures & W_FILTER) { label = new QLabel(i18n("Filter:"), mParent); mFilter = new QLineEdit(mParent); - mFilter->setObjectName(QLatin1String("kcfg_ldapfilter")); + mFilter->setObjectName(QStringLiteral("kcfg_ldapfilter")); mainLayout->addWidget(label, row, 0); mainLayout->addWidget(mFilter, row, 1, 1, 3); @@ -250,13 +250,13 @@ QHBoxLayout *hbox = new QHBoxLayout; btgroup->setLayout(hbox); mSecNo = new QRadioButton(i18nc("@option:radio set no security", "No"), btgroup); - mSecNo->setObjectName(QLatin1String("kcfg_ldapnosec")); + mSecNo->setObjectName(QStringLiteral("kcfg_ldapnosec")); hbox->addWidget(mSecNo); mSecTLS = new QRadioButton(i18nc("@option:radio use TLS security", "TLS"), btgroup); - mSecTLS->setObjectName(QLatin1String("kcfg_ldaptls")); + mSecTLS->setObjectName(QStringLiteral("kcfg_ldaptls")); hbox->addWidget(mSecTLS); mSecSSL = new QRadioButton(i18nc("@option:radio use SSL security", "SSL"), btgroup); - mSecSSL->setObjectName(QLatin1String("kcfg_ldapssl")); + mSecSSL->setObjectName(QStringLiteral("kcfg_ldapssl")); hbox->addWidget(mSecSSL); mainLayout->addWidget(btgroup, row, 0, 1, 4); @@ -279,15 +279,15 @@ mAnonymous = new QRadioButton(i18nc("@option:radio anonymous authentication", "Anonymous"), authbox); - mAnonymous->setObjectName(QLatin1String("kcfg_ldapanon")); + mAnonymous->setObjectName(QStringLiteral("kcfg_ldapanon")); hbox->addWidget(mAnonymous); mSimple = new QRadioButton(i18nc("@option:radio simple authentication", "Simple"), authbox); - mSimple->setObjectName(QLatin1String("kcfg_ldapsimple")); + mSimple->setObjectName(QStringLiteral("kcfg_ldapsimple")); hbox->addWidget(mSimple); mSASL = new QRadioButton(i18nc("@option:radio SASL authentication", "SASL"), authbox); - mSASL->setObjectName(QLatin1String("kcfg_ldapsasl")); + mSASL->setObjectName(QStringLiteral("kcfg_ldapsasl")); hbox->addWidget(mSASL); hbox = new QHBoxLayout; @@ -295,11 +295,11 @@ label = new QLabel(i18n("SASL mechanism:"), authbox); hbox->addWidget(label); mMech = new KComboBox(false, authbox); - mMech->setObjectName(QLatin1String("kcfg_ldapsaslmech")); + mMech->setObjectName(QStringLiteral("kcfg_ldapsaslmech")); mMech->setEditable(true); - mMech->addItem(QLatin1String("DIGEST-MD5")); - mMech->addItem(QLatin1String("GSSAPI")); - mMech->addItem(QLatin1String("PLAIN")); + mMech->addItem(QStringLiteral("DIGEST-MD5")); + mMech->addItem(QStringLiteral("GSSAPI")); + mMech->addItem(QStringLiteral("PLAIN")); hbox->addWidget(mMech); //without host query doesn't make sense @@ -332,7 +332,7 @@ LdapUrl _url(_server.url()); - _url.setDn(LdapDN(QLatin1String(""))); + _url.setDn(LdapDN(QStringLiteral(""))); _url.setAttributes(QStringList(mAttr)); _url.setScope(LdapUrl::Base); @@ -375,7 +375,7 @@ void LdapConfigWidget::Private::queryMechClicked() { - mAttr = QLatin1String("supportedsaslmechanisms"); + mAttr = QStringLiteral("supportedsaslmechanisms"); sendQuery(); if (!mQResult.isEmpty()) { mQResult.sort(); @@ -386,7 +386,7 @@ void LdapConfigWidget::Private::queryDNClicked() { - mAttr = QLatin1String("namingcontexts"); + mAttr = QStringLiteral("namingcontexts"); sendQuery(); if (!mQResult.isEmpty()) { mDn->setText(mQResult.first()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapconnection.cpp new/kldap-15.12.0/src/ldapconnection.cpp --- old/kldap-15.08.3/src/ldapconnection.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapconnection.cpp 2015-11-14 11:16:08.000000000 +0100 @@ -58,7 +58,7 @@ using namespace KLDAP; -class LdapConnection::LdapConnectionPrivate +class Q_DECL_HIDDEN LdapConnection::LdapConnectionPrivate { public: LdapConnectionPrivate(); @@ -145,12 +145,6 @@ //No translated error messages yet #ifdef LDAP_FOUND return QString::fromUtf8(ldap_err2string(code)); - switch (code) { - case LDAP_OPERATIONS_ERROR: - return i18n("LDAP Operations error"); - //FIXME: - /* add the LDAP error codes */ - } #else return i18n("No LDAP Support..."); #endif @@ -256,7 +250,7 @@ int version = d->mServer.version(); int timeout = d->mServer.timeout(); - url = d->mServer.security() == LdapServer::SSL ? QLatin1String("ldaps") : QLatin1String("ldap"); + url = d->mServer.security() == LdapServer::SSL ? QStringLiteral("ldaps") : QStringLiteral("ldap"); url += QLatin1String("://"); url += d->mServer.host(); url += QLatin1Char(':'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapcontrol.cpp new/kldap-15.12.0/src/ldapcontrol.cpp --- old/kldap-15.08.3/src/ldapcontrol.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapcontrol.cpp 2015-11-14 11:16:08.000000000 +0100 @@ -25,15 +25,15 @@ using namespace KLDAP; -class LdapControl::Private : public QSharedData +class LdapControlPrivate : public QSharedData { public: - Private() + LdapControlPrivate() { mCritical = false; } - Private(const Private &other) + LdapControlPrivate(const LdapControlPrivate &other) : QSharedData(other) { mOid = other.mOid; @@ -47,13 +47,13 @@ }; LdapControl::LdapControl() - : d(new Private) + : d(new LdapControlPrivate) { setControl(QString(), QByteArray(), false); } LdapControl::LdapControl(const QString &oid, const QByteArray &value, bool critical) - : d(new Private) + : d(new LdapControlPrivate) { setControl(oid, value, critical); } @@ -124,7 +124,7 @@ Ber ber(d->mValue); int size; - if (ber.scanf(QLatin1String("{iO}"), &size, &cookie) == -1) { + if (ber.scanf(QStringLiteral("{iO}"), &size, &cookie) == -1) { return -1; } else { return size; @@ -136,8 +136,8 @@ LdapControl control; Ber ber; - ber.printf(QLatin1String("{iO}"), pagesize, &cookie); - control.setOid(QLatin1String("1.2.840.113556.1.4.319")); + ber.printf(QStringLiteral("{iO}"), pagesize, &cookie); + control.setOid(QStringLiteral("1.2.840.113556.1.4.319")); control.setValue(ber.flatten()); return control; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapcontrol.h new/kldap-15.12.0/src/ldapcontrol.h --- old/kldap-15.08.3/src/ldapcontrol.h 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapcontrol.h 2015-11-14 11:16:08.000000000 +0100 @@ -24,6 +24,7 @@ #include <QtCore/QString> #include <QtCore/QVector> #include <QtCore/QSharedDataPointer> +class LdapControlPrivate; #include "kldap_export.h" @@ -109,8 +110,7 @@ static void insert(LdapControls &list, const LdapControl &ctrl); private: - class Private; - QSharedDataPointer<Private> d; + QSharedDataPointer<LdapControlPrivate> d; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapdn.cpp new/kldap-15.12.0/src/ldapdn.cpp --- old/kldap-15.08.3/src/ldapdn.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapdn.cpp 2015-11-14 11:16:08.000000000 +0100 @@ -26,14 +26,14 @@ using namespace KLDAP; -class LdapDN::LdapDNPrivate +class Q_DECL_HIDDEN LdapDN::LdapDNPrivate { public: LdapDNPrivate() : m_dn() {} ~LdapDNPrivate() {} bool isValidRDNString(const QString &rdn) const; - QStringList splitOnNonEscapedChar(const QString &rdn, const QChar &ch) const; + QStringList splitOnNonEscapedChar(const QString &rdn, QChar ch) const; QString m_dn; }; @@ -65,8 +65,7 @@ return true; } -QStringList LdapDN::LdapDNPrivate::splitOnNonEscapedChar(const QString &str, - const QChar &ch) const +QStringList LdapDN::LdapDNPrivate::splitOnNonEscapedChar(const QString &str, QChar ch) const { QStringList strParts; int index = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapmodel_p.cpp new/kldap-15.12.0/src/ldapmodel_p.cpp --- old/kldap-15.08.3/src/ldapmodel_p.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapmodel_p.cpp 2015-11-14 11:16:08.000000000 +0100 @@ -100,7 +100,7 @@ // Query the server for the base DN //qCDebug(LDAP_LOG) << "Searching for the baseDN"; setSearchType(LdapModelPrivate::NamingContexts, rootNode()); - search(LdapDN(), LdapUrl::Base, QString(), QStringList() << QLatin1String("namingContexts")); + search(LdapDN(), LdapUrl::Base, QString(), QStringList() << QStringLiteral("namingContexts")); return; } @@ -108,7 +108,7 @@ //qCDebug(LDAP_LOG) << "Searching for attributes of the baseDN"; searchResults().clear(); setSearchType(LdapModelPrivate::BaseDN, rootNode()); - search(baseDN(), LdapUrl::Base, QString(), QStringList() << QLatin1String("dn") << QLatin1String("objectClass")); + search(baseDN(), LdapUrl::Base, QString(), QStringList() << QStringLiteral("dn") << QStringLiteral("objectClass")); } void LdapModel::LdapModelPrivate::gotSearchResult(KLDAP::LdapSearch *search) @@ -121,8 +121,8 @@ // Set the baseDN QString baseDN; if (!searchResults().isEmpty() && - searchResults().at(0).hasAttribute(QLatin1String("namingContexts"))) { - baseDN = QLatin1String(searchResults().at(0).value(QLatin1String("namingContexts"))); + searchResults().at(0).hasAttribute(QStringLiteral("namingContexts"))) { + baseDN = QLatin1String(searchResults().at(0).value(QStringLiteral("namingContexts"))); //qCDebug(LDAP_LOG) << "Found baseDN =" << baseDN; } setBaseDN(LdapDN(baseDN)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapmodel_p.h new/kldap-15.12.0/src/ldapmodel_p.h --- old/kldap-15.08.3/src/ldapmodel_p.h 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapmodel_p.h 2015-11-14 11:16:08.000000000 +0100 @@ -35,7 +35,7 @@ /** * @internal */ -class LdapModel::LdapModelPrivate +class Q_DECL_HIDDEN LdapModel::LdapModelPrivate { public: enum SearchType { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapobject.cpp new/kldap-15.12.0/src/ldapobject.cpp --- old/kldap-15.08.3/src/ldapobject.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapobject.cpp 2015-11-14 11:16:08.000000000 +0100 @@ -25,14 +25,14 @@ using namespace KLDAP; -class LdapObject::Private : public QSharedData +class LdapObjectPrivate : public QSharedData { public: - Private() + LdapObjectPrivate() { } - Private(const Private &other) + LdapObjectPrivate(const LdapObjectPrivate &other) : QSharedData(other) { mDn = other.mDn; @@ -44,12 +44,12 @@ }; LdapObject::LdapObject() - : d(new Private) + : d(new LdapObjectPrivate) { } LdapObject::LdapObject(const QString &dn) - : d(new Private) + : d(new LdapObjectPrivate) { d->mDn = LdapDN(dn); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapobject.h new/kldap-15.12.0/src/ldapobject.h --- old/kldap-15.08.3/src/ldapobject.h 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapobject.h 2015-11-14 11:16:08.000000000 +0100 @@ -25,6 +25,7 @@ #include <QtCore/QMap> #include <QtCore/QSharedDataPointer> #include <QtCore/QString> +class LdapObjectPrivate; #include "ldapdn.h" #include "kldap_export.h" @@ -107,8 +108,7 @@ bool hasAttribute(const QString &attributeName) const; private: - class Private; - QSharedDataPointer<Private> d; + QSharedDataPointer<LdapObjectPrivate> d; }; typedef QVector<LdapObject> LdapObjects; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapoperation.cpp new/kldap-15.12.0/src/ldapoperation.cpp --- old/kldap-15.08.3/src/ldapoperation.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapoperation.cpp 2015-11-14 11:16:08.000000000 +0100 @@ -69,7 +69,7 @@ return timeout < 0 ? 0 : timeout; } -class LdapOperation::LdapOperationPrivate +class Q_DECL_HIDDEN LdapOperation::LdapOperationPrivate { public: LdapOperationPrivate(); @@ -171,6 +171,7 @@ } LdapOperation::LdapOperationPrivate::LdapOperationPrivate() + : mConnection(Q_NULLPTR) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapsearch.cpp new/kldap-15.12.0/src/ldapsearch.cpp --- old/kldap-15.08.3/src/ldapsearch.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapsearch.cpp 2015-11-14 11:16:08.000000000 +0100 @@ -32,10 +32,10 @@ //blocking the GUI for xxx milliseconds #define LDAPSEARCH_BLOCKING_TIMEOUT 10 -class LdapSearch::Private +class LdapSearchPrivate { public: - Private(LdapSearch *parent) + LdapSearchPrivate(LdapSearch *parent) : mParent(parent) { } @@ -63,7 +63,7 @@ bool mFinished; }; -void LdapSearch::Private::result() +void LdapSearchPrivate::result() { if (mAbandoned) { mOp.abandon(mId); @@ -128,7 +128,7 @@ int estsize = -1; const int numberOfControls(mOp.controls().count()); for (int i = 0; i < numberOfControls; ++i) { - estsize = mOp.controls()[i].parsePageControl(cookie); + estsize = mOp.controls().at(i).parsePageControl(cookie); if (estsize != -1) { break; } @@ -175,7 +175,7 @@ } } -bool LdapSearch::Private::connect() +bool LdapSearchPrivate::connect() { int ret = mConn->connect(); if (ret != KLDAP_SUCCESS) { @@ -187,7 +187,7 @@ return true; } -void LdapSearch::Private::closeConnection() +void LdapSearchPrivate::closeConnection() { if (mOwnConnection && mConn) { delete mConn; @@ -196,7 +196,7 @@ } //This starts the real job -bool LdapSearch::Private::startSearch(const LdapDN &base, LdapUrl::Scope scope, +bool LdapSearchPrivate::startSearch(const LdapDN &base, LdapUrl::Scope scope, const QString &filter, const QStringList &attributes, int pagesize, int count) { @@ -249,14 +249,14 @@ /////////////////////////////////////////////// LdapSearch::LdapSearch() - : d(new Private(this)) + : d(new LdapSearchPrivate(this)) { d->mOwnConnection = true; d->mConn = Q_NULLPTR; } LdapSearch::LdapSearch(LdapConnection &connection) - : d(new Private(this)) + : d(new LdapSearchPrivate(this)) { d->mOwnConnection = false; d->mConn = &connection; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapsearch.h new/kldap-15.12.0/src/ldapsearch.h --- old/kldap-15.08.3/src/ldapsearch.h 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapsearch.h 2015-11-14 11:16:08.000000000 +0100 @@ -25,6 +25,7 @@ #include <QtCore/QList> #include <QtCore/QObject> #include <QtCore/QString> +class LdapSearchPrivate; #include "kldap_export.h" @@ -140,8 +141,7 @@ void result(KLDAP::LdapSearch *search); private: - class Private; - Private *const d; + LdapSearchPrivate *const d; Q_PRIVATE_SLOT(d, void result()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapserver.cpp new/kldap-15.12.0/src/ldapserver.cpp --- old/kldap-15.08.3/src/ldapserver.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapserver.cpp 2015-11-14 11:16:08.000000000 +0100 @@ -24,7 +24,7 @@ using namespace KLDAP; -class LdapServer::LdapServerPrivate +class Q_DECL_HIDDEN LdapServer::LdapServerPrivate { public: QString mHost; @@ -286,7 +286,7 @@ d->mSecurity = None; if (url.scheme() == QLatin1String("ldaps")) { d->mSecurity = SSL; - } else if (url.hasExtension(QLatin1String("x-tls"))) { + } else if (url.hasExtension(QStringLiteral("x-tls"))) { d->mSecurity = TLS; } qCDebug(LDAP_LOG) << "security:" << d->mSecurity; @@ -294,21 +294,21 @@ d->mMech.clear(); d->mUser.clear(); d->mBindDn.clear(); - if (url.hasExtension(QLatin1String("x-sasl"))) { + if (url.hasExtension(QStringLiteral("x-sasl"))) { d->mAuth = SASL; - if (url.hasExtension(QLatin1String("x-mech"))) { - d->mMech = url.extension(QLatin1String("x-mech"), critical); + if (url.hasExtension(QStringLiteral("x-mech"))) { + d->mMech = url.extension(QStringLiteral("x-mech"), critical); } - if (url.hasExtension(QLatin1String("x-realm"))) { - d->mRealm = url.extension(QLatin1String("x-realm"), critical); + if (url.hasExtension(QStringLiteral("x-realm"))) { + d->mRealm = url.extension(QStringLiteral("x-realm"), critical); } - if (url.hasExtension(QLatin1String("bindname"))) { - d->mBindDn = url.extension(QLatin1String("bindname"), critical); + if (url.hasExtension(QStringLiteral("bindname"))) { + d->mBindDn = url.extension(QStringLiteral("bindname"), critical); } d->mUser = url.userName(); - } else if (url.hasExtension(QLatin1String("bindname"))) { + } else if (url.hasExtension(QStringLiteral("bindname"))) { d->mAuth = Simple; - d->mBindDn = url.extension(QLatin1String("bindname"), critical); + d->mBindDn = url.extension(QStringLiteral("bindname"), critical); } else { QString user = url.userName(); if (user.isEmpty()) { @@ -319,32 +319,32 @@ } } d->mPassword = url.password(); - if (url.hasExtension(QLatin1String("x-version"))) { - d->mVersion = url.extension(QLatin1String("x-version"), critical).toInt(); + if (url.hasExtension(QStringLiteral("x-version"))) { + d->mVersion = url.extension(QStringLiteral("x-version"), critical).toInt(); } else { d->mVersion = 3; } - if (url.hasExtension(QLatin1String("x-timeout"))) { - d->mTimeout = url.extension(QLatin1String("x-timeout"), critical).toInt(); + if (url.hasExtension(QStringLiteral("x-timeout"))) { + d->mTimeout = url.extension(QStringLiteral("x-timeout"), critical).toInt(); } else { d->mTimeout = 0; } - if (url.hasExtension(QLatin1String("x-timelimit"))) { - d->mTimeLimit = url.extension(QLatin1String("x-timelimit"), critical).toInt(); + if (url.hasExtension(QStringLiteral("x-timelimit"))) { + d->mTimeLimit = url.extension(QStringLiteral("x-timelimit"), critical).toInt(); } else { d->mTimeLimit = 0; } - if (url.hasExtension(QLatin1String("x-sizelimit"))) { - d->mSizeLimit = url.extension(QLatin1String("x-sizelimit"), critical).toInt(); + if (url.hasExtension(QStringLiteral("x-sizelimit"))) { + d->mSizeLimit = url.extension(QStringLiteral("x-sizelimit"), critical).toInt(); } else { d->mSizeLimit = 0; } - if (url.hasExtension(QLatin1String("x-pagesize"))) { - d->mPageSize = url.extension(QLatin1String("x-pagesize"), critical).toInt(); + if (url.hasExtension(QStringLiteral("x-pagesize"))) { + d->mPageSize = url.extension(QStringLiteral("x-pagesize"), critical).toInt(); } else { d->mPageSize = 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapstructureproxymodel.cpp new/kldap-15.12.0/src/ldapstructureproxymodel.cpp --- old/kldap-15.08.3/src/ldapstructureproxymodel.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapstructureproxymodel.cpp 2015-11-14 11:16:08.000000000 +0100 @@ -27,7 +27,7 @@ using namespace KLDAP; -class LdapStructureProxyModel::LdapStructureProxyModelPrivate +class Q_DECL_HIDDEN LdapStructureProxyModel::LdapStructureProxyModelPrivate { public: LdapStructureProxyModelPrivate(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldapurl.cpp new/kldap-15.12.0/src/ldapurl.cpp --- old/kldap-15.08.3/src/ldapurl.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldapurl.cpp 2015-11-14 11:16:08.000000000 +0100 @@ -26,7 +26,7 @@ using namespace KLDAP; -class LdapUrl::LdapUrlPrivate +class Q_DECL_HIDDEN LdapUrl::LdapUrlPrivate { public: LdapUrlPrivate() @@ -196,7 +196,7 @@ // set the attributes to query if (!d->m_attributes.isEmpty()) { - q += d->m_attributes.join(QLatin1String(",")); + q += d->m_attributes.join(QStringLiteral(",")); } // set the scope @@ -254,7 +254,7 @@ d->m_attributes.clear(); d->m_scope = Base; - d->m_filter = QLatin1String("(objectClass=*)"); + d->m_filter = QStringLiteral("(objectClass=*)"); d->m_extensions.clear(); int i = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kldap-15.08.3/src/ldif.cpp new/kldap-15.12.0/src/ldif.cpp --- old/kldap-15.08.3/src/ldif.cpp 2015-08-31 11:24:03.000000000 +0200 +++ new/kldap-15.12.0/src/ldif.cpp 2015-11-14 11:16:08.000000000 +0100 @@ -24,7 +24,7 @@ using namespace KLDAP; -class Ldif::LdifPrivate +class Q_DECL_HIDDEN Ldif::LdifPrivate { public: int mModType;
