History

Rework all c++ calls

vladest committed 9 years ago

Commit 3ceeb0d1 parent 5b033e07 files · +257 −255Browse files

Showing the changes to interface/src/AvatarBookmarks.cpp (1 of 7 files). Show all

Unified · Split

interface/src/AvatarBookmarks.cpp+4−5
@@ -106,10 +106,9 @@ void AvatarBookmarks::changeToBookmarkedAvatar() { · 105 unmodified lines
106106 }
107107
108108 void AvatarBookmarks::addBookmark() {
109− auto offscreenUi = DependencyManager::get<OffscreenUi>();
110− connect(offscreenUi.data(), &OffscreenUi::inputDialogResponse, this, [=] (QVariant response) {
111− disconnect(offscreenUi.data(), &OffscreenUi::inputDialogResponse, this, nullptr);
112− auto offscreenUi = DependencyManager::get<OffscreenUi>();
109+ ModalDialogListener* dlg = OffscreenUi::getTextAsync(OffscreenUi::ICON_PLACEMARK, "Bookmark Avatar", "Name", QString());
110+ connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
111+ disconnect(dlg, &ModalDialogListener::response, this, nullptr);
113112 auto bookmarkName = response.toString();
114113 bookmarkName = bookmarkName.trimmed().replace(QRegExp("(\r\n|[\r\n\t\v ])+"), " ");
115114 if (bookmarkName.length() == 0) {
@@ -130,7 +129,7 @@ void AvatarBookmarks::addBookmark() { · 14 unmodified lines
130129
131130 Bookmarks::addBookmarkToFile(bookmarkName, *bookmark);
132131 });
133− OffscreenUi::getTextAsync(OffscreenUi::ICON_PLACEMARK, "Bookmark Avatar", "Name", QString());
132+
134133 }
135134
136135 void AvatarBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& bookmark) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t