Skip to content

Commit c1d89fe

Browse files
committed
Remove non-functional remainders of OptionTranslator code
1 parent 48e08d0 commit c1d89fe

17 files changed

Lines changed: 12 additions & 4880 deletions

addon/doxywizard/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ inputstring.h
144144
inputstrlist.h
145145
wizard.h
146146
translationmanager.h
147-
optiontranslations.h
148147
)
149148

150149
qt_add_resources(doxywizard_RESOURCES_RCC doxywizard.qrc)
@@ -219,7 +218,6 @@ inputbool.cpp
219218
inputstring.cpp
220219
inputint.cpp
221220
inputstrlist.cpp
222-
optiontranslations.cpp
223221
translationmanager.cpp
224222
${GENERATED_SRC_WIZARD}/settings.h
225223
${GENERATED_SRC_WIZARD}/config_doxyw.cpp

addon/doxywizard/doxywizard.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "expert.h"
1616
#include "wizard.h"
1717
#include "translationmanager.h"
18-
#include "optiontranslations.h"
1918

2019
#include <QMenu>
2120
#include <QMenuBar>
@@ -349,7 +348,6 @@ void MainWindow::retranslateUi()
349348
m_workingDirHintLabel->setText(tr("Configure doxygen using the Wizard and/or Expert tab, then switch to the Run tab to generate the documentation"));
350349
m_showSettingsBtn->setText(tr("Show configuration"));
351350

352-
OptionTranslations::instance().retranslate();
353351
m_wizard->retranslateUi();
354352
m_expert->retranslateUi();
355353
}

addon/doxywizard/expert.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "version.h"
2323
#include "configdoc.h"
2424
#include "settings.h"
25-
#include "optiontranslations.h"
2625
#include "translationmanager.h"
2726

2827
#include <QTreeWidget>

addon/doxywizard/inputbool.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "inputbool.h"
1414
#include "helplabel.h"
1515
#include "config_msg.h"
16-
#include "optiontranslations.h"
1716

