From f963a8c4620c8c43cb30b7817c4e22cd28394db0 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Sat, 30 Jun 2007 22:14:50 +0000 Subject: [PATCH] lol, grammar. Originally committed to SVN as r1323. --- aegisub/Makefile.am | 2 +- aegisub/video_display_visual.h | 4 ++-- ...o_dragable_feature.cpp => video_draggable_feature.cpp} | 8 ++++---- ...video_dragable_feature.h => video_draggable_feature.h} | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) rename aegisub/{video_dragable_feature.cpp => video_draggable_feature.cpp} (91%) rename aegisub/{video_dragable_feature.h => video_draggable_feature.h} (94%) diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am index 5e8295e3e..3b11b87c5 100644 --- a/aegisub/Makefile.am +++ b/aegisub/Makefile.am @@ -210,7 +210,7 @@ aegisub_SOURCES = \ video_context.cpp \ video_display.cpp \ video_display_visual.cpp \ - video_dragable_feature.cpp \ + video_draggable_feature.cpp \ video_frame.cpp \ video_provider.cpp \ video_provider_dummy.cpp \ diff --git a/aegisub/video_display_visual.h b/aegisub/video_display_visual.h index ab31108c2..aedc91b66 100644 --- a/aegisub/video_display_visual.h +++ b/aegisub/video_display_visual.h @@ -40,7 +40,7 @@ /////////// // Headers #include "gl_wrap.h" -#include "video_dragable_feature.h" +#include "video_draggable_feature.h" #include @@ -74,7 +74,7 @@ private: AssDialogue *curSelection; VideoDisplay *parent; - std::vector drags; + std::vector drags; void GetLinePosition(AssDialogue *diag,int &x,int &y); void GetLinePosition(AssDialogue *diag,int &x,int &y,int &orgx,int &orgy); diff --git a/aegisub/video_dragable_feature.cpp b/aegisub/video_draggable_feature.cpp similarity index 91% rename from aegisub/video_dragable_feature.cpp rename to aegisub/video_draggable_feature.cpp index 0ea39f43d..db2a37a8c 100644 --- a/aegisub/video_dragable_feature.cpp +++ b/aegisub/video_draggable_feature.cpp @@ -36,12 +36,12 @@ /////////// // Headers -#include "video_dragable_feature.h" +#include "video_draggable_feature.h" /////////////// // Constructor -VideoDragAbleFeature::VideoDragAbleFeature() { +VideoDraggableFeature::VideoDraggableFeature() { type = DRAG_NONE; x = -1; y = -1; @@ -51,12 +51,12 @@ VideoDragAbleFeature::VideoDragAbleFeature() { ///////////////////// // Is mouse over it? -bool VideoDragAbleFeature::IsMouseOver(int x,int y) { +bool VideoDraggableFeature::IsMouseOver(int x,int y) { return false; } //////////////// // Draw feature -void VideoDragAbleFeature::Draw(bool highlighted) { +void VideoDraggableFeature::Draw(bool highlighted) { } diff --git a/aegisub/video_dragable_feature.h b/aegisub/video_draggable_feature.h similarity index 94% rename from aegisub/video_dragable_feature.h rename to aegisub/video_draggable_feature.h index 8e5b919da..3733c9563 100644 --- a/aegisub/video_dragable_feature.h +++ b/aegisub/video_draggable_feature.h @@ -44,7 +44,7 @@ //////////////// // Feature type -enum DragAbleFeatureType { +enum DraggableFeatureType { DRAG_NONE, DRAG_BIG_SQUARE, DRAG_BIG_CIRCLE, @@ -55,9 +55,9 @@ enum DragAbleFeatureType { ///////////////////// // Drag-able feature -class VideoDragAbleFeature { +class VideoDraggableFeature { public: - DragAbleFeatureType type; + DraggableFeatureType type; int x,y; int index; AssDialogue *line; @@ -65,5 +65,5 @@ public: bool IsMouseOver(int x,int y); void Draw(bool highlighted); - VideoDragAbleFeature(); + VideoDraggableFeature(); };