TDE
/
knetworkmanager8
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/knetworkmanager8
0
0
Fork 0
Code Issues Releases Wiki Activity

Change class names for DBus interfaces.

Browse Source 
Change the way that MOC files are processed.
This is related to the last changes in dbus-1-tqt.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
master
Slávek Banko 6 years ago
parent 5b2672774a
commit 2895b54800
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
4 changed files with 27 additions and 48 deletions
Show Stats Download Patch File Download Diff File

45
knetworkmanager-0.8/src/dbus/CMakeLists.txt
Unescape View File

@ -32,6 +32,13 @@ function( add_dbus_xml option basename classname namespace xmlfile )
add_custom_command( OUTPUT ${basename}.cpp ${basename}.h add_custom_command( OUTPUT ${basename}.cpp ${basename}.h
COMMAND ${DBUSXML2QT3_EXECUTABLE} -${option} ${basename} ${classname} -N ${namespace} ${INTROSPECTIONPATH}/${xmlfile} 2>/dev/null COMMAND ${DBUSXML2QT3_EXECUTABLE} -${option} ${basename} ${classname} -N ${namespace} ${INTROSPECTIONPATH}/${xmlfile} 2>/dev/null
DEPENDS ${INTROSPECTIONPATH}/${xmlfile} ) DEPENDS ${INTROSPECTIONPATH}/${xmlfile} )
if( "${option}" STREQUAL "p" )
add_custom_command( OUTPUT ${basename}.moc
COMMAND ${TMOC_EXECUTABLE} ${basename}.h -o ${basename}.moc
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${basename}.h )
set_property( SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${basename}.cpp APPEND
PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${basename}.moc )
endif( )
endfunction( ) endfunction( )
add_dbus_xml( p networkmanagerproxy NetworkManagerProxy DBus nm-manager.xml ) add_dbus_xml( p networkmanagerproxy NetworkManagerProxy DBus nm-manager.xml )
@ -46,33 +53,15 @@ add_dbus_xml( p activeconnectionproxy ActiveConnectionProxy DBus nm-active-conne
add_dbus_xml( p vpnconnectionproxy VPNConnectionProxy DBus nm-vpn-connection-only.xml ) add_dbus_xml( p vpnconnectionproxy VPNConnectionProxy DBus nm-vpn-connection-only.xml )
add_dbus_xml( p vpnpluginproxy VPNPluginProxy DBus nm-vpn-plugin.xml ) add_dbus_xml( p vpnpluginproxy VPNPluginProxy DBus nm-vpn-plugin.xml )
add_dbus_xml( i networkmanagersettings SettingsInterface DBus nm-settings.xml ) add_dbus_xml( i networkmanagersettings SettingsInterface DBus nm-settings.xml )
add_dbus_xml( i connection "" DBus nm-exported-connection.xml )
add_custom_command( OUTPUT connectionnode.cpp connectionnode.h introspectableinterface.cpp introspectableinterface.h
COMMAND ${DBUSXML2QT3_EXECUTABLE} -n connectionnode -c ConnectionNode -N DBus ${INTROSPECTIONPATH}/nm-exported-connection.xml 2>/dev/null
COMMAND sed s/\#include\\ \\"secrets.h\\"// connectionnode.cpp > connectionnode.cpp_tmp
COMMAND sed s/\#include\\ \\"introspectable.h\\"/\#include\\ \\"introspectableinterface.h\\"/ connectionnode.cpp_tmp > connectionnode.cpp
COMMAND rm -f connectionnode.cpp_tmp
DEPENDS ${INTROSPECTIONPATH}/nm-exported-connection.xml )
# generate moc files
set( MOCHEADERS accesspointproxy.h deviceproxy.h networkmanagerproxy.h networkmanagervpnproxy.h wiredproxy.h add_custom_command(
wirelessproxy.h activeconnectionproxy.h vpnconnectionproxy.h vpnpluginproxy.h gsmproxy.h cdmaproxy.h ) OUTPUT
connection.cpp connection.h
foreach( _header_file ${MOCHEADERS} ) connectionnode.cpp connectionnode.h
get_filename_component( _basename "${_header_file}" NAME_WE ) introspectableInterface.cpp introspectableInterface.h
set( _moc_file ${_basename}.moc ) COMMAND ${DBUSXML2QT3_EXECUTABLE} -i connection -n connectionnode -c ConnectionNode -N DBus ${INTROSPECTIONPATH}/nm-exported-connection.xml 2>/dev/null
list( APPEND _moc_files ${_moc_file} ) DEPENDS ${INTROSPECTIONPATH}/nm-exported-connection.xml
add_custom_command( OUTPUT ${_moc_file} )
COMMAND ${TMOC_EXECUTABLE} ${_header_file} -o ${_moc_file}
DEPENDS ${_header_file} )
endforeach( )
add_custom_command( OUTPUT mocfiles.cpp
COMMAND cat ${_moc_files} > mocfiles.cpp
DEPENDS ${_moc_files} )
# build the library # build the library
@ -82,7 +71,7 @@ tde_add_library( knm_dbus STATIC_PIC
networkmanagerproxy.cpp networkmanagervpnproxy.cpp networkmanagerproxy.cpp networkmanagervpnproxy.cpp
deviceproxy.cpp wiredproxy.cpp wirelessproxy.cpp deviceproxy.cpp wiredproxy.cpp wirelessproxy.cpp
accesspointproxy.cpp networkmanagersettings.cpp accesspointproxy.cpp networkmanagersettings.cpp
connection.cpp connectionnode.cpp introspectableinterface.cpp connection.cpp connectionnode.cpp introspectableInterface.cpp
mocfiles.cpp activeconnectionproxy.cpp vpnconnectionproxy.cpp activeconnectionproxy.cpp vpnconnectionproxy.cpp
vpnpluginproxy.cpp gsmproxy.cpp cdmaproxy.cpp vpnpluginproxy.cpp gsmproxy.cpp cdmaproxy.cpp
) )

