From 090905056bf4cafe31c5161d56167c3f0aa70922 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 11 Dec 2012 10:58:28 -0800 Subject: [PATCH] Remove spaces in > > in nested templates --- aegisub/src/ass_attachment.h | 2 +- aegisub/src/ass_entry.h | 2 +- aegisub/src/ass_file.h | 2 +- aegisub/src/dialog_fonts_collector.cpp | 2 +- aegisub/src/dialog_kara_timing_copy.h | 2 +- aegisub/src/dialog_properties.h | 2 +- aegisub/src/factory_manager.h | 2 +- aegisub/src/menu.cpp | 4 ++-- aegisub/src/subs_edit_box.h | 2 +- aegisub/src/thesaurus.h | 2 +- aegisub/src/video_out_gl.cpp | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/aegisub/src/ass_attachment.h b/aegisub/src/ass_attachment.h index d932fa07a..d9702c3d7 100644 --- a/aegisub/src/ass_attachment.h +++ b/aegisub/src/ass_attachment.h @@ -40,7 +40,7 @@ /// @class AssAttachment class AssAttachment : public AssEntry { /// Decoded file data - std::shared_ptr > data; + std::shared_ptr> data; /// Encoded data which has been read from the script but not yet decoded wxString buffer; diff --git a/aegisub/src/ass_entry.h b/aegisub/src/ass_entry.h index 8454c184d..deff83e0a 100644 --- a/aegisub/src/ass_entry.h +++ b/aegisub/src/ass_entry.h @@ -47,7 +47,7 @@ enum AssEntryGroup { ENTRY_GROUP_MAX }; -class AssEntry : public boost::intrusive::make_list_base_hook >::type { +class AssEntry : public boost::intrusive::make_list_base_hook>::type { public: virtual ~AssEntry() { } diff --git a/aegisub/src/ass_file.h b/aegisub/src/ass_file.h index 066389c68..268dbebef 100644 --- a/aegisub/src/ass_file.h +++ b/aegisub/src/ass_file.h @@ -49,7 +49,7 @@ class AssDialogue; class AssStyle; class AssAttachment; -typedef boost::intrusive::make_list >::type EntryList; +typedef boost::intrusive::make_list>::type EntryList; typedef EntryList::iterator entryIter; typedef EntryList::const_iterator constEntryIter; diff --git a/aegisub/src/dialog_fonts_collector.cpp b/aegisub/src/dialog_fonts_collector.cpp index 43ef42874..2dfd8b361 100644 --- a/aegisub/src/dialog_fonts_collector.cpp +++ b/aegisub/src/dialog_fonts_collector.cpp @@ -380,7 +380,7 @@ void DialogFontsCollector::OnRadio(wxCommandEvent &) { } void DialogFontsCollector::OnAddText(wxThreadEvent &event) { - std::pair str = event.GetPayload >(); + std::pair str = event.GetPayload>(); collection_log->SetReadOnly(false); int pos = collection_log->GetReverseUnicodePosition(collection_log->GetLength()); collection_log->AppendText(str.second); diff --git a/aegisub/src/dialog_kara_timing_copy.h b/aegisub/src/dialog_kara_timing_copy.h index e4c0ed431..05cb4bec6 100644 --- a/aegisub/src/dialog_kara_timing_copy.h +++ b/aegisub/src/dialog_kara_timing_copy.h @@ -53,7 +53,7 @@ class DialogKanjiTimer : public wxDialog { wxComboBox *SourceStyle, *DestStyle; wxCheckBox *Interpolate; - std::vector > LinesToChange; + std::vector> LinesToChange; AssEntry *currentSourceLine; AssEntry *currentDestinationLine; diff --git a/aegisub/src/dialog_properties.h b/aegisub/src/dialog_properties.h index 8196fc83c..85fee5bfe 100644 --- a/aegisub/src/dialog_properties.h +++ b/aegisub/src/dialog_properties.h @@ -45,7 +45,7 @@ class DialogProperties : public wxDialog { agi::Context *c; ///< Project this dialog is adjusting the properties of /// Pairs of a script property and a text control for that property - std::vector > properties; + std::vector> properties; // Things that effect rendering wxComboBox *WrapStyle; ///< Wrapping style for long lines diff --git a/aegisub/src/factory_manager.h b/aegisub/src/factory_manager.h index cadf52480..3b17771b4 100644 --- a/aegisub/src/factory_manager.h +++ b/aegisub/src/factory_manager.h @@ -31,7 +31,7 @@ template class FactoryBase { protected: - typedef std::map > map; + typedef std::map> map; typedef typename map::iterator iterator; static map *classes; diff --git a/aegisub/src/menu.cpp b/aegisub/src/menu.cpp index 873c863e9..ca944e7be 100644 --- a/aegisub/src/menu.cpp +++ b/aegisub/src/menu.cpp @@ -122,9 +122,9 @@ struct menu_item_cmp { /// handlers makes everything involves events unusably slow. class CommandManager { /// Menu items which need to do something on menu open - std::deque > dynamic_items; + std::deque> dynamic_items; /// Menu items which need to be updated only when hotkeys change - std::deque > static_items; + std::deque> static_items; /// window id -> command map std::vector items; /// MRU menus which need to be updated on menu open diff --git a/aegisub/src/subs_edit_box.h b/aegisub/src/subs_edit_box.h index ff5efdd0f..e8b899d79 100644 --- a/aegisub/src/subs_edit_box.h +++ b/aegisub/src/subs_edit_box.h @@ -133,7 +133,7 @@ class SubsEditBox : public wxPanel { /// The start and end times of the selected lines without changes made to /// avoid negative durations, so that they can be restored if future changes /// eliminate the negative durations - boost::container::map > initialTimes; + boost::container::map> initialTimes; // Constructor helpers wxTextCtrl *MakeMarginCtrl(wxString const& tooltip, int margin, wxString const& commit_msg); diff --git a/aegisub/src/thesaurus.h b/aegisub/src/thesaurus.h index 6c3b6712b..f5c0bf7fe 100644 --- a/aegisub/src/thesaurus.h +++ b/aegisub/src/thesaurus.h @@ -46,7 +46,7 @@ class Thesaurus { void OnPathChanged(); public: /// A pair of a word and synonyms for that word - typedef std::pair > Entry; + typedef std::pair> Entry; Thesaurus(); ~Thesaurus(); diff --git a/aegisub/src/video_out_gl.cpp b/aegisub/src/video_out_gl.cpp index 0d8d2584f..51c24256f 100644 --- a/aegisub/src/video_out_gl.cpp +++ b/aegisub/src/video_out_gl.cpp @@ -143,7 +143,7 @@ void VideoOutGL::InitTextures(int width, int height, GLenum format, int bpp, boo textureIdList.resize(textureCount); textureList.resize(textureCount); CHECK_INIT_ERROR(glGenTextures(textureIdList.size(), &textureIdList[0])); - vector > textureSizes; + vector> textureSizes; textureSizes.reserve(textureCount); /* Unfortunately, we can't simply use one of the two standard ways to do