From 2c8e0c7421ae82a5f718dcc11854fa6f88e14645 Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Thu, 23 Jul 2009 11:23:09 -0400
Subject: [PATCH] [#1910] Remove compilation warnings in src/dbus and
src/history
---
sflphone-common/src/history/historyitem.cpp | 7 ++++++-
sflphone-common/src/history/historymanager.cpp | 4 +++-
sflphone-common/src/history/historymanager.h | 10 +++++-----
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/sflphone-common/src/history/historyitem.cpp b/sflphone-common/src/history/historyitem.cpp
index 90a5ff02a5..fd33f8de34 100644
--- a/sflphone-common/src/history/historyitem.cpp
+++ b/sflphone-common/src/history/historyitem.cpp
@@ -27,7 +27,12 @@
#define EMPTY_STRING "empty"
HistoryItem::HistoryItem (std::string timestamp_start, CallType call_type, std::string timestamp_stop, std::string name, std::string number, std::string account_id)
- : _timestamp_start (timestamp_start), _call_type (call_type), _timestamp_stop (timestamp_stop), _name (name), _number (number), _account_id (account_id)
+ : _timestamp_start (timestamp_start),
+ _timestamp_stop (timestamp_stop),
+ _call_type (call_type),
+ _name (name),
+ _number (number),
+ _account_id (account_id)
{
}
diff --git a/sflphone-common/src/history/historymanager.cpp b/sflphone-common/src/history/historymanager.cpp
index 8cb5fc7b9f..f2fda5c38b 100644
--- a/sflphone-common/src/history/historymanager.cpp
+++ b/sflphone-common/src/history/historymanager.cpp
@@ -23,7 +23,9 @@
#include <cc++/file.h>
#include <time.h>
-HistoryManager::HistoryManager () : _history_loaded (false), _history_path ("")
+HistoryManager::HistoryManager ()
+ : _history_loaded (false),
+ _history_path ("")
{
}
diff --git a/sflphone-common/src/history/historymanager.h b/sflphone-common/src/history/historymanager.h
index 7fadbcdadc..b00b509c3c 100644
--- a/sflphone-common/src/history/historymanager.h
+++ b/sflphone-common/src/history/historymanager.h
@@ -121,17 +121,17 @@ class HistoryManager {
*/
HistoryItemMap _history_items;
+ /*
+ * History has been loaded
+ */
+ bool _history_loaded;
+
/*
* The path to the history file
*/
std::string _history_path;
- /*
- * History has been loaded
- */
- bool _history_loaded;
-
friend class HistoryTest;
};
--
GitLab