wilderjds
/
konsole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Generate dbus's xml files at build time instead of storing them in source.

Browse Source 
svn path=/trunk/KDE/kdebase/apps/konsole/; revision=1073387
wilder-portage
Kurt Hindenburg 16 years ago
parent 1b3b8b3357
commit b6d38f852e
6 changed files with 10 additions and 110 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/CMakeLists.txt
  2. 1
      src/Session.h
  3. 33
      src/org.kde.konsole.Konsole.xml
  4. 5
      src/org.kde.konsole.KonsoleScripting.xml
  5. 65
      src/org.kde.konsole.Session.xml
  6. 5
      src/org.kde.konsole.SessionScripting.xml

11
src/CMakeLists.txt
Unescape View File

@ -30,12 +30,17 @@ configure_file (config-konsole.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-konsol
# qdbuscpp2xml -m Session.h -o org.kde.konsole.Session.xml
# qdbuscpp2xml -M -s ViewManager.h -o org.kde.konsole.Konsole.xml
# Generate dbus .xml files; do not store .xml in source folder
qt4_generate_dbus_interface( Session.h org.kde.konsole.Session.xml OPTIONS
-m)
qt4_generate_dbus_interface( ViewManager.h org.kde.konsole.Konsole.xml OPTIONS -s -M)
qt4_add_dbus_adaptor( sessionadaptors_SRCS
org.kde.konsole.Session.xml
${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Session.xml
Session.h
Konsole::Session )
qt4_add_dbus_adaptor( konsoleadaptors_SRCS
org.kde.konsole.Konsole.xml
${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Konsole.xml
ViewManager.h
Konsole::ViewManager )
@ -81,6 +86,8 @@ configure_file (config-konsole.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-konsol
XKB.cpp
ZModemDialog.cpp
konsole_wcwidth.cpp
${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Konsole.xml
${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Session.xml
)
set(konsole_LIBS

1
src/Session.h
Unescape View File

@ -62,6 +62,7 @@ class ZModemDialog;
class KONSOLEPRIVATE_EXPORT Session : public QObject
{
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "org.kde.konsole.Session")
public:
Q_PROPERTY(QString name READ nameTitle)

33
src/org.kde.konsole.Konsole.xml
Unescape View File

@ -1,33 +0,0 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.kde.konsole.Konsole">
<method name="sessionCount">
<arg type="i" direction="out"/>
</method>
<method name="currentSession">
<arg type="i" direction="out"/>
</method>
<method name="newSession">
<arg type="i" direction="out"/>
<arg name="profile" type="s" direction="in"/>
<arg name="directory" type="s" direction="in"/>
</method>
<method name="profileList">
<arg type="as" direction="out"/>
</method>
<method name="newSession">
<arg type="i" direction="out"/>
</method>
<method name="nextSession">
</method>
<method name="prevSession">
</method>
<method name="moveSessionLeft">
</method>
<method name="moveSessionRight">
</method>
</interface>
</node>

5
src/org.kde.konsole.KonsoleScripting.xml
Unescape View File

@ -1,5 +0,0 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.kde.konsole.KonsoleScripting">
</interface>
</node>

65
src/org.kde.konsole.Session.xml
Unescape View File

@ -1,65 +0,0 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.kde.konsole.Session">
<method name="environment">
<arg type="as" direction="out"/>
</method>
<method name="setEnvironment">
<arg name="environment" type="as" direction="in"/>
</method>
<method name="close">
</method>
<method name="setMonitorActivity">
<arg type="b" direction="in"/>
</method>
<method name="isMonitorActivity">
<arg type="b" direction="out"/>
</method>
<method name="setMonitorSilence">
<arg type="b" direction="in"/>
</method>
<method name="isMonitorSilence">
<arg type="b" direction="out"/>
</method>
<method name="setMonitorSilenceSeconds">
<arg name="seconds" type="i" direction="in"/>
</method>
<method name="setFlowControlEnabled">
<arg name="enabled" type="b" direction="in"/>
</method>
<method name="flowControlEnabled">
<arg type="b" direction="out"/>
</method>
<method name="sendText">
<arg name="text" type="s" direction="in"/>
</method>
<method name="sendMouseEvent">
<arg name="buttons" type="i" direction="in"/>
<arg name="column" type="i" direction="in"/>
<arg name="line" type="i" direction="in"/>
<arg name="eventType" type="i" direction="in"/>
</method>
<method name="processId">
<arg type="i" direction="out"/>
</method>
<method name="foregroundProcessId">
<arg type="i" direction="out"/>
</method>
<method name="setCodec">
<arg type="b" direction="out"/>
<arg name="codec" type="ay" direction="in"/>
</method>
<method name="codec">
<arg type="ay" direction="out"/>
</method>
<method name="setTitle">
<arg name="role" type="i" direction="in"/>
<arg name="title" type="s" direction="in"/>
</method>
<method name="title">
<arg type="s" direction="out"/>
<arg name="role" type="i" direction="in"/>
</method>
</interface>
</node>

5
src/org.kde.konsole.SessionScripting.xml
Unescape View File

@ -1,5 +0,0 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.kde.konsole.SessionScripting">
</interface>
</node>
Write Preview
Loading…
Cancel
Save