forked from qt-creator/qt-creator
more style
Change-Id: Iecd6819a5376beced5413f134d3026fb889a13b1 Reviewed-on: http://codereview.qt-project.org/5115 Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
@@ -1799,26 +1799,26 @@ void MimeDatabasePrivate::debug(QTextStream &str) const
|
||||
}
|
||||
|
||||
MimeDatabase::MimeDatabase() :
|
||||
m_d(new MimeDatabasePrivate)
|
||||
d(new MimeDatabasePrivate)
|
||||
{
|
||||
}
|
||||
|
||||
MimeDatabase::~MimeDatabase()
|
||||
{
|
||||
delete m_d;
|
||||
delete d;
|
||||
}
|
||||
|
||||
MimeType MimeDatabase::findByType(const QString &typeOrAlias) const
|
||||
{
|
||||
m_mutex.lock();
|
||||
const MimeType rc = m_d->findByType(typeOrAlias);
|
||||
const MimeType rc = d->findByType(typeOrAlias);
|
||||
m_mutex.unlock();
|
||||
return rc;
|
||||
}
|
||||
|
||||
MimeType MimeDatabase::findByFileUnlocked(const QFileInfo &f) const
|
||||
{
|
||||
return m_d->findByFile(f);
|
||||
return d->findByFile(f);
|
||||
}
|
||||
|
||||
MimeType MimeDatabase::findByFile(const QFileInfo &f) const
|
||||
@@ -1832,7 +1832,7 @@ MimeType MimeDatabase::findByFile(const QFileInfo &f) const
|
||||
MimeType MimeDatabase::findByData(const QByteArray &data) const
|
||||
{
|
||||
m_mutex.lock();
|
||||
const MimeType rc = m_d->findByData(data);
|
||||
const MimeType rc = d->findByData(data);
|
||||
m_mutex.unlock();
|
||||
return rc;
|
||||
}
|
||||
@@ -1840,7 +1840,7 @@ MimeType MimeDatabase::findByData(const QByteArray &data) const
|
||||
bool MimeDatabase::addMimeType(const MimeType &mt)
|
||||
{
|
||||
m_mutex.lock();
|
||||
const bool rc = m_d->addMimeType(mt);
|
||||
const bool rc = d->addMimeType(mt);
|
||||
m_mutex.unlock();
|
||||
return rc;
|
||||
}
|
||||
@@ -1848,7 +1848,7 @@ bool MimeDatabase::addMimeType(const MimeType &mt)
|
||||
bool MimeDatabase::addMimeTypes(const QString &fileName, QString *errorMessage)
|
||||
{
|
||||
m_mutex.lock();
|
||||
const bool rc = m_d->addMimeTypes(fileName, errorMessage);
|
||||
const bool rc = d->addMimeTypes(fileName, errorMessage);
|
||||
m_mutex.unlock();
|
||||
return rc;
|
||||
}
|
||||
@@ -1856,7 +1856,7 @@ bool MimeDatabase::addMimeTypes(const QString &fileName, QString *errorMessage)
|
||||
bool MimeDatabase::addMimeTypes(QIODevice *device, QString *errorMessage)
|
||||
{
|
||||
m_mutex.lock();
|
||||
const bool rc = m_d->addMimeTypes(device, errorMessage);
|
||||
const bool rc = d->addMimeTypes(device, errorMessage);
|
||||
m_mutex.unlock();
|
||||
return rc;
|
||||
}
|
||||
@@ -1864,7 +1864,7 @@ bool MimeDatabase::addMimeTypes(QIODevice *device, QString *errorMessage)
|
||||
QStringList MimeDatabase::suffixes() const
|
||||
{
|
||||
m_mutex.lock();
|
||||
const QStringList rc = m_d->suffixes();
|
||||
const QStringList rc = d->suffixes();
|
||||
m_mutex.unlock();
|
||||
return rc;
|
||||
}
|
||||
@@ -1872,7 +1872,7 @@ QStringList MimeDatabase::suffixes() const
|
||||
QStringList MimeDatabase::filterStrings() const
|
||||
{
|
||||
m_mutex.lock();
|
||||
const QStringList rc = m_d->filterStrings();
|
||||
const QStringList rc = d->filterStrings();
|
||||
m_mutex.unlock();
|
||||
return rc;
|
||||
}
|
||||
@@ -1903,7 +1903,7 @@ QString MimeDatabase::allFiltersString(QString *allFilesFilter) const
|
||||
QList<MimeGlobPattern> MimeDatabase::globPatterns() const
|
||||
{
|
||||
m_mutex.lock();
|
||||
const QList<MimeGlobPattern> rc = m_d->globPatterns();
|
||||
const QList<MimeGlobPattern> rc = d->globPatterns();
|
||||
m_mutex.unlock();
|
||||
return rc;
|
||||
}
|
||||
@@ -1912,14 +1912,14 @@ void MimeDatabase::setGlobPatterns(const QString &typeOrAlias,
|
||||
const QList<MimeGlobPattern> &globPatterns)
|
||||
{
|
||||
m_mutex.lock();
|
||||
m_d->setGlobPatterns(typeOrAlias, globPatterns);
|
||||
d->setGlobPatterns(typeOrAlias, globPatterns);
|
||||
m_mutex.unlock();
|
||||
}
|
||||
|
||||
MimeDatabase::IMagicMatcherList MimeDatabase::magicMatchers() const
|
||||
{
|
||||
m_mutex.lock();
|
||||
const IMagicMatcherList rc = m_d->magicMatchers();
|
||||
const IMagicMatcherList rc = d->magicMatchers();
|
||||
m_mutex.unlock();
|
||||
return rc;
|
||||
}
|
||||
@@ -1928,14 +1928,14 @@ void MimeDatabase::setMagicMatchers(const QString &typeOrAlias,
|
||||
const IMagicMatcherList &matchers)
|
||||
{
|
||||
m_mutex.lock();
|
||||
m_d->setMagicMatchers(typeOrAlias, matchers);
|
||||
d->setMagicMatchers(typeOrAlias, matchers);
|
||||
m_mutex.unlock();
|
||||
}
|
||||
|
||||
QList<MimeType> MimeDatabase::mimeTypes() const
|
||||
{
|
||||
m_mutex.lock();
|
||||
const QList<MimeType> &mimeTypes = m_d->mimeTypes();
|
||||
const QList<MimeType> &mimeTypes = d->mimeTypes();
|
||||
m_mutex.unlock();
|
||||
return mimeTypes;
|
||||
}
|
||||
@@ -1943,14 +1943,14 @@ QList<MimeType> MimeDatabase::mimeTypes() const
|
||||
void MimeDatabase::syncUserModifiedMimeTypes()
|
||||
{
|
||||
m_mutex.lock();
|
||||
m_d->syncUserModifiedMimeTypes();
|
||||
d->syncUserModifiedMimeTypes();
|
||||
m_mutex.unlock();
|
||||
}
|
||||
|
||||
void MimeDatabase::clearUserModifiedMimeTypes()
|
||||
{
|
||||
m_mutex.lock();
|
||||
m_d->clearUserModifiedMimeTypes();
|
||||
d->clearUserModifiedMimeTypes();
|
||||
m_mutex.unlock();
|
||||
}
|
||||
|
||||
@@ -1981,7 +1981,7 @@ QString MimeDatabase::preferredSuffixByFile(const QFileInfo &f) const
|
||||
bool MimeDatabase::setPreferredSuffix(const QString &typeOrAlias, const QString &suffix)
|
||||
{
|
||||
m_mutex.lock();
|
||||
const bool rc = m_d->setPreferredSuffix(typeOrAlias, suffix);
|
||||
const bool rc = d->setPreferredSuffix(typeOrAlias, suffix);
|
||||
m_mutex.unlock();
|
||||
return rc;
|
||||
}
|
||||
@@ -2001,7 +2001,7 @@ QDebug operator<<(QDebug d, const MimeDatabase &mt)
|
||||
QString s;
|
||||
{
|
||||
QTextStream str(&s);
|
||||
mt.m_d->debug(str);
|
||||
mt.d->debug(str);
|
||||
}
|
||||
d << s;
|
||||
return d;
|
||||
|
||||
Reference in New Issue
Block a user