Und wieder eine Umbenennungsorgie...

8 files changed, 32 insertions, 32 deletions

diff --git a/src/Client/CommandParser.cpp b/src/Client/CommandParser.cpp
index ed15b7b..decb28e 100644
--- a/src/Client/CommandParser.cpp
+++ b/src/Client/CommandParser.cpp
@@ -18,8 +18,8 @@
  */
 
 #include "CommandParser.h"
-#include "Request/CoreStatusRequest.h"
-#include <Common/Request/DisconnectRequest.h>
+#include "Requests/CoreStatusRequest.h"
+#include <Common/Requests/DisconnectRequest.h>
 #include <Net/Packets/HostStatusPacket.h>
 
 #include <iostream>
@@ -86,14 +86,14 @@ void CommandParser::helpCommand(const std::vector<std::string> &args) {
 void CommandParser::statusCommand(const std::vector<std::string>&) {
   activeRequests++;
 
-  Request::CoreStatusRequest::send(connection, *requestManager, sigc::mem_fun(this, &CommandParser::coreStatusRequestFinished));
+  Requests::CoreStatusRequest::send(connection, *requestManager, sigc::mem_fun(this, &CommandParser::coreStatusRequestFinished));
 }
 
 void CommandParser::exitCommand(const std::vector<std::string>&) {
   activeRequests++;
   disconnect = true;
 
-  Common::Request::DisconnectRequest::send(connection, *requestManager, sigc::mem_fun(this, &CommandParser::requestFinished));
+  Common::Requests::DisconnectRequest::send(connection, *requestManager, sigc::mem_fun(this, &CommandParser::requestFinished));
 }
 
 void CommandParser::coreStatusRequestFinished(const Net::Packets::HostStatusPacket &packet) {
diff --git a/src/Client/Makefile.am b/src/Client/Makefile.am
index 65407f3..6ee2248 100644
--- a/src/Client/Makefile.am
+++ b/src/Client/Makefile.am
@@ -1,7 +1,7 @@
-SUBDIRS = Request
+SUBDIRS = Requests
 
 noinst_LTLIBRARIES   = libclient.la
 libclient_la_SOURCES = CommandParser.cpp
-libclient_la_LIBADD  = Request/librequest.la
+libclient_la_LIBADD  = Requests/librequests.la
 
 noinst_HEADERS       = CommandParser.h
diff --git a/src/Client/Makefile.in b/src/Client/Makefile.in
index a1a049e..3d9d14c 100644
--- a/src/Client/Makefile.in
+++ b/src/Client/Makefile.in
@@ -44,7 +44,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
-libclient_la_DEPENDENCIES = Request/librequest.la
+libclient_la_DEPENDENCIES = Requests/librequests.la
 am_libclient_la_OBJECTS = CommandParser.lo
 libclient_la_OBJECTS = $(am_libclient_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
@@ -191,10 +191,10 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = Request
+SUBDIRS = Requests
 noinst_LTLIBRARIES = libclient.la
 libclient_la_SOURCES = CommandParser.cpp
-libclient_la_LIBADD = Request/librequest.la
+libclient_la_LIBADD = Requests/librequests.la
 noinst_HEADERS = CommandParser.h
 all: all-recursive
 
diff --git a/src/Client/Request/Makefile.am b/src/Client/Request/Makefile.am
deleted file mode 100644
index 64b5a33..0000000
--- a/src/Client/Request/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-noinst_LTLIBRARIES    = librequest.la
-librequest_la_SOURCES = CoreStatusRequest.cpp
-
-noinst_HEADERS        = CoreStatusRequest.h
diff --git a/src/Client/Request/CoreStatusRequest.cpp b/src/Client/Requests/CoreStatusRequest.cpp
index f5fe043..fa3f1f1 100644
--- a/src/Client/Request/CoreStatusRequest.cpp
+++ b/src/Client/Requests/CoreStatusRequest.cpp
@@ -26,7 +26,7 @@
 
 namespace Mad {
 namespace Client {
-namespace Request {
+namespace Requests {
 
 bool CoreStatusRequest::send(Net::Connection *connection, Common::RequestManager &requestManager, const sigc::slot<void,const Net::Packets::HostStatusPacket&> &callback) {
   CoreStatusRequest *request = new CoreStatusRequest();
diff --git a/src/Client/Request/CoreStatusRequest.h b/src/Client/Requests/CoreStatusRequest.h
index 1a6a01e..7de8a68 100644
--- a/src/Client/Request/CoreStatusRequest.h
+++ b/src/Client/Requests/CoreStatusRequest.h
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MAD_CLIENT_REQUEST_CORESTATUSREQUEST_H_
-#define MAD_CLIENT_REQUEST_CORESTATUSREQUEST_H_
+#ifndef MAD_CLIENT_REQUESTS_CORESTATUSREQUEST_H_
+#define MAD_CLIENT_REQUESTS_CORESTATUSREQUEST_H_
 
-#include <Common/Request/Request.h>
+#include <Common/Request.h>
 
 #include <sigc++/signal.h>
 
@@ -37,9 +37,9 @@ class HostStatusPacket;
 }
 
 namespace Client {
-namespace Request {
+namespace Requests {
 
-class CoreStatusRequest: public Common::Request::Request {
+class CoreStatusRequest : public Common::Request {
   private:
     sigc::signal<void,const Net::Packets::HostStatusPacket&> finished;
 
@@ -56,4 +56,4 @@ class CoreStatusRequest: public Common::Request::Request {
 }
 }
 
-#endif /* MAD_CLIENT_REQUEST_CORESTATUSREQUEST_H_ */
+#endif /* MAD_CLIENT_REQUESTS_CORESTATUSREQUEST_H_ */
diff --git a/src/Client/Requests/Makefile.am b/src/Client/Requests/Makefile.am
new file mode 100644
index 0000000..4ba72b6
--- /dev/null
+++ b/src/Client/Requests/Makefile.am
@@ -0,0 +1,4 @@
+noinst_LTLIBRARIES     = librequests.la
+librequests_la_SOURCES = CoreStatusRequest.cpp
+
+noinst_HEADERS         = CoreStatusRequest.h
diff --git a/src/Client/Request/Makefile.in b/src/Client/Requests/Makefile.in
index fde067d..b257084 100644
--- a/src/Client/Request/Makefile.in
+++ b/src/Client/Requests/Makefile.in
@@ -33,7 +33,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = src/Client/Request
+subdir = src/Client/Requests
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -44,9 +44,9 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
-librequest_la_LIBADD =
-am_librequest_la_OBJECTS = CoreStatusRequest.lo
-librequest_la_OBJECTS = $(am_librequest_la_OBJECTS)
+librequests_la_LIBADD =
+am_librequests_la_OBJECTS = CoreStatusRequest.lo
+librequests_la_OBJECTS = $(am_librequests_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -59,8 +59,8 @@ CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(librequest_la_SOURCES)
-DIST_SOURCES = $(librequest_la_SOURCES)
+SOURCES = $(librequests_la_SOURCES)
+DIST_SOURCES = $(librequests_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -181,8 +181,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-noinst_LTLIBRARIES = librequest.la
-librequest_la_SOURCES = CoreStatusRequest.cpp
+noinst_LTLIBRARIES = librequests.la
+librequests_la_SOURCES = CoreStatusRequest.cpp
 noinst_HEADERS = CoreStatusRequest.h
 all: all-am
 
@@ -197,9 +197,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Client/Request/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Client/Requests/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Client/Request/Makefile
+	  $(AUTOMAKE) --gnu  src/Client/Requests/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -226,8 +226,8 @@ clean-noinstLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-librequest.la: $(librequest_la_OBJECTS) $(librequest_la_DEPENDENCIES) 
-	$(CXXLINK)  $(librequest_la_OBJECTS) $(librequest_la_LIBADD) $(LIBS)
+librequests.la: $(librequests_la_OBJECTS) $(librequests_la_DEPENDENCIES) 
+	$(CXXLINK)  $(librequests_la_OBJECTS) $(librequests_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)