[gnote] Replace std::list with std::vector in syncui
- From: Aurimas Černius <aurimasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnote] Replace std::list with std::vector in syncui
- Date: Sat, 27 Apr 2019 16:56:44 +0000 (UTC)
commit 4b8c6f55f7dfad221a26b2bf083ce647b35ef9ac
Author: Aurimas Černius <aurisc4 gmail com>
Date: Sat Apr 27 19:37:40 2019 +0300
Replace std::list with std::vector in syncui
src/synchronization/silentui.cpp | 2 +-
src/synchronization/silentui.hpp | 2 +-
src/synchronization/syncdialog.cpp | 8 ++++----
src/synchronization/syncdialog.hpp | 4 ++--
src/synchronization/syncmanager.cpp | 2 +-
src/synchronization/syncui.hpp | 4 +---
6 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/src/synchronization/silentui.cpp b/src/synchronization/silentui.cpp
index 0e7e331b..e0330741 100644
--- a/src/synchronization/silentui.cpp
+++ b/src/synchronization/silentui.cpp
@@ -75,7 +75,7 @@ namespace sync {
void SilentUI::note_conflict_detected(const Note::Ptr & localConflictNote,
NoteUpdate remoteNote,
- const std::list<Glib::ustring> &)
+ const std::vector<Glib::ustring> &)
{
DBG_OUT("note conflict detected, overwriting without a care");
// TODO: At least respect conflict prefs
diff --git a/src/synchronization/silentui.hpp b/src/synchronization/silentui.hpp
index 982f11e5..b0a4442c 100644
--- a/src/synchronization/silentui.hpp
+++ b/src/synchronization/silentui.hpp
@@ -41,7 +41,7 @@ namespace sync {
virtual void note_synchronized(const Glib::ustring & noteTitle, NoteSyncType type) override;
virtual void note_conflict_detected(const Note::Ptr & localConflictNote,
NoteUpdate remoteNote,
- const std::list<Glib::ustring> & noteUpdateTitles) override;
+ const std::vector<Glib::ustring> & noteUpdateTitles) override;
virtual void present_ui() override;
void on_connecting();
void on_idle();
diff --git a/src/synchronization/syncdialog.cpp b/src/synchronization/syncdialog.cpp
index bfc40872..2382aedc 100644
--- a/src/synchronization/syncdialog.cpp
+++ b/src/synchronization/syncdialog.cpp
@@ -60,7 +60,7 @@ class SyncTitleConflictDialog
: public Gtk::Dialog
{
public:
- SyncTitleConflictDialog(const Note::Ptr & existingNote, const std::list<Glib::ustring> & noteUpdateTitles)
+ SyncTitleConflictDialog(const Note::Ptr & existingNote, const std::vector<Glib::ustring> &
noteUpdateTitles)
: Gtk::Dialog(_("Note Conflict"), true)
, m_existing_note(existingNote)
, m_note_update_titles(noteUpdateTitles)
@@ -198,7 +198,7 @@ private:
}
Note::Ptr m_existing_note;
- std::list<Glib::ustring> m_note_update_titles;
+ std::vector<Glib::ustring> m_note_update_titles;
Gtk::Button *continueButton;
@@ -594,7 +594,7 @@ void SyncDialog::note_synchronized(const Glib::ustring & noteTitle, NoteSyncType
void SyncDialog::note_conflict_detected(const Note::Ptr & localConflictNote,
NoteUpdate remoteNote,
- const std::list<Glib::ustring> & noteUpdateTitles)
+ const std::vector<Glib::ustring> & noteUpdateTitles)
{
int dlgBehaviorPref = Preferences::obj()
.get_schema_settings(Preferences::SCHEMA_SYNC)->get_int(Preferences::SYNC_CONFIGURED_CONFLICT_BEHAVIOR);
@@ -623,7 +623,7 @@ void SyncDialog::note_conflict_detected(const Note::Ptr & localConflictNote,
void SyncDialog::note_conflict_detected_(
const Note::Ptr & localConflictNote,
NoteUpdate remoteNote,
- const std::list<Glib::ustring> & noteUpdateTitles,
+ const std::vector<Glib::ustring> & noteUpdateTitles,
SyncTitleConflictResolution savedBehavior,
SyncTitleConflictResolution resolution,
std::exception **mainThreadException)
diff --git a/src/synchronization/syncdialog.hpp b/src/synchronization/syncdialog.hpp
index aa5b89b8..0b1fd76f 100644
--- a/src/synchronization/syncdialog.hpp
+++ b/src/synchronization/syncdialog.hpp
@@ -47,7 +47,7 @@ namespace sync {
virtual void note_synchronized(const Glib::ustring & noteTitle, NoteSyncType type) override;
virtual void note_conflict_detected(const Note::Ptr & localConflictNote,
NoteUpdate remoteNote,
- const std::list<Glib::ustring> & noteUpdateTitles) override;
+ const std::vector<Glib::ustring> & noteUpdateTitles) override;
virtual void present_ui() override;
void header_text(const Glib::ustring &);
void message_text(const Glib::ustring &);
@@ -60,7 +60,7 @@ namespace sync {
static void on_expander_activated(GtkExpander*, gpointer);
void note_conflict_detected_(const Note::Ptr & localConflictNote,
NoteUpdate remoteNote,
- const std::list<Glib::ustring> & noteUpdateTitles,
+ const std::vector<Glib::ustring> & noteUpdateTitles,
SyncTitleConflictResolution savedBehavior,
SyncTitleConflictResolution resolution,
std::exception **mainThreadException);
diff --git a/src/synchronization/syncmanager.cpp b/src/synchronization/syncmanager.cpp
index 90570157..55c201ec 100644
--- a/src/synchronization/syncmanager.cpp
+++ b/src/synchronization/syncmanager.cpp
@@ -213,7 +213,7 @@ namespace sync {
// Gather list of new/updated note titles
// for title conflict handling purposes.
- std::list<Glib::ustring> noteUpdateTitles;
+ std::vector<Glib::ustring> noteUpdateTitles;
for(auto & iter : noteUpdates) {
if(iter.second.m_title != "") {
noteUpdateTitles.push_back(iter.second.m_title);
diff --git a/src/synchronization/syncui.hpp b/src/synchronization/syncui.hpp
index 89569362..6f05f9ef 100644
--- a/src/synchronization/syncui.hpp
+++ b/src/synchronization/syncui.hpp
@@ -22,8 +22,6 @@
#define _SYNCHRONIZATION_SYNCUI_HPP_
-#include <list>
-
#include <glibmm/ustring.h>
#include "syncutils.hpp"
@@ -45,7 +43,7 @@ namespace sync {
virtual void note_synchronized(const Glib::ustring & noteTitle, NoteSyncType type) = 0;
virtual void note_conflict_detected(const Note::Ptr & localConflictNote,
NoteUpdate remoteNote,
- const std::list<Glib::ustring> & noteUpdateTitles) = 0;
+ const std::vector<Glib::ustring> & noteUpdateTitles) = 0;
virtual void present_ui() = 0;
sigc::connection signal_connecting_connect(const SlotConnecting & slot);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]