Merge pull request bitcoin#987 from luke-jr/ipc_name_fix

gmaxwell · gmaxwell · commit 138d08c5315c · 2012-04-06T11:22:24.000-07:00
Cleanup: Replace "URL" with "URI" where we aren't actually working with URLs
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
@@ -225,8 +225,8 @@ FORMS += src/qt/forms/qrcodedialog.ui
 
 contains(BITCOIN_QT_TEST, 1) {
 SOURCES += src/qt/test/test_main.cpp \
-    src/qt/test/urltests.cpp
-HEADERS += src/qt/test/urltests.h
+    src/qt/test/uritests.cpp
+HEADERS += src/qt/test/uritests.h
 DEPENDPATH += src/qt/test
 QT += testlib
 TARGET = bitcoin-qt_test
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -74,13 +74,13 @@ bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption)
     return payFee;
 }
 
-void ThreadSafeHandleURL(const std::string& strURL)
+void ThreadSafeHandleURI(const std::string& strURI)
 {
     if(!guiref)
         return;
 
-    QMetaObject::invokeMethod(guiref, "handleURL", GUIUtil::blockingGUIThreadConnection(),
-                               Q_ARG(QString, QString::fromStdString(strURL)));
+    QMetaObject::invokeMethod(guiref, "handleURI", GUIUtil::blockingGUIThreadConnection(),
+                               Q_ARG(QString, QString::fromStdString(strURI)));
 }
 
 void MainFrameRepaint()
