Rename server.* to something less generic to facilitate use as a sub-module.

Should probably do this for the rest of the files as well.

7 files changed, 6 insertions, 6 deletions

diff --git a/src/eventqueue.h b/src/eventqueue.h
index 76680bb..d54dadf 100755
--- a/src/eventqueue.h
+++ b/src/eventqueue.h
@@ -3,7 +3,7 @@
 
 #include <QtGui>
 #include <json.h>
-#include "server.h"
+#include "webclientserver.h"
 
 struct EventEntry
 {
diff --git a/src/multiuserserver.cpp b/src/multiuserserver.cpp
index cb2010a..198b323 100755
--- a/src/multiuserserver.cpp
+++ b/src/multiuserserver.cpp
@@ -2,7 +2,7 @@
 
 #include <json.h>
 #include <eventqueue.h>
-#include <server.h>
+#include <webclientserver.h>
 
 SessionServer::SessionServer(QWidget *widget, Session *session)
 {
diff --git a/src/multiuserserver.h b/src/multiuserserver.h
index 4095c19..996381b 100755
--- a/src/multiuserserver.h
+++ b/src/multiuserserver.h
@@ -2,7 +2,7 @@
 #define MULTIUSER_H
 
 #include <QtGui>
-#include <server.h>
+#include <webclientserver.h>
 #include <widgeteventhandler.h>
 
 class SessionServer : public FileServer
diff --git a/src/singleuserserver.cpp b/src/singleuserserver.cpp
index 6186618..e8f545e 100755
--- a/src/singleuserserver.cpp
+++ b/src/singleuserserver.cpp
@@ -2,7 +2,7 @@
 
 #include <json.h>
 #include <eventqueue.h>
-#include <server.h>
+#include <webclientserver.h>
 
 void SingleUserServer::setRootWidget(QWidget *widget)
 {
diff --git a/src/singleuserserver.h b/src/singleuserserver.h
index 5f6a450..65a35eb 100755
--- a/src/singleuserserver.h
+++ b/src/singleuserserver.h
@@ -2,7 +2,7 @@
 #define SINGLEUSER_H
 
 #include <QtGui>
-#include <server.h>
+#include <webclientserver.h>
 #include <widgeteventhandler.h>
 
 class SingleUserServer : public FileServer
diff --git a/src/server.cpp b/src/webclientserver.cpp
index d806284..d8c2de5 100755
--- a/src/server.cpp
+++ b/src/webclientserver.cpp
@@ -1,4 +1,4 @@
-#include "server.h"
+#include "webclientserver.h"
 #include <time.h>
 
 HttpRequest::HttpRequest()
diff --git a/src/server.h b/src/webclientserver.h
index 353753e..353753e 100755
--- a/src/server.h
+++ b/src/webclientserver.h