Changeset 117 in pacpusframework

Timestamp:

Jun 25, 2013, 1:50:46 PM (12 years ago)

Author:

Marek Kurdej

Message:

Removed FileLib dependency in PacpusLib (using PacpusException instead of DbiteException).

Location:

trunk

Files:

• include/Pacpus/kernel/ComponentFactory.h (modified) (4 diffs)
• include/Pacpus/kernel/DbiteException.h (modified) (1 diff)
• src/PacpusLib/PacpusApplication.cpp (modified) (2 diffs)

trunk/include/Pacpus/kernel/ComponentFactory.h

@@ -53 +53 @@
     /// Ctor of ComponentFactory, initialize the factory of the components of type @em T.
     /// @param type Name of the type of the components.
-    ComponentFactory(const QString& type);
+    ComponentFactory(const QString & type);
 
     /// Dtor of ComponentFactory.
@@ -60 +60 @@
     /// Gets the name of the type of the components.
     /// @returns Name of the type of the components.
-    const QString& getType() const;
+    const QString & getType() const;
 
 protected:
-    virtual ComponentBase* instantiateComponent(const QString& name);
+    virtual ComponentBase * instantiateComponent(const QString& name);
 
 private:
@@ -89 +89 @@
 
 template<typename T>
-ComponentBase* ComponentFactory<T>::instantiateComponent(const QString& name)
+ComponentBase * ComponentFactory<T>::instantiateComponent(const QString & name)
 {
     return new T(name);
@@ -96 +96 @@
 } // namespace pacpus
 
-#endif // DEF_PACPUS_DBITEEXCEPTION_H
+#endif // DEF_PACPUS_COMPONENTFACTORY_H

trunk/include/Pacpus/kernel/DbiteException.h

@@ -23 +23 @@
 namespace pacpus {
 
-/// DbiteException
-/// @brief Exception thrown when an error manipulation a dbite file occured.
+/// Exception thrown when an error during manipulation a dbite file occurs.
 class FILELIB_API DbiteException
     : virtual public PacpusException

trunk/src/PacpusLib/PacpusApplication.cpp

@@ -9 +9 @@
 /// @copyright Copyright (c) UTC/CNRS Heudiasyc 2006 - 2013. All rights reserved.
 
-#include <Pacpus/kernel/DbiteException.h>
 #include <Pacpus/kernel/Log.h>
 #include <Pacpus/kernel/PacpusApplication.h>
+#include <Pacpus/kernel/PacpusException.h>
 
 using namespace pacpus;
@@ -83 +83 @@
     try {
         return QApplication::notify(receiver, ev);
-    } catch(DbiteException & e) {
-        LOG_ERROR("DbiteException thrown:" << e.what());
+    } catch(PacpusException & e) {
+        LOG_ERROR("PacpusException thrown:" << e.what());
     } catch(std::exception & e) {
         LOG_ERROR("std::exception thrown:" << e.what());