@@ -133,10 +133,10 @@ int main(int argc, char *argv[])
     {
         if (strlen(argv[i]) > 7 && strncasecmp(argv[i], "bitcoin:", 8) == 0)
         {
-            const char *strURL = argv[i];
+            const char *strURI = argv[i];
             try {
-                boost::interprocess::message_queue mq(boost::interprocess::open_only, "BitcoinURL");
-                if(mq.try_send(strURL, strlen(strURL), 0))
+                boost::interprocess::message_queue mq(boost::interprocess::open_only, BITCOINURI_QUEUE_NAME);
+                if(mq.try_send(strURI, strlen(strURI), 0))
                     exit(0);
                 else
                     break;
@@ -248,21 +248,21 @@ int main(int argc, char *argv[])
                     window.show();
                 }
 
-                // Place this here as guiref has to be defined if we dont want to lose URLs
+                // Place this here as guiref has to be defined if we dont want to lose URIs
                 ipcInit();
 
 #if !defined(MAC_OSX) && !defined(WIN32)
 // TODO: implement qtipcserver.cpp for Mac and Windows
 
-                // Check for URL in argv
+                // Check for URI in argv
                 for (int i = 1; i < argc; i++)
                 {
                     if (strlen(argv[i]) > 7 && strncasecmp(argv[i], "bitcoin:", 8) == 0)
                     {
-                        const char *strURL = argv[i];
+                        const char *strURI = argv[i];
                         try {
-                            boost::interprocess::message_queue mq(boost::interprocess::open_only, "BitcoinURL");
-                            mq.try_send(strURL, strlen(strURL), 0);
+                            boost::interprocess::message_queue mq(boost::interprocess::open_only, BITCOINURI_QUEUE_NAME);
+                            mq.try_send(strURI, strlen(strURI), 0);
                         }
                         catch (boost::interprocess::interprocess_exception &ex) {
                         }
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -715,7 +715,7 @@ void BitcoinGUI::gotoMessagePage(QString addr)
 
 void BitcoinGUI::dragEnterEvent(QDragEnterEvent *event)
 {
-    // Accept only URLs
+    // Accept only URIs
     if(event->mimeData()->hasUrls())
         event->acceptProposedAction();
 }
@@ -725,20 +725,20 @@ void BitcoinGUI::dropEvent(QDropEvent *event)
     if(event->mimeData()->hasUrls())
     {
         gotoSendCoinsPage();
-        QList<QUrl> urls = event->mimeData()->urls();
-        foreach(const QUrl &url, urls)
+        QList<QUrl> uris = event->mimeData()->urls();
+        foreach(const QUrl &uri, uris)
         {
-            sendCoinsPage->handleURL(url.toString());
+            sendCoinsPage->handleURI(uri.toString());
         }
     }
 
     event->acceptProposedAction();
 }
 
-void BitcoinGUI::handleURL(QString strURL)
+void BitcoinGUI::handleURI(QString strURI)
 {
     gotoSendCoinsPage();
-    sendCoinsPage->handleURL(strURL);
+    sendCoinsPage->handleURI(strURI);
 
     if(!isActiveWindow())
         activateWindow();
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
@@ -125,7 +125,7 @@ public slots:
       @param[out] payFee            true to pay the fee, false to not pay the fee
     */
     void askFee(qint64 nFeeRequired, bool *payFee);
-    void handleURL(QString strURL);
+    void handleURI(QString strURI);
 
     void gotoMessagePage();
     void gotoMessagePage(QString);
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -52,15 +52,15 @@ void GUIUtil::setupAmountWidget(QLineEdit *widget, QWidget *parent)
     widget->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
 }
 
-bool GUIUtil::parseBitcoinURL(const QUrl &url, SendCoinsRecipient *out)
+bool GUIUtil::parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out)
 {
-    if(url.scheme() != QString("bitcoin"))
+    if(uri.scheme() != QString("bitcoin"))
         return false;
 
     SendCoinsRecipient rv;
-    rv.address = url.path();
+    rv.address = uri.path();
     rv.amount = 0;
-    QList<QPair<QString, QString> > items = url.queryItems();
+    QList<QPair<QString, QString> > items = uri.queryItems();
     for (QList<QPair<QString, QString> >::iterator i = items.begin(); i != items.end(); i++)
     {
         bool fShouldReturnFalse = false;
@@ -97,18 +97,18 @@ bool GUIUtil::parseBitcoinURL(const QUrl &url, SendCoinsRecipient *out)
     return true;
 }
 
-bool GUIUtil::parseBitcoinURL(QString url, SendCoinsRecipient *out)
+bool GUIUtil::parseBitcoinURI(QString uri, SendCoinsRecipient *out)
 {
     // Convert bitcoin:// to bitcoin:
     //
     //    Cannot handle this later, because bitcoin:// will cause Qt to see the part after // as host,
     //    which will lowercase it (and thus invalidate the address).
-    if(url.startsWith("bitcoin://"))
+    if(uri.startsWith("bitcoin://"))
     {
-        url.replace(0, 10, "bitcoin:");
+        uri.replace(0, 10, "bitcoin:");
     }
-    QUrl urlInstance(url);
-    return parseBitcoinURL(urlInstance, out);
+    QUrl uriInstance(uri);
+    return parseBitcoinURI(uriInstance, out);
 }
 
 QString GUIUtil::HtmlEscape(const QString& str, bool fMultiLine)
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
@@ -29,10 +29,10 @@ class GUIUtil
     static void setupAddressWidget(QLineEdit *widget, QWidget *parent);
     static void setupAmountWidget(QLineEdit *widget, QWidget *parent);
 
-    // Parse "bitcoin:" URL into recipient object, return true on succesful parsing
-    // See Bitcoin URL definition discussion here: https://bitcointalk.org/index.php?topic=33490.0
-    static bool parseBitcoinURL(const QUrl &url, SendCoinsRecipient *out);
-    static bool parseBitcoinURL(QString url, SendCoinsRecipient *out);
+    // Parse "bitcoin:" URI into recipient object, return true on succesful parsing
+    // See Bitcoin URI definition discussion here: https://bitcointalk.org/index.php?topic=33490.0
+    static bool parseBitcoinURI(const QUrl &, SendCoinsRecipient *out);
+    static bool parseBitcoinURI(QString uri, SendCoinsRecipient *out);
 
     // HTML escaping for rich text controls
     static QString HtmlEscape(const QString& str, bool fMultiLine=false);
diff --git a/src/qt/qtipcserver.cpp b/src/qt/qtipcserver.cpp
@@ -8,6 +8,7 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 
 #include "headers.h"
+#include "qtipcserver.h"
 
 using namespace boost::interprocess;
 using namespace boost::posix_time;
@@ -16,7 +17,7 @@ using namespace std;
 
 void ipcShutdown()
 {
-    message_queue::remove("BitcoinURL");
+    message_queue::remove(BITCOINURI_QUEUE_NAME);
 }
 
 void ipcThread(void* parg)
@@ -30,7 +31,7 @@ void ipcThread(void* parg)
         ptime d = boost::posix_time::microsec_clock::universal_time() + millisec(100);
         if(mq->timed_receive(&strBuf, sizeof(strBuf), nSize, nPriority, d))
         {
-            ThreadSafeHandleURL(std::string(strBuf, nSize));
+            ThreadSafeHandleURI(std::string(strBuf, nSize));
             Sleep(1000);
         }
         if (fShutdown)
@@ -60,23 +61,23 @@ void ipcInit()
     size_t nSize;
     unsigned int nPriority;
     try {
-        mq = new message_queue(open_or_create, "BitcoinURL", 2, 256);
+        mq = new message_queue(open_or_create, BITCOINURI_QUEUE_NAME, 2, 256);
 
         // Make sure we don't lose any bitcoin: URIs
         for (int i = 0; i < 2; i++)
         {
             ptime d = boost::posix_time::microsec_clock::universal_time() + millisec(1);
             if(mq->timed_receive(&strBuf, sizeof(strBuf), nSize, nPriority, d))
             {
-                ThreadSafeHandleURL(std::string(strBuf, nSize));
+                ThreadSafeHandleURI(std::string(strBuf, nSize));
             }
             else
                 break;
         }
 
         // Make sure only one bitcoin instance is listening
-        message_queue::remove("BitcoinURL");
-        mq = new message_queue(open_or_create, "BitcoinURL", 2, 256);
+        message_queue::remove(BITCOINURI_QUEUE_NAME);
+        mq = new message_queue(open_or_create, BITCOINURI_QUEUE_NAME, 2, 256);
     }
     catch (interprocess_exception &ex) {
         return;
diff --git a/src/qt/qtipcserver.h b/src/qt/qtipcserver.h
@@ -1,2 +1,4 @@
+#define BITCOINURI_QUEUE_NAME "BitcoinURI"
+
 void ipcInit();
 void ipcShutdown();
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
@@ -265,10 +265,10 @@ void SendCoinsDialog::pasteEntry(const SendCoinsRecipient &rv)
 }
 
 
-void SendCoinsDialog::handleURL(const QString &url)
+void SendCoinsDialog::handleURI(const QString &uri)
 {
     SendCoinsRecipient rv;
-    if(!GUIUtil::parseBitcoinURL(url, &rv))
+    if(!GUIUtil::parseBitcoinURI(uri, &rv))
     {
         return;
     }
diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h
@@ -30,7 +30,7 @@ class SendCoinsDialog : public QDialog
     QWidget *setupTabChain(QWidget *prev);
 
     void pasteEntry(const SendCoinsRecipient &rv);
-    void handleURL(const QString &url);
+    void handleURI(const QString &uri);
 
 public slots:
     void clear();
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp
@@ -1,11 +1,11 @@
 #include <QTest>
 #include <QObject>
 
-#include "urltests.h"
+#include "uritests.h"
 
 // This is all you need to run all the tests
 int main(int argc, char *argv[])
 {
-    URLTests test1;
+    URITests test1;
     QTest::qExec(&test1);
 }
diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp
@@ -1,4 +1,4 @@
-#include "urltests.h"
+#include "uritests.h"
 #include "../guiutil.h"
 #include "../walletmodel.h"
 
@@ -13,59 +13,59 @@ struct SendCoinsRecipient
 };
 */
 
-void URLTests::urlTests()
+void URITests::uriTests()
 {
     SendCoinsRecipient rv;
-    QUrl url;
-    url.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?req-dontexist="));
-    QVERIFY(!GUIUtil::parseBitcoinURL(url, &rv));
+    QUrl uri;
+    uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?req-dontexist="));
+    QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv));
 
-    url.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?dontexist="));
-    QVERIFY(GUIUtil::parseBitcoinURL(url, &rv));
+    uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?dontexist="));
+    QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv));
     QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
     QVERIFY(rv.label == QString());
     QVERIFY(rv.amount == 0);
 
