Changeset 5908 for branches/newapi

Timestamp:

12/02/07 20:04:42 (12 months ago)

Author:

erijo

Message:

Moved static methods to a separate file so that unit-test can provide
their own implementation of e.g. getInstance (to e.g. return a mock
object instance).

Location:

branches/newapi/licq/src

Files:

• static.cpp (added)
• util/log.cpp (modified) (2 diffs)
• util/log.h (modified) (1 diff)

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

@@ -19 +19 @@
 
 #include "licq/interface/logsink.h"
-#include "licq/thread/threadspecific.h"
 #include "util/log.h"
-#include "util/tr.h"
 
 #include <cassert>
@@ -27 +25 @@
 #include <time.h>
 
-static Licq::ThreadSpecific<LicqDaemon::Log> ThreadLogs;
-
 LicqDaemon::Log::Log(const std::string& owner, Licq::LogSink* sink)
   : myOwner(owner), mySink(sink)
 {
   assert(mySink != NULL);
-}
-
-void LicqDaemon::Log::setThreadLog(const Log* log)
-{
-  if (ThreadLogs.hasData())
-  {
-    ThreadLogs.getData()->fatal() <<
-        tr("LicqDaemon::Log::setThreadLog called more than once");
-    ::abort();
-  }
-  ThreadLogs.setData(log);
-}
-
-LicqDaemon::Log* LicqDaemon::Log::getThreadLog()
-{
-  assert(ThreadLogs.hasData());
-  return ThreadLogs.getData();
 }
 

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

@@ -51 +51 @@
    * @see getThreadLog()
    */
-  static void setThreadLog(const Log* log);
-
-  /**
-   * @returns The default log for the calling thread. setThreadLog()
-   * must have been called by the calling thread before calling this
-   * method.
-   *
-   * @see setThreadLog()
-   */
-  static Log* getThreadLog();
+  static void setThreadLog(const Licq::Log* log);
 
   // From Licq::Log