22
knetworkmanager-0.8/src/dbus/Makefile.am
Unescape View File

@ -19,8 +19,7 @@ DBUSPROXY = networkmanagerproxy.cpp \
networkmanagersettings.cpp \ networkmanagersettings.cpp \
connection.cpp \ connection.cpp \
connectionnode.cpp \ connectionnode.cpp \
introspectableinterface.cpp \ introspectableInterface.cpp \
mocfiles.cpp \
activeconnectionproxy.cpp \ activeconnectionproxy.cpp \
vpnconnectionproxy.cpp \ vpnconnectionproxy.cpp \
vpnpluginproxy.cpp \ vpnpluginproxy.cpp \
@ -37,7 +36,7 @@ DBUSPROXYHEADERS = networkmanagerproxy.h \
networkmanagersettings.h \ networkmanagersettings.h \
connection.h \ connection.h \
connectionnode.h \ connectionnode.h \
introspectableinterface.h \ introspectableInterface.h \
activeconnectionproxy.h \ activeconnectionproxy.h \
vpnconnectionproxy.h \ vpnconnectionproxy.h \
vpnpluginproxy.h \ vpnpluginproxy.h \
@ -49,7 +48,7 @@ noinst_HEADERS = accesspointproxy.h \
connection.h \ connection.h \
connectionnode.h \ connectionnode.h \
deviceproxy.h \ deviceproxy.h \
introspectableinterface.h \ introspectableInterface.h \
networkmanagerproxy.h \ networkmanagerproxy.h \
networkmanagervpnproxy.h \ networkmanagervpnproxy.h \
networkmanagersettings.h \ networkmanagersettings.h \
@ -64,15 +63,13 @@ cdmaproxy.h
noinst_LTLIBRARIES = libknm_dbus.la noinst_LTLIBRARIES = libknm_dbus.la
libknm_dbus_la_SOURCES = $(DBUSPROXY) libknm_dbus_la_SOURCES = $(DBUSPROXY)
libknm_dbus_la_DEPENDENCIES = $(MOCSUBS)
CLEANFILES = $(DBUSPROXY) $(DBUSPROXYHEADERS) $(MOCSUBS) CLEANFILES = $(DBUSPROXY) $(DBUSPROXYHEADERS) $(MOCSUBS)
.h.moc: .h.moc:
$(TQTMOC) $< -o $@ $(TQTMOC) $< -o $@
mocfiles.cpp: $(MOCSUBS)
cat $(MOCSUBS) > mocfiles.cpp
networkmanagerproxy.cpp networkmanagerproxy.h: networkmanagerproxy.cpp networkmanagerproxy.h:
$(DBUSXML2QT3) -p networkmanagerproxy -c NetworkManagerProxy -N DBus $(INTROSPECTIONPATH)nm-manager.xml $(DBUSXML2QT3) -p networkmanagerproxy -c NetworkManagerProxy -N DBus $(INTROSPECTIONPATH)nm-manager.xml
@ -118,12 +115,5 @@ vpnpluginproxy.cpp vpnpluginproxy.h:
networkmanagersettings.cpp networkmanagersettings.h: networkmanagersettings.cpp networkmanagersettings.h:
$(DBUSXML2QT3) -i networkmanagersettings -c SettingsInterface -N DBus $(INTROSPECTIONPATH)nm-settings.xml $(DBUSXML2QT3) -i networkmanagersettings -c SettingsInterface -N DBus $(INTROSPECTIONPATH)nm-settings.xml
connection.cpp connection.h: connection.cpp connection.h connectionnode.cpp connectionnode.h introspectableInterface.cpp introspectableInterface.h:
$(DBUSXML2QT3) -i connection -N DBus $(INTROSPECTIONPATH)nm-exported-connection.xml $(DBUSXML2QT3) -i connection -n connectionnode -c ConnectionNode -N DBus $(INTROSPECTIONPATH)nm-exported-connection.xml
connectionnode.cpp connectionnode.h introspectableinterface.cpp introspectableinterface.h:
$(DBUSXML2QT3) -n connectionnode -c ConnectionNode -N DBus $(INTROSPECTIONPATH)nm-exported-connection.xml
sed s/#include\ \"secrets.h\"// connectionnode.cpp > connectionnode.cpp_tmp
sed s/#include\ \"introspectable.h\"/#include\ \"introspectableinterface.h\"/ connectionnode.cpp_tmp > connectionnode.cpp
rm -f connectionnode.cpp_tmp

