summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2013-10-16 18:41:41 (GMT)
committerSwift Review <review@swift.im>2013-10-26 15:33:27 (GMT)
commit806157b94327f8c41f5e4402a73608cd9e5225b0 (patch)
tree287d0c5f73c21d189db3eea485621a9c784bf1c8 /Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.h
parentf7a239f06131bdad9ca7c11e88496de1d7b5a9f9 (diff)
downloadswift-806157b94327f8c41f5e4402a73608cd9e5225b0.zip
swift-806157b94327f8c41f5e4402a73608cd9e5225b0.tar.bz2
VCard: Remove name fields from field menu. They're always displayed in edit mode now.
Change-Id: I9ee5faae53e9300300e01a1782b51645399f1669 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Diffstat (limited to 'Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.h')
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.h b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.h
index f279701..6a5ae46 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.h
+++ b/Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.h
@@ -7,8 +7,8 @@
#pragma once
#include <QMenu>
-#include <QSignalMapper>
#include <QWidget>
+
#include <Swiften/Base/ByteArray.h>
namespace Ui {
@@ -29,8 +29,6 @@ namespace Swift {
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;
@@ -56,18 +54,9 @@ namespace Swift {
void setSuffix(const QString suffix);
QString getSuffix() const;
- public slots:
- void showField(const QString& widgetName);
-
- private:
- void prepareAddFieldMenu();
-
private:
Ui::QtVCardPhotoAndNameFields* ui;
bool editable;
-
- QMenu* addFieldMenu;
- QSignalMapper* actionSignalMapper;
};
}