Changeset 5911 for branches/newapi

Timestamp:

12/02/07 20:17:45 (12 months ago)

Author:

erijo

Message:

Moved licq/interface/log.h to licq/log.h. Makes more sense to have it there IMHO.

Location:

branches/newapi/licq

Files:

• licq/interface/logsink.h (modified) (1 diff)
• licq/log.h (moved) (moved from branches/newapi/licq/licq/interface/log.h)
• src/daemon.cpp (modified) (1 diff)
• src/plugin/plugincacheimpl.cpp (modified) (1 diff)
• src/plugin/test/pluginlibrarytest.cpp (modified) (3 diffs)
• src/test/log.h (modified) (1 diff)
• src/util/log.h (modified) (1 diff)

branches/newapi/licq/licq/interface/logsink.h

@@ -21 +21 @@
 #define LICQ_LOGSINK_H
 
-#include "licq/interface/log.h"
+#include "licq/log.h"
 #include "licq/macros.h"
 

branches/newapi/licq/src/daemon.cpp

@@ -22 +22 @@
 #include "licq/exception/runtimeexception.h"
 #include "licq/exception/unixexception.h"
-#include "licq/interface/log.h"
+#include "licq/log.h"
 #include "licq/version.h"
 #include "plugin/plugincache.h"

branches/newapi/licq/src/plugin/plugincacheimpl.cpp

@@ -22 +22 @@
 #include "licq/exception/systemexception.h"
 #include "licq/exception/unixexception.h"
-#include "licq/interface/log.h"
+#include "licq/log.h"
 #include "plugin/plugincacheimpl.h"
 #include "plugin/pluginlibrary.h"

branches/newapi/licq/src/plugin/test/pluginlibrarytest.cpp

@@ -18 +18 @@
  */
 
-#include "licq/interface/log.h"
+#include "licq/log.h"
 #include "plugin/pluginlibraryimpl.h"
 
@@ -28 +28 @@
   char** myArgv;
   bool myDestroyed;
-};
-
-class VoidLog : public Licq::Log
-{
-public:
-  void log(Level, const std::string&) {}
-  void packet(const std::string&, const uint8_t*, size_t) {}
 };
 
@@ -112 +105 @@
 BOOST_AUTO_TEST_CASE(createDestroy)
 {
-  VoidLog log;
+  Licq::Log* log = Licq::Log::getThreadLog();
   const char* argv[] = { "licq" };
-  FakePlugin* plugin = (FakePlugin*)myLib.createPlugin(log, 1, (char**)argv);
+  FakePlugin* plugin = (FakePlugin*)myLib.createPlugin(*log, 1, (char**)argv);
   BOOST_CHECK_EQUAL(plugin->myArgc, 1);
   BOOST_CHECK_EQUAL(plugin->myArgv, (char**)argv);

branches/newapi/licq/src/test/log.h

@@ -21 +21 @@
 #define LICQTEST_LOG_H
 
-#include "licq/interface/log.h"
+#include "licq/log.h"
 
 #include <iostream>

branches/newapi/licq/src/util/log.h

@@ -21 +21 @@
 #define LICQDAEMON_LOG_H
 
-#include "licq/interface/log.h"
 #include "licq/interface/logsink.h"
+#include "licq/log.h"
 
 #include <string>