[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim-runtime/KDE/4.7] resources/dav/resource: Better detect
From: Gregory Oestreicher <greg () kamago ! net>
Date: 2011-09-30 21:16:30
Message-ID: 20110930211630.6D4FBA60A6 () git ! kde ! org
[Download RAW message or body]
Git commit fec8aae38c55b0aba36539d52c56a9b2ba5a7b15 by Gregory Oestreicher.
Committed on 30/09/2011 at 23:12.
Pushed by goestreicher into branch 'KDE/4.7'.
Better detect duplicate collection names across multiple configuration URLs
M +6 -5 resources/dav/resource/davgroupwareresource.cpp
M +3 -0 resources/dav/resource/davgroupwareresource.h
http://commits.kde.org/kdepim-runtime/fec8aae38c55b0aba36539d52c56a9b2ba5a7b15
diff --git a/resources/dav/resource/davgroupwareresource.cpp \
b/resources/dav/resource/davgroupwareresource.cpp index 5aaf311..e4cc539 100644
--- a/resources/dav/resource/davgroupwareresource.cpp
+++ b/resources/dav/resource/davgroupwareresource.cpp
@@ -182,6 +182,8 @@ void DavGroupwareResource::retrieveCollections()
}
emit status( Running, i18n( "Fetching collections" ) );
+ mSeenCollectionsNames.clear();
+ mSeenCollectionsUrls.clear();
DavCollectionsMultiFetchJob *job = new DavCollectionsMultiFetchJob( \
Settings::self()->configuredDavUrls() ); connect( job, SIGNAL( result( KJob* ) ), \
SLOT( onRetrieveCollectionsFinished( KJob* ) ) ); @@ -465,8 +467,6 @@ void \
DavGroupwareResource::onRetrieveCollectionsFinished( KJob *job ) }
const DavCollection::List davCollections = fetchJob->collections();
- QSet<QString> seenCollectionsNames;
- QSet<QString> seenCollectionsUrls;
foreach ( const DavCollection &davCollection, davCollections ) {
if ( mCollectionsWithTemporaryError.contains( davCollection.url() ) ) {
@@ -474,10 +474,10 @@ void DavGroupwareResource::onRetrieveCollectionsFinished( KJob \
*job ) mCollectionsWithTemporaryError.removeOne( davCollection.url() );
}
- if ( seenCollectionsUrls.contains( davCollection.url() ) )
+ if ( mSeenCollectionsUrls.contains( davCollection.url() ) )
continue;
else
- seenCollectionsUrls.insert( davCollection.url() );
+ mSeenCollectionsUrls.insert( davCollection.url() );
Akonadi::Collection collection;
collection.setParentCollection( mDavCollectionRoot );
@@ -485,10 +485,11 @@ void DavGroupwareResource::onRetrieveCollectionsFinished( KJob \
*job ) if ( davCollection.displayName().isEmpty() ) {
collection.setName( name() + " (" + davCollection.url() + ')' );
} else {
- if ( seenCollectionsNames.contains( davCollection.displayName() ) ) {
+ if ( mSeenCollectionsNames.contains( davCollection.displayName() ) ) {
collection.setName( davCollection.displayName() + " (" + davCollection.url() \
+ ')' ); } else {
collection.setName( davCollection.displayName() );
+ mSeenCollectionsNames.insert( davCollection.displayName() );
}
}
diff --git a/resources/dav/resource/davgroupwareresource.h \
b/resources/dav/resource/davgroupwareresource.h index 6965ac7..c765369 100644
--- a/resources/dav/resource/davgroupwareresource.h
+++ b/resources/dav/resource/davgroupwareresource.h
@@ -23,6 +23,7 @@
#include <akonadi/resourcebase.h>
+#include <QtCore/QSet>
#include <QtCore/QStringList>
class DavGroupwareResource : public Akonadi::ResourceBase,
@@ -86,6 +87,8 @@ class DavGroupwareResource : public Akonadi::ResourceBase,
Akonadi::Collection mDavCollectionRoot;
EtagCache mEtagCache;
QStringList mCollectionsWithTemporaryError;
+ QSet<QString> mSeenCollectionsNames;
+ QSet<QString> mSeenCollectionsUrls;
};
#endif
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic