Changeset 5910 for branches/newapi

Timestamp:

12/02/07 20:12:41 (12 months ago)

Author:

erijo

Message:

Log::{get,set}ThreadLog? usage cleanup.

Location:

branches/newapi/licq/src

Files:

• daemon.cpp (modified) (2 diffs)
• daemon.h (modified) (2 diffs)
• main.cpp (modified) (1 diff)
• plugin/plugincacheimpl.cpp (modified) (2 diffs)
• static.cpp (modified) (2 diffs)
• util/log.h (modified) (1 diff)

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/version.h"
 #include "plugin/plugincache.h"
@@ -88 +89 @@
 
 LicqDaemon::Daemon::Daemon()
-  : myLog(*Log::getThreadLog())
+  : myLog(*Licq::Log::getThreadLog())
 {
   // Empty

branches/newapi/licq/src/daemon.h

@@ -22 +22 @@
 
 #include "licq/interface/daemon.h"
-#include "util/log.h"
 
 #include <iosfwd>
@@ -52 +51 @@
 
 private:
-  Licq::Log& myLog;
+  class Licq::Log& myLog;
 
   std::string myBaseDir;

branches/newapi/licq/src/main.cpp

@@ -57 +57 @@
   LicqDaemon::LogDistributor logDistributor;
   LicqDaemon::Log::setThreadLog(new LicqDaemon::Log("licq", &logDistributor));
-  Licq::Log& log = *LicqDaemon::Log::getThreadLog();
+  Licq::Log& log = *Licq::Log::getThreadLog();
 
   // Enable logging to stderr

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 "plugin/plugincacheimpl.h"
 #include "plugin/pluginlibrary.h"
 #include "plugin/pluginloader.h"
-#include "util/log.h"
 #include "util/support.h"
 #include "util/tr.h"
@@ -105 +105 @@
 LicqDaemon::PluginCacheImpl::PluginCacheImpl(PluginLoader& loader,
                                              bool testMode)
-  : myLog(*Log::getThreadLog()),
+  : myLog(*Licq::Log::getThreadLog()),
     myLoader(loader),
     myInTestMode(testMode)

branches/newapi/licq/src/static.cpp

@@ -39 +39 @@
 static Licq::ThreadSpecific<LicqDaemon::Log> ThreadLogs;
 
-void LicqDaemon::Log::setThreadLog(const Licq::Log* log)
+void LicqDaemon::Log::setThreadLog(const Log* log)
 {
   if (ThreadLogs.hasData())
@@ -47 +47 @@
     ::abort();
   }
-
-  const Log* l = dynamic_cast<const Log*>(log);
-  assert(l != NULL);
-  ThreadLogs.setData(l);
+  ThreadLogs.setData(log);
 }
 

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

@@ -51 +51 @@
    * @see getThreadLog()
    */
-  static void setThreadLog(const Licq::Log* log);
+  static void setThreadLog(const Log* log);
 
   // From Licq::Log