Rename projects and files to avoid naming conflicts

CMakeLists.txt

@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(QAdwaitaDecorations
+project(QWhiteSurGtkDecorations
     VERSION 0.1.5
-    DESCRIPTION "Qt Wayland decoration plugin using libadwaita style"
+    DESCRIPTION "Qt Wayland decoration plugin using WhiteSur-gtk style"
     LANGUAGES CXX C)
 
 option(USE_QT6 "Use Qt6 instead of Qt5" OFF)

README.md

@@ -1,5 +1,9 @@
-# QAdwaitaDecorations
-Qt decoration plugin implementing Adwaita-like client-side decorations.
+# QWhiteSurGtkDecorations
+Qt decoration plugin implementing WhiteSurGTK-like client-side decorations.
+
+This project is modified based on the [QAdwaitaDecorations](https://github.com/FedoraQt/QAdwaitaDecorations) project.  
+
+Some of the icon resources used in this project come from [WhiteSur-gtk-theme](https://github.com/vinceliuice/WhiteSur-gtk-theme.git).
 
 ## How to compile
 This library uses private Qt headers and will likely not be forward nor
@@ -20,7 +24,7 @@ make && make install
 It can be used by setting the QT_WAYLAND_DECORATION environment variable:
 
 ```
-export QT_WAYLAND_DECORATION=adwaita
+export QT_WAYLAND_DECORATION=whitesur-gtk
 ```
 
 ## License

src/CMakeLists.txt

@@ -2,13 +2,13 @@
 qt_add_resources(SOURCES resources.qrc)
 
 set(qadwaitadecorations_SRCS
-    qadwaitadecorationsplugin.cpp
-    qadwaitadecorations.cpp
+        qwhitesurgtkdecorationsplugin.cpp
+        qwhitesurgtkdecorations.cpp
     ${SOURCES}
 )
 
-add_library(qadwaitadecorations MODULE ${qadwaitadecorations_SRCS})
-target_link_libraries(qadwaitadecorations
+add_library(qwhitesurgtkdecorations MODULE ${qadwaitadecorations_SRCS})
+target_link_libraries(qwhitesurgtkdecorations
     Qt${QT_VERSION_MAJOR}::Core
     Qt${QT_VERSION_MAJOR}::Gui
     Qt${QT_VERSION_MAJOR}::GuiPrivate
@@ -19,12 +19,12 @@ target_link_libraries(qadwaitadecorations
 
 if (NOT USE_QT6)
     if (${Qt5XkbCommonSupport_FOUND})
-    target_link_libraries(qadwaitadecorations
+    target_link_libraries(qwhitesurgtkdecorations
         Qt${QT_VERSION_MAJOR}::XkbCommonSupportPrivate
         Qt${QT_VERSION_MAJOR}::ThemeSupportPrivate
     )
     endif()
 endif()
 
-install(TARGETS qadwaitadecorations DESTINATION ${QT_PLUGINS_DIR}/wayland-decoration-client)
+install(TARGETS qwhitesurgtkdecorations DESTINATION ${QT_PLUGINS_DIR}/wayland-decoration-client)
 

src/qadwaitadecorations.cpp → src/qwhitesurgtkdecorations.cpp

@@ -17,7 +17,7 @@
  *
  */
 
-#include "qadwaitadecorations.h"
+#include "qwhitesurgtkdecorations.h"
 
 #include <QtWaylandClient/private/qwaylandshellsurface_p.h>
 #include <QtWaylandClient/private/qwaylandshmbackingstore_p.h>

src/qwhitesurgtkdecorations.json

@@ -0,0 +1,5 @@
+{
+    "Keys": [ "whitesur-gtk" ]
+}
+
+

src/qadwaitadecorationsplugin.cpp → src/qwhitesurgtkdecorationsplugin.cpp

@@ -17,14 +17,14 @@
  *
  */
 
-#include "qadwaitadecorationsplugin.h"
-#include "qadwaitadecorations.h"
+#include "qwhitesurgtkdecorationsplugin.h"
+#include "qwhitesurgtkdecorations.h"
 
 QWaylandAbstractDecoration *QAdwaitaDecorationsPlugin::create(const QString &system,
                                                               const QStringList &paramList)
 {
     Q_UNUSED(paramList)
-    if (system == "adwaita" || system == "gnome")
+    if (system == "whitesur-gtk")
         return new QAdwaitaDecorations();
     return nullptr;
 }

src/qadwaitadecorationsplugin.h → src/qwhitesurgtkdecorationsplugin.h

@@ -27,7 +27,7 @@ using namespace QtWaylandClient;
 class QAdwaitaDecorationsPlugin : public QWaylandDecorationPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID QWaylandDecorationFactoryInterface_iid FILE "qadwaitadecorations.json")
+    Q_PLUGIN_METADATA(IID QWaylandDecorationFactoryInterface_iid FILE "qwhitesurgtkdecorations.json")
 public:
     QWaylandAbstractDecoration *create(const QString &system,
                                        const QStringList &paramList) override;