diff --git a/src/audio/alaw.cpp b/src/audio/alaw.cpp
index 3c3dc34fdb743b1943d0ddfd227c8c91784568c2..c6dad35daf54c928d1b6797ae540b32e155b3eb2 100644
--- a/src/audio/alaw.cpp
+++ b/src/audio/alaw.cpp
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audio/alaw.h b/src/audio/alaw.h
index c75e0a550b239542e9395453515ea4da127f4c27..eac925fe573befa02c6aafed74d0a1e000cbcf73 100644
--- a/src/audio/alaw.h
+++ b/src/audio/alaw.h
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audio/audiocodec.cpp b/src/audio/audiocodec.cpp
index 358aeb616efe1a9bc867ed0c0c53c10195c3ce64..02f83d8b57e076261757ee5149fc59555b3651be 100644
--- a/src/audio/audiocodec.cpp
+++ b/src/audio/audiocodec.cpp
@@ -1,5 +1,6 @@
-/*
+/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This is free software; you can redistribute it and/or modify
diff --git a/src/audio/common.h b/src/audio/common.h
index 039dd9132499dc030da6fec132eca3e7ef668d95..5594a1a00bd626508088b4c2efcbea41dcdae8dd 100644
--- a/src/audio/common.h
+++ b/src/audio/common.h
@@ -1,3 +1,22 @@
+/**
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author:
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
/*
Type definitions and helper macros which aren't part of Standard C++
This will need to be edited on systems where 'char', 'short' and 'int'
diff --git a/src/audio/dtmf.h b/src/audio/dtmf.h
index 476a15140824c0cc036b3211679c2f38e2412cb6..b0701722941ce9d28dff4e62b5e3d62b7057888b 100644
--- a/src/audio/dtmf.h
+++ b/src/audio/dtmf.h
@@ -4,17 +4,17 @@
*
* Portions Copyright (c) 2000 Billy Biggs <bbiggs@div8.net>
* Portions Copyright (c) 2004 Wirlab <kphone@wirlab.net>
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/src/audio/dtmfgenerator.cpp b/src/audio/dtmfgenerator.cpp
index ffe7b7121bf8393cae46c14266c950751fce71f2..955d945cd699eac6820c4f9a80a80bc6a5cc3ed9 100644
--- a/src/audio/dtmfgenerator.cpp
+++ b/src/audio/dtmfgenerator.cpp
@@ -1,16 +1,16 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
- * Author: Yan Morin <yan.morin@savoirfairelinux.com>
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* Portions (c) 2003 iptel.org
*
- * This library is free software; you can redistribute it and/or modify it
+ * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Library General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
- * This library is distributed in the hope that it will be useful, but WITHOUT
+ * This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
* License for more details.
diff --git a/src/audio/dtmfgenerator.h b/src/audio/dtmfgenerator.h
index aa22144c87ccc7d2e856ffc405adc05d4155ae6d..4df6875b13983a6334fb669db266e2f7362f212c 100644
--- a/src/audio/dtmfgenerator.h
+++ b/src/audio/dtmfgenerator.h
@@ -1,15 +1,16 @@
-/*
+/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* Portions (c) 2003 iptel.org
*
- * This library is free software; you can redistribute it and/or modify it
+ * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Library General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
- * This library is distributed in the hope that it will be useful, but WITHOUT
+ * This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
* License for more details.
diff --git a/src/audio/g711.cpp b/src/audio/g711.cpp
index 2444fe6adc6f7fd337f06d42396fa0c4e742c0d7..ace00df9d7c73943e3339546ee68fd5f71a02c4f 100644
--- a/src/audio/g711.cpp
+++ b/src/audio/g711.cpp
@@ -1,23 +1,27 @@
-/*
+/**
+ * Copyright (C) 2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
+ *
Implementation of ITU-T (formerly CCITT) Recomendation G711
Copyright (C) 2004 J.D.Medhurst (a.k.a. Tixy)
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ *
+ */
#include "common.h"
#include "g711.h"
diff --git a/src/audio/g711.h b/src/audio/g711.h
index ee20b1240b7d0758b575566517a85d9795a5d31b..37cd32984930c19159ee56dbbb43847a44e82d9c 100644
--- a/src/audio/g711.h
+++ b/src/audio/g711.h
@@ -1,23 +1,27 @@
-/*
+/**
+ * Copyright (C) 2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
+ *
Implementation of ITU-T (formerly CCITT) Recomendation G711
Copyright (C) 2004 J.D.Medhurst (a.k.a. Tixy)
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ *
+ */
#ifndef __G711_H__
#define __G711_H__
diff --git a/src/audio/gsmcodec.cpp b/src/audio/gsmcodec.cpp
index 60d54eda887faf917524db2bd74780476aaec9ae..25f921f26bda1affd86eb2dc8fad51d6aab686b6 100644
--- a/src/audio/gsmcodec.cpp
+++ b/src/audio/gsmcodec.cpp
@@ -1,7 +1,8 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
- * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
- *
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
+ * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -11,10 +12,10 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <iostream>
diff --git a/src/audio/gsmcodec.h b/src/audio/gsmcodec.h
index 27073fbb322b7c3fbf275b5cc2c345eb61d70058..51ac62605499e35144fc28432ac510f503e722c7 100644
--- a/src/audio/gsmcodec.h
+++ b/src/audio/gsmcodec.h
@@ -1,7 +1,8 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -11,7 +12,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/src/audio/ringbuffer.h b/src/audio/ringbuffer.h
index 9e1ef6bef4177f45a0f92e7ef5e9d59982fcc411..c361be31564506d2c83562be39e745d2fc3b62c7 100644
--- a/src/audio/ringbuffer.h
+++ b/src/audio/ringbuffer.h
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* Portions Copyright (C) Dominic Mazzoni (Audacity)
diff --git a/src/audio/ulaw.cpp b/src/audio/ulaw.cpp
index 3830587d93af1ba31efbb83f292cf1fd27596c68..c16a12f0568bf1416b0509bd81afb8e8b55490af 100644
--- a/src/audio/ulaw.cpp
+++ b/src/audio/ulaw.cpp
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audio/ulaw.h b/src/audio/ulaw.h
index eff25df25393d8d2b5a7b4fe33d2ec238889c8b0..a7a2337885dc0a873f00934caebaa258ec0f7471 100644
--- a/src/audio/ulaw.h
+++ b/src/audio/ulaw.h
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/config/config.cpp b/src/config/config.cpp
index c8dc5e63b29ff46caa51db98719c3029b7db000a..67c2ee1e23a2990be95f78635ab7ec6fe4e89732 100644
--- a/src/config/config.cpp
+++ b/src/config/config.cpp
@@ -1,7 +1,7 @@
/**
* Copyright (C) 2005 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -11,7 +11,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/src/config/config.h b/src/config/config.h
index 884844263914bf1214af9b9f97ca4da321afbfaa..b09e3094394755ab23726079b95f281fde6fdf90 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -1,7 +1,7 @@
/**
* Copyright (C) 2005 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -11,7 +11,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/src/error.cpp b/src/error.cpp
index bcc3985a8dda1e3973bfe21e5b553bee7d88fb05..f27ec012151817e589cdbb402bf0d4776a2d1259 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/error.h b/src/error.h
index 58178394703ae4539645d870ba03fe9373d7b858..93db4e034e06540eccd7830b1b13de1f5d8b3b03 100644
--- a/src/error.h
+++ b/src/error.h
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/eventthread.cpp b/src/eventthread.cpp
index 67cff80b7367a9abc059efcd2276a218e04991e4..6e445ab232c3adda875de21ae6842ca0743dd7f9 100644
--- a/src/eventthread.cpp
+++ b/src/eventthread.cpp
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/eventthread.h b/src/eventthread.h
index c85f228b68cdb98a9a9d7edfae48eb8036704baa..7508b1cfc33effb6911cb74ec83c028efaf7ff42 100644
--- a/src/eventthread.h
+++ b/src/eventthread.h
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gui/server/ObjectPool.hpp b/src/gui/server/ObjectPool.hpp
index d686f9bd668cea2d28feaa49ce76d8d58842ed52..fa1f19af9a30c017beb00915dbbe0fad093ec554 100644
--- a/src/gui/server/ObjectPool.hpp
+++ b/src/gui/server/ObjectPool.hpp
@@ -1,8 +1,8 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com> (cc++ mutex)
* Author: Jean-Philippe Barrette-LaPierre
* <jean-philippe.barrette-lapierre@savoirfairelinux.com>
- * Yan Morin <yan.morin@savoirfairelinux.com> (cc++ mutex)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/gui/server/ObjectPool.inl b/src/gui/server/ObjectPool.inl
index 9f96681e1eec7d044cc3384e0bfb25eaa6e1e5c2..4132e8e38629fdbf88a299a17cb6da5613db5383 100644
--- a/src/gui/server/ObjectPool.inl
+++ b/src/gui/server/ObjectPool.inl
@@ -1,8 +1,8 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com> (cc++ mutex)
* Author: Jean-Philippe Barrette-LaPierre
* <jean-philippe.barrette-lapierre@savoirfairelinux.com>
- * Yan Morin <yan.morin@savoirfairelinux.com> (cc++ mutex)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/gui/server/argtokenizer.cpp b/src/gui/server/argtokenizer.cpp
index 2d5ca5fb9af12d97aaaf5748173b9419156c2661..036374e6d13d1250784544a014ce7854661eeeda 100644
--- a/src/gui/server/argtokenizer.cpp
+++ b/src/gui/server/argtokenizer.cpp
@@ -1,7 +1,7 @@
/**
* Copyright (C) 2005 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -11,7 +11,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/src/gui/server/argtokenizer.h b/src/gui/server/argtokenizer.h
index 3c19b7ecde58ed9448893a57d17cad70a6a49956..d6b5d07367ba8eafc4ed622dc5297ca32fa18fc1 100644
--- a/src/gui/server/argtokenizer.h
+++ b/src/gui/server/argtokenizer.h
@@ -1,7 +1,7 @@
/**
* Copyright (C) 2005 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -11,7 +11,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/src/gui/server/factory.cpp b/src/gui/server/factory.cpp
deleted file mode 100644
index 3915f7d2f67ddef34ec8b609a5d5e33db8e6220f..0000000000000000000000000000000000000000
--- a/src/gui/server/factory.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-#include <stdexcept>
-#include <string>
-#include <iostream>
-#include <map>
-
-
-class Request
-{
-public:
- Request()
- {
- std::cout << "This is a Normal Request" << std::endl;
- }
-};
-
-class SpecificRequest : public Request
-{
-public:
- SpecificRequest()
- {
- std::cout << "This is a Specific Request" << std::endl;
- }
-};
-
-
-class RequestCreatorBase
-{
-public:
- virtual Request *create() = 0;
- virtual RequestCreatorBase *clone() = 0;
-};
-
-template< typename T >
-class RequestCreator : public RequestCreatorBase
-{
-public:
- virtual Request *create()
- {
- return new T();
- }
-
- virtual RequestCreatorBase *clone()
- {
- return new RequestCreator< T >();
- }
-};
-
-
-class RequestFactory
-{
-public:
- Request *create(const std::string &requestname)
- {
- std::map< std::string, RequestCreatorBase * >::iterator pos = mRequests.find(requestname);
- if(pos == mRequests.end()) {
- throw std::runtime_error("there's no request of that name");
- }
-
- return pos->second->create();
- }
-
- template< typename T >
- void registerRequest(const std::string &requestname)
- {
- std::map< std::string, RequestCreatorBase * >::iterator pos =
- mRequests.find(requestname);
- if(pos != mRequests.end()) {
- delete pos->second; pos->second = NULL;
- mRequests.erase(pos);
- }
-
- mRequests.insert(std::make_pair(requestname, new RequestCreator< T >()));
- }
-
- private:
- std::map< std::string, RequestCreatorBase * > mRequests;
-};
-
-
-int main(int, char **)
-{
- RequestFactory factory;
-
- factory.registerRequest< Request > ("requestsimple");
- factory.registerRequest< SpecificRequest >("requestspecific");
-
- std::cout << "First one" << std::endl;
- delete factory.create("requestsimple");
-
- std::cout << "Second one" << std::endl;
- delete factory.create("requestspecific");
-
- factory.registerRequest< SpecificRequest >("requestsimple");
- std::cout << "Third one" << std::endl;
- delete factory.create("requestsimple");
-
- return 0;
-}
diff --git a/src/gui/server/guiserver.h b/src/gui/server/guiserver.h
index 543757f2dacc0146a0df7a070353018b4b6097ed..4633045de5a5bd827ff940e5977f2c670d9f7bd0 100644
--- a/src/gui/server/guiserver.h
+++ b/src/gui/server/guiserver.h
@@ -1,7 +1,7 @@
/**
* Copyright (C) 2005 Savoir-Faire Linux inc.
* Author: Yan Morin <yan.morin@savoirfairelinux.com>
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -11,7 +11,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.