1.1 --- a/mainwindow.cpp Wed Jul 22 11:48:23 2009 +0000
1.2 +++ b/mainwindow.cpp Mon Jul 27 12:53:17 2009 +0000
1.3 @@ -37,7 +37,6 @@
1.4
1.5 extern TextEditor *textEditor;
1.6 extern Main *mainWindow;
1.7 -extern QDBusConnection dbusConnection;
1.8 extern QString tmpVymDir;
1.9 extern QString clipboardDir;
1.10 extern QString clipboardFile;
1.11 @@ -228,15 +227,6 @@
1.12 restoreState (settings.value("/mainwindow/state",0).toByteArray());
1.13
1.14 updateGeometry();
1.15 -
1.16 - //Initialize DBUS
1.17 - new Adaptor (this);
1.18 - dbusConnection = QDBusConnection::sessionBus();
1.19 - dbusConnection.registerObject("/MainWindow", this);
1.20 - dbusConnection.registerService("org.insilmaril.vym");
1.21 -
1.22 -
1.23 -
1.24 }
1.25
1.26 Main::~Main()
1.27 @@ -3247,11 +3237,12 @@
1.28
1.29 void Main::updateNoteEditor(QModelIndex index )
1.30 {
1.31 - TreeItem *ti=((VymModel*)sender())->getItem(index);
1.32 - /*
1.33 - cout << "Main::updateNoteEditor model="<<sender();
1.34 - cout << " item="<<ti->headingStd()<<" ("<<ti<<")"<<endl;
1.35 - */
1.36 + cout << QObject::sender();
1.37 + QObject *obj=QObject::sender();
1.38 + TreeItem *ti=((TreeModel*)obj)->getItem (index);
1.39 + //TreeItem *ti=((VymModel*) QObject::sender())->getItem(index);
1.40 + //cout << "Main::updateNoteEditor model="<<sender();
1.41 + //cout << " item="<<ti->headingStd()<<" ("<<ti<<")"<<endl;
1.42 textEditor->setNote (ti->getNoteObj() );
1.43 }
1.44