-    url.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?label=Wikipedia Example Address"));
-    QVERIFY(GUIUtil::parseBitcoinURL(url, &rv));
+    uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?label=Wikipedia Example Address"));
+    QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv));
     QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
     QVERIFY(rv.label == QString("Wikipedia Example Address"));
     QVERIFY(rv.amount == 0);
 
-    url.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=0.001"));
-    QVERIFY(GUIUtil::parseBitcoinURL(url, &rv));
+    uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=0.001"));
+    QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv));
     QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
     QVERIFY(rv.label == QString());
     QVERIFY(rv.amount == 100000);
 
-    url.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1.001"));
-    QVERIFY(GUIUtil::parseBitcoinURL(url, &rv));
+    uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1.001"));
+    QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv));
     QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
     QVERIFY(rv.label == QString());
     QVERIFY(rv.amount == 100100000);
 
-    url.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=100&label=Wikipedia Example"));
-    QVERIFY(GUIUtil::parseBitcoinURL(url, &rv));
+    uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=100&label=Wikipedia Example"));
+    QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv));
     QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
     QVERIFY(rv.amount == 10000000000);
     QVERIFY(rv.label == QString("Wikipedia Example"));
 
-    url.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?message=Wikipedia Example Address"));
-    QVERIFY(GUIUtil::parseBitcoinURL(url, &rv));
+    uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?message=Wikipedia Example Address"));
+    QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv));
     QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
     QVERIFY(rv.label == QString());
 
