~ubuntu-branches/ubuntu/quantal/akonadi/quantal

« back to all changes in this revision

Viewing changes to server/src/storage/dbconfigmysqlembedded.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-01-24 23:43:13 UTC
  • mto: (3.1.12 sid)
  • mto: This revision was merged to the branch mainline in revision 69.
  • Revision ID: package-import@ubuntu.com-20120124234313-ooald4uh9w8jilyw
Tags: upstream-1.7.0
ImportĀ upstreamĀ versionĀ 1.7.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
19
19
 
20
20
#include "dbconfigmysqlembedded.h"
21
21
 
22
 
#include "../../libs/xdgbasedirs_p.h"
23
 
#include "akdebug.h"
 
22
#include <akdebug.h>
 
23
#include <akstandarddirs.h>
 
24
 
 
25
#include <libs/xdgbasedirs_p.h>
24
26
 
25
27
#include <QtCore/QDir>
26
28
#include <QtSql/QSqlDriver>
29
31
 
30
32
static QString dataDir()
31
33
{
32
 
  QString akonadiHomeDir = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi" ) );
 
34
  QString akonadiHomeDir = AkStandardDirs::saveDir( "data" );
33
35
  if ( akonadiHomeDir.isEmpty() ) {
34
36
    akFatal() << "Unable to create directory 'akonadi' in " << XdgBaseDirs::homePath( "data" )
35
37
              << "during database initialization";