1817
#include <QCheckBox>
1918
#include <QTextStream>
@@ -24,7 +23,7 @@ InputBool::InputBool( QGridLayout *layout, int &row,
2423
const QString &docs )
2524
: m_default(checked), m_docs(docs), m_id(id)
2625
{
27-
m_lab = new HelpLabel(OptionTranslations::instance().translate(id));
26+
m_lab = new HelpLabel(id);
2827
m_cb = new QCheckBox;
2928
layout->addWidget(m_lab,row, 0);
3029
layout->addWidget(m_cb,row, 1);
@@ -74,14 +73,13 @@ void InputBool::setValue( bool s )
7473

7574
void InputBool::updateDefault()
7675
{
77-
QString translatedId = OptionTranslations::instance().translate(m_id);
7876
if (m_state==m_default || !m_lab->isEnabled())
7977
{
80-
m_lab->setText(QString::fromLatin1("<qt>")+translatedId+QString::fromLatin1("</qt>"));
78+
m_lab->setText(QString::fromLatin1("<qt>")+m_id+QString::fromLatin1("</qt>"));
8179
}
8280
else
8381
{
84-
m_lab->setText(QString::fromLatin1("<qt><font color='red'>")+translatedId+QString::fromLatin1("</font></qt>"));
82+
m_lab->setText(QString::fromLatin1("<qt><font color='red'>")+m_id+QString::fromLatin1("</font></qt>"));
8583
}
8684
}
8785

addon/doxywizard/inputint.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "inputint.h"
1414
#include "helplabel.h"
1515
#include "config_msg.h"
16-
#include "optiontranslations.h"
1716

1817
#include <QSpinBox>
1918
#include <QGridLayout>
@@ -35,7 +34,7 @@ InputInt::InputInt( QGridLayout *layout,int &row,
3534
const QString & docs )
3635
: m_default(defVal), m_minVal(minVal), m_maxVal(maxVal), m_docs(docs), m_id(id)
3736
{
38-
m_lab = new HelpLabel(OptionTranslations::instance().translate(id));
37+
m_lab = new HelpLabel(id);
3938
m_sp = new NoWheelSpinBox;
4039
m_sp->setMinimum(minVal);
4140
m_sp->setMaximum(maxVal);
@@ -83,14 +82,13 @@ void InputInt::setValue(int val)
8382
void InputInt::updateDefault()
8483
{
8584
{
86-
QString translatedId = OptionTranslations::instance().translate(m_id);
8785
if (m_val==m_default || !m_lab->isEnabled())
8886
{
89-
m_lab->setText(QString::fromLatin1("<qt>")+translatedId+QString::fromLatin1("</qt>"));
87+
m_lab->setText(QString::fromLatin1("<qt>")+m_id+QString::fromLatin1("</qt>"));
9088
}
9189
else
9290
{
93-
m_lab->setText(QString::fromLatin1("<qt><font color='red'>")+translatedId+QString::fromLatin1("</font></qt>"));
91+
m_lab->setText(QString::fromLatin1("<qt><font color='red'>")+m_id+QString::fromLatin1("</font></qt>"));
9492
}
9593
}
9694
}

addon/doxywizard/inputstring.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "doxywizard.h"
1616
#include "config_msg.h"
1717
#include "config.h"
18-
#include "optiontranslations.h"
1918

2019
#include <QComboBox>
2120
#include <QLineEdit>
@@ -42,7 +41,7 @@ InputString::InputString( QGridLayout *layout,int &row,
4241
: m_default(s), m_sm(m), m_index(0), m_docs(docs), m_id(id),
4342
m_absPath(absPath==QString::fromLatin1("1"))
4443
{
45-
m_lab = new HelpLabel(OptionTranslations::instance().translate(id));
44+
m_lab = new HelpLabel(id);
4645
m_brFile = nullptr;
4746
m_brDir = nullptr;
4847
if (m==StringFixed)
@@ -133,14 +132,13 @@ void InputString::setValue(const QString &s)
133132
void InputString::updateDefault()
134133
{
135134
{
136-
QString translatedId = OptionTranslations::instance().translate(m_id);
137135
if (m_str==m_default || !m_lab->isEnabled())
138136
{
139-
m_lab->setText(QString::fromLatin1("<qt>")+translatedId+QString::fromLatin1("</qt>"));
137+
m_lab->setText(QString::fromLatin1("<qt>")+m_id+QString::fromLatin1("</qt>"));
140138
}
141139
else
142140
{
143-
m_lab->setText(QString::fromLatin1("<qt><font color='red'>")+translatedId+QString::fromLatin1("</font></qt>"));
141+
m_lab->setText(QString::fromLatin1("<qt><font color='red'>")+m_id+QString::fromLatin1("</font></qt>"));
144142
}
145143
if (m_im)
146144
{

addon/doxywizard/inputstrlist.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "helplabel.h"
1515
#include "doxywizard.h"
1616
#include "config.h"
17-
#include "optiontranslations.h"
1817

1918
#include <QToolBar>
2019
#include <QGridLayout>
@@ -30,7 +29,7 @@ InputStrList::InputStrList( QGridLayout *layout,int &row,
3029
const QString & docs)
3130
: m_default(sl), m_strList(sl), m_docs(docs), m_id(id)
3231
{
33-
m_lab = new HelpLabel(OptionTranslations::instance().translate(id));
32+
m_lab = new HelpLabel(id);
3433

3534
m_le = new QLineEdit;
3635
m_le->clear();
@@ -229,14 +228,13 @@ void InputStrList::update()
229228

230229
void InputStrList::updateDefault()
231230
{
232-
QString translatedId = OptionTranslations::instance().translate(m_id);
233231
if (isDefault() || !m_lab->isEnabled())
234232
{
235-
m_lab->setText(QString::fromLatin1("<qt>")+translatedId+QString::fromLatin1("</qt>"));
233+
m_lab->setText(QString::fromLatin1("<qt>")+m_id+QString::fromLatin1("</qt>"));
236234
}
237235
else
238236
{
239-
m_lab->setText(QString::fromLatin1("<qt><font color='red'>")+translatedId+QString::fromLatin1("</font></qt>"));
237+
m_lab->setText(QString::fromLatin1("<qt><font color='red'>")+m_id+QString::fromLatin1("</font></qt>"));
240238
}
241239
}
242240

0 commit comments

Comments
 (0)