Skip to content

Commit 70aa250

Browse files
abbatabbat
committed
#42 - начало рефакторинга дерева исходников
1 parent 01b8e61 commit 70aa250

File tree

255 files changed

+77
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

255 files changed

+77
-79
lines changed

‎dev/build.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ qmake -project -recursive -Wall -o ${PROJECT_NAME}.pro \
1515
"QT += network sql webkit" \
1616
"LIBS += -laspell -lz" \
1717
"ICON = icons/Main-Logo.icns" \
18-
"macx { QMAKE_CXX = clang }"
18+
"macx { QMAKE_CXX = clang }" \
19+
src
1920

2021
# создание make-файлов
2122
qmake ${PROJECT_NAME}.pro

‎dev/doxygen/doxygen.conf

+3-6
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ABBREVIATE_BRIEF = "The $name class" \
2525
ALWAYS_DETAILED_SEC = NO
2626
INLINE_INHERITED_MEMB = NO
2727
FULL_PATH_NAMES = YES
28-
STRIP_FROM_PATH = ../
28+
STRIP_FROM_PATH = ../src/
2929
STRIP_FROM_INC_PATH =
3030
SHORT_NAMES = NO
3131
JAVADOC_AUTOBRIEF = NO
@@ -90,7 +90,7 @@ WARN_LOGFILE =
9090
#---------------------------------------------------------------------------
9191
# configuration options related to the input files
9292
#---------------------------------------------------------------------------
93-
INPUT = ../
93+
INPUT = ../src/
9494
INPUT_ENCODING = UTF-8
9595
FILE_PATTERNS = *.c \
9696
*.cc \
@@ -144,10 +144,7 @@ FILE_PATTERNS = *.c \
144144
RECURSIVE = YES
145145
EXCLUDE =
146146
EXCLUDE_SYMLINKS = NO
147-
EXCLUDE_PATTERNS = moc_* \
148-
qrc_* \
149-
.svn \
150-
*/dev/*
147+
EXCLUDE_PATTERNS =
151148
EXCLUDE_SYMBOLS =
152149
EXAMPLE_PATH =
153150
EXAMPLE_PATTERNS = *

‎form_date.cpp renamed to ‎src/forms/form_date.cpp

File renamed without changes.

‎form_date.h renamed to ‎src/forms/form_date.h

File renamed without changes.

‎form_date_ui.cpp renamed to ‎src/forms/form_date_ui.cpp

File renamed without changes.

‎form_date_ui.h renamed to ‎src/forms/form_date_ui.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef _avalon_form_date_ui_h_
77
#define _avalon_form_date_ui_h_
88

9-
#include "sysheaders.h"
9+
#include "../sysheaders.h"
1010

1111
/*!
1212
* \brief GUI формы выбора даты/времени

‎form_input.cpp renamed to ‎src/forms/form_input.cpp

File renamed without changes.

‎form_input.h renamed to ‎src/forms/form_input.h

File renamed without changes.

‎form_input_ui.cpp renamed to ‎src/forms/form_input_ui.cpp

File renamed without changes.

‎form_input_ui.h renamed to ‎src/forms/form_input_ui.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef _avalon_form_input_ui_h_
77
#define _avalon_form_input_ui_h_
88

9-
#include "sysheaders.h"
9+
#include "../sysheaders.h"
1010

1111
/*!
1212
* \brief GUI формы запроса ввода пользователя (аналог InputBox)

‎form_main.cpp renamed to ‎src/forms/form_main.cpp

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1-
/*!
2-
* \file
3-
* \brief Главная форма приложения
4-
*/
5-
//----------------------------------------------------------------------------------------------
61
#include "form_main.h"
72
//----------------------------------------------------------------------------------------------
8-
#include "global.h"
3+
#include "../global.h"
4+
#include "../webservice.h"
5+
#include "../storage/storage_factory.h"
6+
//----------------------------------------------------------------------------------------------
97
#include "form_date.h"
108
#include "form_input.h"
11-
#include "webservice.h"
129
#include "form_request.h"
1310
#include "form_settings.h"
1411
#include "form_subscribe.h"
15-
#include "storage/storage_factory.h"
1612
//----------------------------------------------------------------------------------------------
1713

1814
AFormMain::AFormMain () : AFormMainUI (), IFormMain ()

‎form_main.h renamed to ‎src/forms/form_main.h

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#define _avalon_form_main_h_
88

99
#include "form_main_ui.h"
10-
#include "interfaces.h"
1110