4
knetworkmanager-0.8/src/knetworkmanager-connection_dbus.h
Unescape View File

@ -41,12 +41,12 @@ class TQT_DBusObjectPath;
namespace ConnectionSettings namespace ConnectionSettings
{ {
class Connection; class ConnectionInterface;
class ConnectionSetting; class ConnectionSetting;
class ConnectionDBusPrivate; class ConnectionDBusPrivate;
// DBUS abstraction for a connection // DBUS abstraction for a connection
class ConnectionDBus : public TQObject, public DBus::Connection class ConnectionDBus : public TQObject, public DBus::ConnectionInterface
{ {
Q_OBJECT Q_OBJECT

4
knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.h
Unescape View File

@ -47,7 +47,7 @@ namespace ConnectionSettings
class ConnectionSecretsDBusPrivate; class ConnectionSecretsDBusPrivate;
// a connection wraps multiple settings // a connection wraps multiple settings
class ConnectionSecretsDBus : public TQObject, public DBus::Secrets class ConnectionSecretsDBus : public TQObject, public DBus::SecretsInterface
{ {
Q_OBJECT Q_OBJECT
@ -59,7 +59,7 @@ namespace ConnectionSettings
void SendGetSecretsError(); void SendGetSecretsError();
protected: protected:
// implementation of the Secrets DBus-interface // implementation of the SecretsInterface DBus-interface
void GetSecretsAsync(int, const TQString&, const TQStringList&, bool); void GetSecretsAsync(int, const TQString&, const TQStringList&, bool);
void handleMethodReply(const TQT_DBusMessage& reply); void handleMethodReply(const TQT_DBusMessage& reply);
bool handleSignalSend(const TQT_DBusMessage& reply); bool handleSignalSend(const TQT_DBusMessage& reply);

Write Preview
Loading…
Cancel
Save