]>
Commit | Line | Data |
---|---|---|
8a8f9fb3 AM |
1 | From 1d79c645ffbd858517f07cee3143dc64fac7c3e9 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com> | |
3 | Date: Mon, 10 Nov 2014 11:51:45 +0100 | |
4 | Subject: [PATCH 11/30] Convert some qDebugs to akDebugs | |
5 | ||
6 | This should make Akonadi in release mode even less chatty. | |
7 | --- | |
8 | server/src/handler/merge.cpp | 3 ++- | |
9 | server/src/handler/modify.cpp | 6 +++--- | |
10 | server/src/handler/remove.cpp | 4 ++-- | |
11 | server/src/search/searchmanager.cpp | 12 ++++++------ | |
12 | 4 files changed, 13 insertions(+), 12 deletions(-) | |
13 | ||
14 | diff --git a/server/src/handler/merge.cpp b/server/src/handler/merge.cpp | |
15 | index fffe100..c26917d 100644 | |
16 | --- a/server/src/handler/merge.cpp | |
17 | +++ b/server/src/handler/merge.cpp | |
18 | @@ -328,8 +328,9 @@ bool Merge::parseStream() | |
19 | } | |
20 | ||
21 | } else { | |
22 | + akDebug() << "Multiple merge candidates:"; | |
23 | Q_FOREACH (const PimItem &item, result) { | |
24 | - qDebug() << item.id() << item.remoteId() << item.gid(); | |
25 | + akDebug() << "\t" << item.id() << item.remoteId() << item.gid(); | |
26 | } | |
27 | // Nor GID or RID are guaranteed to be unique, so make sure we don't merge | |
28 | // something we don't want | |
29 | diff --git a/server/src/handler/modify.cpp b/server/src/handler/modify.cpp | |
30 | index 9671fb9..ad329db 100644 | |
31 | --- a/server/src/handler/modify.cpp | |
32 | +++ b/server/src/handler/modify.cpp | |
33 | @@ -216,9 +216,9 @@ bool Modify::parseStream() | |
34 | ||
35 | queryAttributes = attrs.join( QLatin1String( " " ) ); | |
36 | ||
37 | - qDebug() << collection.queryAttributes() << queryAttributes; | |
38 | - qDebug() << collection.queryCollections() << queryCollections; | |
39 | - qDebug() << collection.queryString() << queryString; | |
40 | + akDebug() << collection.queryAttributes() << queryAttributes; | |
41 | + akDebug() << collection.queryCollections() << queryCollections; | |
42 | + akDebug() << collection.queryString() << queryString; | |
43 | ||
44 | if ( collection.queryAttributes() != queryAttributes | |
45 | || collection.queryCollections() != queryCollections | |
46 | diff --git a/server/src/handler/remove.cpp b/server/src/handler/remove.cpp | |
47 | index 090531f..daec5a0 100644 | |
48 | --- a/server/src/handler/remove.cpp | |
49 | +++ b/server/src/handler/remove.cpp | |
50 | @@ -40,8 +40,8 @@ bool Remove::parseStream() | |
51 | { | |
52 | mScope.parseScope( m_streamParser ); | |
53 | connection()->context()->parseContext( m_streamParser ); | |
54 | - qDebug() << "Tag context:" << connection()->context()->tagId(); | |
55 | - qDebug() << "Collection context: " << connection()->context()->collectionId(); | |
56 | + akDebug() << "Tag context:" << connection()->context()->tagId(); | |
57 | + akDebug() << "Collection context: " << connection()->context()->collectionId(); | |
58 | ||
59 | ||
60 | SelectQueryBuilder<PimItem> qb; | |
61 | diff --git a/server/src/search/searchmanager.cpp b/server/src/search/searchmanager.cpp | |
62 | index 35e76e1..c821aa3 100644 | |
63 | --- a/server/src/search/searchmanager.cpp | |
64 | +++ b/server/src/search/searchmanager.cpp | |
65 | @@ -159,7 +159,7 @@ void SearchManager::loadSearchPlugins() | |
66 | Q_FOREACH ( const QString &pluginDir, dirs ) { | |
67 | QDir dir( pluginDir + QLatin1String( "/akonadi" ) ); | |
68 | const QStringList desktopFiles = dir.entryList( QStringList() << QLatin1String( "*.desktop" ), QDir::Files ); | |
69 | - qDebug() << "SEARCH MANAGER: searching in " << pluginDir + QLatin1String( "/akonadi" ) << ":" << desktopFiles; | |
70 | + akDebug() << "SEARCH MANAGER: searching in " << pluginDir + QLatin1String( "/akonadi" ) << ":" << desktopFiles; | |
71 | ||
72 | Q_FOREACH ( const QString &desktopFileName, desktopFiles ) { | |
73 | QSettings desktop( pluginDir + QLatin1String( "/akonadi/" ) + desktopFileName, QSettings::IniFormat ); | |
74 | @@ -170,13 +170,13 @@ void SearchManager::loadSearchPlugins() | |
75 | ||
76 | const QString libraryName = desktop.value( QLatin1String( "X-Akonadi-Library" ) ).toString(); | |
77 | if ( loadedPlugins.contains( libraryName ) ) { | |
78 | - qDebug() << "Already loaded one version of this plugin, skipping: " << libraryName; | |
79 | + akDebug() << "Already loaded one version of this plugin, skipping: " << libraryName; | |
80 | continue; | |
81 | } | |
82 | // When search plugin override is active, ignore all plugins except for the override | |
83 | if ( !pluginOverride.isEmpty() ) { | |
84 | if ( libraryName != pluginOverride ) { | |
85 | - qDebug() << desktopFileName << "skipped because of AKONADI_OVERRIDE_SEARCHPLUGIN"; | |
86 | + akDebug() << desktopFileName << "skipped because of AKONADI_OVERRIDE_SEARCHPLUGIN"; | |
87 | continue; | |
88 | } | |
89 | ||
90 | @@ -198,7 +198,7 @@ void SearchManager::loadSearchPlugins() | |
91 | continue; | |
92 | } | |
93 | ||
94 | - qDebug() << "SearchManager: loaded search plugin" << libraryName; | |
95 | + akDebug() << "SearchManager: loaded search plugin" << libraryName; | |
96 | mPlugins << plugin; | |
97 | loadedPlugins << libraryName; | |
98 | } | |
99 | @@ -390,7 +390,7 @@ void SearchManager::searchUpdateResultsAvailable( const QSet<qint64> &results ) | |
100 | } | |
101 | } | |
102 | ||
103 | - qDebug() << "Got" << newMatches.count() << "results, out of which" << existingMatches.count() << "are already in the collection"; | |
104 | + akDebug() << "Got" << newMatches.count() << "results, out of which" << existingMatches.count() << "are already in the collection"; | |
105 | ||
106 | newMatches = newMatches - existingMatches; | |
107 | ||
108 | @@ -405,7 +405,7 @@ void SearchManager::searchUpdateResultsAvailable( const QSet<qint64> &results ) | |
109 | Collection::addPimItem( collection.id(), id ); | |
110 | } | |
111 | ||
112 | - qDebug() << "Added" << newMatches.count(); | |
113 | + akDebug() << "Added" << newMatches.count(); | |
114 | ||
115 | if ( !existingTransaction && !DataStore::self()->commitTransaction() ) { | |
116 | akDebug() << "Failed to commit transaction"; | |
117 | -- | |
118 | 2.1.0 | |
119 |