← Back to branch summary

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

« back to all changes in this revision

Viewing changes to server/src/tracer.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:
server/src/tracer.cpp
26
26
#include "dbustracer.h"
27
27
#include "filetracer.h"
28
28
#include "nulltracer.h"
29
 
#include "../libs/xdgbasedirs_p.h"
 
29
#include <libs/xdgbasedirs_p.h>
 
30
#include <akstandarddirs.h>
30
31
 
31
32
// #define DEFAULT_TRACER QLatin1String( "dbus" )
32
33
#define DEFAULT_TRACER QLatin1String( "null" )
120
121
QString Tracer::currentTracer() const
121
122
{
122
123
  QMutexLocker locker( &mMutex );
123
 
  const QSettings settings( XdgBaseDirs::akonadiServerConfigFile(), QSettings::IniFormat );
 
124
  const QSettings settings( AkStandardDirs::serverConfigFile(), QSettings::IniFormat );
124
125
  return settings.value( QLatin1String( "Debug/Tracer" ), DEFAULT_TRACER ).toString();
125
126
}
126
127
 
130
131
  delete mTracerBackend;
131
132
  mTracerBackend = 0;
132
133
 
133
 
  QSettings settings( XdgBaseDirs::akonadiServerConfigFile(), QSettings::IniFormat );
 
134
  QSettings settings( AkStandardDirs::serverConfigFile(), QSettings::IniFormat );
134
135
  settings.setValue( QLatin1String( "Debug/Tracer" ), type );
135
136
  settings.sync();
136
137
 
137
138
  if ( type == QLatin1String("file") ) {
138
 
    const QSettings settings( XdgBaseDirs::akonadiServerConfigFile(), QSettings::IniFormat );
 
139
    const QSettings settings( AkStandardDirs::serverConfigFile(), QSettings::IniFormat );
139
140
    const QString file = settings.value( QLatin1String( "Debug/File" ), QLatin1String("/dev/null") ).toString();
140
141
    mTracerBackend = new FileTracer( file );
141
142
  } else if ( type == QLatin1String("null") ) {