Changeset View
Changeset View
Standalone View
Standalone View
src/util.cpp
Show All 15 Lines | 1 | /* | |||
---|---|---|---|---|---|
16 | License along with this library; if not, write to the Free Software | 16 | License along with this library; if not, write to the Free Software | ||
17 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | 17 | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
18 | */ | 18 | */ | ||
19 | 19 | | |||
20 | #include "util_p.h" | 20 | #include "util_p.h" | ||
21 | #include "imapsettings.h" | 21 | #include "imapsettings.h" | ||
22 | 22 | | |||
23 | #include <servermanager.h> | 23 | #include <servermanager.h> | ||
24 | #include <KDBusConnectionPool> | 24 | #include <QDBusConnection> | ||
25 | 25 | | |||
26 | #include <assert.h> | 26 | #include <assert.h> | ||
27 | #include "akonadi_mime_debug.h" | 27 | #include "akonadi_mime_debug.h" | ||
28 | #include <KJobUiDelegate> | 28 | #include <KJobUiDelegate> | ||
29 | #include <KIO/Job> | 29 | #include <KIO/Job> | ||
30 | 30 | | |||
31 | namespace Util { | 31 | namespace Util { | ||
32 | /// Helper to sanely show an error message for a job | 32 | /// Helper to sanely show an error message for a job | ||
Show All 10 Lines | 34 | { | |||
43 | } | 43 | } | ||
44 | } | 44 | } | ||
45 | 45 | | |||
46 | OrgKdeAkonadiImapSettingsInterface *createImapSettingsInterface(const QString &ident) | 46 | OrgKdeAkonadiImapSettingsInterface *createImapSettingsInterface(const QString &ident) | ||
47 | { | 47 | { | ||
48 | //NOTE(Andras): from kmail/util.cpp | 48 | //NOTE(Andras): from kmail/util.cpp | ||
49 | return new OrgKdeAkonadiImapSettingsInterface(Akonadi::ServerManager::agentServiceName(Akonadi::ServerManager::Resource, ident), | 49 | return new OrgKdeAkonadiImapSettingsInterface(Akonadi::ServerManager::agentServiceName(Akonadi::ServerManager::Resource, ident), | ||
50 | QStringLiteral("/Settings"), | 50 | QStringLiteral("/Settings"), | ||
51 | KDBusConnectionPool::threadConnection()); | 51 | QDBusConnection::sessionBus()); | ||
52 | } | 52 | } | ||
53 | } | 53 | } |