diff -r 338ebdc9b947 -r 14f2b1b15242 main.cpp --- a/main.cpp Fri Oct 02 14:31:03 2009 +0000 +++ b/main.cpp Fri Nov 13 08:32:03 2009 +0000 @@ -16,6 +16,9 @@ #include #endif +#include // To retrieve PID for use in DBUS +#include + // Global variables TextEditor *textEditor; // used in Constr. of LinkableMapObj // initialized in mainwindow @@ -25,8 +28,10 @@ QString vymCodeName; Main *mainWindow; // used in BranchObj::select() + QDBusConnection dbusConnection= QDBusConnection::sessionBus(); + QString tmpVymDir; // All temp files go there, created in mainwindow QString clipboardDir; // Clipboard used in all mapEditors QString clipboardFile; // Clipboard used in all mapEditors @@ -61,7 +66,6 @@ vymBuildDate=__VYM_BUILD_DATE; vymCodeName=__VYM_CODENAME; - // Reading and initializing options commandline options options.add ("debug", Option::Switch, "d", "debug"); options.add ("version", Option::Switch, "v","version"); @@ -87,7 +91,7 @@ if (options.isOn ("version")) { - cout << "VYM - View Your Mind (c) 2004-2007 Uwe Drechsel " << endl + cout << "VYM - View Your Mind (c) 2004-2009 Uwe Drechsel " << endl <<" Version: "<<__VYM_VERSION <processEvents(); - // FIXME-3 playing around with dbus - /* - new Adaptor (&app); - dbusConnection.registerService("org.insilmaril.MainWindow"); - QDBusConnection::sessionBus().registerObject("/MainApplication", &app); - */ - - m.loadCmdLine(); // Run script