-    QVERIFY(GUIUtil::parseBitcoinURL("bitcoin://175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?message=Wikipedia Example Address", &rv));
+    QVERIFY(GUIUtil::parseBitcoinURI("bitcoin://175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?message=Wikipedia Example Address", &rv));
     QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
     QVERIFY(rv.label == QString());
 
     // We currently dont implement the message paramenter (ok, yea, we break spec...)
-    url.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?req-message=Wikipedia Example Address"));
-    QVERIFY(!GUIUtil::parseBitcoinURL(url, &rv));
+    uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?req-message=Wikipedia Example Address"));
+    QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv));
 
-    url.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1,000&label=Wikipedia Example"));
-    QVERIFY(!GUIUtil::parseBitcoinURL(url, &rv));
+    uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1,000&label=Wikipedia Example"));
+    QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv));
 
-    url.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1,000.0&label=Wikipedia Example"));
-    QVERIFY(!GUIUtil::parseBitcoinURL(url, &rv));
+    uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1,000.0&label=Wikipedia Example"));
+    QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv));
 }
diff --git a/src/qt/test/uritests.h b/src/qt/test/uritests.h
@@ -0,0 +1,15 @@
+#ifndef URITESTS_H
+#define URITESTS_H
+
+#include <QTest>
+#include <QObject>
+
+class URITests : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void uriTests();
+};
+
+#endif // URITESTS_H
diff --git a/src/qt/test/urltests.h b/src/qt/test/urltests.h
diff --git a/src/ui_interface.h b/src/ui_interface.h
@@ -40,7 +40,7 @@
 
 extern int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style=wxOK);
 extern bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption);
-extern void ThreadSafeHandleURL(const std::string& strURL);
+extern void ThreadSafeHandleURI(const std::string& strURI);
 extern void MainFrameRepaint();
 extern void AddressBookRepaint();
 extern void QueueShutdown();

