Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at 2015-01-21 22:08:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepimlibs4 (Old) and /work/SRC/openSUSE:Factory/.kdepimlibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepimlibs4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepimlibs4/kdepimlibs4.changes 2014-11-19 20:26:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepimlibs4.new/kdepimlibs4.changes 2015-01-21 22:08:13.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 12 19:26:37 UTC 2015 - [email protected] + +- Update to 4.14.4 + * KDE Applications 14.12.1 + * See https://www.kde.org/announcements/announce-applications-14.12.1.php + +------------------------------------------------------------------- Old: ---- kdepimlibs-4.14.3.tar.xz New: ---- kdepimlibs-4.14.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.BB80Rb/_old 2015-01-21 22:08:14.000000000 +0100 +++ /var/tmp/diff_new_pack.BB80Rb/_new 2015-01-21 22:08:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdepimlibs4 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: kdepimlibs4 -Version: 4.14.3 +Version: 4.14.4 Release: 0 Summary: KDE PIM Libraries License: LGPL-2.1+ ++++++ kdepimlibs-4.14.3.tar.xz -> kdepimlibs-4.14.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/CMakeLists.txt new/kdepimlibs-4.14.4/CMakeLists.txt --- old/kdepimlibs-4.14.3/CMakeLists.txt 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/CMakeLists.txt 2015-01-05 09:05:05.000000000 +0100 @@ -7,7 +7,7 @@ ############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) ############### set(KDEPIMLIBS_VERSION_MAJOR 4) set(KDEPIMLIBS_VERSION_MINOR 14) -set(KDEPIMLIBS_VERSION_PATCH 3) +set(KDEPIMLIBS_VERSION_PATCH 4) set(KDEPIMLIBS_VERSION ${KDEPIMLIBS_VERSION_MAJOR}.${KDEPIMLIBS_VERSION_MINOR}.${KDEPIMLIBS_VERSION_PATCH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/cachepolicy.cpp new/kdepimlibs-4.14.4/akonadi/cachepolicy.cpp --- old/kdepimlibs-4.14.3/akonadi/cachepolicy.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/cachepolicy.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -54,8 +54,9 @@ }; CachePolicy::CachePolicy() - : d(new Private) { + static QSharedDataPointer<Private> sharedPrivate(new Private); + d = sharedPrivate; } CachePolicy::CachePolicy(const CachePolicy &other) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/calendar/blockalarmsattribute.cpp new/kdepimlibs-4.14.4/akonadi/calendar/blockalarmsattribute.cpp --- old/kdepimlibs-4.14.3/akonadi/calendar/blockalarmsattribute.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/calendar/blockalarmsattribute.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -92,7 +92,8 @@ QByteArray BlockAlarmsAttribute::type() const { - return "BlockAlarmsAttribute"; + static const QByteArray sType( "BlockAlarmsAttribute" ); + return sType; } BlockAlarmsAttribute *BlockAlarmsAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/calendar/incidencefetchjob_p.cpp new/kdepimlibs-4.14.4/akonadi/calendar/incidencefetchjob_p.cpp --- old/kdepimlibs-4.14.3/akonadi/calendar/incidencefetchjob_p.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/calendar/incidencefetchjob_p.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -55,6 +55,12 @@ return; CollectionFetchJob *fetch = qobject_cast<CollectionFetchJob*>(job); Q_ASSERT(fetch); + + if (fetch->collections().isEmpty()) { + emitResult(); + return; + } + foreach(const Collection &col, fetch->collections()) { if (!m_mimeTypeChecker.isWantedCollection(col) || col.isVirtual()) continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/calendar/publishdialog.cpp new/kdepimlibs-4.14.4/akonadi/calendar/publishdialog.cpp --- old/kdepimlibs-4.14.3/akonadi/calendar/publishdialog.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/calendar/publishdialog.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -61,7 +61,8 @@ d->mUI.mRemove->setIcon(KIcon("list-remove")); d->mUI.mRemove->setEnabled(false); d->mUI.mSelectAddressee->setIcon(KIcon("view-pim-contacts")); - + d->mUI.mNameLineEdit->setTrapReturnKey( true ); + d->mUI.mEmailLineEdit->setTrapReturnKey( true ); connect(d->mUI.mListWidget, SIGNAL(itemSelectionChanged()), d, SLOT(updateInput())); connect(d->mUI.mNew, SIGNAL(clicked()), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/collectionquotaattribute.cpp new/kdepimlibs-4.14.4/akonadi/collectionquotaattribute.cpp --- old/kdepimlibs-4.14.3/akonadi/collectionquotaattribute.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/collectionquotaattribute.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -73,7 +73,8 @@ QByteArray CollectionQuotaAttribute::type() const { - return "collectionquota"; + static const QByteArray sType( "collectionquota" ); + return sType; } Akonadi::Attribute *CollectionQuotaAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/collectionrightsattribute.cpp new/kdepimlibs-4.14.4/akonadi/collectionrightsattribute.cpp --- old/kdepimlibs-4.14.3/akonadi/collectionrightsattribute.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/collectionrightsattribute.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -21,8 +21,6 @@ using namespace Akonadi; -static const char *s_accessRightsIdentifier = "AccessRights"; - static Collection::Rights dataToRights(const QByteArray &data) { Collection::Rights rights = Collection::ReadOnly; @@ -142,6 +140,7 @@ QByteArray CollectionRightsAttribute::type() const { + static const QByteArray s_accessRightsIdentifier("AccessRights"); return s_accessRightsIdentifier; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/contact/contactmetadataattribute.cpp new/kdepimlibs-4.14.4/akonadi/contact/contactmetadataattribute.cpp --- old/kdepimlibs-4.14.3/akonadi/contact/contactmetadataattribute.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/contact/contactmetadataattribute.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -53,7 +53,8 @@ QByteArray ContactMetaDataAttribute::type() const { - return "contactmetadata"; + static const QByteArray sType( "contactmetadata" ); + return sType; } Attribute* ContactMetaDataAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/entityannotationsattribute.cpp new/kdepimlibs-4.14.4/akonadi/entityannotationsattribute.cpp --- old/kdepimlibs-4.14.3/akonadi/entityannotationsattribute.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/entityannotationsattribute.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -61,7 +61,8 @@ QByteArray EntityAnnotationsAttribute::type() const { - return "entityannotations"; + static const QByteArray sType( "entityannotations" ); + return sType; } Akonadi::Attribute *EntityAnnotationsAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/entitydeletedattribute.cpp new/kdepimlibs-4.14.4/akonadi/entitydeletedattribute.cpp --- old/kdepimlibs-4.14.3/akonadi/entitydeletedattribute.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/entitydeletedattribute.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -74,7 +74,8 @@ QByteArray Akonadi::EntityDeletedAttribute::type() const { - return "DELETED"; + static const QByteArray sType( "DELETED" ); + return sType; } EntityDeletedAttribute *EntityDeletedAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/entitydisplayattribute.cpp new/kdepimlibs-4.14.4/akonadi/entitydisplayattribute.cpp --- old/kdepimlibs-4.14.3/akonadi/entitydisplayattribute.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/entitydisplayattribute.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -76,7 +76,8 @@ QByteArray Akonadi::EntityDisplayAttribute::type() const { - return "ENTITYDISPLAY"; + static const QByteArray sType( "ENTITYDISPLAY" ); + return sType; } EntityDisplayAttribute *EntityDisplayAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/entityhiddenattribute.cpp new/kdepimlibs-4.14.4/akonadi/entityhiddenattribute.cpp --- old/kdepimlibs-4.14.3/akonadi/entityhiddenattribute.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/entityhiddenattribute.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -36,7 +36,8 @@ QByteArray Akonadi::EntityHiddenAttribute::type() const { - return "HIDDEN"; + static const QByteArray sType( "HIDDEN" ); + return sType; } EntityHiddenAttribute *EntityHiddenAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/entitymimetypefiltermodel.cpp new/kdepimlibs-4.14.4/akonadi/entitymimetypefiltermodel.cpp --- old/kdepimlibs-4.14.3/akonadi/entitymimetypefiltermodel.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/entitymimetypefiltermodel.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -109,20 +109,20 @@ Q_D(const EntityMimeTypeFilterModel); const QModelIndex idx = sourceModel()->index(sourceRow, 0, sourceParent); - const Akonadi::Item item = idx.data(EntityTreeModel::ItemRole).value<Akonadi::Item>(); - - if (item.isValid() && !item.hasPayload()) { - kDebug() << "Item " << item.id() << " doesn't have payload"; - return false; - } - const QString rowMimetype = idx.data(EntityTreeModel::MimeTypeRole).toString(); if (d->excludedMimeTypes.contains(rowMimetype)) { return false; } - if (d->includedMimeTypes.isEmpty() || - d->includedMimeTypes.contains(rowMimetype)) { + + if (d->includedMimeTypes.isEmpty() || d->includedMimeTypes.contains(rowMimetype)) { + const Akonadi::Item item = idx.data(EntityTreeModel::ItemRole).value<Akonadi::Item>(); + + if (item.isValid() && !item.hasPayload()) { + kDebug() << "Item " << item.id() << " doesn't have payload"; + return false; + } + return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/indexpolicyattribute.cpp new/kdepimlibs-4.14.4/akonadi/indexpolicyattribute.cpp --- old/kdepimlibs-4.14.3/akonadi/indexpolicyattribute.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/indexpolicyattribute.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -57,7 +57,8 @@ QByteArray IndexPolicyAttribute::type() const { - return "INDEXPOLICY"; + static const QByteArray sType( "INDEXPOLICY" ); + return sType; } Attribute *IndexPolicyAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/kmime/messagefolderattribute.cpp new/kdepimlibs-4.14.4/akonadi/kmime/messagefolderattribute.cpp --- old/kdepimlibs-4.14.3/akonadi/kmime/messagefolderattribute.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/kmime/messagefolderattribute.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -48,7 +48,8 @@ QByteArray MessageFolderAttribute::type() const { - return "MESSAGEFOLDER"; + static const QByteArray sType( "MESSAGEFOLDER" ); + return sType; } MessageFolderAttribute *MessageFolderAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/kmime/messagethreadingattribute.cpp new/kdepimlibs-4.14.4/akonadi/kmime/messagethreadingattribute.cpp --- old/kdepimlibs-4.14.3/akonadi/kmime/messagethreadingattribute.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/kmime/messagethreadingattribute.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -47,7 +47,8 @@ QByteArray MessageThreadingAttribute::type() const { - return "MESSAGETHREADING"; + static const QByteArray sType( "MESSAGETHREADING" ); + return sType; } MessageThreadingAttribute *MessageThreadingAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/kmime/removeduplicatesjob.cpp new/kdepimlibs-4.14.4/akonadi/kmime/removeduplicatesjob.cpp --- old/kdepimlibs-4.14.3/akonadi/kmime/removeduplicatesjob.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/kmime/removeduplicatesjob.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -161,6 +161,7 @@ : Job(parent) , d(new Private(this)) { + d->mJobCount = 1; d->mFolders << folder; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/persistentsearchattribute.cpp new/kdepimlibs-4.14.4/akonadi/persistentsearchattribute.cpp --- old/kdepimlibs-4.14.3/akonadi/persistentsearchattribute.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/persistentsearchattribute.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -112,7 +112,8 @@ QByteArray PersistentSearchAttribute::type() const { - return "PERSISTENTSEARCH"; // ### should eventually be AKONADI_PARAM_PERSISTENTSEARCH + static const QByteArray sType( "PERSISTENTSEARCH" ); + return sType; } Attribute *PersistentSearchAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/socialutils/socialnetworkattributes.cpp new/kdepimlibs-4.14.4/akonadi/socialutils/socialnetworkattributes.cpp --- old/kdepimlibs-4.14.3/akonadi/socialutils/socialnetworkattributes.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/socialutils/socialnetworkattributes.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -81,7 +81,8 @@ QByteArray Akonadi::SocialNetworkAttributes::type() const { - return QByteArray( "socialattributes" ); + static const QByteArray sType( "socialattributes" ); + return sType; } QString Akonadi::SocialNetworkAttributes::userName() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/standardactionmanager.cpp new/kdepimlibs-4.14.4/akonadi/standardactionmanager.cpp --- old/kdepimlibs-4.14.3/akonadi/standardactionmanager.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/standardactionmanager.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -459,18 +459,17 @@ } #ifndef QT_NO_CLIPBOARD + QAbstractItemModel *model = const_cast<QAbstractItemModel *>(selectionModel->model()); QMimeData *mimeData = selectionModel->model()->mimeData(safeSelectedRows(selectionModel)); + model->setData(QModelIndex(), false, EntityTreeModel::PendingCutRole); markCutAction(mimeData, cut); QApplication::clipboard()->setMimeData(mimeData); - QAbstractItemModel *model = const_cast<QAbstractItemModel *>(selectionModel->model()); - foreach (const QModelIndex &index, safeSelectedRows(selectionModel)) { model->setData(index, true, EntityTreeModel::PendingCutRole); } #endif } - void updateActions() { // collect all selected collections diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/tagattribute.cpp new/kdepimlibs-4.14.4/akonadi/tagattribute.cpp --- old/kdepimlibs-4.14.3/akonadi/tagattribute.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/tagattribute.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -75,7 +75,8 @@ QByteArray Akonadi::TagAttribute::type() const { - return "TAG"; + static const QByteArray sType( "TAG" ); + return sType; } TagAttribute *TagAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/tageditwidget.cpp new/kdepimlibs-4.14.4/akonadi/tageditwidget.cpp --- old/kdepimlibs-4.14.3/akonadi/tageditwidget.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/tageditwidget.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -111,13 +111,15 @@ void TagEditWidget::Private::slotCreateTag() { - Akonadi::TagCreateJob *createJob = new Akonadi::TagCreateJob(Akonadi::Tag(m_newTagEdit->text()), this); - connect(createJob, SIGNAL(finished(KJob*)), - this, SLOT(slotCreateTagFinished(KJob*))); - - m_newTagEdit->clear(); - m_newTagEdit->setEnabled(false); - m_newTagButton->setEnabled(false); + if (m_newTagButton->isEnabled()) { + Akonadi::TagCreateJob *createJob = new Akonadi::TagCreateJob(Akonadi::Tag(m_newTagEdit->text()), this); + connect(createJob, SIGNAL(finished(KJob*)), + this, SLOT(slotCreateTagFinished(KJob*))); + + m_newTagEdit->clear(); + m_newTagEdit->setEnabled(false); + m_newTagButton->setEnabled(false); + } } void TagEditWidget::Private::slotCreateTagFinished(KJob *job) @@ -214,9 +216,12 @@ d.data(), SLOT(slotItemEntered(QModelIndex))); d->m_newTagEdit = new KLineEdit(this); + d->m_newTagEdit->setTrapReturnKey(true); d->m_newTagEdit->setClearButtonShown(true); connect(d->m_newTagEdit, SIGNAL(textEdited(QString)), d.data(), SLOT(slotTextEdited(QString))); + connect(d->m_newTagEdit, SIGNAL(returnPressed()), + d.data(), SLOT(slotCreateTag())); d->m_newTagButton = new QPushButton(i18nc("@label", "Create new tag")); d->m_newTagButton->setEnabled(false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/akonadi/tests/testresource/knutresource.desktop new/kdepimlibs-4.14.4/akonadi/tests/testresource/knutresource.desktop --- old/kdepimlibs-4.14.3/akonadi/tests/testresource/knutresource.desktop 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/akonadi/tests/testresource/knutresource.desktop 2015-01-05 09:05:05.000000000 +0100 @@ -60,7 +60,7 @@ Comment[nds]=En Fehlersöök-Hölper Comment[nl]=Een agent voor debugging-doeleinden Comment[nn]=Ein agent til feilsøking -Comment[pl]=Agent na potrzeby debugowania +Comment[pl]=Agent na potrzeby diagnostyczne Comment[pt]=Um agente para fins de depuração Comment[pt_BR]=Um agente para depuração Comment[ru]=Агент Akonadi для целей отладки diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/kalarmcal/compatibilityattribute.cpp new/kdepimlibs-4.14.4/kalarmcal/compatibilityattribute.cpp --- old/kdepimlibs-4.14.3/kalarmcal/compatibilityattribute.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/kalarmcal/compatibilityattribute.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -97,7 +97,8 @@ QByteArray CompatibilityAttribute::name() { - return "KAlarmCompatibility"; + static const QByteArray attType("KAlarmCompatibility"); + return attType; } QByteArray CompatibilityAttribute::serialized() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/kalarmcal/eventattribute.cpp new/kdepimlibs-4.14.4/kalarmcal/eventattribute.cpp --- old/kdepimlibs-4.14.3/kalarmcal/eventattribute.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/kalarmcal/eventattribute.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -74,7 +74,8 @@ QByteArray EventAttribute::type() const { - return "KAlarmEvent"; + static const QByteArray attType("KAlarmEvent"); + return attType; } EventAttribute* EventAttribute::clone() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/kioslave/smtp/tests/CMakeLists.txt new/kdepimlibs-4.14.4/kioslave/smtp/tests/CMakeLists.txt --- old/kdepimlibs-4.14.3/kioslave/smtp/tests/CMakeLists.txt 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/kioslave/smtp/tests/CMakeLists.txt 2015-01-05 09:05:05.000000000 +0100 @@ -37,3 +37,8 @@ target_link_libraries(interactivesmtpserver ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) +########### next target ############### +set( test_request_source requesttest.cpp ../request.cpp) +kde4_add_unit_test( requesttest ${test_request_source}) +target_link_libraries( requesttest ${QT_QTTEST_LIBRARY} ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/kioslave/smtp/tests/requesttest.cpp new/kdepimlibs-4.14.4/kioslave/smtp/tests/requesttest.cpp --- old/kdepimlibs-4.14.3/kioslave/smtp/tests/requesttest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepimlibs-4.14.4/kioslave/smtp/tests/requesttest.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -0,0 +1,84 @@ +/* + Copyright (c) 2014 Montel Laurent <[email protected]> + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + This program 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 + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ +#include "requesttest.h" +#include "../request.h" +#include <qtest_kde.h> +#include <KUrl> +RequestTest::RequestTest(QObject *parent) + : QObject(parent) +{ + +} + +RequestTest::~RequestTest() +{ + +} + +void RequestTest::shouldHaveDefaultValue() +{ + KioSMTP::Request request; + QVERIFY(request.to().isEmpty()); + QVERIFY(request.cc().isEmpty()); + QVERIFY(request.bcc().isEmpty()); + QVERIFY(request.emitHeaders()); + QVERIFY(!request.is8BitBody()); + QVERIFY(request.profileName().isEmpty()); + QVERIFY(request.fromAddress().isEmpty()); + QVERIFY(request.heloHostname().isEmpty()); + QCOMPARE(request.size(), static_cast<unsigned int>(0)); +} + +void RequestTest::shouldParseRequest_data() +{ + QTest::addColumn<KUrl>("smtpurl"); + QTest::addColumn<QString>("to"); + QTest::addColumn<QString>("from"); + QTest::addColumn<QString>("cc"); + QTest::addColumn<QString>("bcc"); + QTest::addColumn<bool>("emitheaders"); + QTest::addColumn<unsigned int>("size"); + QTest::newRow("correct url") << KUrl(QLatin1String("smtps://smtp.kde.org:465/send?headers=0&from=foo%40kde.org&to=foo%40kde.org&size=617")) + << QString(QLatin1String("[email protected]")) + << QString(QLatin1String("[email protected]")) + << QString() + << QString() + << false + << static_cast<unsigned int>(617); + +} + +void RequestTest::shouldParseRequest() +{ + QFETCH( KUrl, smtpurl ); + QFETCH( QString, to ); + QFETCH( QString, from ); + QFETCH( QString, cc ); + QFETCH( QString, bcc ); + QFETCH( bool, emitheaders); + QFETCH( unsigned int, size ); + + KioSMTP::Request request = KioSMTP::Request::fromURL(smtpurl); + QCOMPARE(request.to().join(QLatin1String(",")), to); + QCOMPARE(request.cc().join(QLatin1String(",")), cc); + QCOMPARE(request.fromAddress(), from); + QCOMPARE(request.bcc().join(QLatin1String(",")), bcc); + QCOMPARE(request.size(), size); + QCOMPARE(request.emitHeaders(), emitheaders); +} + +QTEST_KDEMAIN(RequestTest, NoGUI) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/kioslave/smtp/tests/requesttest.h new/kdepimlibs-4.14.4/kioslave/smtp/tests/requesttest.h --- old/kdepimlibs-4.14.3/kioslave/smtp/tests/requesttest.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepimlibs-4.14.4/kioslave/smtp/tests/requesttest.h 2015-01-05 09:05:05.000000000 +0100 @@ -0,0 +1,35 @@ +/* + Copyright (c) 2014 Montel Laurent <[email protected]> + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + This program 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 + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#ifndef REQUESTTEST_H +#define REQUESTTEST_H + +#include <QObject> + +class RequestTest : public QObject +{ + Q_OBJECT +public: + explicit RequestTest(QObject *parent = 0); + ~RequestTest(); +private Q_SLOTS: + void shouldHaveDefaultValue(); + void shouldParseRequest_data(); + void shouldParseRequest(); +}; + +#endif // REQUESTTEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/kmime/kmime_util.cpp new/kdepimlibs-4.14.4/kmime/kmime_util.cpp --- old/kdepimlibs-4.14.3/kmime/kmime_util.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/kmime/kmime_util.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -205,7 +205,9 @@ const QByteArray &defaultCS, bool forceCS ) { QByteArray result; + result.reserve(64); QByteArray spaceBuffer; + spaceBuffer.reserve(64); const char *scursor = src.constData(); const char *send = scursor + src.length(); bool onlySpacesSinceLastWord = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.3/kpimutils/linklocator.cpp new/kdepimlibs-4.14.4/kpimutils/linklocator.cpp --- old/kdepimlibs-4.14.3/kpimutils/linklocator.cpp 2014-11-04 22:19:27.000000000 +0100 +++ new/kdepimlibs-4.14.4/kpimutils/linklocator.cpp 2015-01-05 09:05:05.000000000 +0100 @@ -177,7 +177,7 @@ { // the following characters are allowed in a dot-atom (RFC 2822): // a-z A-Z 0-9 . ! # $ % & ' * + - / = ? ^ _ ` { | } ~ - const QString allowedSpecialChars = QLatin1String( ".!#$%&'*+-/=?^_`{|}~" ); + static const QString allowedSpecialChars = QLatin1String( ".!#$%&'*+-/=?^_`{|}~" ); // the character directly before the URL must not be a letter, a number or // any other character allowed in a dot-atom (RFC 2822). @@ -229,7 +229,7 @@ if ( mText[mPos] == QLatin1Char('@') ) { // the following characters are allowed in a dot-atom (RFC 2822): // a-z A-Z 0-9 . ! # $ % & ' * + - / = ? ^ _ ` { | } ~ - const QString allowedSpecialChars = QLatin1String( ".!#$%&'*+-/=?^_`{|}~" ); + static const QString allowedSpecialChars = QLatin1String( ".!#$%&'*+-/=?^_`{|}~" ); // determine the local part of the email address int start = mPos - 1; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
