diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 3c2d790eaf..d276b63d3f 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -122,14 +122,14 @@ set(client_SRCS emojimodel.cpp fileactivitylistmodel.cpp tray/syncstatussummary.cpp - tray/ActivityData.cpp - tray/ActivityListModel.cpp + tray/activitydata.cpp + tray/activitylistmodel.cpp tray/unifiedsearchresult.cpp tray/unifiedsearchresultimageprovider.cpp tray/unifiedsearchresultslistmodel.cpp - tray/UserModel.cpp - tray/NotificationHandler.cpp - tray/NotificationCache.cpp + tray/usermodel.cpp + tray/notificationhandler.cpp + tray/notificationcache.cpp creds/credentialsfactory.cpp creds/httpcredentialsgui.cpp creds/oauth.cpp diff --git a/src/gui/fileactivitylistmodel.cpp b/src/gui/fileactivitylistmodel.cpp index 08e9162522..104ff317c2 100644 --- a/src/gui/fileactivitylistmodel.cpp +++ b/src/gui/fileactivitylistmodel.cpp @@ -14,7 +14,7 @@ #include "fileactivitylistmodel.h" #include "folderman.h" -#include "tray/ActivityListModel.h" +#include "tray/activitylistmodel.h" namespace OCC { diff --git a/src/gui/fileactivitylistmodel.h b/src/gui/fileactivitylistmodel.h index 2c465dcf2a..421c581286 100644 --- a/src/gui/fileactivitylistmodel.h +++ b/src/gui/fileactivitylistmodel.h @@ -15,7 +15,7 @@ #pragma once #include "accountstate.h" -#include "tray/ActivityListModel.h" +#include "tray/activitylistmodel.h" namespace OCC { diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp index dafb0dfc1a..decb58805d 100644 --- a/src/gui/systray.cpp +++ b/src/gui/systray.cpp @@ -17,7 +17,7 @@ #include "theme.h" #include "config.h" #include "common/utility.h" -#include "tray/UserModel.h" +#include "tray/usermodel.h" #include "tray/unifiedsearchresultimageprovider.h" #include "configfile.h" diff --git a/src/gui/systray.h b/src/gui/systray.h index e6b7bdc025..70917aaabb 100644 --- a/src/gui/systray.h +++ b/src/gui/systray.h @@ -18,7 +18,7 @@ #include #include "accountmanager.h" -#include "tray/UserModel.h" +#include "tray/usermodel.h" class QScreen; class QQmlApplicationEngine; diff --git a/src/gui/tray/ActivityData.cpp b/src/gui/tray/activitydata.cpp similarity index 97% rename from src/gui/tray/ActivityData.cpp rename to src/gui/tray/activitydata.cpp index 9378a65969..866c97956f 100644 --- a/src/gui/tray/ActivityData.cpp +++ b/src/gui/tray/activitydata.cpp @@ -14,7 +14,7 @@ #include -#include "ActivityData.h" +#include "activitydata.h" namespace OCC { diff --git a/src/gui/tray/ActivityData.h b/src/gui/tray/activitydata.h similarity index 100% rename from src/gui/tray/ActivityData.h rename to src/gui/tray/activitydata.h diff --git a/src/gui/tray/ActivityListModel.cpp b/src/gui/tray/activitylistmodel.cpp similarity index 99% rename from src/gui/tray/ActivityListModel.cpp rename to src/gui/tray/activitylistmodel.cpp index 3d69956b96..3d126244df 100644 --- a/src/gui/tray/ActivityListModel.cpp +++ b/src/gui/tray/activitylistmodel.cpp @@ -31,8 +31,8 @@ #include "guiutility.h" #include "invalidfilenamedialog.h" -#include "ActivityData.h" -#include "ActivityListModel.h" +#include "activitydata.h" +#include "activitylistmodel.h" #include "theme.h" diff --git a/src/gui/tray/ActivityListModel.h b/src/gui/tray/activitylistmodel.h similarity index 99% rename from src/gui/tray/ActivityListModel.h rename to src/gui/tray/activitylistmodel.h index 6573161044..379fc9ba86 100644 --- a/src/gui/tray/ActivityListModel.h +++ b/src/gui/tray/activitylistmodel.h @@ -17,7 +17,7 @@ #include -#include "ActivityData.h" +#include "activitydata.h" class QJsonDocument; diff --git a/src/gui/tray/NotificationCache.cpp b/src/gui/tray/notificationcache.cpp similarity index 94% rename from src/gui/tray/NotificationCache.cpp rename to src/gui/tray/notificationcache.cpp index e2d4f777ee..f60c2457d6 100644 --- a/src/gui/tray/NotificationCache.cpp +++ b/src/gui/tray/notificationcache.cpp @@ -1,4 +1,4 @@ -#include "NotificationCache.h" +#include "notificationcache.h" namespace OCC { diff --git a/src/gui/tray/NotificationCache.h b/src/gui/tray/notificationcache.h similarity index 100% rename from src/gui/tray/NotificationCache.h rename to src/gui/tray/notificationcache.h diff --git a/src/gui/tray/NotificationHandler.cpp b/src/gui/tray/notificationhandler.cpp similarity index 99% rename from src/gui/tray/NotificationHandler.cpp rename to src/gui/tray/notificationhandler.cpp index d97feed1cd..2bb4b7ef65 100644 --- a/src/gui/tray/NotificationHandler.cpp +++ b/src/gui/tray/notificationhandler.cpp @@ -1,4 +1,4 @@ -#include "NotificationHandler.h" +#include "notificationhandler.h" #include "accountstate.h" #include "capabilities.h" diff --git a/src/gui/tray/NotificationHandler.h b/src/gui/tray/notificationhandler.h similarity index 93% rename from src/gui/tray/NotificationHandler.h rename to src/gui/tray/notificationhandler.h index 5bc4692f59..5bd824f5cf 100644 --- a/src/gui/tray/NotificationHandler.h +++ b/src/gui/tray/notificationhandler.h @@ -3,7 +3,7 @@ #include -#include "UserModel.h" +#include "usermodel.h" class QJsonDocument; @@ -34,4 +34,4 @@ private: }; } -#endif // NOTIFICATIONHANDLER_H \ No newline at end of file +#endif // NOTIFICATIONHANDLER_H diff --git a/src/gui/tray/syncstatussummary.cpp b/src/gui/tray/syncstatussummary.cpp index adb2003e91..8f74985c8e 100644 --- a/src/gui/tray/syncstatussummary.cpp +++ b/src/gui/tray/syncstatussummary.cpp @@ -18,7 +18,7 @@ #include "navigationpanehelper.h" #include "networkjobs.h" #include "syncresult.h" -#include "tray/UserModel.h" +#include "tray/usermodel.h" #include diff --git a/src/gui/tray/unifiedsearchresultimageprovider.cpp b/src/gui/tray/unifiedsearchresultimageprovider.cpp index f0bba8efef..97a57f519d 100644 --- a/src/gui/tray/unifiedsearchresultimageprovider.cpp +++ b/src/gui/tray/unifiedsearchresultimageprovider.cpp @@ -14,7 +14,7 @@ #include "unifiedsearchresultimageprovider.h" -#include "UserModel.h" +#include "usermodel.h" #include #include diff --git a/src/gui/tray/UserModel.cpp b/src/gui/tray/usermodel.cpp similarity index 99% rename from src/gui/tray/UserModel.cpp rename to src/gui/tray/usermodel.cpp index 3624dd6522..36016ead7e 100644 --- a/src/gui/tray/UserModel.cpp +++ b/src/gui/tray/usermodel.cpp @@ -1,5 +1,5 @@ -#include "NotificationHandler.h" -#include "UserModel.h" +#include "notificationhandler.h" +#include "usermodel.h" #include "accountmanager.h" #include "owncloudgui.h" @@ -12,8 +12,8 @@ #include "logger.h" #include "guiutility.h" #include "syncfileitem.h" -#include "tray/ActivityListModel.h" -#include "tray/NotificationCache.h" +#include "tray/activitylistmodel.h" +#include "tray/notificationcache.h" #include "tray/unifiedsearchresultslistmodel.h" #include "userstatusconnector.h" diff --git a/src/gui/tray/UserModel.h b/src/gui/tray/usermodel.h similarity index 99% rename from src/gui/tray/UserModel.h rename to src/gui/tray/usermodel.h index 88dc78a25d..5ec34a916c 100644 --- a/src/gui/tray/UserModel.h +++ b/src/gui/tray/usermodel.h @@ -8,11 +8,11 @@ #include #include -#include "ActivityListModel.h" +#include "activitylistmodel.h" #include "accountfwd.h" #include "accountmanager.h" #include "folderman.h" -#include "NotificationCache.h" +#include "notificationcache.h" #include "userstatusselectormodel.h" #include "userstatusconnector.h" #include diff --git a/src/gui/userstatusselectormodel.cpp b/src/gui/userstatusselectormodel.cpp index 47a8c74a95..6ae0dd256f 100644 --- a/src/gui/userstatusselectormodel.cpp +++ b/src/gui/userstatusselectormodel.cpp @@ -13,7 +13,7 @@ */ #include "userstatusselectormodel.h" -#include "tray/UserModel.h" +#include "tray/usermodel.h" #include #include diff --git a/test/testnotificationcache.cpp b/test/testnotificationcache.cpp index 6ee05e3d79..eba7e3f4d5 100644 --- a/test/testnotificationcache.cpp +++ b/test/testnotificationcache.cpp @@ -1,6 +1,6 @@ #include -#include "tray/NotificationCache.h" +#include "tray/notificationcache.h" class TestNotificationCache : public QObject {