refactor(network): normalize source and export names

main
reionwong 3 weeks ago
parent 698949da21
commit 7387a0f734

@ -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

@ -22,12 +22,12 @@
#ifndef APPLETPROXYMODEL_H
#define APPLETPROXYMODEL_H
#include <networkmanager_export.h>
#include <network_export.h>
#include <QSortFilterProxyModel>
#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)

@ -21,7 +21,7 @@
#ifndef NETWORKITEMSLIST_H
#define NETWORKITEMSLIST_H
#include <networkmanager_export.h>
#include <network_export.h>
#include <QAbstractListModel>
@ -29,7 +29,7 @@
class NetworkModelItem;
class NETWORKMANAGER_EXPORT NetworkItemsList : public QObject
class CUTEFISH_NETWORK_EXPORT NetworkItemsList : public QObject
{
Q_OBJECT

@ -21,7 +21,7 @@
#ifndef NETWORKMODEL_H
#define NETWORKMODEL_H
#include <networkmanager_export.h>
#include <network_export.h>
#include <QAbstractListModel>
#include <QLoggingCategory>
@ -39,7 +39,7 @@
Q_DECLARE_LOGGING_CATEGORY(gLcNm)
class NETWORKMANAGER_EXPORT NetworkModel : public QAbstractListModel
class CUTEFISH_NETWORK_EXPORT NetworkModel : public QAbstractListModel
{
Q_OBJECT

@ -21,7 +21,7 @@
#ifndef NETWORKMODELITEM_H
#define NETWORKMODELITEM_H
#include <networkmanager_export.h>
#include <network_export.h>
#include <NetworkManagerQt/ActiveConnection>
#include <NetworkManagerQt/Connection>
@ -31,7 +31,7 @@
#include "networkmodel.h"
class NETWORKMANAGER_EXPORT NetworkModelItem : public QObject
class CUTEFISH_NETWORK_EXPORT NetworkModelItem : public QObject
{
Q_OBJECT

@ -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"

@ -22,7 +22,7 @@
#ifndef UIUTILS_H
#define UIUTILS_H
#include <networkmanager_export.h>
#include <network_export.h>
#include <NetworkManagerQt/Device>
#include <NetworkManagerQt/ModemDevice>
@ -42,7 +42,7 @@
#include <ModemManagerQt/modem.h>
#endif
class NETWORKMANAGER_EXPORT UiUtils
class CUTEFISH_NETWORK_EXPORT UiUtils
{
public:
enum SortedConnectionType {

@ -2,7 +2,7 @@
#include <NetworkManagerQt/WiredSetting>
#include <QDebug>
#include "wiressitemsettings.h"
#include "wirelessitemsettings.h"
#include <sys/types.h>
#include <unistd.h>

@ -1,13 +1,13 @@
#ifndef WIRELESSITEMSETTINGS_H
#define WIRELESSITEMSETTINGS_H
#include <networkmanager_export.h>
#include <network_export.h>
#include <QtCore/QObject>
#include <NetworkManagerQt/Connection>
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)
Loading…
Cancel
Save