Changeset 91369 in vbox

Timestamp:

Sep 24, 2021 4:47:04 PM (3 years ago)

Author:

vboxsync

Message:

Main: bugref:1909: Added ability to use translation inside non-member functions

Location:

trunk

Files:

• include/VBox/VirtualBoxTranslator.h (moved) (moved from trunk/src/VBox/Main/include/VirtualBoxTranslator.h ) (2 diffs)
• src/VBox/Main/include/VirtualBoxBase.h (modified) (1 diff)
• src/VBox/Main/include/VirtualBoxClientImpl.h (modified) (1 diff)
• src/VBox/Main/src-all/VirtualBoxBase.cpp (modified) (2 diffs)
• src/VBox/Main/src-all/VirtualBoxTranslator.cpp (modified) (1 diff)
• src/VBox/Main/src-server/SystemPropertiesImpl.cpp (modified) (1 diff)

trunk/include/VBox/VirtualBoxTranslator.h

@@ -25 +25 @@
 
 #include <iprt/cpp/lock.h>
+
 #include <VBox/com/AutoLock.h>
+#include <VBox/com/defs.h>
+#include <VBox/com/Guid.h>
+#include <VBox/com/ptr.h>
+#include <VBox/com/string.h>
+
+#ifdef VBOX_WITH_MAIN_NLS
+#define DECLARE_TRANSLATION_CONTEXT(ctx) \
+struct ctx \
+{\
+   static const char *tr(const char *pszSource, const char *pszComment = NULL, const int iNum = -1) \
+   { \
+       return VirtualBoxTranslator::translate(NULL, #ctx, pszSource, pszComment, iNum); \
+   } \
+};
+#else
+#define DECLARE_TRANSLATION_CONTEXT(ctx) \
+struct ctx \
+{\
+   static const char *tr(const char *pszSource, const char *pszComment = NULL, const int iNum = -1) \
+   { \
+       NOREF(pszComment); \
+       NOREF(iNum);       \
+       return pszSource;  \
+   } \
+};
+#endif
 
 typedef void *TRCOMPONENT;
 
+#ifdef VBOX_WITH_MAIN_NLS
+
+struct IVirtualBox;
 class QMTranslator;
 
@@ -139 +169 @@
 };
 
+#endif /* !VBOX_WITH_MAIN_NLS */
+
 #endif /* !MAIN_INCLUDED_VirtualBoxTranslator_h */
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/include/VirtualBoxBase.h

@@ -36 +36 @@
 #include "VBox/com/VirtualBox.h"
 
-#include "VirtualBoxTranslator.h"
+#include <VBox/VirtualBoxTranslator.h>
 
 // avoid including VBox/settings.h and VBox/xml.h; only declare the classes

trunk/src/VBox/Main/include/VirtualBoxClientImpl.h

@@ -24 +24 @@
 #include "VirtualBoxClientWrap.h"
 #include "EventImpl.h"
-#include "VirtualBoxTranslator.h"
+#include <VBox/VirtualBoxTranslator.h>
 
 #ifdef RT_OS_WINDOWS

trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp

@@ -34 +34 @@
 #include "AutoCaller.h"
 #include "VirtualBoxErrorInfoImpl.h"
-#include "VirtualBoxTranslator.h"
 #include "Global.h"
 #include "LoggingNew.h"
@@ -40 +39 @@
 #include "VBox/com/ErrorInfo.h"
 #include "VBox/com/MultiResult.h"
+#include <VBox/VirtualBoxTranslator.h>
+
 
 ////////////////////////////////////////////////////////////////////////////////

trunk/src/VBox/Main/src-all/VirtualBoxTranslator.cpp

@@ -29 +29 @@
 #include "VirtualBoxBase.h"
 #include "QMTranslator.h"
-#include "VirtualBoxTranslator.h"
+#include <VBox/VirtualBoxTranslator.h>
 
 #define TRANSLATOR_CACHE_SIZE 32

trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp

@@ -28 +28 @@
 #include "LoggingNew.h"
 #include "AutostartDb.h"
-#include "VirtualBoxTranslator.h"
+#include <VBox/VirtualBoxTranslator.h>
 
 // generated header