Original file line number	Diff line number	Diff line change
`@@ -74,13 +74,13 @@ bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption)`
`74`	`74`	`return payFee;`
`75`	`75`	`}`
`76`	`76`
`77`		`-void ThreadSafeHandleURL(const std::string& strURL)`
	`77`	`+void ThreadSafeHandleURI(const std::string& strURI)`
`78`	`78`	`{`
`79`	`79`	`if(!guiref)`
`80`	`80`	`return;`
`81`	`81`
`82`		`- QMetaObject::invokeMethod(guiref, "handleURL", GUIUtil::blockingGUIThreadConnection(),`
`83`		`- Q_ARG(QString, QString::fromStdString(strURL)));`
	`82`	`+ QMetaObject::invokeMethod(guiref, "handleURI", GUIUtil::blockingGUIThreadConnection(),`
	`83`	`+ Q_ARG(QString, QString::fromStdString(strURI)));`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`void MainFrameRepaint()`
`@@ -133,10 +133,10 @@ int main(int argc, char *argv[])`
`133`	`133`	`{`
`134`	`134`	`if (strlen(argv[i]) > 7 && strncasecmp(argv[i], "bitcoin:", 8) == 0)`
`135`	`135`	`{`
`136`		`- const char *strURL = argv[i];`
	`136`	`+ const char *strURI = argv[i];`
`137`	`137`	`try {`
`138`		`- boost::interprocess::message_queue mq(boost::interprocess::open_only, "BitcoinURL");`
`139`		`- if(mq.try_send(strURL, strlen(strURL), 0))`
	`138`	`+ boost::interprocess::message_queue mq(boost::interprocess::open_only, BITCOINURI_QUEUE_NAME);`
	`139`	`+ if(mq.try_send(strURI, strlen(strURI), 0))`
`140`	`140`	`exit(0);`
`141`	`141`	`else`
`142`	`142`	`break;`
`@@ -248,21 +248,21 @@ int main(int argc, char *argv[])`
`248`	`248`	`window.show();`
`249`	`249`	`}`
`250`	`250`
`251`		`- // Place this here as guiref has to be defined if we dont want to lose URLs`
	`251`	`+ // Place this here as guiref has to be defined if we dont want to lose URIs`
`252`	`252`	`ipcInit();`
`253`	`253`
`254`	`254`	`#if !defined(MAC_OSX) && !defined(WIN32)`
`255`	`255`	`// TODO: implement qtipcserver.cpp for Mac and Windows`
`256`	`256`
`257`		`- // Check for URL in argv`
	`257`	`+ // Check for URI in argv`
`258`	`258`	`for (int i = 1; i < argc; i++)`
`259`	`259`	`{`
`260`	`260`	`if (strlen(argv[i]) > 7 && strncasecmp(argv[i], "bitcoin:", 8) == 0)`
`261`	`261`	`{`
`262`		`- const char *strURL = argv[i];`
	`262`	`+ const char *strURI = argv[i];`
`263`	`263`	`try {`
`264`		`- boost::interprocess::message_queue mq(boost::interprocess::open_only, "BitcoinURL");`
`265`		`- mq.try_send(strURL, strlen(strURL), 0);`
	`264`	`+ boost::interprocess::message_queue mq(boost::interprocess::open_only, BITCOINURI_QUEUE_NAME);`
	`265`	`+ mq.try_send(strURI, strlen(strURI), 0);`
`266`	`266`	`}`
`267`	`267`	`catch (boost::interprocess::interprocess_exception &ex) {`
`268`	`268`	`}`
Original file line number	Diff line number	Diff line change
`@@ -715,7 +715,7 @@ void BitcoinGUI::gotoMessagePage(QString addr)`
`715`	`715`
`716`	`716`	`void BitcoinGUI::dragEnterEvent(QDragEnterEvent *event)`
`717`	`717`	`{`
`718`		`- // Accept only URLs`
	`718`	`+ // Accept only URIs`
