From eee6e97fda7f93fa221c3fde71b6c71e1c540197 Mon Sep 17 00:00:00 2001 From: Alex Hultman Date: Sat, 15 Sep 2018 05:04:34 +0200 Subject: [PATCH] Move files around --- 15.pro | 22 +++++++++++----------- main.cpp | 4 ++-- src/{new_design => }/AsyncSocket.h | 0 src/{new_design => }/AsyncSocketData.h | 0 src/{new_design => }/HttpContext.h | 0 src/{new_design => }/HttpContextData.h | 0 src/{new_design => }/HttpParser.h | 0 src/{new_design => }/HttpResponse.h | 0 src/{new_design => }/HttpResponseData.h | 0 src/{new_design => }/HttpRouter.h | 0 src/{new_design => }/Loop.h | 0 src/{new_design => }/LoopData.h | 0 src/{new_design => }/StaticDispatch.h | 0 13 files changed, 13 insertions(+), 13 deletions(-) rename src/{new_design => }/AsyncSocket.h (100%) rename src/{new_design => }/AsyncSocketData.h (100%) rename src/{new_design => }/HttpContext.h (100%) rename src/{new_design => }/HttpContextData.h (100%) rename src/{new_design => }/HttpParser.h (100%) rename src/{new_design => }/HttpResponse.h (100%) rename src/{new_design => }/HttpResponseData.h (100%) rename src/{new_design => }/HttpRouter.h (100%) rename src/{new_design => }/Loop.h (100%) rename src/{new_design => }/LoopData.h (100%) rename src/{new_design => }/StaticDispatch.h (100%) diff --git a/15.pro b/15.pro index db172d1..a941946 100644 --- a/15.pro +++ b/15.pro @@ -13,21 +13,21 @@ SOURCES += \ uSockets/src/loop.c HEADERS += \ - src/new_design/HttpRouter.h \ - src/new_design/HttpParser.h \ + src/HttpRouter.h \ + src/HttpParser.h \ src/websocket/libwshandshake.hpp \ src/websocket/WebSocketProtocol.h \ src/websocket/WebSocket.h \ src/websocket/WebSocketApp.h \ - src/new_design/HttpContext.h \ - src/new_design/HttpContextData.h \ - src/new_design/HttpResponseData.h \ - src/new_design/HttpResponse.h \ - src/new_design/StaticDispatch.h \ - src/new_design/LoopData.h \ - src/new_design/AsyncSocket.h \ - src/new_design/AsyncSocketData.h \ - src/new_design/Loop.h + src/HttpContext.h \ + src/HttpContextData.h \ + src/HttpResponseData.h \ + src/HttpResponse.h \ + src/StaticDispatch.h \ + src/LoopData.h \ + src/AsyncSocket.h \ + src/AsyncSocketData.h \ + src/Loop.h INCLUDEPATH += uSockets/src src QMAKE_CXXFLAGS += -fsanitize=address diff --git a/main.cpp b/main.cpp index c3f8eca..e4f322e 100644 --- a/main.cpp +++ b/main.cpp @@ -45,8 +45,8 @@ std::string_view getFile(std::string_view file) { } } -#include "new_design/HttpContext.h" -#include "new_design/HttpResponse.h" +#include "HttpContext.h" +#include "HttpResponse.h" int main(int argc, char **argv) { diff --git a/src/new_design/AsyncSocket.h b/src/AsyncSocket.h similarity index 100% rename from src/new_design/AsyncSocket.h rename to src/AsyncSocket.h diff --git a/src/new_design/AsyncSocketData.h b/src/AsyncSocketData.h similarity index 100% rename from src/new_design/AsyncSocketData.h rename to src/AsyncSocketData.h diff --git a/src/new_design/HttpContext.h b/src/HttpContext.h similarity index 100% rename from src/new_design/HttpContext.h rename to src/HttpContext.h diff --git a/src/new_design/HttpContextData.h b/src/HttpContextData.h similarity index 100% rename from src/new_design/HttpContextData.h rename to src/HttpContextData.h diff --git a/src/new_design/HttpParser.h b/src/HttpParser.h similarity index 100% rename from src/new_design/HttpParser.h rename to src/HttpParser.h diff --git a/src/new_design/HttpResponse.h b/src/HttpResponse.h similarity index 100% rename from src/new_design/HttpResponse.h rename to src/HttpResponse.h diff --git a/src/new_design/HttpResponseData.h b/src/HttpResponseData.h similarity index 100% rename from src/new_design/HttpResponseData.h rename to src/HttpResponseData.h diff --git a/src/new_design/HttpRouter.h b/src/HttpRouter.h similarity index 100% rename from src/new_design/HttpRouter.h rename to src/HttpRouter.h diff --git a/src/new_design/Loop.h b/src/Loop.h similarity index 100% rename from src/new_design/Loop.h rename to src/Loop.h diff --git a/src/new_design/LoopData.h b/src/LoopData.h similarity index 100% rename from src/new_design/LoopData.h rename to src/LoopData.h diff --git a/src/new_design/StaticDispatch.h b/src/StaticDispatch.h similarity index 100% rename from src/new_design/StaticDispatch.h rename to src/StaticDispatch.h