Browse Source

refactor(core): rename corestructs to toxfile.cpp

It only contains this struct now.
pull/4770/head
sudden6 8 years ago
parent
commit
1dce8f6468
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
  1. 4
      CMakeLists.txt
  2. 2
      src/chatlog/chatmessage.h
  3. 2
      src/chatlog/content/filetransferwidget.h
  4. 2
      src/core/core.h
  5. 2
      src/core/corefile.cpp
  6. 2
      src/core/corefile.h
  7. 2
      src/core/toxfile.cpp
  8. 0
      src/core/toxfile.h
  9. 2
      src/model/friend.h
  10. 2
      src/persistence/settings.cpp
  11. 2
      src/persistence/settings.h
  12. 2
      src/widget/categorywidget.h
  13. 1
      src/widget/contentdialog.h
  14. 2
      src/widget/form/chatform.h
  15. 2
      src/widget/friendlistlayout.h
  16. 2
      src/widget/friendlistwidget.h
  17. 3
      src/widget/widget.h

4
CMakeLists.txt

@ -231,8 +231,6 @@ set(${PROJECT_NAME}_SOURCES
src/core/corefile.cpp src/core/corefile.cpp
src/core/corefile.h src/core/corefile.h
src/core/core.h src/core/core.h
src/core/corestructs.cpp
src/core/corestructs.h
src/core/dhtserver.cpp src/core/dhtserver.cpp
src/core/dhtserver.h src/core/dhtserver.h
src/core/icoresettings.h src/core/icoresettings.h
@ -242,6 +240,8 @@ set(${PROJECT_NAME}_SOURCES
src/core/toxcall.h src/core/toxcall.h
src/core/toxencrypt.cpp src/core/toxencrypt.cpp
src/core/toxencrypt.h src/core/toxencrypt.h
src/core/toxfile.cpp
src/core/toxfile.h
src/core/toxid.cpp src/core/toxid.cpp
src/core/toxid.h src/core/toxid.h
src/core/toxpk.cpp src/core/toxpk.cpp

2
src/chatlog/chatmessage.h

@ -21,7 +21,7 @@
#define CHATMESSAGE_H #define CHATMESSAGE_H
#include "chatline.h" #include "chatline.h"
#include "src/core/corestructs.h" #include "src/core/toxfile.h"
#include <QDateTime> #include <QDateTime>
class QGraphicsScene; class QGraphicsScene;

2
src/chatlog/content/filetransferwidget.h

@ -24,7 +24,7 @@
#include <QWidget> #include <QWidget>
#include "src/chatlog/chatlinecontent.h" #include "src/chatlog/chatlinecontent.h"
#include "src/core/corestructs.h" #include "src/core/toxfile.h"
namespace Ui { namespace Ui {

2
src/core/core.h

@ -21,7 +21,7 @@
#ifndef CORE_HPP #ifndef CORE_HPP
#define CORE_HPP #define CORE_HPP
#include "corestructs.h" #include "toxfile.h"
#include "toxid.h" #include "toxid.h"
#include <tox/tox.h> #include <tox/tox.h>

2
src/core/corefile.cpp

@ -20,7 +20,7 @@
#include "core.h" #include "core.h"
#include "corefile.h" #include "corefile.h"
#include "corestructs.h" #include "toxfile.h"
#include "src/persistence/profile.h" #include "src/persistence/profile.h"
#include "src/persistence/settings.h" #include "src/persistence/settings.h"
#include <QDebug> #include <QDebug>

2
src/core/corefile.h

@ -26,7 +26,7 @@
#include <memory> #include <memory>
#include <tox/tox.h> #include <tox/tox.h>
#include "corestructs.h" #include "toxfile.h"
#include <QHash> #include <QHash>
#include <QMutex> #include <QMutex>

2
src/core/corestructs.cpp → src/core/toxfile.cpp

@ -1,4 +1,4 @@
#include "src/core/corestructs.h" #include "src/core/toxfile.h"
#include "src/core/core.h" #include "src/core/core.h"
#include <QFile> #include <QFile>
#include <QRegularExpression> #include <QRegularExpression>

0
src/core/corestructs.h → src/core/toxfile.h

2
src/model/friend.h

@ -21,8 +21,8 @@
#define FRIEND_H #define FRIEND_H
#include "contact.h" #include "contact.h"
#include "src/core/core.h"
#include "src/core/toxid.h" #include "src/core/toxid.h"
#include "src/core/corestructs.h"
#include <QObject> #include <QObject>
#include <QString> #include <QString>

2
src/persistence/settings.cpp

@ -20,7 +20,7 @@
#include "settings.h" #include "settings.h"
#include "src/core/core.h" #include "src/core/core.h"
#include "src/core/corestructs.h" #include "src/core/corefile.h"
#include "src/nexus.h" #include "src/nexus.h"
#include "src/persistence/profile.h" #include "src/persistence/profile.h"
#include "src/persistence/profilelocker.h" #include "src/persistence/profilelocker.h"

2
src/persistence/settings.h

@ -21,9 +21,9 @@
#ifndef SETTINGS_HPP #ifndef SETTINGS_HPP
#define SETTINGS_HPP #define SETTINGS_HPP
#include "src/core/corestructs.h"
#include "src/core/icoresettings.h" #include "src/core/icoresettings.h"
#include "src/core/toxencrypt.h" #include "src/core/toxencrypt.h"
#include "src/core/toxfile.h"
#include <QDate> #include <QDate>
#include <QFlags> #include <QFlags>

2
src/widget/categorywidget.h

@ -21,7 +21,7 @@
#define CATEGORYWIDGET_H #define CATEGORYWIDGET_H
#include "genericchatitemwidget.h" #include "genericchatitemwidget.h"
#include "src/core/corestructs.h" #include "src/core/core.h"
class FriendListLayout; class FriendListLayout;
class FriendListWidget; class FriendListWidget;

1
src/widget/contentdialog.h

@ -22,7 +22,6 @@
#include <tuple> #include <tuple>
#include "src/core/corestructs.h"
#include "src/widget/genericchatitemlayout.h" #include "src/widget/genericchatitemlayout.h"
#include "src/widget/tool/activatedialog.h" #include "src/widget/tool/activatedialog.h"

2
src/widget/form/chatform.h

@ -26,7 +26,7 @@
#include <QTimer> #include <QTimer>
#include "genericchatform.h" #include "genericchatform.h"
#include "src/core/corestructs.h" #include "src/core/core.h"
#include "src/persistence/history.h" #include "src/persistence/history.h"
#include "src/widget/tool/screenshotgrabber.h" #include "src/widget/tool/screenshotgrabber.h"

2
src/widget/friendlistlayout.h

@ -16,7 +16,7 @@
#define FRIENDLISTLAYOUT_H #define FRIENDLISTLAYOUT_H
#include "genericchatitemlayout.h" #include "genericchatitemlayout.h"
#include "src/core/corestructs.h" #include "src/core/core.h"
#include <QBoxLayout> #include <QBoxLayout>
class FriendWidget; class FriendWidget;

2
src/widget/friendlistwidget.h

@ -21,7 +21,7 @@
#define FRIENDLISTWIDGET_H #define FRIENDLISTWIDGET_H
#include "genericchatitemlayout.h" #include "genericchatitemlayout.h"
#include "src/core/corestructs.h" #include "src/core/core.h"
#include <QWidget> #include <QWidget>
class QVBoxLayout; class QVBoxLayout;

3
src/widget/widget.h

@ -29,7 +29,8 @@
#include "genericchatitemwidget.h" #include "genericchatitemwidget.h"
#include "src/core/corestructs.h" #include "src/core/core.h"
#include "src/core/toxfile.h"
#include "src/core/toxid.h" #include "src/core/toxid.h"
#define PIXELS_TO_ACT 7 #define PIXELS_TO_ACT 7

Loading…
Cancel
Save