`719`	`719`	`if(event->mimeData()->hasUrls())`
`720`	`720`	`event->acceptProposedAction();`
`721`	`721`	`}`
`@@ -725,20 +725,20 @@ void BitcoinGUI::dropEvent(QDropEvent *event)`
`725`	`725`	`if(event->mimeData()->hasUrls())`
`726`	`726`	`{`
`727`	`727`	`gotoSendCoinsPage();`
`728`		`- QList<QUrl> urls = event->mimeData()->urls();`
`729`		`- foreach(const QUrl &url, urls)`
	`728`	`+ QList<QUrl> uris = event->mimeData()->urls();`
	`729`	`+ foreach(const QUrl &uri, uris)`
`730`	`730`	`{`
`731`		`- sendCoinsPage->handleURL(url.toString());`
	`731`	`+ sendCoinsPage->handleURI(uri.toString());`
`732`	`732`	`}`
`733`	`733`	`}`
`734`	`734`
`735`	`735`	`event->acceptProposedAction();`
`736`	`736`	`}`
`737`	`737`
`738`		`-void BitcoinGUI::handleURL(QString strURL)`
	`738`	`+void BitcoinGUI::handleURI(QString strURI)`
`739`	`739`	`{`
`740`	`740`	`gotoSendCoinsPage();`
`741`		`- sendCoinsPage->handleURL(strURL);`
	`741`	`+ sendCoinsPage->handleURI(strURI);`
`742`	`742`
`743`	`743`	`if(!isActiveWindow())`
`744`	`744`	`activateWindow();`
Original file line number	Diff line number	Diff line change
`@@ -52,15 +52,15 @@ void GUIUtil::setupAmountWidget(QLineEdit widget, QWidget parent)`
`52`	`52`	`widget->setAlignment(Qt::AlignRight\|Qt::AlignVCenter);`
`53`	`53`	`}`
`54`	`54`
`55`		`-bool GUIUtil::parseBitcoinURL(const QUrl &url, SendCoinsRecipient *out)`
	`55`	`+bool GUIUtil::parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out)`
`56`	`56`	`{`
`57`		`- if(url.scheme() != QString("bitcoin"))`
	`57`	`+ if(uri.scheme() != QString("bitcoin"))`
`58`	`58`	`return false;`
`59`	`59`
`60`	`60`	`SendCoinsRecipient rv;`
`61`		`- rv.address = url.path();`
	`61`	`+ rv.address = uri.path();`
`62`	`62`	`rv.amount = 0;`
`63`		`- QList<QPair<QString, QString> > items = url.queryItems();`
	`63`	`+ QList<QPair<QString, QString> > items = uri.queryItems();`
`64`	`64`	`for (QList<QPair<QString, QString> >::iterator i = items.begin(); i != items.end(); i++)`
`65`	`65`	`{`
`66`	`66`	`bool fShouldReturnFalse = false;`
`@@ -97,18 +97,18 @@ bool GUIUtil::parseBitcoinURL(const QUrl &url, SendCoinsRecipient *out)`
`97`	`97`	`return true;`
`98`	`98`	`}`
`99`	`99`
`100`		`-bool GUIUtil::parseBitcoinURL(QString url, SendCoinsRecipient *out)`
	`100`	`+bool GUIUtil::parseBitcoinURI(QString uri, SendCoinsRecipient *out)`
`101`	`101`	`{`
`102`	`102`	`// Convert bitcoin:// to bitcoin:`
`103`	`103`	`//`
`104`	`104`	`// Cannot handle this later, because bitcoin:// will cause Qt to see the part after // as host,`
`105`	`105`	`// which will lowercase it (and thus invalidate the address).`
`106`		`- if(url.startsWith("bitcoin://"))`
	`106`	`+ if(uri.startsWith("bitcoin://"))`
`107`	`107`	`{`
`108`		`- url.replace(0, 10, "bitcoin:");`
	`108`	`+ uri.replace(0, 10, "bitcoin:");`