1211
/*!
1312
* \brief Класс главной формы приложения

‎form_main_ui.cpp renamed to ‎src/forms/form_main_ui.cpp

File renamed without changes.

‎form_main_ui.h renamed to ‎src/forms/form_main_ui.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#ifndef _avalon_form_main_ui_h_
77
#define _avalon_form_main_ui_h_
88

9-
#include "forum_tree.h"
10-
#include "message_tree.h"
11-
#include "message_view.h"
9+
#include "../widgets/forum_tree.h"
10+
#include "../widgets/message_tree.h"
11+
#include "../widgets/message_view.h"
1212

1313
/*!
1414
* \brief Класс для генерации GUI части главной формы

‎form_message.cpp renamed to ‎src/forms/form_message.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "form_message.h"
22
//----------------------------------------------------------------------------------------------
3-
#include "parser.h"
4-
#include "global.h"
5-
#include "storage/storage_factory.h"
3+
#include "../parser.h"
4+
#include "../global.h"
5+
#include "../storage/storage_factory.h"
66
//----------------------------------------------------------------------------------------------
77

88
FormMessage::FormMessage (QWidget* parent, bool is_reply, const AMessageInfoGUI& info, int edit_id) : FormMessageUI (parent)

‎form_message.h renamed to ‎src/forms/form_message.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
#ifndef _avalon_form_message_h_
77
#define _avalon_form_message_h_
88

9-
#include "model/all.h"
10-
#include "interfaces.h"
9+
#include "../model/all.h"
10+
#include "../interfaces.h"
11+
1112
#include "form_message_ui.h"
1213

1314
/*!

‎form_message_ui.cpp renamed to ‎src/forms/form_message_ui.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "form_message_ui.h"
2-
#include "parser.h"
2+
//----------------------------------------------------------------------------------------------
3+
#include "../parser.h"
34
//----------------------------------------------------------------------------------------------
45
/*!
56
* \brief Описатель спецсимвола для вставки

‎form_message_ui.h renamed to ‎src/forms/form_message_ui.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#ifndef _avalon_form_message_ui_h_
77
#define _avalon_form_message_ui_h_
88

9-
#include "web_view.h"
10-
#include "spell_edit.h"
9+
#include "../widgets/web_view.h"
10+
#include "../widgets/spell_edit.h"
1111

1212
/*!
1313
* \brief GUI формы создания или ответа на сообщение.

‎form_moderate.cpp renamed to ‎src/forms/form_moderate.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "form_moderate.h"
2-
#include "storage/storage_factory.h"
2+
//----------------------------------------------------------------------------------------------
3+
#include "../storage/storage_factory.h"
34
//----------------------------------------------------------------------------------------------
45

56
FormModerate::FormModerate (QWidget* parent, int id_message, int edit_id) : FormModerateUI (parent)

‎form_moderate.h renamed to ‎src/forms/form_moderate.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
#define _avalon_form_moderate_h_
88

99
#include "form_moderate_ui.h"
10-
#include "iforum_tree.h"
10+
11+
#include "../widgets/iforum_tree.h"
1112

1213
/*!
1314
* \brief Форма для ввода информации о модерировании

‎form_moderate_ui.cpp renamed to ‎src/forms/form_moderate_ui.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "form_moderate_ui.h"
2-
#include "storage/storage_factory.h"
2+
//----------------------------------------------------------------------------------------------
3+
#include "../storage/storage_factory.h"
34
//----------------------------------------------------------------------------------------------
45

56
FormModerateUI::FormModerateUI (QWidget* parent) : QDialog (parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint

‎form_moderate_ui.h renamed to ‎src/forms/form_moderate_ui.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef _avalon_form_moderate_ui_h_
77
#define _avalon_form_moderate_ui_h_
88

9-
#include "sysheaders.h"
9+
#include "../sysheaders.h"
1010

1111
/*!
1212
* \brief Описатель действия для списка действий при создании модерилки

‎form_request.cpp renamed to ‎src/forms/form_request.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
/*!
2-
* \file
3-
* \brief Форма для отображения прогресса работы и для HTTP запросов
4-
*/
5-
//----------------------------------------------------------------------------------------------
61
#include "form_request.h"
72
//----------------------------------------------------------------------------------------------
83

‎form_request.h renamed to ‎src/forms/form_request.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
#ifndef _avalon_form_request_h_
77
#define _avalon_form_request_h_
88

9-
#include "iprogress.h"
9+
#include "../iprogress.h"
10+
1011
#include "form_request_ui.h"
1112

