1 files changed, 37 insertions, 42 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.h b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.h
index f279701..ca6a1f3 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.h
+++ b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.h
@@ -4,70 +4,65 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <QMenu>
-#include <QSignalMapper>
 #include <QWidget>
+
 #include <Swiften/Base/ByteArray.h>
 
 namespace Ui {
-	class QtVCardPhotoAndNameFields;
+    class QtVCardPhotoAndNameFields;
 }
 
 
 namespace Swift {
 
-	class QtVCardPhotoAndNameFields : public QWidget {
-		Q_OBJECT
-		Q_PROPERTY(bool editable READ isEditable WRITE setEditable)
-
-		public:
-			explicit QtVCardPhotoAndNameFields(QWidget* parent = 0);
-			~QtVCardPhotoAndNameFields();
-
-			bool isEditable() const;
-			void setEditable(bool);
-
-			QMenu* getAddFieldMenu() const;
-
-			void setAvatar(const ByteArray& data, const std::string& type);
-			ByteArray getAvatarData() const;
-			std::string getAvatarType() const;
+    class QtVCardPhotoAndNameFields : public QWidget {
+        Q_OBJECT
+        Q_PROPERTY(bool editable READ isEditable WRITE setEditable)
 
-			void setFormattedName(const QString formattedName);
-			QString getFormattedName() const;
+        public:
+            explicit QtVCardPhotoAndNameFields(QWidget* parent = nullptr);
+            ~QtVCardPhotoAndNameFields();
 
-			void setNickname(const QString nickname);
-			QString getNickname() const;
+            bool isEditable() const;
+            void setEditable(bool);
 
-			void setPrefix(const QString prefix);
-			QString getPrefix() const;
+            void setAvatar(const ByteArray& data, const std::string& type);
+            ByteArray getAvatarData() const;
+            std::string getAvatarType() const;
 
-			void setGivenName(const QString givenName);
-			QString getGivenName() const;
+            void setFormattedName(const QString& formattedName);
+            QString getFormattedName() const;
 
-			void setMiddleName(const QString middleName);
-			QString getMiddleName() const;
+            void setNickname(const QString& nickname);
+            QString getNickname() const;
 
-			void setFamilyName(const QString familyName);
-			QString getFamilyName() const;
+            void setPrefix(const QString& prefix);
+            QString getPrefix() const;
 
-			void setSuffix(const QString suffix);
-			QString getSuffix() const;
+            void setGivenName(const QString& givenName);
+            QString getGivenName() const;
 
-		public slots:
-			void showField(const QString& widgetName);
+            void setMiddleName(const QString& middleName);
+            QString getMiddleName() const;
 
-		private:
-			void prepareAddFieldMenu();
+            void setFamilyName(const QString& familyName);
+            QString getFamilyName() const;
 
-		private:
-			Ui::QtVCardPhotoAndNameFields* ui;
-			bool editable;
+            void setSuffix(const QString& suffix);
+            QString getSuffix() const;
 
-			QMenu* addFieldMenu;
-			QSignalMapper* actionSignalMapper;
-	};
+        private:
+            Ui::QtVCardPhotoAndNameFields* ui;
+            bool editable;
+    };
 
 }