From d0ccf0c755f55d1ef765e9ceeb6b9586a9fb52ca Mon Sep 17 00:00:00 2001
From: Philip Kaufmann <phil.kaufmann@t-online.de>
Date: Fri, 4 May 2012 18:19:06 +0200
Subject: move label placeholdertext from sendcoinsentry.cpp to ui-file

---
 src/qt/forms/sendcoinsentry.ui | 6 ++++++
 src/qt/sendcoinsentry.cpp      | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui
index 22a3f8fdc6..da0273e9b1 100644
--- a/src/qt/forms/sendcoinsentry.ui
+++ b/src/qt/forms/sendcoinsentry.ui
@@ -65,6 +65,9 @@
        <property name="toolTip">
         <string>Enter a label for this address to add it to your address book</string>
        </property>
+       <property name="placeholderText">
+        <string>Enter a label for this address to add it to your address book</string>
+       </property>
       </widget>
      </item>
     </layout>
@@ -95,6 +98,9 @@
        <property name="maxLength">
         <number>34</number>
        </property>
+       <property name="placeholderText">
+        <string>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string>
+       </property>
       </widget>
      </item>
      <item>
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
index c8242d8352..d9b1daf679 100644
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -21,10 +21,6 @@ SendCoinsEntry::SendCoinsEntry(QWidget *parent) :
     ui->payToLayout->setSpacing(4);
 #endif
 
-#if QT_VERSION >= 0x040700
-    ui->payTo->setPlaceholderText(tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));
-    ui->addAsLabel->setPlaceholderText(tr("Enter a label for this address to add it to your address book"));
-#endif
     setFocusPolicy(Qt::TabFocus);
     setFocusProxy(ui->payTo);
 
-- 
cgit v1.2.3