From 0fe371abe0eb910f5dd5d49acdb87509feab66be Mon Sep 17 00:00:00 2001 From: yuanqiliang Date: Mon, 28 Feb 2022 16:31:21 +0800 Subject: [PATCH] fix: dbus protocol standard recommended use big camel case Log: --- server/lib/lftmanager.cpp | 14 +++++++------- server/lib/lftmanager.h | 6 +++--- server/tool/com.deepin.anything.xml | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/server/lib/lftmanager.cpp b/server/lib/lftmanager.cpp index 6ecfb996..88b40da1 100644 --- a/server/lib/lftmanager.cpp +++ b/server/lib/lftmanager.cpp @@ -320,7 +320,7 @@ static void removeBuf(fs_buf *buf, bool &removeLFTFile) free_fs_buf(buf); } -bool LFTManager::addPath(QString path, bool autoIndex) +bool LFTManager::AddPath(QString path, bool autoIndex) { nDebug() << path << autoIndex; @@ -391,7 +391,7 @@ bool LFTManager::addPath(QString path, bool autoIndex) _global_fsWatcherMap->remove(path); - Q_EMIT addPathFinished(path, buf); + Q_EMIT AddPathFinished(path, buf); } if (buf) { @@ -610,7 +610,7 @@ QStringList LFTManager::refresh(const QByteArray &serialUriFilter) if (!checkFSBuf(buf)) { // 重新生成fs buf - addPath(QString::fromLocal8Bit(get_root_path(buf)), dir_iterator.fileName().endsWith(".lft")); + AddPath(QString::fromLocal8Bit(get_root_path(buf)), dir_iterator.fileName().endsWith(".lft")); free_fs_buf(buf); nWarning() << "Failed on check fs buf of: " << lft_file; @@ -1137,7 +1137,7 @@ void LFTManager::_indexAll() continue; if (!hasLFT(QString::fromLocal8Bit(device->mountPoints().first()))) - _addPathByPartition(device); + _AddPathByPartition(device); else nDebug() << "Exist index data:" << device->mountPoints().first() << ", block:" << block; } @@ -1169,7 +1169,7 @@ void LFTManager::_cleanAllIndex() } } -void LFTManager::_addPathByPartition(const DBlockDevice *block) +void LFTManager::_AddPathByPartition(const DBlockDevice *block) { nDebug() << block->device() << block->id() << block->drive(); @@ -1187,7 +1187,7 @@ void LFTManager::_addPathByPartition(const DBlockDevice *block) nDebug() << "can index:" << index; if (index) // 建立索引时一切以第一个挂载点为准 - addPath(QString::fromLocal8Bit(block->mountPoints().first()), true); + AddPath(QString::fromLocal8Bit(block->mountPoints().first()), true); device->deleteLater(); } @@ -1213,7 +1213,7 @@ void LFTManager::onMountAdded(const QString &blockDevicePath, const QByteArray & if (DBlockDevice *block = LFTDiskTool::diskManager()->createBlockPartitionByMountPoint(mountPoint)) { if (!block->isLoopDevice()) { - _addPathByPartition(block); + _AddPathByPartition(block); } block->deleteLater(); diff --git a/server/lib/lftmanager.h b/server/lib/lftmanager.h index d60d2e67..f167e6ab 100644 --- a/server/lib/lftmanager.h +++ b/server/lib/lftmanager.h @@ -43,7 +43,7 @@ class LFTManager : public QObject, protected QDBusContext static QStringList logCategoryList(); static QByteArray setCodecNameForLocale(const QByteArray &codecName); - bool addPath(QString path, bool autoIndex = false); + bool AddPath(QString path, bool autoIndex = false); bool removePath(const QString &path); bool hasLFT(const QString &path) const; bool lftBuinding(const QString &path) const; @@ -82,7 +82,7 @@ public Q_SLOTS: void setLogLevel(int logLevel); Q_SIGNALS: - void addPathFinished(const QString &path, bool success); + void AddPathFinished(const QString &path, bool success); void autoIndexExternalChanged(bool autoIndexExternal); void autoIndexInternalChanged(bool autoIndexInternal); @@ -99,7 +99,7 @@ public Q_SLOTS: void _indexAll(); void _indexAllDelay(int time = 10 * 60 * 1000); void _cleanAllIndex(); - void _addPathByPartition(const DBlockDevice *block); + void _AddPathByPartition(const DBlockDevice *block); void onMountAdded(const QString &blockDevicePath, const QByteArray &mountPoint); void onMountRemoved(const QString &blockDevicePath, const QByteArray &mountPoint); void onFSAdded(const QString &blockDevicePath); diff --git a/server/tool/com.deepin.anything.xml b/server/tool/com.deepin.anything.xml index 9baba57a..69aa8aa5 100644 --- a/server/tool/com.deepin.anything.xml +++ b/server/tool/com.deepin.anything.xml @@ -12,7 +12,7 @@ - + @@ -93,7 +93,7 @@ - +