From 1dce8f6468bdba2a41388b8ea582cce6118cd0cb Mon Sep 17 00:00:00 2001 From: sudden6 Date: Fri, 27 Oct 2017 14:02:43 +0200 Subject: [PATCH] refactor(core): rename corestructs to toxfile.cpp It only contains this struct now. --- CMakeLists.txt | 4 ++-- src/chatlog/chatmessage.h | 2 +- src/chatlog/content/filetransferwidget.h | 2 +- src/core/core.h | 2 +- src/core/corefile.cpp | 2 +- src/core/corefile.h | 2 +- src/core/{corestructs.cpp => toxfile.cpp} | 2 +- src/core/{corestructs.h => toxfile.h} | 0 src/model/friend.h | 2 +- src/persistence/settings.cpp | 2 +- src/persistence/settings.h | 2 +- src/widget/categorywidget.h | 2 +- src/widget/contentdialog.h | 1 - src/widget/form/chatform.h | 2 +- src/widget/friendlistlayout.h | 2 +- src/widget/friendlistwidget.h | 2 +- src/widget/widget.h | 3 ++- 17 files changed, 17 insertions(+), 17 deletions(-) rename src/core/{corestructs.cpp => toxfile.cpp} (97%) rename src/core/{corestructs.h => toxfile.h} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0436805bb..90c68121b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -231,8 +231,6 @@ set(${PROJECT_NAME}_SOURCES src/core/corefile.cpp src/core/corefile.h src/core/core.h - src/core/corestructs.cpp - src/core/corestructs.h src/core/dhtserver.cpp src/core/dhtserver.h src/core/icoresettings.h @@ -242,6 +240,8 @@ set(${PROJECT_NAME}_SOURCES src/core/toxcall.h src/core/toxencrypt.cpp src/core/toxencrypt.h + src/core/toxfile.cpp + src/core/toxfile.h src/core/toxid.cpp src/core/toxid.h src/core/toxpk.cpp diff --git a/src/chatlog/chatmessage.h b/src/chatlog/chatmessage.h index 9de05e224..faada03ac 100644 --- a/src/chatlog/chatmessage.h +++ b/src/chatlog/chatmessage.h @@ -21,7 +21,7 @@ #define CHATMESSAGE_H #include "chatline.h" -#include "src/core/corestructs.h" +#include "src/core/toxfile.h" #include class QGraphicsScene; diff --git a/src/chatlog/content/filetransferwidget.h b/src/chatlog/content/filetransferwidget.h index 882c5b9f5..ac9765dab 100644 --- a/src/chatlog/content/filetransferwidget.h +++ b/src/chatlog/content/filetransferwidget.h @@ -24,7 +24,7 @@ #include #include "src/chatlog/chatlinecontent.h" -#include "src/core/corestructs.h" +#include "src/core/toxfile.h" namespace Ui { diff --git a/src/core/core.h b/src/core/core.h index ab5a17c8a..fedb44cce 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -21,7 +21,7 @@ #ifndef CORE_HPP #define CORE_HPP -#include "corestructs.h" +#include "toxfile.h" #include "toxid.h" #include diff --git a/src/core/corefile.cpp b/src/core/corefile.cpp index 64d0e1002..a678a99a7 100644 --- a/src/core/corefile.cpp +++ b/src/core/corefile.cpp @@ -20,7 +20,7 @@ #include "core.h" #include "corefile.h" -#include "corestructs.h" +#include "toxfile.h" #include "src/persistence/profile.h" #include "src/persistence/settings.h" #include diff --git a/src/core/corefile.h b/src/core/corefile.h index 074bac57e..e30d8ef77 100644 --- a/src/core/corefile.h +++ b/src/core/corefile.h @@ -26,7 +26,7 @@ #include #include -#include "corestructs.h" +#include "toxfile.h" #include #include diff --git a/src/core/corestructs.cpp b/src/core/toxfile.cpp similarity index 97% rename from src/core/corestructs.cpp rename to src/core/toxfile.cpp index d414ef66f..c9288e3ea 100644 --- a/src/core/corestructs.cpp +++ b/src/core/toxfile.cpp @@ -1,4 +1,4 @@ -#include "src/core/corestructs.h" +#include "src/core/toxfile.h" #include "src/core/core.h" #include #include diff --git a/src/core/corestructs.h b/src/core/toxfile.h similarity index 100% rename from src/core/corestructs.h rename to src/core/toxfile.h diff --git a/src/model/friend.h b/src/model/friend.h index f90037475..e9921df38 100644 --- a/src/model/friend.h +++ b/src/model/friend.h @@ -21,8 +21,8 @@ #define FRIEND_H #include "contact.h" +#include "src/core/core.h" #include "src/core/toxid.h" -#include "src/core/corestructs.h" #include #include diff --git a/src/persistence/settings.cpp b/src/persistence/settings.cpp index 14840b80c..6c09da13f 100644 --- a/src/persistence/settings.cpp +++ b/src/persistence/settings.cpp @@ -20,7 +20,7 @@ #include "settings.h" #include "src/core/core.h" -#include "src/core/corestructs.h" +#include "src/core/corefile.h" #include "src/nexus.h" #include "src/persistence/profile.h" #include "src/persistence/profilelocker.h" diff --git a/src/persistence/settings.h b/src/persistence/settings.h index c191a2541..8d0ab8d62 100644 --- a/src/persistence/settings.h +++ b/src/persistence/settings.h @@ -21,9 +21,9 @@ #ifndef SETTINGS_HPP #define SETTINGS_HPP -#include "src/core/corestructs.h" #include "src/core/icoresettings.h" #include "src/core/toxencrypt.h" +#include "src/core/toxfile.h" #include #include diff --git a/src/widget/categorywidget.h b/src/widget/categorywidget.h index 226ef4a62..e33632e55 100644 --- a/src/widget/categorywidget.h +++ b/src/widget/categorywidget.h @@ -21,7 +21,7 @@ #define CATEGORYWIDGET_H #include "genericchatitemwidget.h" -#include "src/core/corestructs.h" +#include "src/core/core.h" class FriendListLayout; class FriendListWidget; diff --git a/src/widget/contentdialog.h b/src/widget/contentdialog.h index 711689be1..187c112dc 100644 --- a/src/widget/contentdialog.h +++ b/src/widget/contentdialog.h @@ -22,7 +22,6 @@ #include -#include "src/core/corestructs.h" #include "src/widget/genericchatitemlayout.h" #include "src/widget/tool/activatedialog.h" diff --git a/src/widget/form/chatform.h b/src/widget/form/chatform.h index c9494c169..cf69f1a4d 100644 --- a/src/widget/form/chatform.h +++ b/src/widget/form/chatform.h @@ -26,7 +26,7 @@ #include #include "genericchatform.h" -#include "src/core/corestructs.h" +#include "src/core/core.h" #include "src/persistence/history.h" #include "src/widget/tool/screenshotgrabber.h" diff --git a/src/widget/friendlistlayout.h b/src/widget/friendlistlayout.h index e7da6e7d9..28b12c04b 100644 --- a/src/widget/friendlistlayout.h +++ b/src/widget/friendlistlayout.h @@ -16,7 +16,7 @@ #define FRIENDLISTLAYOUT_H #include "genericchatitemlayout.h" -#include "src/core/corestructs.h" +#include "src/core/core.h" #include class FriendWidget; diff --git a/src/widget/friendlistwidget.h b/src/widget/friendlistwidget.h index 973f24385..4d4042914 100644 --- a/src/widget/friendlistwidget.h +++ b/src/widget/friendlistwidget.h @@ -21,7 +21,7 @@ #define FRIENDLISTWIDGET_H #include "genericchatitemlayout.h" -#include "src/core/corestructs.h" +#include "src/core/core.h" #include class QVBoxLayout; diff --git a/src/widget/widget.h b/src/widget/widget.h index 7d3c11f18..6a20d6bb2 100644 --- a/src/widget/widget.h +++ b/src/widget/widget.h @@ -29,7 +29,8 @@ #include "genericchatitemwidget.h" -#include "src/core/corestructs.h" +#include "src/core/core.h" +#include "src/core/toxfile.h" #include "src/core/toxid.h" #define PIXELS_TO_ACT 7