Changeset 231 in pacpusframework

Timestamp:

Nov 27, 2013, 1:30:18 PM (11 years ago)

Author:

Marek Kurdej

Message:

Fixed: Qt4 compilation on Linux

Location:

trunk/src/PacpusLib

Files:

• ComponentBase.cpp (modified) (1 diff)
• ComponentManager.cpp (modified) (1 diff)
• Log.cpp (modified) (3 diffs)
• XmlConfigFile.cpp (modified) (1 diff)

trunk/src/PacpusLib/ComponentBase.cpp

@@ -28 +28 @@
 std::basic_ostream<_Elem, _Traits> & operator<<(std::basic_ostream<_Elem, _Traits> & os, const boost::program_options::variables_map & vm)
 {
-    for (po::variables_map::const_iterator i = vm.cbegin(); i != vm.cend(); ++i) { 
+    for (po::variables_map::const_iterator i = vm.begin(); i != vm.end(); ++i) { 
         const po::variable_value & v = i->second;
         if (v.empty()) {

trunk/src/PacpusLib/ComponentManager.cpp

@@ -26 +26 @@
 {
     typedef QList<_ListElem> ListType;
-    for (ListType::const_iterator it = list.cbegin(), itend = list.cend(); it != itend; ++it) {
+    for (typename ListType::const_iterator it = list.cbegin(), itend = list.cend(); it != itend; ++it) {
         os << *it << "\n";
     }

trunk/src/PacpusLib/Log.cpp

@@ -34 +34 @@
 PACPUSLIB_API std::basic_ostream<char>& operator<< (std::basic_ostream<char>& strm, QString const& s);
 
-namespace pacpus {
+namespace pacpus
+{
    
 void init_log_factories()
@@ -148 +149 @@
 
 namespace pacpus
+{
 
     LogConfigurator::LogConfigurator()
     {}
-    void LogConfigurator::configureLoggerWithFile(const char * /*configFilename*/)
+
+    LogConfigurator::~LogConfigurator()
+    {}
+
+    void LogConfigurator::configureLoggerWithFile(const char* /*configFilename*/)
     {}
 
@@ -157 +163 @@
 
 #endif // PACPUS_USE_LOG
+

trunk/src/PacpusLib/XmlConfigFile.cpp

@@ -9 +9 @@
 #include <Pacpus/kernel/Log.h>
 
+#include <cassert>
 #include <QFile>
 #include <QTextStream>