TranslatableString.h does not include Identifier.h
This commit is contained in:
parent
bb14a6016f
commit
f7d9602a42
|
@ -42,6 +42,7 @@
|
|||
#ifndef __AUDACITY_COMPONENT_INTERFACE_H__
|
||||
#define __AUDACITY_COMPONENT_INTERFACE_H__
|
||||
|
||||
#include "Identifier.h"
|
||||
#include "audacity/Types.h"
|
||||
#include <wx/string.h> // member variables
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@ Paul Licameli -- split from ProjectFileIO.h
|
|||
#include <thread>
|
||||
|
||||
#include "ClientData.h"
|
||||
#include "Identifier.h"
|
||||
|
||||
struct sqlite3;
|
||||
struct sqlite3_stmt;
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
|
||||
|
||||
#include "audacity/Types.h"
|
||||
#include "Identifier.h"
|
||||
|
||||
//#include <mutex>
|
||||
#include "MemoryX.h"
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
|
||||
|
||||
#include "Languages.h"
|
||||
#include "Identifier.h"
|
||||
#include "MemoryX.h"
|
||||
|
||||
#include "Internat.h"
|
||||
|
|
|
@ -14,7 +14,8 @@
|
|||
class wxArrayString;
|
||||
class wxString;
|
||||
|
||||
#include "audacity/Types.h"
|
||||
#include "Identifier.h"
|
||||
#include "Internat.h"
|
||||
|
||||
namespace Languages {
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#include <vector>
|
||||
|
||||
#include "audacity/Types.h"
|
||||
#include "Identifier.h"
|
||||
|
||||
class wxArrayString;
|
||||
class wxDynamicLibrary;
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#ifndef __AUDACITY_PROJECT__
|
||||
#define __AUDACITY_PROJECT__
|
||||
|
||||
|
||||
#include "Identifier.h"
|
||||
|
||||
#include "ClientData.h" // to inherit
|
||||
|
||||
|
|
|
@ -15,6 +15,7 @@ Paul Licameli split from AudacityProject.h
|
|||
|
||||
#include <wx/event.h> // to inherit
|
||||
#include "ClientData.h" // to inherit
|
||||
#include "Identifier.h"
|
||||
|
||||
class wxTimer;
|
||||
class wxTimerEvent;
|
||||
|
|
|
@ -9,10 +9,16 @@
|
|||
**********************************************************************/
|
||||
|
||||
#include "TranslatableString.h"
|
||||
#include "Identifier.h"
|
||||
#include <wx/translation.h>
|
||||
|
||||
const wxChar *const TranslatableString::NullContextName = wxT("*");
|
||||
|
||||
Identifier TranslatableString::MSGID() const
|
||||
{
|
||||
return Identifier{ mMsgid };
|
||||
}
|
||||
|
||||
const TranslatableString::Formatter
|
||||
TranslatableString::NullContextFormatter {
|
||||
[](const wxString & str, TranslatableString::Request request) -> wxString {
|
||||
|
|
|
@ -11,7 +11,11 @@
|
|||
#ifndef __AUDACITY_TRANSLATABLE_STRING__
|
||||
#define __AUDACITY_TRANSLATABLE_STRING__
|
||||
|
||||
#include "../../../src/Identifier.h"
|
||||
#include <stddef.h> // for size_t
|
||||
#include <functional>
|
||||
#include <wx/string.h>
|
||||
|
||||
class Identifier;
|
||||
|
||||
#include <vector>
|
||||
|
||||
|
@ -70,7 +74,7 @@ public:
|
|||
//! MSGID is the English lookup key in the catalog, not necessarily for user's eyes if locale is some other.
|
||||
/*! The MSGID might not be all the information TranslatableString holds.
|
||||
This is a deliberately ugly-looking function name. Use with caution. */
|
||||
Identifier MSGID() const { return Identifier{ mMsgid }; }
|
||||
Identifier MSGID() const;
|
||||
|
||||
wxString Translation() const { return DoFormat( false ); }
|
||||
|
||||
|
|
|
@ -48,6 +48,7 @@ but little else.
|
|||
|
||||
|
||||
#include "audacity/Types.h"
|
||||
#include "../Identifier.h"
|
||||
#include "../Internat.h"
|
||||
#include "../MemoryX.h"
|
||||
|
||||
|
|
Loading…
Reference in New Issue