From 389e391b70936131f50fe435c1a1db5da23ea80a Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 27 Oct 2006 11:06:32 +0000 Subject: [PATCH] Rename interface from Session.Scripting to SessionScripting. Regenerate adaptors. svn path=/trunk/KDE/kdebase/apps/konsole/; revision=599487 --- ...l => org.kde.konsole.SessionScripting.xml} | 2 +- konsole/sessionscriptingadaptor.cpp | 25 ++++++++----------- konsole/sessionscriptingadaptor.h | 24 +++++++++++------- 3 files changed, 26 insertions(+), 25 deletions(-) rename konsole/{org.kde.konsole.Session.Scripting.xml => org.kde.konsole.SessionScripting.xml} (86%) diff --git a/konsole/org.kde.konsole.Session.Scripting.xml b/konsole/org.kde.konsole.SessionScripting.xml similarity index 86% rename from konsole/org.kde.konsole.Session.Scripting.xml rename to konsole/org.kde.konsole.SessionScripting.xml index 1764e6fc..1de94b36 100644 --- a/konsole/org.kde.konsole.Session.Scripting.xml +++ b/konsole/org.kde.konsole.SessionScripting.xml @@ -1,6 +1,6 @@ - + diff --git a/konsole/sessionscriptingadaptor.cpp b/konsole/sessionscriptingadaptor.cpp index eb03c5ae..1fa4d0ab 100644 --- a/konsole/sessionscriptingadaptor.cpp +++ b/konsole/sessionscriptingadaptor.cpp @@ -1,10 +1,11 @@ /* - * This file was generated by dbusidl2cpp version 0.5 - * when processing input file org.kde.konsole.Session.Scripting.xml + * This file was generated by dbusxml2cpp version 0.6 + * Command line was: dbusxml2cpp -l TESession -i TESession.h -a sessionscriptingadaptor -m org.kde.konsole.SessionScripting.xml * - * dbusidl2cpp is Copyright (C) 2006 Trolltech AS. All rights reserved. + * dbusxml2cpp is Copyright (C) 2006 Trolltech ASA. All rights reserved. * * This is an auto-generated file. + * Do not edit! All changes made to it will be lost. */ #include "sessionscriptingadaptor.h" @@ -20,8 +21,8 @@ * Implementation of adaptor class SessionScriptingAdaptor */ -SessionScriptingAdaptor::SessionScriptingAdaptor(QObject *parent) - : QDBusAbstractAdaptor(parent) +SessionScriptingAdaptor::SessionScriptingAdaptor(TESession *parent) + : QDBusAbstractAdaptor(parent) { // constructor setAutoRelaySignals(true); @@ -34,20 +35,14 @@ SessionScriptingAdaptor::~SessionScriptingAdaptor() void SessionScriptingAdaptor::feedSession(const QString &text) { - // handle method call org.kde.konsole.Session.Scripting.feedSession - QMetaObject::invokeMethod(parent(), "feedSession", Q_ARG(QString, text)); - - // Alternative: - //static_cast(parent())->feedSession(text); + // handle method call org.kde.konsole.SessionScripting.feedSession + parent()->feedSession(text); } void SessionScriptingAdaptor::sendSession(const QString &text) { - // handle method call org.kde.konsole.Session.Scripting.sendSession - QMetaObject::invokeMethod(parent(), "sendSession", Q_ARG(QString, text)); - - // Alternative: - //static_cast(parent())->sendSession(text); + // handle method call org.kde.konsole.SessionScripting.sendSession + parent()->sendSession(text); } diff --git a/konsole/sessionscriptingadaptor.h b/konsole/sessionscriptingadaptor.h index feb86fd8..1e6653e9 100644 --- a/konsole/sessionscriptingadaptor.h +++ b/konsole/sessionscriptingadaptor.h @@ -1,17 +1,20 @@ /* - * This file was generated by dbusidl2cpp version 0.5 - * when processing input file org.kde.konsole.Session.Scripting.xml + * This file was generated by dbusxml2cpp version 0.6 + * Command line was: dbusxml2cpp -l TESession -i TESession.h -a sessionscriptingadaptor -m org.kde.konsole.SessionScripting.xml * - * dbusidl2cpp is Copyright (C) 2006 Trolltech AS. All rights reserved. + * dbusxml2cpp is Copyright (C) 2006 Trolltech ASA. All rights reserved. * * This is an auto-generated file. + * This file may have been hand-edited. Look for HAND-EDIT comments + * before re-generating it. */ -#ifndef SESSIONSCRIPTINGADAPTOR_H_115611150842733 -#define SESSIONSCRIPTINGADAPTOR_H_115611150842733 +#ifndef SESSIONSCRIPTINGADAPTOR_H_1161947113 +#define SESSIONSCRIPTINGADAPTOR_H_1161947113 #include #include +#include "TESession.h" class QByteArray; template class QList; template class QMap; @@ -20,14 +23,14 @@ class QStringList; class QVariant; /* - * Adaptor class for interface org.kde.konsole.Session.Scripting + * Adaptor class for interface org.kde.konsole.SessionScripting */ class SessionScriptingAdaptor: public QDBusAbstractAdaptor { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "org.kde.konsole.Session.Scripting") + Q_CLASSINFO("D-Bus Interface", "org.kde.konsole.SessionScripting") Q_CLASSINFO("D-Bus Introspection", "" -" \n" +" \n" " \n" " \n" " \n" @@ -37,9 +40,12 @@ class SessionScriptingAdaptor: public QDBusAbstractAdaptor " \n" "") public: - SessionScriptingAdaptor(QObject *parent); + SessionScriptingAdaptor(TESession *parent); virtual ~SessionScriptingAdaptor(); + inline TESession *parent() const + { return static_cast(QObject::parent()); } + public: // PROPERTIES public Q_SLOTS: // METHODS void feedSession(const QString &text);