From 9522432112d9107208255ecd5e2e37e195c5f31c Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 13 Mar 2019 00:36:05 +1100 Subject: [PATCH] indentation fix --- effects/internal/voideffect.h | 14 +++++++------- ui/mediaiconservice.cpp | 8 ++++---- ui/mediaiconservice.h | 32 ++++++++++++++++---------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/effects/internal/voideffect.h b/effects/internal/voideffect.h index 210b8bed0..7d524302f 100644 --- a/effects/internal/voideffect.h +++ b/effects/internal/voideffect.h @@ -30,16 +30,16 @@ #include "project/effect.h" class VoidEffect : public Effect { - Q_OBJECT + Q_OBJECT public: - VoidEffect(Clip* c, const QString& n); + VoidEffect(Clip* c, const QString& n); - virtual EffectPtr copy(Clip* c) override; - virtual void load(QXmlStreamReader &stream) override; - virtual void save(QXmlStreamWriter &stream) override; + virtual EffectPtr copy(Clip* c) override; + virtual void load(QXmlStreamReader &stream) override; + virtual void save(QXmlStreamWriter &stream) override; private: - QByteArray bytes; - EffectMeta void_meta; + QByteArray bytes; + EffectMeta void_meta; }; #endif // VOIDEFFECT_H diff --git a/ui/mediaiconservice.cpp b/ui/mediaiconservice.cpp index 64d69ca99..90d67e024 100644 --- a/ui/mediaiconservice.cpp +++ b/ui/mediaiconservice.cpp @@ -40,11 +40,11 @@ MediaIconService::MediaIconService() { void MediaIconService::SetMediaIcon(Media *media, int icon_type) { // if this icon is already part of the throbber animation loop, remove it if (throbber_items_.contains(media)) { -// throbber_lock_.lock(); + // throbber_lock_.lock(); throbber_items_.removeAll(media); -// throbber_lock_.unlock(); + // throbber_lock_.unlock(); // if we aren't animating anything, no need to run the timer for now if (throbber_items_.empty()) { @@ -90,13 +90,13 @@ void MediaIconService::AnimationUpdate() { QIcon throbber_ico = QIcon(throbber_pixmap_.copy(kThrobberSize*throbber_animation_frame_, 0, kThrobberSize, kThrobberSize)); -// throbber_lock_.lock(); + // throbber_lock_.lock(); for (int i=0;i throbber_items_; - QTimer throbber_animator_; - QPixmap throbber_pixmap_; - QMutex throbber_lock_; + int throbber_animation_frame_; + QVector throbber_items_; + QTimer throbber_animator_; + QPixmap throbber_pixmap_; + QMutex throbber_lock_; }; namespace olive { - extern std::unique_ptr media_icon_service; +extern std::unique_ptr media_icon_service; } #endif // MEDIAICONSERVICE_H