1213
/*!

‎form_request_ui.cpp renamed to ‎src/forms/form_request_ui.cpp

File renamed without changes.

‎form_request_ui.h renamed to ‎src/forms/form_request_ui.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef _avalon_form_request_ui_h_
77
#define _avalon_form_request_ui_h_
88

9-
#include "sysheaders.h"
9+
#include "../sysheaders.h"
1010

1111
/*!
1212
* \brief GUI формы для отображения прогресса работы и для HTTP запросов

‎form_settings.cpp renamed to ‎src/forms/form_settings.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "form_settings.h"
22
//----------------------------------------------------------------------------------------------
3-
#include "global.h"
4-
#include "storage/storage_factory.h"
3+
#include "../global.h"
4+
#include "../storage/storage_factory.h"
55
//----------------------------------------------------------------------------------------------
66

77
FormSettings::FormSettings (QWidget* parent) : FormSettingsUI (parent)

‎form_settings.h renamed to ‎src/forms/form_settings.h

File renamed without changes.

‎form_settings_ui.cpp renamed to ‎src/forms/form_settings_ui.cpp

File renamed without changes.

‎form_settings_ui.h renamed to ‎src/forms/form_settings_ui.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef _avalon_form_settings_ui_h_
77
#define _avalon_form_settings_ui_h_
88

9-
#include "sysheaders.h"
9+
#include "../sysheaders.h"
1010

1111
/*!
1212
* \brief GUI формы настроек программы

‎form_source.cpp renamed to ‎src/forms/form_source.cpp

File renamed without changes.

‎form_source.h renamed to ‎src/forms/form_source.h

File renamed without changes.

‎form_source_ui.cpp renamed to ‎src/forms/form_source_ui.cpp

File renamed without changes.

‎form_source_ui.h renamed to ‎src/forms/form_source_ui.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef _avalon_form_source_ui_h_
77
#define _avalon_form_source_ui_h_
88

9-
#include "sysheaders.h"
9+
#include "../sysheaders.h"
1010

1111
/*!
1212
* \brief GUI формы просмотра сообщения в raw

‎form_subscribe.cpp renamed to ‎src/forms/form_subscribe.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#include "form_subscribe.h"
22
//----------------------------------------------------------------------------------------------
3-
#include "webservice.h"
3+
#include "../webservice.h"
4+
#include "../widgets/tree_widget_item.h"
5+
#include "../storage/storage_factory.h"
6+
//----------------------------------------------------------------------------------------------
47
#include "form_request.h"
5-
#include "tree_widget_item.h"
6-
#include "storage/storage_factory.h"
78
//----------------------------------------------------------------------------------------------
89
/*!
910
* \brief Элемент для дерева форумов с информацией о форуме

‎form_subscribe.h renamed to ‎src/forms/form_subscribe.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
#ifndef _avalon_form_subscribe_h_
77
#define _avalon_form_subscribe_h_
88

9-
#include "model/all.h"
9+
#include "../model/all.h"
10+
1011
#include "form_subscribe_ui.h"
1112

1213
/*!

‎form_subscribe_ui.cpp renamed to ‎src/forms/form_subscribe_ui.cpp

File renamed without changes.

‎form_subscribe_ui.h renamed to ‎src/forms/form_subscribe_ui.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef _avalon_form_subscribe_ui_h_
77
#define _avalon_form_subscribe_ui_h_
88

9-
#include "sysheaders.h"
9+
#include "../sysheaders.h"
1010

1111
/*!
1212
* \brief GUI формы подписки на форумы

‎iform_main.h renamed to ‎src/forms/iform_main.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef _avalon_iform_main_h_
77
#define _avalon_iform_main_h_
88

9-
#include "sysheaders.h"
9+
#include "../sysheaders.h"
1010

1111
/*!
1212
* \brief Перечисление действий/меню для включения отключения

‎global.cpp renamed to ‎src/global.cpp

File renamed without changes.

‎global.h renamed to ‎src/global.h

File renamed without changes.

‎icon_effect.cpp renamed to ‎src/icon_effect.cpp

File renamed without changes.

‎icon_effect.h renamed to ‎src/icon_effect.h

File renamed without changes.

‎icons/Main-Logo.icns renamed to ‎src/icons/Main-Logo.icns

File renamed without changes.

‎icons/Main-Logo.psd renamed to ‎src/icons/Main-Logo.psd

‎icons/backward24.png renamed to ‎src/icons/backward24.png

File renamed without changes.

‎icons/bold24.png renamed to ‎src/icons/bold24.png

File renamed without changes.

‎icons/char24.png renamed to ‎src/icons/char24.png

File renamed without changes.

‎icons/childunread.png renamed to ‎src/icons/childunread.png

File renamed without changes.

‎icons/code24.png renamed to ‎src/icons/code24.png

File renamed without changes.

‎icons/compress16.png renamed to ‎src/icons/compress16.png

File renamed without changes.

‎icons/compress24.png renamed to ‎src/icons/compress24.png

File renamed without changes.

‎icons/compress256.png renamed to ‎src/icons/compress256.png

File renamed without changes.

‎icons/compress32.png renamed to ‎src/icons/compress32.png

File renamed without changes.

‎icons/compress48.png renamed to ‎src/icons/compress48.png

File renamed without changes.

‎icons/copy16.png renamed to ‎src/icons/copy16.png

File renamed without changes.

‎icons/date128.png renamed to ‎src/icons/date128.png

File renamed without changes.

‎icons/date16.png renamed to ‎src/icons/date16.png

File renamed without changes.

‎icons/date22.png renamed to ‎src/icons/date22.png

File renamed without changes.

‎icons/date24.png renamed to ‎src/icons/date24.png

File renamed without changes.

‎icons/date32.png renamed to ‎src/icons/date32.png

File renamed without changes.

‎icons/date48.png renamed to ‎src/icons/date48.png

File renamed without changes.

‎icons/date64.png renamed to ‎src/icons/date64.png

File renamed without changes.

‎icons/delete16.png renamed to ‎src/icons/delete16.png

File renamed without changes.

‎icons/delete24.png renamed to ‎src/icons/delete24.png

File renamed without changes.

‎icons/download128.png renamed to ‎src/icons/download128.png

File renamed without changes.

‎icons/download16.png renamed to ‎src/icons/download16.png

File renamed without changes.

‎icons/download22.png renamed to ‎src/icons/download22.png

File renamed without changes.

‎icons/download24.png renamed to ‎src/icons/download24.png

File renamed without changes.

‎icons/download32.png renamed to ‎src/icons/download32.png

File renamed without changes.

‎icons/download48.png renamed to ‎src/icons/download48.png

File renamed without changes.

‎icons/download64.png renamed to ‎src/icons/download64.png

File renamed without changes.

‎icons/draft24.png renamed to ‎src/icons/draft24.png

File renamed without changes.

‎icons/edit16.png renamed to ‎src/icons/edit16.png

File renamed without changes.

‎icons/edit22.png renamed to ‎src/icons/edit22.png

File renamed without changes.

‎icons/edit32.png renamed to ‎src/icons/edit32.png

File renamed without changes.

‎icons/edit48.png renamed to ‎src/icons/edit48.png

File renamed without changes.

‎icons/edit64.png renamed to ‎src/icons/edit64.png

File renamed without changes.

‎icons/exit16.png renamed to ‎src/icons/exit16.png

File renamed without changes.

‎icons/forward24.png renamed to ‎src/icons/forward24.png

File renamed without changes.

‎icons/google.ico renamed to ‎src/icons/google.ico

File renamed without changes.

‎icons/google.translate.ico renamed to ‎src/icons/google.translate.ico

File renamed without changes.

‎icons/help16.png renamed to ‎src/icons/help16.png

File renamed without changes.

‎icons/hyperlink24.png renamed to ‎src/icons/hyperlink24.png

File renamed without changes.

‎icons/image24.png renamed to ‎src/icons/image24.png

File renamed without changes.

‎icons/italic24.png renamed to ‎src/icons/italic24.png

File renamed without changes.

‎icons/main.ico renamed to ‎src/icons/main.ico

File renamed without changes.

‎icons/main.png renamed to ‎src/icons/main.png

File renamed without changes.

‎icons/markallasread16.png renamed to ‎src/icons/markallasread16.png

File renamed without changes.

‎icons/markallasunread16.png renamed to ‎src/icons/markallasunread16.png

File renamed without changes.

‎icons/markpatrialasread16.png renamed to ‎src/icons/markpatrialasread16.png

File renamed without changes.

‎icons/markpatrialasunread16.png renamed to ‎src/icons/markpatrialasunread16.png

File renamed without changes.

‎icons/messageread.png renamed to ‎src/icons/messageread.png

File renamed without changes.

‎icons/messageunread.png renamed to ‎src/icons/messageunread.png

File renamed without changes.

‎icons/moderate.png renamed to ‎src/icons/moderate.png

File renamed without changes.

‎icons/myunread.png renamed to ‎src/icons/myunread.png

File renamed without changes.

‎icons/new128.png renamed to ‎src/icons/new128.png

File renamed without changes.

‎icons/new16.png renamed to ‎src/icons/new16.png

File renamed without changes.

‎icons/new22.png renamed to ‎src/icons/new22.png

File renamed without changes.

‎icons/new24.png renamed to ‎src/icons/new24.png

File renamed without changes.

‎icons/new32.png renamed to ‎src/icons/new32.png

File renamed without changes.

‎icons/new48.png renamed to ‎src/icons/new48.png

File renamed without changes.

‎icons/new64.png renamed to ‎src/icons/new64.png

File renamed without changes.

‎icons/nextunreadarticle16.png renamed to ‎src/icons/nextunreadarticle16.png

File renamed without changes.

‎icons/nextunreadarticle24.png renamed to ‎src/icons/nextunreadarticle24.png

File renamed without changes.

‎icons/nextunreadforum16.png renamed to ‎src/icons/nextunreadforum16.png

File renamed without changes.

‎icons/nextunreadforum24.png renamed to ‎src/icons/nextunreadforum24.png

File renamed without changes.

‎icons/nextunreadthread16.png renamed to ‎src/icons/nextunreadthread16.png

File renamed without changes.

‎icons/nextunreadthread24.png renamed to ‎src/icons/nextunreadthread24.png

File renamed without changes.

‎icons/open16.png renamed to ‎src/icons/open16.png

File renamed without changes.

‎icons/quote24.png renamed to ‎src/icons/quote24.png

File renamed without changes.

‎icons/rate_1.png renamed to ‎src/icons/rate_1.png

File renamed without changes.

‎icons/rate_2.png renamed to ‎src/icons/rate_2.png

File renamed without changes.

‎icons/rate_3.png renamed to ‎src/icons/rate_3.png

File renamed without changes.

‎icons/rate_cross.png renamed to ‎src/icons/rate_cross.png

File renamed without changes.

‎icons/rate_minus.png renamed to ‎src/icons/rate_minus.png

File renamed without changes.

‎icons/rate_plus.png renamed to ‎src/icons/rate_plus.png

File renamed without changes.

‎icons/rate_plus_1.png renamed to ‎src/icons/rate_plus_1.png

File renamed without changes.

‎icons/rate_smile.png renamed to ‎src/icons/rate_smile.png

File renamed without changes.

‎icons/reply16.png renamed to ‎src/icons/reply16.png

File renamed without changes.

‎icons/reply22.png renamed to ‎src/icons/reply22.png

File renamed without changes.

‎icons/reply32.png renamed to ‎src/icons/reply32.png

File renamed without changes.

‎icons/reply48.png renamed to ‎src/icons/reply48.png

File renamed without changes.

‎icons/rsdn16.png renamed to ‎src/icons/rsdn16.png

File renamed without changes.

‎icons/settings128.png renamed to ‎src/icons/settings128.png

File renamed without changes.

‎icons/settings16.png renamed to ‎src/icons/settings16.png

File renamed without changes.

‎icons/settings22.png renamed to ‎src/icons/settings22.png

File renamed without changes.

‎icons/settings24.png renamed to ‎src/icons/settings24.png

File renamed without changes.

‎icons/settings32.png renamed to ‎src/icons/settings32.png

File renamed without changes.

‎icons/settings48.png renamed to ‎src/icons/settings48.png

File renamed without changes.

‎icons/settings64.png renamed to ‎src/icons/settings64.png

File renamed without changes.

‎icons/show_topic.png renamed to ‎src/icons/show_topic.png

File renamed without changes.

‎icons/slovari.yandex.ico renamed to ‎src/icons/slovari.yandex.ico

File renamed without changes.

‎icons/smile24.png renamed to ‎src/icons/smile24.png

File renamed without changes.

‎icons/storage16.png renamed to ‎src/icons/storage16.png

File renamed without changes.

‎icons/subscribe16.png renamed to ‎src/icons/subscribe16.png

File renamed without changes.

‎icons/subscribe22.png renamed to ‎src/icons/subscribe22.png

File renamed without changes.

‎icons/subscribe32.png renamed to ‎src/icons/subscribe32.png

File renamed without changes.

‎icons/subscribe48.png renamed to ‎src/icons/subscribe48.png

File renamed without changes.

‎icons/subscribe64.png renamed to ‎src/icons/subscribe64.png

File renamed without changes.

‎icons/synchronize16.png renamed to ‎src/icons/synchronize16.png

File renamed without changes.

‎icons/synchronize24.png renamed to ‎src/icons/synchronize24.png

File renamed without changes.

‎icons/synchronize256.png renamed to ‎src/icons/synchronize256.png

File renamed without changes.

‎icons/synchronize32.png renamed to ‎src/icons/synchronize32.png

File renamed without changes.

‎icons/synchronize48.png renamed to ‎src/icons/synchronize48.png

File renamed without changes.

‎icons/unsubscribe16.png renamed to ‎src/icons/unsubscribe16.png

File renamed without changes.

‎icons/update16.png renamed to ‎src/icons/update16.png

File renamed without changes.

‎icons/viewsource16.png renamed to ‎src/icons/viewsource16.png

File renamed without changes.

‎icons/viewsource22.png renamed to ‎src/icons/viewsource22.png

File renamed without changes.

‎icons/viewsource32.png renamed to ‎src/icons/viewsource32.png

File renamed without changes.

‎icons/viewsource48.png renamed to ‎src/icons/viewsource48.png

File renamed without changes.

‎icons/viewsource64.png renamed to ‎src/icons/viewsource64.png

File renamed without changes.

‎icons/wikipedia.ico renamed to ‎src/icons/wikipedia.ico

File renamed without changes.

‎icons/yandex.ico renamed to ‎src/icons/yandex.ico

File renamed without changes.

‎interfaces.h renamed to ‎src/interfaces.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#ifndef _avalon_interfaces_h_
77
#define _avalon_interfaces_h_
88

9-
#include "iform_main.h"
10-
#include "iforum_tree.h"
11-
#include "imessage_tree.h"
12-
#include "imessage_view.h"
9+
#include "forms/iform_main.h"
10+
#include "widgets/iforum_tree.h"
11+
#include "widgets/imessage_tree.h"
12+
#include "widgets/imessage_view.h"
1313

1414
#endif

‎iprogress.h renamed to ‎src/iprogress.h

File renamed without changes.

‎main.cpp renamed to ‎src/main.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
* Точка входа
44
*/
55

