fix: [vault] the translate error

The qt translator can not identify the macro name space, so do not use the macro. Log: fix issue Bug: https://pms.uniontech.com/bug-view-211801.html
linuxdeepin · Jul 27, 2023 · fab843d · fab843d
1 parent ddf19a9
commit fab843d
Show file tree

Hide file tree

Showing 46 changed files with 223 additions and 226 deletions.
diff --git a/src/plugins/filemanager/dfmplugin-vault/dbus/vaultdbusutils.cpp b/src/plugins/filemanager/dfmplugin-vault/dbus/vaultdbusutils.cpp
@@ -12,7 +12,7 @@
 
 #include <unistd.h>
 
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 QVariant VaultDBusUtils::vaultManagerDBusCall(QString function, const QVariant &vaule)
 {

diff --git a/src/plugins/filemanager/dfmplugin-vault/dfmplugin_vault_global.h b/src/plugins/filemanager/dfmplugin-vault/dfmplugin_vault_global.h
@@ -11,8 +11,7 @@
 #define DPVAULT_END_NAMESPACE }
 #define DPVAULT_USE_NAMESPACE using namespace dfmplugin_vault;
 
-DPVAULT_BEGIN_NAMESPACE
-
+namespace dfmplugin_vault {
 enum VaultState {
     kUnknow = 0,
     kNotExisted,
@@ -154,6 +153,6 @@ inline constexpr char kAppSessionPath[] { "/org/deepin/dde/SessionManager1" };
 inline constexpr char kAppSessionService[] { "com.deepin.SessionManager" };
 inline constexpr char kAppSessionPath[] { "/com/deepin/SessionManager" };
 #endif
-DPVAULT_END_NAMESPACE
+}
 
 #endif   // DFMPLUGIN_VAULT_GLOBAL_H
diff --git a/src/plugins/filemanager/dfmplugin-vault/events/vaulteventcaller.cpp b/src/plugins/filemanager/dfmplugin-vault/events/vaulteventcaller.cpp
@@ -9,7 +9,7 @@
 #include <dfm-framework/event/event.h>
 
 DFMBASE_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 void VaultEventCaller::sendItemActived(quint64 windowId, const QUrl &url)
 {

diff --git a/src/plugins/filemanager/dfmplugin-vault/events/vaulteventreceiver.cpp b/src/plugins/filemanager/dfmplugin-vault/events/vaulteventreceiver.cpp
@@ -29,7 +29,7 @@ Q_DECLARE_METATYPE(bool *)
 
 DPF_USE_NAMESPACE
 DFMBASE_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultEventReceiver::VaultEventReceiver(QObject *parent)
     : QObject(parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/fileutils/private/vaultfileiteratorprivate.cpp b/src/plugins/filemanager/dfmplugin-vault/fileutils/private/vaultfileiteratorprivate.cpp
@@ -12,7 +12,7 @@
 
 USING_IO_NAMESPACE
 DFMBASE_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultFileIteratorPrivate::VaultFileIteratorPrivate(const QUrl &url,
                                                    const QStringList &nameFilters,

diff --git a/src/plugins/filemanager/dfmplugin-vault/fileutils/private/vaultfilewatcherprivate.cpp b/src/plugins/filemanager/dfmplugin-vault/fileutils/private/vaultfilewatcherprivate.cpp
@@ -6,7 +6,7 @@
 #include "fileutils/vaultfilewatcher.h"
 
 DFMBASE_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultFileWatcherPrivate::VaultFileWatcherPrivate(const QUrl &fileUrl, VaultFileWatcher *qq)
     : AbstractFileWatcherPrivate(fileUrl, qq)

diff --git a/src/plugins/filemanager/dfmplugin-vault/fileutils/vaultfileinfo.cpp b/src/plugins/filemanager/dfmplugin-vault/fileutils/vaultfileinfo.cpp
@@ -24,7 +24,7 @@
 
 DWIDGET_USE_NAMESPACE
 DFMBASE_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultFileInfoPrivate::VaultFileInfoPrivate(const QUrl &url, VaultFileInfo *qq)
     : q(qq)

diff --git a/src/plugins/filemanager/dfmplugin-vault/fileutils/vaultfileiterator.cpp b/src/plugins/filemanager/dfmplugin-vault/fileutils/vaultfileiterator.cpp
@@ -11,7 +11,7 @@
 #include <QSharedPointer>
 
 DFMBASE_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultFileIterator::VaultFileIterator(const QUrl &url, const QStringList &nameFilters, QDir::Filters filters, QDirIterator::IteratorFlags flags)
     : AbstractDirIterator(VaultHelper::vaultToLocalUrl(url), nameFilters, filters, flags)

diff --git a/src/plugins/filemanager/dfmplugin-vault/fileutils/vaultfilewatcher.cpp b/src/plugins/filemanager/dfmplugin-vault/fileutils/vaultfilewatcher.cpp
@@ -10,7 +10,7 @@
 #include <dfm-base/base/schemefactory.h>
 
 DFMBASE_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultFileWatcher::VaultFileWatcher(const QUrl &url, QObject *parent)
     : AbstractFileWatcher(new VaultFileWatcherPrivate(VaultHelper::vaultToLocalUrl(url), this), parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/menus/vaultcomputermenuscene.cpp b/src/plugins/filemanager/dfmplugin-vault/menus/vaultcomputermenuscene.cpp
@@ -11,8 +11,8 @@
 
 #include <QMenu>
 
-DPVAULT_USE_NAMESPACE
 DFMBASE_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 AbstractMenuScene *VaultComputerMenuCreator::create()
 {

diff --git a/src/plugins/filemanager/dfmplugin-vault/menus/vaultmenuscene.cpp b/src/plugins/filemanager/dfmplugin-vault/menus/vaultmenuscene.cpp
@@ -14,7 +14,7 @@
 #include <QList>
 
 DFMBASE_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 static const char *const kWorkSpaceScene = "WorkspaceMenu";
 

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/encryption/interfaceactivevault.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/encryption/interfaceactivevault.cpp
@@ -7,7 +7,7 @@
 #include "utils/vaulthelper.h"
 #include "utils/pathmanager.h"
 
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 InterfaceActiveVault::InterfaceActiveVault(QObject *parent)
     : QObject(parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/encryption/operatorcenter.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/encryption/operatorcenter.cpp
@@ -27,7 +27,7 @@ extern "C" {
 }
 #define signals public
 
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 OperatorCenter::OperatorCenter(QObject *parent)
     : QObject(parent), strCryfsPassword(""), strUserKey(""), standOutput("")

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/encryption/vaultconfig.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/encryption/vaultconfig.cpp
@@ -10,7 +10,7 @@
 #include <QDir>
 #include <QSettings>
 
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultConfig::VaultConfig(const QString &filePath)
     : currentFilePath(filePath)

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/fileencrypthandle.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/fileencrypthandle.cpp
@@ -28,8 +28,8 @@
 
 inline constexpr int kArgumentsNum { 3 };
 
-DPVAULT_USE_NAMESPACE
 DFMBASE_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 FileEncryptHandle::FileEncryptHandle(QObject *parent)
     : QObject(parent), d(new FileEncryptHandlerPrivate(this))

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/fileencrypthandle.h b/src/plugins/filemanager/dfmplugin-vault/utils/fileencrypthandle.h
@@ -10,8 +10,7 @@
 #include <QObject>
 #include <QDBusMessage>
 
-DPVAULT_BEGIN_NAMESPACE
-
+namespace dfmplugin_vault {
 class FileEncryptHandlerPrivate;
 class FileEncryptHandle : public QObject
 {
@@ -50,7 +49,6 @@ public slots:
 private:
     FileEncryptHandlerPrivate *d = nullptr;
 };
-
-DPVAULT_END_NAMESPACE
+}
 
 #endif   // VAULTHANDLE_H
diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/fileencrypthandle_p.h b/src/plugins/filemanager/dfmplugin-vault/utils/fileencrypthandle_p.h
@@ -13,8 +13,7 @@ class QMutex;
 class QProcess;
 class QThread;
 
-DPVAULT_BEGIN_NAMESPACE
-
+namespace dfmplugin_vault {
 class FileEncryptHandle;
 class FileEncryptHandlerPrivate
 {
@@ -74,7 +73,6 @@ class FileEncryptHandlerPrivate
     CryfsVersionInfo cryfsVersion { CryfsVersionInfo(-1, -1, -1) };
     VaultState curState { kUnknow };
 };
-
-DPVAULT_END_NAMESPACE
+}
 
 #endif   // VAULTHANDLE_P_H
diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/pathmanager.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/pathmanager.cpp
@@ -7,7 +7,7 @@
 
 #include <dfm-io/dfmio_utils.h>
 
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 PathManager::PathManager(QObject *parent)
     : QObject(parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/policy/policymanager.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/policy/policymanager.cpp
@@ -9,7 +9,7 @@
 
 #include <QDBusConnection>
 
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 PolicyManager::VaultPageMark PolicyManager::recordVaultPageMark;
 bool PolicyManager::vaultVisiable = true;

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/servicemanager.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/servicemanager.cpp
@@ -12,7 +12,7 @@
 #include <QUrl>
 
 DFMBASE_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 ServiceManager::ServiceManager(QObject *parent)
     : QObject(parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/vaultautolock.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/vaultautolock.cpp
@@ -18,7 +18,7 @@ constexpr char kVaultGroup[] = { "Vault/AutoLock" };
 constexpr char kVaultAutoLockKey[] { "AutoLock" };
 
 DFMBASE_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultAutoLock::VaultAutoLock(QObject *parent)
     : QObject(parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/vaultentryfileentity.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/vaultentryfileentity.cpp
@@ -9,7 +9,7 @@
 #include <QApplication>
 
 DFMBASE_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultEntryFileEntity::VaultEntryFileEntity(const QUrl &url)
     : AbstractEntryFileEntity(url)

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/vaultfilehelper.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/vaultfilehelper.cpp
@@ -21,7 +21,7 @@
 
 Q_DECLARE_METATYPE(QList<QUrl> *)
 
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 DFMGLOBAL_USE_NAMESPACE
 DFMBASE_USE_NAMESPACE
 

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/vaultfilehelper.h b/src/plugins/filemanager/dfmplugin-vault/utils/vaultfilehelper.h
@@ -16,8 +16,8 @@
 #include <QObject>
 #include <QFileDevice>
 
-DPVAULT_BEGIN_NAMESPACE
 
+namespace dfmplugin_vault {
 class VaultFileHelper : public QObject
 {
     Q_OBJECT
@@ -70,6 +70,6 @@ class VaultFileHelper : public QObject
 private:
     explicit VaultFileHelper(QObject *parent = nullptr);
 };
-DPVAULT_END_NAMESPACE
+}
 
 #endif   // VAULTFILEHELPER_H
diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/vaulthelper.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/vaulthelper.cpp
@@ -40,7 +40,7 @@ Q_DECLARE_METATYPE(QList<QUrl> *)
 
 DFMBASE_USE_NAMESPACE
 DWIDGET_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 QUrl VaultHelper::rootUrl()
 {

diff --git a/src/plugins/filemanager/dfmplugin-vault/utils/vaultvisiblemanager.cpp b/src/plugins/filemanager/dfmplugin-vault/utils/vaultvisiblemanager.cpp
@@ -40,7 +40,7 @@ Q_DECLARE_METATYPE(BasicViewFieldFunc)
 DFMBASE_USE_NAMESPACE
 DPF_USE_NAMESPACE
 DCORE_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultVisibleManager::VaultVisibleManager(QObject *parent)
     : QObject(parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/vault.cpp b/src/plugins/filemanager/dfmplugin-vault/vault.cpp
@@ -16,7 +16,7 @@ Q_DECLARE_METATYPE(QString *)
 Q_DECLARE_METATYPE(Qt::DropAction *)
 
 DFMBASE_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 void Vault::initialize()
 {

diff --git a/src/plugins/filemanager/dfmplugin-vault/views/createvaultview/vaultactivefinishedview.cpp b/src/plugins/filemanager/dfmplugin-vault/views/createvaultview/vaultactivefinishedview.cpp
@@ -32,7 +32,7 @@ Q_DECLARE_METATYPE(const char *)
 using namespace PolkitQt1;
 DFMBASE_USE_NAMESPACE
 DWIDGET_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultActiveFinishedView::VaultActiveFinishedView(QWidget *parent)
     : QWidget(parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/views/createvaultview/vaultactivesavekeyfileview.cpp b/src/plugins/filemanager/dfmplugin-vault/views/createvaultview/vaultactivesavekeyfileview.cpp
@@ -22,7 +22,7 @@
 
 DGUI_USE_NAMESPACE
 DWIDGET_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultActiveSaveKeyFileView::VaultActiveSaveKeyFileView(QWidget *parent)
     : QWidget(parent)

diff --git a/...gins/filemanager/dfmplugin-vault/views/createvaultview/vaultactivesetunlockmethodview.cpp b/...gins/filemanager/dfmplugin-vault/views/createvaultview/vaultactivesetunlockmethodview.cpp
@@ -19,8 +19,8 @@
 #include <QGridLayout>
 #include <QVBoxLayout>
 
-DPVAULT_USE_NAMESPACE
 DWIDGET_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultActiveSetUnlockMethodView::VaultActiveSetUnlockMethodView(QWidget *parent)
     : QWidget(parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/views/createvaultview/vaultactivestartview.cpp b/src/plugins/filemanager/dfmplugin-vault/views/createvaultview/vaultactivestartview.cpp
@@ -11,7 +11,7 @@
 #include <QSpacerItem>
 
 DWIDGET_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultActiveStartView::VaultActiveStartView(QWidget *parent)
     : QWidget(parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/views/removevaultview/vaultremovebypasswordview.cpp b/src/plugins/filemanager/dfmplugin-vault/views/removevaultview/vaultremovebypasswordview.cpp
@@ -15,7 +15,7 @@
 #include <QTimer>
 
 DWIDGET_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultRemoveByPasswordView::VaultRemoveByPasswordView(QWidget *parent)
     : QWidget(parent)

diff --git a/...lugins/filemanager/dfmplugin-vault/views/removevaultview/vaultremovebyrecoverykeyview.cpp b/...lugins/filemanager/dfmplugin-vault/views/removevaultview/vaultremovebyrecoverykeyview.cpp
@@ -15,7 +15,7 @@
 #define MAX_KEY_LENGTH (32)   //!凭证最大值，4的倍数
 
 DWIDGET_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultRemoveByRecoverykeyView::VaultRemoveByRecoverykeyView(QWidget *parent)
     : QWidget(parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/views/removevaultview/vaultremoveprogressview.cpp b/src/plugins/filemanager/dfmplugin-vault/views/removevaultview/vaultremoveprogressview.cpp
@@ -19,7 +19,7 @@
 
 DWIDGET_USE_NAMESPACE
 DFMBASE_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultRemoveProgressView::VaultRemoveProgressView(QWidget *parent)
     : QWidget(parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/views/unlockview/passwordrecoveryview.cpp b/src/plugins/filemanager/dfmplugin-vault/views/unlockview/passwordrecoveryview.cpp
@@ -7,7 +7,7 @@
 #include <QVBoxLayout>
 
 DWIDGET_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 PasswordRecoveryView::PasswordRecoveryView(QWidget *parent)
     : QFrame(parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/views/unlockview/recoverykeyview.cpp b/src/plugins/filemanager/dfmplugin-vault/views/unlockview/recoverykeyview.cpp
@@ -22,7 +22,7 @@
 #define MAX_KEY_LENGTH (32)
 
 DWIDGET_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 RecoveryKeyView::RecoveryKeyView(QWidget *parent)
     : QFrame(parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/views/unlockview/retrievepasswordview.cpp b/src/plugins/filemanager/dfmplugin-vault/views/unlockview/retrievepasswordview.cpp
@@ -27,7 +27,7 @@
 using namespace PolkitQt1;
 
 DWIDGET_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 constexpr char kVaultTRoot[] = "dfmvault:///";
 

diff --git a/src/plugins/filemanager/dfmplugin-vault/views/unlockview/unlockview.cpp b/src/plugins/filemanager/dfmplugin-vault/views/unlockview/unlockview.cpp
@@ -27,7 +27,7 @@ constexpr int kToolTipShowDuration = 3000;
 
 DFMBASE_USE_NAMESPACE
 DWIDGET_USE_NAMESPACE
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 UnlockView::UnlockView(QWidget *parent)
     : QFrame(parent)

diff --git a/src/plugins/filemanager/dfmplugin-vault/views/vaultcreatepage.cpp b/src/plugins/filemanager/dfmplugin-vault/views/vaultcreatepage.cpp
@@ -21,7 +21,7 @@
 #include <QMouseEvent>
 #include <QWindow>
 
-DPVAULT_USE_NAMESPACE
+using namespace dfmplugin_vault;
 
 VaultActiveView::VaultActiveView(QWidget *parent)
     : VaultPageBase(parent)