Skip to content

Commit 8a3712e

Browse files
Replace forward declaration to find bug with segfault
1 parent c89259c commit 8a3712e

File tree

7 files changed

+33
-41
lines changed

7 files changed

+33
-41
lines changed

src/Convert.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Convert
99
/// @brief Returns list QStringList of QString as element by converting std::list<std::string>value.
1010
QStringList ToQStringList(const std::list<std::string>& srcList);
1111
/// @brief Returns list std::list of std::string as element by converting QStringList<QString> value.
12-
inline std::list<std::string> ToStdStringList(const QStringList& srcList);
12+
inline std::list<std::string> ToStdStringList(const QStringList& srcList);
1313
/// @brief Return enum Languages value that equivalent to the text value.
1414
Languages ToLangEnum(const std::string& locale);
1515
/// @brief Converts QChar to Qt::Key enum equivalent.

src/GUI/HotkeysMainWindow.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
#include <QCoreApplication>
55
#include <QDialog>
66
#include <QDialogButtonBox>
7-
#include <QButtonGroup>
87
#include <QVBoxLayout>
9-
#include <QTreeWidgetItem>
10-
#include <QScrollArea>
118
#include <QComboBox>
129

1310
#include "../Parsers/CSFParser.hpp"
@@ -16,10 +13,9 @@
1613
#include "../Unsorted.hpp"
1714
#include "../Convert.hpp"
1815

19-
#include "ActionHotkeyWidget.hpp"
2016
#include "ImageManager.hpp"
21-
#include "HotkeysMainWindow.hpp"
2217
#include "WindowManager.hpp"
18+
#include "HotkeysMainWindow.hpp"
2319

2420
HotkeysMainWindow::HotkeysMainWindow(const QVariant& configuration, QWidget* parent)
2521
: QMainWindow(parent)

src/GUI/HotkeysMainWindow.hpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
#pragma once
22
#include <QMainWindow>
3+
#include <QScrollArea>
4+
#include <QTreeWidgetItem>
5+
#include <QButtonGroup>
6+
#include <QHBoxLayout>
7+
38
#include "../Parsers/JSONFile.hpp"
9+
#include "ActionHotkeyWidget.hpp"
410
#include "Faction.hpp"
511