6-
#include "form_main.h"
6+
#include "forms/form_main.h"
77
#include "global.h"
8-
#include <memory>
98

109
/*!
1110
* (no comments)

‎model/all.h renamed to ‎src/model/all.h

File renamed without changes.

‎model/commit.h renamed to ‎src/model/commit.h

File renamed without changes.

‎model/forum.h renamed to ‎src/model/forum.h

File renamed without changes.

‎model/forum_group.h renamed to ‎src/model/forum_group.h

File renamed without changes.

‎model/group.h renamed to ‎src/model/group.h

File renamed without changes.

‎model/message.h renamed to ‎src/model/message.h

File renamed without changes.

‎model/moderate.h renamed to ‎src/model/moderate.h

File renamed without changes.

‎model/rating.h renamed to ‎src/model/rating.h

File renamed without changes.

‎model/row_version.h renamed to ‎src/model/row_version.h

File renamed without changes.

‎model/user.h renamed to ‎src/model/user.h

File renamed without changes.

‎parser.cpp renamed to ‎src/parser.cpp

File renamed without changes.

‎parser.h renamed to ‎src/parser.h

File renamed without changes.

‎resource.qrc renamed to ‎src/resource.qrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152

153153
<file>icons/Main-Logo.icns</file>
154154

155-
<file>dev/avalon.sqlite.sql</file>
155+
<file>sql/avalon.sqlite.sql</file>
156156

157157
</qresource>
158158
</RCC>

‎resource.rc renamed to ‎src/resource.rc

File renamed without changes.

‎smiles/angel.png renamed to ‎src/smiles/angel.png

File renamed without changes.

‎smiles/angry.png renamed to ‎src/smiles/angry.png

File renamed without changes.

‎smiles/beer.png renamed to ‎src/smiles/beer.png

File renamed without changes.

‎smiles/biggrin.png renamed to ‎src/smiles/biggrin.png

File renamed without changes.

‎smiles/blink.png renamed to ‎src/smiles/blink.png

File renamed without changes.

‎smiles/blush.png renamed to ‎src/smiles/blush.png

File renamed without changes.

‎smiles/bomb.png renamed to ‎src/smiles/bomb.png

File renamed without changes.

‎smiles/cool.png renamed to ‎src/smiles/cool.png

File renamed without changes.

‎smiles/cry.png renamed to ‎src/smiles/cry.png

File renamed without changes.

‎smiles/devil.png renamed to ‎src/smiles/devil.png

File renamed without changes.

‎smiles/drool.png renamed to ‎src/smiles/drool.png

File renamed without changes.

‎smiles/getlost.png renamed to ‎src/smiles/getlost.png

File renamed without changes.

‎smiles/grin.png renamed to ‎src/smiles/grin.png

File renamed without changes.

‎smiles/happy.png renamed to ‎src/smiles/happy.png

File renamed without changes.

‎smiles/in_love.png renamed to ‎src/smiles/in_love.png

File renamed without changes.

‎smiles/kiss.png renamed to ‎src/smiles/kiss.png

File renamed without changes.

‎smiles/kissed.png renamed to ‎src/smiles/kissed.png

File renamed without changes.

‎smiles/kissing.png renamed to ‎src/smiles/kissing.png

File renamed without changes.

‎smiles/laughing.png renamed to ‎src/smiles/laughing.png

File renamed without changes.

‎smiles/music.png renamed to ‎src/smiles/music.png

File renamed without changes.

‎smiles/poo.png renamed to ‎src/smiles/poo.png

File renamed without changes.

‎smiles/pouty.png renamed to ‎src/smiles/pouty.png

File renamed without changes.

‎smiles/rolleyes.png renamed to ‎src/smiles/rolleyes.png

File renamed without changes.

‎smiles/rose.png renamed to ‎src/smiles/rose.png

File renamed without changes.

‎smiles/sad.png renamed to ‎src/smiles/sad.png

File renamed without changes.

‎smiles/shock.png renamed to ‎src/smiles/shock.png

File renamed without changes.

‎smiles/shocked.png renamed to ‎src/smiles/shocked.png

File renamed without changes.

‎smiles/shut_up.png renamed to ‎src/smiles/shut_up.png

File renamed without changes.

‎smiles/sick.png renamed to ‎src/smiles/sick.png

File renamed without changes.

‎smiles/sideways.png renamed to ‎src/smiles/sideways.png

File renamed without changes.

‎smiles/sleep.png renamed to ‎src/smiles/sleep.png

File renamed without changes.

‎smiles/smile.png renamed to ‎src/smiles/smile.png

File renamed without changes.

‎smiles/stop.png renamed to ‎src/smiles/stop.png

File renamed without changes.

‎smiles/teethy.png renamed to ‎src/smiles/teethy.png

File renamed without changes.

‎smiles/thumb_down.png renamed to ‎src/smiles/thumb_down.png

File renamed without changes.

‎smiles/thumbs_up.png renamed to ‎src/smiles/thumbs_up.png

File renamed without changes.

‎smiles/tired.png renamed to ‎src/smiles/tired.png

File renamed without changes.

‎smiles/tongue.png renamed to ‎src/smiles/tongue.png

File renamed without changes.

‎smiles/wacko.png renamed to ‎src/smiles/wacko.png

File renamed without changes.

‎smiles/wink.png renamed to ‎src/smiles/wink.png

File renamed without changes.

‎smiles/wrong.png renamed to ‎src/smiles/wrong.png

File renamed without changes.

‎spellchecker.cpp renamed to ‎src/spellchecker.cpp

File renamed without changes.

‎spellchecker.h renamed to ‎src/spellchecker.h

File renamed without changes.

‎dev/avalon.mysql.000.sql renamed to ‎src/sql/avalon.mysql.000.sql

File renamed without changes.

‎dev/avalon.mysql.sql renamed to ‎src/sql/avalon.mysql.sql

File renamed without changes.

‎dev/avalon.sqlite.sql renamed to ‎src/sql/avalon.sqlite.sql

File renamed without changes.

‎storage/database.cpp renamed to ‎src/storage/database.cpp

File renamed without changes.

‎storage/database.h renamed to ‎src/storage/database.h

File renamed without changes.

‎storage/database_error.cpp renamed to ‎src/storage/database_error.cpp

File renamed without changes.

‎storage/database_error.h renamed to ‎src/storage/database_error.h

File renamed without changes.

‎storage/istorage.h renamed to ‎src/storage/istorage.h

File renamed without changes.

‎storage/mysql_database.cpp renamed to ‎src/storage/mysql_database.cpp

File renamed without changes.

‎storage/mysql_database.h renamed to ‎src/storage/mysql_database.h

File renamed without changes.

‎storage/mysql_storage.cpp renamed to ‎src/storage/mysql_storage.cpp

File renamed without changes.

‎storage/mysql_storage.h renamed to ‎src/storage/mysql_storage.h

File renamed without changes.

‎storage/query.cpp renamed to ‎src/storage/query.cpp

File renamed without changes.

‎storage/query.h renamed to ‎src/storage/query.h

File renamed without changes.

‎storage/sqlite_database.cpp renamed to ‎src/storage/sqlite_database.cpp

File renamed without changes.

‎storage/sqlite_database.h renamed to ‎src/storage/sqlite_database.h

File renamed without changes.

‎storage/sqlite_storage.cpp renamed to ‎src/storage/sqlite_storage.cpp

File renamed without changes.

‎storage/sqlite_storage.h renamed to ‎src/storage/sqlite_storage.h

File renamed without changes.

‎storage/storage_factory.cpp renamed to ‎src/storage/storage_factory.cpp

File renamed without changes.

‎storage/storage_factory.h renamed to ‎src/storage/storage_factory.h

File renamed without changes.

‎sysheaders.h renamed to ‎src/sysheaders.h

File renamed without changes.

‎translations/qt_ru_RU.qm renamed to ‎src/translations/qt_ru_RU.qm

File renamed without changes.

‎version.cpp renamed to ‎src/version.cpp

File renamed without changes.

‎version.h renamed to ‎src/version.h

File renamed without changes.

‎webservice.cpp renamed to ‎src/webservice.cpp

File renamed without changes.

‎webservice.h renamed to ‎src/webservice.h

File renamed without changes.

‎forum_tree.cpp renamed to ‎src/widgets/forum_tree.cpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
#include "forum_tree.h"
22
//----------------------------------------------------------------------------------------------
3-
#include "global.h"
4-
#include "model/all.h"
5-
#include "form_date.h"
6-
#include "icon_effect.h"
7-
#include "form_message.h"
3+
#include "../global.h"
4+
#include "../model/all.h"
5+
#include "../icon_effect.h"
6+
#include "../forms/form_date.h"
7+
#include "../forms/form_message.h"
8+
#include "../storage/storage_factory.h"
9+
//----------------------------------------------------------------------------------------------
810
#include "tree_widget_item.h"
9-
#include "storage/storage_factory.h"
1011
//----------------------------------------------------------------------------------------------
1112
/*!
1213
* \brief Элемент для дерева группы форумов с информацией о группе

‎forum_tree.h renamed to ‎src/widgets/forum_tree.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef _avalon_forum_tree_h_
77
#define _avalon_forum_tree_h_
88

9-
#include "interfaces.h"
9+
#include "../interfaces.h"
1010

1111
/*!
1212
* \brief Виджет дерева форумов

‎iforum_tree.h renamed to ‎src/widgets/iforum_tree.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef _avalon_iforum_tree_h_
77
#define _avalon_iforum_tree_h_
88

9-
#include "sysheaders.h"
9+
#include "../sysheaders.h"
1010

1111
/*!
1212
* \brief Интерфейс для работы с деревом форумов

‎imessage_tree.h renamed to ‎src/widgets/imessage_tree.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef _avalon_imessage_tree_h_
77
#define _avalon_imessage_tree_h_
88

9-
#include "model/all.h"
9+
#include "../model/all.h"
1010

1111
/*!
1212
* \brief Интерфейс для работы с деревом сообщений

‎imessage_view.h renamed to ‎src/widgets/imessage_view.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef _avalon_imessage_view_h_
77
#define _avalon_imessage_view_h_
88

9-
#include "model/all.h"
9+
#include "../model/all.h"
1010

1111
/*!
1212
* \brief Интерфейс для работы с областью отображения HTML сообщения извне

‎message_tree.cpp renamed to ‎src/widgets/message_tree.cpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
#include "message_tree.h"
22
//----------------------------------------------------------------------------------------------
3-
#include "global.h"
4-
#include "form_source.h"
5-
#include "icon_effect.h"
6-
#include "form_message.h"
7-
#include "form_moderate.h"
3+
#include "../global.h"
4+
#include "../icon_effect.h"
5+
#include "../forms/form_source.h"
6+
#include "../forms/form_message.h"
7+
#include "../forms/form_moderate.h"
8+
#include "../storage/storage_factory.h"
9+
//----------------------------------------------------------------------------------------------
810
#include "tree_widget_item.h"
9-
#include "storage/storage_factory.h"
1011
//----------------------------------------------------------------------------------------------
1112
/*!
1213
* \brief Максимальная длина истории для навигации Вперед / Назад

‎message_tree.h renamed to ‎src/widgets/message_tree.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef _avalon_message_tree_h_
77
#define _avalon_message_tree_h_
88

9-
#include "interfaces.h"
9+
#include "../interfaces.h"
1010

1111
/*!
1212
* \brief Виджет дерева сообщений

0 commit comments

Comments
 (0)