From d2c3f904db4046ba83dd258a7e1b7d39deb515ec Mon Sep 17 00:00:00 2001 From: laserpants Date: Sun, 19 Jun 2016 16:39:11 +0300 Subject: [PATCH] rename ScrollBar files from scrollbar to scrollwidget to clear up QtCreator mess --- components/{scrollbar.cpp => scrollwidget.cpp} | 6 +++--- components/{scrollbar.h => scrollwidget.h} | 6 +++--- ...crollbar_internal.cpp => scrollwidget_internal.cpp} | 2 +- .../{scrollbar_internal.h => scrollwidget_internal.h} | 2 +- components/{scrollbar_p.h => scrollwidget_p.h} | 6 +++--- examples/avatarexamples.cpp | 2 +- qt-material-widgets.pro | 10 +++++----- 7 files changed, 17 insertions(+), 17 deletions(-) rename components/{scrollbar.cpp => scrollwidget.cpp} (96%) rename components/{scrollbar.h => scrollwidget.h} (91%) rename components/{scrollbar_internal.cpp => scrollwidget_internal.cpp} (96%) rename components/{scrollbar_internal.h => scrollwidget_internal.h} (95%) rename components/{scrollbar_p.h => scrollwidget_p.h} (85%) diff --git a/components/scrollbar.cpp b/components/scrollwidget.cpp similarity index 96% rename from components/scrollbar.cpp rename to components/scrollwidget.cpp index 23996b3..c95e279 100644 --- a/components/scrollbar.cpp +++ b/components/scrollwidget.cpp @@ -1,8 +1,8 @@ -#include "scrollbar.h" +#include "scrollwidget.h" #include #include -#include "scrollbar_p.h" -#include "scrollbar_internal.h" +#include "scrollwidget_p.h" +#include "scrollwidget_internal.h" #include "lib/style.h" ScrollBarPrivate::ScrollBarPrivate(ScrollBar *q) diff --git a/components/scrollbar.h b/components/scrollwidget.h similarity index 91% rename from components/scrollbar.h rename to components/scrollwidget.h index ab88548..8de2cf9 100644 --- a/components/scrollbar.h +++ b/components/scrollwidget.h @@ -1,5 +1,5 @@ -#ifndef SCROLLBAR_H -#define SCROLLBAR_H +#ifndef SCROLLWIDGET_H +#define SCROLLWIDGET_H #include @@ -37,4 +37,4 @@ private: Q_DECLARE_PRIVATE(ScrollBar) }; -#endif // SCROLLBAR_H +#endif // SCROLLWIDGET_H diff --git a/components/scrollbar_internal.cpp b/components/scrollwidget_internal.cpp similarity index 96% rename from components/scrollbar_internal.cpp rename to components/scrollwidget_internal.cpp index 31b392e..8d5fcdd 100644 --- a/components/scrollbar_internal.cpp +++ b/components/scrollwidget_internal.cpp @@ -1,4 +1,4 @@ -#include "scrollbar_internal.h" +#include "scrollwidget_internal.h" #include #include diff --git a/components/scrollbar_internal.h b/components/scrollwidget_internal.h similarity index 95% rename from components/scrollbar_internal.h rename to components/scrollwidget_internal.h index 594aec5..af878d6 100644 --- a/components/scrollbar_internal.h +++ b/components/scrollwidget_internal.h @@ -2,7 +2,7 @@ #define SCROLLBAR_INTERNAL_H #include -#include "scrollbar.h" +#include "scrollwidget.h" class ScrollBar; diff --git a/components/scrollbar_p.h b/components/scrollwidget_p.h similarity index 85% rename from components/scrollbar_p.h rename to components/scrollwidget_p.h index 42f1bdb..3693e87 100644 --- a/components/scrollbar_p.h +++ b/components/scrollwidget_p.h @@ -1,5 +1,5 @@ -#ifndef SCROLLBAR_P_H -#define SCROLLBAR_P_H +#ifndef SCROLLWIDGET_P_H +#define SCROLLWIDGET_P_H #include @@ -25,4 +25,4 @@ public: bool useThemeColors; }; -#endif // SCROLLBAR_P_H +#endif // SCROLLWIDGET_P_H diff --git a/examples/avatarexamples.cpp b/examples/avatarexamples.cpp index f21e479..7c4a5ac 100644 --- a/examples/avatarexamples.cpp +++ b/examples/avatarexamples.cpp @@ -6,7 +6,7 @@ #include "components/badge.h" #include "exampleview.h" #include "frame.h" -#include "components/scrollbar.h" +#include "components/scrollwidget.h" AvatarExamples::AvatarExamples(QWidget *parent) : ExampleList(parent) diff --git a/qt-material-widgets.pro b/qt-material-widgets.pro index 3cc5af8..c653f88 100644 --- a/qt-material-widgets.pro +++ b/qt-material-widgets.pro @@ -68,8 +68,8 @@ SOURCES += main.cpp\ components/circularprogress.cpp \ components/circularprogress_internal.cpp \ components/progress_internal.cpp \ - components/scrollbar.cpp \ - components/scrollbar_internal.cpp + components/scrollwidget.cpp \ + components/scrollwidget_internal.cpp HEADERS += mainwindow.h \ components/appbar.h \ @@ -148,9 +148,9 @@ HEADERS += mainwindow.h \ components/circularprogress_p.h \ components/circularprogress_internal.h \ components/progress_internal.h \ - components/scrollbar.h \ - components/scrollbar_p.h \ - components/scrollbar_internal.h + components/scrollwidget_p.h \ + components/scrollwidget.h \ + components/scrollwidget_internal.h RESOURCES += \ resources.qrc