summaryrefslogtreecommitdiff
path: root/src/client/requestbroker
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-05-17 16:44:25 (GMT)
committer jacob1 <jfu614@gmail.com>2013-05-17 16:44:25 (GMT)
commit981f6984c2c0f87d54a9c90f4518c69c9ef02ae0 (patch)
tree757bd699a23c1fad61e60700265a25feb1a3042c /src/client/requestbroker
parentcbd402d8cb6aa699ffde83a1b5b3c2f4fc51baaf (diff)
parent77bf649fb4482c86ac1fd9b3233f062b53226007 (diff)
downloadpowder-981f6984c2c0f87d54a9c90f4518c69c9ef02ae0.zip
powder-981f6984c2c0f87d54a9c90f4518c69c9ef02ae0.tar.gz
Merge branch 'HEAD' of git@github.com:FacialTurd/The-Powder-Toy.git
Diffstat (limited to 'src/client/requestbroker')
-rw-r--r--src/client/requestbroker/APIRequest.cpp2
-rw-r--r--src/client/requestbroker/APIResultParser.h2
-rw-r--r--src/client/requestbroker/ImageRequest.cpp2
-rw-r--r--src/client/requestbroker/ImageRequest.h2
-rw-r--r--src/client/requestbroker/RequestBroker.cpp2
-rw-r--r--src/client/requestbroker/RequestBroker.h2
-rw-r--r--src/client/requestbroker/ThumbRenderRequest.cpp2
7 files changed, 7 insertions, 7 deletions
diff --git a/src/client/requestbroker/APIRequest.cpp b/src/client/requestbroker/APIRequest.cpp
index d94171e..10b2a8b 100644
--- a/src/client/requestbroker/APIRequest.cpp
+++ b/src/client/requestbroker/APIRequest.cpp
@@ -134,4 +134,4 @@ void APIRequest::Cleanup()
Parser->Cleanup(ResultObject);
ResultObject = NULL;
}
-} \ No newline at end of file
+}
diff --git a/src/client/requestbroker/APIResultParser.h b/src/client/requestbroker/APIResultParser.h
index 40c7512..aadfbfb 100644
--- a/src/client/requestbroker/APIResultParser.h
+++ b/src/client/requestbroker/APIResultParser.h
@@ -13,4 +13,4 @@ public:
virtual ~APIResultParser() { }
};
-#endif \ No newline at end of file
+#endif
diff --git a/src/client/requestbroker/ImageRequest.cpp b/src/client/requestbroker/ImageRequest.cpp
index 778d8b6..9c8d42c 100644
--- a/src/client/requestbroker/ImageRequest.cpp
+++ b/src/client/requestbroker/ImageRequest.cpp
@@ -147,4 +147,4 @@ void ImageRequest::Cleanup()
delete ((VideoBuffer*)ResultObject);
ResultObject = NULL;
}
-} \ No newline at end of file
+}
diff --git a/src/client/requestbroker/ImageRequest.h b/src/client/requestbroker/ImageRequest.h
index 9a2cf34..2fc0b62 100644
--- a/src/client/requestbroker/ImageRequest.h
+++ b/src/client/requestbroker/ImageRequest.h
@@ -11,4 +11,4 @@ public:
virtual RequestBroker::ProcessResponse Process(RequestBroker & rb);
virtual ~ImageRequest();
virtual void Cleanup();
-}; \ No newline at end of file
+};
diff --git a/src/client/requestbroker/RequestBroker.cpp b/src/client/requestbroker/RequestBroker.cpp
index cfa1294..17ee1cc 100644
--- a/src/client/requestbroker/RequestBroker.cpp
+++ b/src/client/requestbroker/RequestBroker.cpp
@@ -309,4 +309,4 @@ void RequestBroker::Request::Cleanup()
(*iter)->Cleanup();
iter++;
}
-} \ No newline at end of file
+}
diff --git a/src/client/requestbroker/RequestBroker.h b/src/client/requestbroker/RequestBroker.h
index 4c31e89..f6454a9 100644
--- a/src/client/requestbroker/RequestBroker.h
+++ b/src/client/requestbroker/RequestBroker.h
@@ -75,4 +75,4 @@ public:
virtual ~Request();
virtual void Cleanup();
};
-}; \ No newline at end of file
+};
diff --git a/src/client/requestbroker/ThumbRenderRequest.cpp b/src/client/requestbroker/ThumbRenderRequest.cpp
index 3601401..1b38529 100644
--- a/src/client/requestbroker/ThumbRenderRequest.cpp
+++ b/src/client/requestbroker/ThumbRenderRequest.cpp
@@ -50,4 +50,4 @@ void ThumbRenderRequest::Cleanup()
delete ((VideoBuffer*)ResultObject);
ResultObject = NULL;
}
-} \ No newline at end of file
+}