From e84731379dcabb6324317c8d9cbc960d33d4a70e Mon Sep 17 00:00:00 2001
From: Nathan Osman <nathan@quickmediasolutions.com>
Date: Sat, 13 Jun 2015 22:16:32 -0700
Subject: [PATCH] Moved the handler classes to a separate directory.

---
 src/CMakeLists.txt                    | 8 ++++----
 src/{ => handler}/qhttphandler.cpp    | 0
 src/{ => handler}/qhttphandler.h      | 0
 src/{ => handler}/qhttpsubhandler.cpp | 0
 src/{ => handler}/qhttpsubhandler.h   | 0
 src/{ => handler}/qhttpsubhandler_p.h | 0
 tests/TestQHttpSubHandler.cpp         | 8 ++++----
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename src/{ => handler}/qhttphandler.cpp (100%)
 rename src/{ => handler}/qhttphandler.h (100%)
 rename src/{ => handler}/qhttpsubhandler.cpp (100%)
 rename src/{ => handler}/qhttpsubhandler.h (100%)
 rename src/{ => handler}/qhttpsubhandler_p.h (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 196639c..7578518 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,20 +3,20 @@ configure_file(qhttpengine.pc.in "${CMAKE_CURRENT_BINARY_DIR}/qhttpengine.pc" @O
 
 set(INCLUDE
     "${CMAKE_CURRENT_BINARY_DIR}/config.h"
+    handler/qhttphandler.h
+    handler/qhttpsubhandler.h
     qhttpengine.h
-    qhttphandler.h
     qhttpserver.h
     qhttpsocket.h
-    qhttpsubhandler.h
     qiodevicecopier.h
 )
 
 set(SRC
+    handler/qhttphandler.cpp
+    handler/qhttpsubhandler.cpp
     qhttpengine.cpp
-    qhttphandler.cpp
     qhttpserver.cpp
     qhttpsocket.cpp
-    qhttpsubhandler.cpp
     qiodevicecopier.cpp
 )
 
diff --git a/src/qhttphandler.cpp b/src/handler/qhttphandler.cpp
similarity index 100%
rename from src/qhttphandler.cpp
rename to src/handler/qhttphandler.cpp
diff --git a/src/qhttphandler.h b/src/handler/qhttphandler.h
similarity index 100%
rename from src/qhttphandler.h
rename to src/handler/qhttphandler.h
diff --git a/src/qhttpsubhandler.cpp b/src/handler/qhttpsubhandler.cpp
similarity index 100%
rename from src/qhttpsubhandler.cpp
rename to src/handler/qhttpsubhandler.cpp
diff --git a/src/qhttpsubhandler.h b/src/handler/qhttpsubhandler.h
similarity index 100%
rename from src/qhttpsubhandler.h
rename to src/handler/qhttpsubhandler.h
diff --git a/src/qhttpsubhandler_p.h b/src/handler/qhttpsubhandler_p.h
similarity index 100%
rename from src/qhttpsubhandler_p.h
rename to src/handler/qhttpsubhandler_p.h
diff --git a/tests/TestQHttpSubHandler.cpp b/tests/TestQHttpSubHandler.cpp
index 4ed8815..a2a4bcb 100644
--- a/tests/TestQHttpSubHandler.cpp
+++ b/tests/TestQHttpSubHandler.cpp
@@ -25,7 +25,7 @@
 #include <QRegExp>
 #include <QTest>
 
-#include "qhttpsubhandler.h"
+#include "handler/qhttpsubhandler.h"
 
 class DummyHandler : public QHttpHandler
 {
@@ -59,14 +59,14 @@ void TestQHttpSubHandler::testPatterns_data()
     QTest::addColumn<bool>("match");
 
     QTest::newRow("success")
-            << QRegExp("test")
+            << QRegExp("\\w+")
             << QString("test")
             << QString("")
             << true;
 
     QTest::newRow("failure")
-            << QRegExp("test")
-            << QString("fail")
+            << QRegExp("\\d+")
+            << QString("test")
             << QString("")
             << false;