Commit 42914ab6 authored by Guy Maurel's avatar Guy Maurel
Browse files

trim all the lines for akonadi, #111780

parent 4f0a31ae
......@@ -74,7 +74,7 @@ void AgentServer::startAgent( const QString &identifier, const QString &typeIden
return;
}
}
QPluginLoader *loader = m_agentLoader.load( fileName );
if ( loader == 0 )
return; // No plugin found, debug output in AgentLoader.
......
......@@ -29,7 +29,7 @@
namespace Akonadi {
class AgentThread;
class AgentServer : public QObject
{
Q_OBJECT
......@@ -58,7 +58,7 @@ class AgentServer : public QObject
bool m_processingConfigureRequests;
bool m_quiting;
};
}
#endif
......@@ -20,14 +20,14 @@
#define GLOBAL_H
namespace Akonadi {
// rfc1730 section 3
/** The state of the client
*/
enum ConnectionState {
NonAuthenticated, ///< Not yet authenticated
Authenticated, ///< The client is authenticated
Selected,
Selected,
LoggingOut
};
......
......@@ -44,7 +44,7 @@ namespace Akonadi {
- @c FULLPAYLOAD: Retrieve the full payload
- @c CACHEONLY: Restrict retrieval to parts already in the cache, even if more parts have been requested.
- @c EXTERNALPAYLOAD: Indicate the capability to retrieve parts via the filesystem instead over the socket
- @c ANCESTORS: Indicate the desired ancestor collection depth (0 is the default)
- @c ANCESTORS: Indicate the desired ancestor collection depth (0 is the default)
*/
class Fetch : public Handler
{
......
......@@ -54,7 +54,7 @@ class DataStore;
* The items are marked as hidden (by the Append and AkAppend
* handlers) and then enqueued to the preprocessor chain via this class.
* Once all the preprocessors have done their work the item is unhidden again.
*
*
* Preprocessing isn't designed for critical tasks. There may
* be circumstances under that the Akonadi server fails to push an item
* to all the preprocessors. Most notably after a server restart all
......
......@@ -839,7 +839,7 @@ bool Akonadi::DataStore::beginTransaction()
return false;
if ( m_transactionLevel == 0 ) {
TRANSACTION_MUTEX_LOCK;
TRANSACTION_MUTEX_LOCK;
QSqlDriver *driver = m_database.driver();
if ( !driver->beginTransaction() ) {
debugLastDbError( "DataStore::beginTransaction" );
......
......@@ -172,7 +172,7 @@ class DataStore : public QObject
bool cleanupPimItems( const PimItem::List &items );
/**
* Unhides the specified PimItem. Emits the itemAdded() notification as
* Unhides the specified PimItem. Emits the itemAdded() notification as
* the hidden flag is assumed to have been set by appendPimItem() before
* pushing the item to the preprocessor chain. The hidden item had his
* notifications disabled until now (so for the clients the "unhide" operation
......
......@@ -250,7 +250,7 @@ void DbConfigMysql::startInternalServer()
// first run, some MySQL versions need a mysql_install_db run for that
const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String("akonadi/mysql-global.conf" ));
if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) {
const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1").arg(confFile) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1").arg(confFile) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
QProcess::execute( mMysqlInstallDbPath, arguments );
}
......
......@@ -465,6 +465,6 @@ void ImapStreamParserTest::testAbortCommand()
} catch ( const Akonadi::Exception &e ) {
qDebug() << e.type() << e.what();
QFAIL( "Exception caught" );
}
}
}
......@@ -38,7 +38,7 @@ public:
{
if ( !s_backend )
s_backend = new MockBackend();
return s_backend;
return s_backend;
}
};
......@@ -52,7 +52,7 @@ public:
{
if ( !s_connection )
s_connection = new MockConnection();
return s_connection;
return s_connection;
}
}; // End of class MockObjects
......
......@@ -68,7 +68,7 @@ QString AkDBus::parseAgentServiceName(const QString &serviceName, AkDBus::AgentT
return QString();
return parts.at(1);
}
return QString();
}
......
......@@ -38,7 +38,7 @@ namespace AkDBus
StorageJanitor,
UpgradeIndicator
};
/**
* Returns the service name for the given @p serviceType.
*/
......@@ -52,7 +52,7 @@ namespace AkDBus
Resource,
Preprocessor
};
/**
* Parses a D-Bus service name and checks if it belongs to an agent of this instance.
* @param serviceName The service name to parse.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment