Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdecore: do not store the KCatalog object as KuitSemantics member

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-08-27 20:46:25 +03:00
parent 5d12e973e6
commit 453680e04d
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
kdecore/localization/kuitsemantics.cpp
View file

@ -17,6 +17,7 @@
*/ */
#include "kuitsemantics_p.h" #include "kuitsemantics_p.h"
#include "kcatalog_p.h"
#include "kglobal.h" #include "kglobal.h"
#include "klocale.h" #include "klocale.h"
#include "kdebug.h" #include "kdebug.h"
@ -27,36 +28,36 @@ const QLatin1String KuitSemantics::s_numreal = QLatin1String(KUIT_NUMREAL);
const QLatin1String KuitSemantics::s_title = QLatin1String("title"); const QLatin1String KuitSemantics::s_title = QLatin1String("title");
KuitSemantics::KuitSemantics(const QString &lang) KuitSemantics::KuitSemantics(const QString &lang)
: m_catalog(QString::fromLatin1("kdelibs4"), lang)
{ {
const KCatalog catalog(QString::fromLatin1("kdelibs4"), lang);
KuitFormat format; KuitFormat format;
format.tag = QString::fromLatin1("filename"); format.tag = QString::fromLatin1("filename");
format.plain = m_catalog.translate("@filename/plain", "‘%1’"); format.plain = catalog.translate("@filename/plain", "‘%1’");
format.rich = m_catalog.translate("@filename/rich", "<tt>%1</tt>"); format.rich = catalog.translate("@filename/rich", "<tt>%1</tt>");
m_formats.append(format); m_formats.append(format);
format.tag = QString::fromLatin1("email"); format.tag = QString::fromLatin1("email");
format.plain = m_catalog.translate("@email/plain", "<%1>"); format.plain = catalog.translate("@email/plain", "<%1>");
format.rich = m_catalog.translate("@email/rich", "&lt;<a href=\"mailto:%1\">%1</a>&gt;"); format.rich = catalog.translate("@email/rich", "&lt;<a href=\"mailto:%1\">%1</a>&gt;");
m_formats.append(format); m_formats.append(format);
format.tag = QString::fromLatin1("title"); format.tag = QString::fromLatin1("title");
format.plain = m_catalog.translate("@title/plain", "== %1 =="); format.plain = catalog.translate("@title/plain", "== %1 ==");
format.rich = m_catalog.translate("@title/rich", "<h2>%1</h2>"); format.rich = catalog.translate("@title/rich", "<h2>%1</h2>");
m_formats.append(format); m_formats.append(format);
format.tag = QString::fromLatin1("warning"); format.tag = QString::fromLatin1("warning");
format.plain = m_catalog.translate("@warning/plain", "WARNING: %1"); format.plain = catalog.translate("@warning/plain", "WARNING: %1");
format.rich = m_catalog.translate("@warning/rich", "<b>Warning</b>: %1"); format.rich = catalog.translate("@warning/rich", "<b>Warning</b>: %1");
m_formats.append(format); m_formats.append(format);
format.tag = QString::fromLatin1("command"); format.tag = QString::fromLatin1("command");
format.plain = m_catalog.translate("@command/plain", "%1"); format.plain = catalog.translate("@command/plain", "%1");
format.rich = m_catalog.translate("@command/rich", "<tt>%1</tt>"); format.rich = catalog.translate("@command/rich", "<tt>%1</tt>");
m_formats.append(format); m_formats.append(format);
format.tag = QString::fromLatin1("resource"); format.tag = QString::fromLatin1("resource");
format.plain = m_catalog.translate("@resource/plain", "“%1”"); format.plain = catalog.translate("@resource/plain", "“%1”");
format.rich = m_catalog.translate("@resource/rich", "“%1”"); format.rich = catalog.translate("@resource/rich", "“%1”");
m_formats.append(format); m_formats.append(format);
format.tag = QString::fromLatin1("message"); format.tag = QString::fromLatin1("message");
format.plain = m_catalog.translate("@message/plain", "/%1/"); format.plain = catalog.translate("@message/plain", "/%1/");
format.rich = m_catalog.translate("@message/rich", "<i>%1</i>"); format.rich = catalog.translate("@message/rich", "<i>%1</i>");
m_formats.append(format); m_formats.append(format);
// special cases // special cases
format.tag = QString::fromLatin1(KUIT_NUMARGS); format.tag = QString::fromLatin1(KUIT_NUMARGS);

3
kdecore/localization/kuitsemantics_p.h
View file

@ -19,8 +19,6 @@
#ifndef KUITSEMANTICS_P_H #ifndef KUITSEMANTICS_P_H
#define KUITSEMANTICS_P_H #define KUITSEMANTICS_P_H
#include "kcatalog_p.h"
#include <QString> #include <QString>
#include <QList> #include <QList>
@ -62,7 +60,6 @@ public:
QString format(const QString &text, const QString &ctxt) const; QString format(const QString &text, const QString &ctxt) const;
private: private:
KCatalog m_catalog;
QList<KuitFormat> m_formats; QList<KuitFormat> m_formats;
static const QLatin1String s_numargs; static const QLatin1String s_numargs;
static const QLatin1String s_numintg; static const QLatin1String s_numintg;