Merge pull request #268

3788943 Addressbook: Fix size_t build error (Jaquee)
28a220d Addressbook: New tooltip implementation (old didn't work on ubuntu) (Jaquee)
a0f35aa bring tooltip to front (Jaquee)
0e5329a Addressbook: updated references to bitmonero (Jaquee)
a344f17 AddressBook: basic functions (Jaquee)

1 files changed, 10 insertions, 1 deletions

diff --git a/main.cpp b/main.cpp
index 644c6270..9f87124f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -46,6 +46,8 @@
 #include "model/TransactionHistoryModel.h"
 #include "model/TransactionHistorySortFilterModel.h"
 #include "daemon/DaemonManager.h"
+#include "AddressBook.h"
+#include "model/AddressBookModel.h"
 
 
 int main(int argc, char *argv[])
@@ -92,6 +94,13 @@ int main(int argc, char *argv[])
 
     qmlRegisterUncreatableType<DaemonManager>("moneroComponents.DaemonManager", 1, 0, "DaemonManager",
                                                    "DaemonManager can't be instantiated directly");
+
+    qmlRegisterUncreatableType<AddressBookModel>("moneroComponents.AddressBookModel", 1, 0, "AddressBookModel",
+                                                        "AddressBookModel can't be instantiated directly");
+
+    qmlRegisterUncreatableType<AddressBook>("moneroComponents.AddressBook", 1, 0, "AddressBook",
+                                                        "AddressBook can't be instantiated directly");
+
     qRegisterMetaType<PendingTransaction::Priority>();
     qRegisterMetaType<TransactionInfo::Direction>();
     qRegisterMetaType<TransactionHistoryModel::TransactionInfoRole>();
@@ -152,7 +161,7 @@ int main(int argc, char *argv[])
     QObject::connect(eventFilter, SIGNAL(mousePressed(QVariant,QVariant,QVariant)), rootObject, SLOT(mousePressed(QVariant,QVariant,QVariant)));
     QObject::connect(eventFilter, SIGNAL(mouseReleased(QVariant,QVariant,QVariant)), rootObject, SLOT(mouseReleased(QVariant,QVariant,QVariant)));
 
-    // WalletManager::instance()->setLogLevel(WalletManager::LogLevel_Max);
+    //WalletManager::instance()->setLogLevel(WalletManager::LogLevel_Max);
 
     return app.exec();
 }