`109`	`109`	`}`
`110`		`- QUrl urlInstance(url);`
`111`		`- return parseBitcoinURL(urlInstance, out);`
	`110`	`+ QUrl uriInstance(uri);`
	`111`	`+ return parseBitcoinURI(uriInstance, out);`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`QString GUIUtil::HtmlEscape(const QString& str, bool fMultiLine)`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`#include <boost/date_time/posix_time/posix_time.hpp>`
`9`	`9`
`10`	`10`	`#include "headers.h"`
	`11`	`+#include "qtipcserver.h"`
`11`	`12`
`12`	`13`	`using namespace boost::interprocess;`
`13`	`14`	`using namespace boost::posix_time;`
`@@ -16,7 +17,7 @@ using namespace std;`
`16`	`17`
`17`	`18`	`void ipcShutdown()`
`18`	`19`	`{`
`19`		`- message_queue::remove("BitcoinURL");`
	`20`	`+ message_queue::remove(BITCOINURI_QUEUE_NAME);`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`void ipcThread(void* parg)`
`@@ -30,7 +31,7 @@ void ipcThread(void* parg)`
`30`	`31`	`ptime d = boost::posix_time::microsec_clock::universal_time() + millisec(100);`
`31`	`32`	`if(mq->timed_receive(&strBuf, sizeof(strBuf), nSize, nPriority, d))`
`32`	`33`	`{`
`33`		`- ThreadSafeHandleURL(std::string(strBuf, nSize));`
	`34`	`+ ThreadSafeHandleURI(std::string(strBuf, nSize));`
`34`	`35`	`Sleep(1000);`
`35`	`36`	`}`
`36`	`37`	`if (fShutdown)`
`@@ -60,23 +61,23 @@ void ipcInit()`
`60`	`61`	`size_t nSize;`
`61`	`62`	`unsigned int nPriority;`
`62`	`63`	`try {`
`63`		`- mq = new message_queue(open_or_create, "BitcoinURL", 2, 256);`
	`64`	`+ mq = new message_queue(open_or_create, BITCOINURI_QUEUE_NAME, 2, 256);`
`64`	`65`
`65`	`66`	`// Make sure we don't lose any bitcoin: URIs`
`66`	`67`	`for (int i = 0; i < 2; i++)`
`67`	`68`	`{`
`68`	`69`	`ptime d = boost::posix_time::microsec_clock::universal_time() + millisec(1);`
`69`	`70`	`if(mq->timed_receive(&strBuf, sizeof(strBuf), nSize, nPriority, d))`
`70`	`71`	`{`
`71`		`- ThreadSafeHandleURL(std::string(strBuf, nSize));`
	`72`	`+ ThreadSafeHandleURI(std::string(strBuf, nSize));`
`72`	`73`	`}`
`73`	`74`	`else`
`74`	`75`	`break;`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`// Make sure only one bitcoin instance is listening`
`78`		`- message_queue::remove("BitcoinURL");`
`79`		`- mq = new message_queue(open_or_create, "BitcoinURL", 2, 256);`
	`79`	`+ message_queue::remove(BITCOINURI_QUEUE_NAME);`
	`80`	`+ mq = new message_queue(open_or_create, BITCOINURI_QUEUE_NAME, 2, 256);`
`80`	`81`	`}`
`81`	`82`	`catch (interprocess_exception &ex) {`
`82`	`83`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -265,10 +265,10 @@ void SendCoinsDialog::pasteEntry(const SendCoinsRecipient &rv)`
`265`	`265`	`}`
`266`	`266`
`267`	`267`
`268`		`-void SendCoinsDialog::handleURL(const QString &url)`
	`268`	`+void SendCoinsDialog::handleURI(const QString &uri)`
`269`	`269`	`{`
`270`	`270`	`SendCoinsRecipient rv;`
`271`		`- if(!GUIUtil::parseBitcoinURL(url, &rv))`
	`271`	`+ if(!GUIUtil::parseBitcoinURI(uri, &rv))`
`272`	`272`	`{`
`273`	`273`	`return;`
`274`	`274`	`}`