Changeset 5918 for branches/newapi

Timestamp:

12/02/07 23:44:02 (12 months ago)

Author:

erijo

Message:

Move static methods to static.cpp

Location:

branches/newapi/licq/src

Files:

• daemon.cpp (modified) (1 diff)
• main.cpp (modified) (1 diff)
• static.cpp (modified) (2 diffs)

branches/newapi/licq/src/daemon.cpp

@@ -38 +38 @@
 #include <sys/types.h>
 
-Licq::Daemon* Licq::Daemon::getInstance()
-{
-  return LicqDaemon::Daemon::getInstance();
-}
-
-LicqDaemon::Daemon* LicqDaemon::Daemon::getInstance()
-{
-  static LicqDaemon::Daemon daemon;
-  return &daemon;
-}
-
 static inline void printLicqVersion(std::ostream& os)
 {

branches/newapi/licq/src/main.cpp

@@ -56 +56 @@
 int main(int argc, char** argv)
 {
+  // Set up logging
   LicqDaemon::LogDistributor logDistributor;
   LicqDaemon::Log::setThreadLog(new LicqDaemon::Log("licq", &logDistributor));

branches/newapi/licq/src/static.cpp

@@ -22 +22 @@
 // own methods to e.g. make getInstance() return a mock object.
 
+#include "daemon.h"
 #include "licq/thread/threadspecific.h"
 #include "plugin/plugincacheimpl.h"
@@ -55 +56 @@
   return ThreadLogs.getData();
 }
+
+Licq::Daemon* Licq::Daemon::getInstance()
+{
+  return LicqDaemon::Daemon::getInstance();
+}
+
+LicqDaemon::Daemon* LicqDaemon::Daemon::getInstance()
+{
+  static LicqDaemon::Daemon daemon;
+  return &daemon;
+}