6-
class QScrollArea;
7-
class QTreeWidget;
8-
class QButtonGroup;
9-
class QHBoxLayout;
10-
11-
class ActionHotkeyWidget;
12-
1312
class HotkeysMainWindow final : public QMainWindow
1413
{
1514
Q_OBJECT

src/GUI/ImageManager.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include <QDir>
22
#include <QImage>
33
#include <QPixmap>
4-
#include <QFileInfo>
54

65
#include "../../libwebp/src/webp/decode.h"
76
#include "../Logger.hpp"

src/GUI/ImageManager.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#pragma once
2+
#include <QFileInfo>
23
#include "../ProgramConstants.hpp"
34

4-
class QFileInfo;
5-
65
class ImageManager
76
{
87
private: // Data

src/GUI/Translations/ru.ts

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -126,113 +126,113 @@
126126
<context>
127127
<name>HotkeysMainWindow</name>
128128
<message>
129-
<location filename="../HotkeysMainWindow.cpp" line="166"/>
129+
<location filename="../HotkeysMainWindow.cpp" line="162"/>
130130
<source>File</source>
131131
<translation>Файл</translation>
132132
</message>
133133
<message>
134-
<location filename="../HotkeysMainWindow.cpp" line="167"/>
134+
<location filename="../HotkeysMainWindow.cpp" line="163"/>
135135
<source>Open</source>
136136
<translation>Открыть</translation>
137137
</message>
138138
<message>
139-
<location filename="../HotkeysMainWindow.cpp" line="168"/>
139+
<location filename="../HotkeysMainWindow.cpp" line="164"/>
140140
<source>Save</source>
141141
<translation>Сохранить</translation>
142142
</message>
143143
<message>
144-
<location filename="../HotkeysMainWindow.cpp" line="169"/>
144+
<location filename="../HotkeysMainWindow.cpp" line="165"/>
145145
<source>Save As...</source>
146146
<translation>Сохранить как...</translation>
147147
</message>
148148
<message>
149-
<location filename="../HotkeysMainWindow.cpp" line="170"/>
149+
<location filename="../HotkeysMainWindow.cpp" line="166"/>
150150
<source>Special</source>
151151
<translation>Дополнительно</translation>
152152
</message>
153153
<message>
154-
<location filename="../HotkeysMainWindow.cpp" line="179"/>
154+
<location filename="../HotkeysMainWindow.cpp" line="175"/>
155155
<source>View</source>
156156
<translation>Вид</translation>
157157
</message>
158158
<message>
159-
<location filename="../HotkeysMainWindow.cpp" line="180"/>
159+
<location filename="../HotkeysMainWindow.cpp" line="176"/>
160160
<source>Status Bar</source>
161161
<translation>Строка состояния</translation>
162162
</message>
163163
<message>
164-
<location filename="../HotkeysMainWindow.cpp" line="181"/>
164+
<location filename="../HotkeysMainWindow.cpp" line="177"/>
165165
<source>Enable</source>
166166
<translation>Включить</translation>
167167
</message>
168168
<message>
169-
<location filename="../HotkeysMainWindow.cpp" line="182"/>
169+
<location filename="../HotkeysMainWindow.cpp" line="178"/>
170170
<source>Disable</source>
171171
<translation>Отключить</translation>
172172
</message>
173173
<message>
174-
<location filename="../HotkeysMainWindow.cpp" line="186"/>
174+
<location filename="../HotkeysMainWindow.cpp" line="182"/>
175175
<source>Settings</source>
176176
<translation>Настройки</translation>
177177
</message>
178178
<message>
179-
<location filename="../HotkeysMainWindow.cpp" line="189"/>
179+
<location filename="../HotkeysMainWindow.cpp" line="185"/>
180180
<source>Language</source>
181181
<translation>Язык</translation>
182182
</message>
183183
<message>
184-
<location filename="../HotkeysMainWindow.cpp" line="193"/>
185-
<location filename="../HotkeysMainWindow.cpp" line="471"/>
184+
<location filename="../HotkeysMainWindow.cpp" line="189"/>
185+
<location filename="../HotkeysMainWindow.cpp" line="467"/>
186186
<source>About</source>
187187
<translation>О программе</translation>
188188
</message>
189189
<message>
190-
<location filename="../HotkeysMainWindow.cpp" line="324"/>
190+
<location filename="../HotkeysMainWindow.cpp" line="320"/>
191191
<source>Layout %1</source>
192192
<translation>Раскладка %1</translation>
193193
</message>
194194
<message>
195-
<location filename="../HotkeysMainWindow.cpp" line="451"/>
195+
<location filename="../HotkeysMainWindow.cpp" line="447"/>
196196
<source>Authors: </source>
197197
<translation>Авторы: </translation>
198198
</message>
199199
<message>
200-
<location filename="../HotkeysMainWindow.cpp" line="452"/>
200+
<location filename="../HotkeysMainWindow.cpp" line="448"/>
201201
<source>Version: </source>
202202
<translation>Версия: </translation>
203203
</message>
204204
<message>
205-
<location filename="../HotkeysMainWindow.cpp" line="453"/>
205+
<location filename="../HotkeysMainWindow.cpp" line="449"/>
206206
<source>Program licensed with </source>
207207
<translation>Программа лицензирована под </translation>
208208
</message>
209209
<message>
210-
<location filename="../HotkeysMainWindow.cpp" line="454"/>
210+
<location filename="../HotkeysMainWindow.cpp" line="450"/>
211211
<source>GitHub repository:</source>
212212
<translation>Репозиторий на GitHub:</translation>
213213
</message>
214214
<message>
215-
<location filename="../HotkeysMainWindow.cpp" line="456"/>
215+
<location filename="../HotkeysMainWindow.cpp" line="452"/>
216216
<source>Support development:</source>
217217
<translation>Поддержать разработку:</translation>
218218
</message>
219219
<message>
220-
<location filename="../HotkeysMainWindow.cpp" line="505"/>
220+
<location filename="../HotkeysMainWindow.cpp" line="501"/>
221221
<source>Lanugage</source>
222222
<translation>Язык</translation>
223223
</message>
224224
<message>
225-
<location filename="../HotkeysMainWindow.cpp" line="514"/>
225+
<location filename="../HotkeysMainWindow.cpp" line="510"/>
226226
<source>LANGUAGE</source>
227227
<translation>ЯЗЫК</translation>
228228
</message>
229229
<message>
230-
<location filename="../HotkeysMainWindow.cpp" line="526"/>
230+
<location filename="../HotkeysMainWindow.cpp" line="522"/>
231231
<source>OK</source>
232232
<translation>Ок</translation>
233233
</message>
234234
<message>
235-
<location filename="../HotkeysMainWindow.cpp" line="527"/>
235+
<location filename="../HotkeysMainWindow.cpp" line="523"/>
236236
<source>Cancel</source>
237237
<translation>Отмена</translation>
238238
</message>

src/GUI/WindowManager.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma once
22
#include <memory>
3+
#include <QTranslator>
34

45
#include "../ProgramConstants.hpp"
56

@@ -8,8 +9,6 @@
89

910
#define WINDOW_MANAGER WindowManager::Instance
1011

11-
class QTranslator;
12-
1312
class WindowManager final
1413
{
1514
private: // Data

0 commit comments

Comments
 (0)