From 7387a0f734ab7f87ec0cb8bd452ea0ce321b0c14 Mon Sep 17 00:00:00 2001 From: reionwong Date: Thu, 3 Sep 2026 23:20:45 -0400 Subject: [PATCH] refactor(network): normalize source and export names --- network/CMakeLists.txt | 6 +++--- network/appletproxymodel.h | 4 ++-- network/networkitemslist.h | 4 ++-- network/networkmodel.h | 4 ++-- network/networkmodelitem.h | 4 ++-- network/qmlplugins.cpp | 2 +- network/uiutils.h | 4 ++-- .../{wiressitemsettings.cpp => wirelessitemsettings.cpp} | 2 +- network/{wiressitemsettings.h => wirelessitemsettings.h} | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) rename network/{wiressitemsettings.cpp => wirelessitemsettings.cpp} (98%) rename network/{wiressitemsettings.h => wirelessitemsettings.h} (92%) diff --git a/network/CMakeLists.txt b/network/CMakeLists.txt index 8e5fb5d..d77d60a 100644 --- a/network/CMakeLists.txt +++ b/network/CMakeLists.txt @@ -16,8 +16,8 @@ set(CUTEFISH_NETWORK_SOURCES networkmodelitem.cpp networkmodelitem.h - wiressitemsettings.cpp - wiressitemsettings.h + wirelessitemsettings.cpp + wirelessitemsettings.h uiutils.cpp uiutils.h @@ -48,7 +48,7 @@ find_package(KF6NetworkManagerQt REQUIRED) find_package(KF6ModemManagerQt REQUIRED) add_library(cutefish-framework-network SHARED ${CUTEFISH_NETWORK_SOURCES}) -generate_export_header(cutefish-framework-network EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/networkmanager_export.h BASE_NAME NetworkManager) +generate_export_header(cutefish-framework-network EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/network_export.h BASE_NAME Cutefish_Network) qt_add_qml_module(cutefish-framework-network URI Cutefish.Network diff --git a/network/appletproxymodel.h b/network/appletproxymodel.h index 514688c..b0b7fee 100644 --- a/network/appletproxymodel.h +++ b/network/appletproxymodel.h @@ -22,12 +22,12 @@ #ifndef APPLETPROXYMODEL_H #define APPLETPROXYMODEL_H -#include +#include #include #include "networkmodelitem.h" -class NETWORKMANAGER_EXPORT AppletProxyModel : public QSortFilterProxyModel +class CUTEFISH_NETWORK_EXPORT AppletProxyModel : public QSortFilterProxyModel { Q_OBJECT Q_PROPERTY(Type type READ type WRITE setType NOTIFY typeChanged) diff --git a/network/networkitemslist.h b/network/networkitemslist.h index 2694905..50cee17 100644 --- a/network/networkitemslist.h +++ b/network/networkitemslist.h @@ -21,7 +21,7 @@ #ifndef NETWORKITEMSLIST_H #define NETWORKITEMSLIST_H -#include +#include #include @@ -29,7 +29,7 @@ class NetworkModelItem; -class NETWORKMANAGER_EXPORT NetworkItemsList : public QObject +class CUTEFISH_NETWORK_EXPORT NetworkItemsList : public QObject { Q_OBJECT diff --git a/network/networkmodel.h b/network/networkmodel.h index d3405c7..b562d81 100644 --- a/network/networkmodel.h +++ b/network/networkmodel.h @@ -21,7 +21,7 @@ #ifndef NETWORKMODEL_H #define NETWORKMODEL_H -#include +#include #include #include @@ -39,7 +39,7 @@ Q_DECLARE_LOGGING_CATEGORY(gLcNm) -class NETWORKMANAGER_EXPORT NetworkModel : public QAbstractListModel +class CUTEFISH_NETWORK_EXPORT NetworkModel : public QAbstractListModel { Q_OBJECT diff --git a/network/networkmodelitem.h b/network/networkmodelitem.h index 9d2a263..bfbbd08 100644 --- a/network/networkmodelitem.h +++ b/network/networkmodelitem.h @@ -21,7 +21,7 @@ #ifndef NETWORKMODELITEM_H #define NETWORKMODELITEM_H -#include +#include #include #include @@ -31,7 +31,7 @@ #include "networkmodel.h" -class NETWORKMANAGER_EXPORT NetworkModelItem : public QObject +class CUTEFISH_NETWORK_EXPORT NetworkModelItem : public QObject { Q_OBJECT diff --git a/network/qmlplugins.cpp b/network/qmlplugins.cpp index d544c52..013b2c6 100644 --- a/network/qmlplugins.cpp +++ b/network/qmlplugins.cpp @@ -3,7 +3,7 @@ #include "networkmodelitem.h" #include "activeconnection.h" #include "appletproxymodel.h" -#include "wiressitemsettings.h" +#include "wirelessitemsettings.h" #include "identitymodel.h" #include "handler.h" #include "enabledconnections.h" diff --git a/network/uiutils.h b/network/uiutils.h index c6e1a82..98f9578 100644 --- a/network/uiutils.h +++ b/network/uiutils.h @@ -22,7 +22,7 @@ #ifndef UIUTILS_H #define UIUTILS_H -#include +#include #include #include @@ -42,7 +42,7 @@ #include #endif -class NETWORKMANAGER_EXPORT UiUtils +class CUTEFISH_NETWORK_EXPORT UiUtils { public: enum SortedConnectionType { diff --git a/network/wiressitemsettings.cpp b/network/wirelessitemsettings.cpp similarity index 98% rename from network/wiressitemsettings.cpp rename to network/wirelessitemsettings.cpp index ada0b64..b1126c5 100644 --- a/network/wiressitemsettings.cpp +++ b/network/wirelessitemsettings.cpp @@ -2,7 +2,7 @@ #include #include -#include "wiressitemsettings.h" +#include "wirelessitemsettings.h" #include #include diff --git a/network/wiressitemsettings.h b/network/wirelessitemsettings.h similarity index 92% rename from network/wiressitemsettings.h rename to network/wirelessitemsettings.h index 42e6956..a45e827 100644 --- a/network/wiressitemsettings.h +++ b/network/wirelessitemsettings.h @@ -1,13 +1,13 @@ #ifndef WIRELESSITEMSETTINGS_H #define WIRELESSITEMSETTINGS_H -#include +#include #include #include -class NETWORKMANAGER_EXPORT WirelessItemSettings : public QObject +class CUTEFISH_NETWORK_EXPORT WirelessItemSettings : public QObject { Q_OBJECT Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)