[rkward-cvs] SF.net SVN: rkward: [2084] branches/KDE4_port/rkward

[tfry at users.sourceforge.net]

Revision: 2084
          http://rkward.svn.sourceforge.net/rkward/?rev=2084&view=rev
Author:   tfry
Date:     2007-10-16 07:36:02 -0700 (Tue, 16 Oct 2007)

Log Message:
-----------
Make help browsing from R work

Modified Paths:
--------------
    branches/KDE4_port/rkward/rbackend/rthread.cpp
    branches/KDE4_port/rkward/rkward.h

Modified: branches/KDE4_port/rkward/rbackend/rthread.cpp
===================================================================
--- branches/KDE4_port/rkward/rbackend/rthread.cpp	2007-10-16 14:06:54 UTC (rev 2083)
+++ branches/KDE4_port/rkward/rbackend/rthread.cpp	2007-10-16 14:36:02 UTC (rev 2084)
@@ -31,6 +31,7 @@
 
 #include <qstring.h>
 #include <qapplication.h>
+#include <QDBusConnection>
 //Added by qt3to4:
 #include <QCustomEvent>
 #include <Q3ValueList>
@@ -517,7 +518,7 @@
 	if (error) status |= SinkFail;
 	runCommandInternal ("rk.set.output.html.file (\"" + RKSettingsModuleGeneral::filesPath () + "/rk_out.html\")\n", &error);
 	if (error) status |= SinkFail;
-//KDE4 TODO!	runCommandInternal ("options (htmlhelp=TRUE); options (browser=\"dcop " + kapp->dcopClient ()->appId () + " rkwardapp openHTMLHelp \")", &error);
+	runCommandInternal ("options (htmlhelp=TRUE); options (browser=\"qdbus " + QDBusConnection::sessionBus ().baseService () + " /MainApplication net.sf.rkward.openHTMLHelp\")", &error);
 	if (error) status |= OtherFail;
 	// TODO: error-handling?
 

Modified: branches/KDE4_port/rkward/rkward.h
===================================================================
--- branches/KDE4_port/rkward/rkward.h	2007-10-16 14:06:54 UTC (rev 2083)
+++ branches/KDE4_port/rkward/rkward.h	2007-10-16 14:36:02 UTC (rev 2084)
@@ -31,7 +31,7 @@
 /** This base provides the DBUS-Interface for RKWardMainWindow */
 class RKWardDBUSInterface : virtual public QDBusAbstractAdaptor {
 	Q_OBJECT
-	Q_CLASSINFO("D-Bus Interface", "org.kde.rkward")
+	Q_CLASSINFO("D-Bus Interface", "net.sf.rkward")
 public:
 	RKWardDBUSInterface (QApplication *application);
 	~RKWardDBUSInterface () {};


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.