1 files changed, 30 insertions, 21 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.h b/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.h
index 0e097d9..ceca88a 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.h
+++ b/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.h
@@ -4,46 +4,55 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <QButtonGroup>
 #include <QPlainTextEdit>
 #include <QRadioButton>
+
 #include <Swiften/Elements/VCard.h>
 
-#include "QtVCardFieldInfo.h"
-#include "QtVCardGeneralField.h"
-#include "QtVCardHomeWork.h"
+#include <Swift/QtUI/QtVCardWidget/QtVCardFieldInfo.h>
+#include <Swift/QtUI/QtVCardWidget/QtVCardGeneralField.h>
+#include <Swift/QtUI/QtVCardWidget/QtVCardHomeWork.h>
 
 namespace Swift {
 
+class QtElidingLabel;
+
 class QtVCardAddressLabelField : public QtVCardGeneralField, public QtVCardHomeWork {
-	Q_OBJECT
+    Q_OBJECT
 
-	public:
-		GENERIC_QT_VCARD_FIELD_INFO("AddressLabel", UNLIMITED_INSTANCES, QtVCardAddressLabelField)
+    public:
+        GENERIC_QT_VCARD_FIELD_INFO(tr("Address Label"), UNLIMITED_INSTANCES, QtVCardAddressLabelField)
 
-		QtVCardAddressLabelField(QWidget* parent = 0, QGridLayout* layout = 0, bool editable = false);
-		virtual ~QtVCardAddressLabelField();
+        QtVCardAddressLabelField(QWidget* parent = nullptr, QGridLayout* layout = nullptr, bool editable = false);
+        virtual ~QtVCardAddressLabelField();
 
-		virtual bool isEmpty() const;
+        virtual bool isEmpty() const;
 
-		void setAddressLabel(const VCard::AddressLabel& addressLabel);
-		VCard::AddressLabel getAddressLabel() const;
+        void setAddressLabel(const VCard::AddressLabel& addressLabel);
+        VCard::AddressLabel getAddressLabel() const;
 
-	protected:
-		virtual void setupContentWidgets();
+    protected:
+        virtual void setupContentWidgets();
 
-	public slots:
-		void handleEditibleChanged(bool isEditable);
+    public slots:
+        void handleEditibleChanged(bool isEditable);
 
-	private:
-		QPlainTextEdit* addressLabelPlainTextEdit;
+    private:
+        QPlainTextEdit* addressLabelPlainTextEdit;
 
-		QLabel* deliveryTypeLabel;
-		QRadioButton* domesticRadioButton;
-		QRadioButton* internationalRadioButton;
-		QButtonGroup* buttonGroup;
+        QtElidingLabel* deliveryTypeLabel;
+        QRadioButton* domesticRadioButton;
+        QRadioButton* internationalRadioButton;
+        QButtonGroup* buttonGroup;
 };
 
 }