Browse Source

Fix deprecation attributes and dialog messages

pull/1639/head
Andrew Belt 7 years ago
parent
commit
b81df0e7fc
3 changed files with 4 additions and 4 deletions
  1. +1
    -1
      include/ui.hpp
  2. +1
    -1
      include/util/common.hpp
  3. +2
    -2
      src/app/RackWidget.cpp

+ 1
- 1
include/ui.hpp View File

@@ -74,7 +74,7 @@ struct Menu : OpaqueWidget {
} }
~Menu(); ~Menu();
/** Deprecated. Just use addChild(child) instead */ /** Deprecated. Just use addChild(child) instead */
void pushChild(Widget *child) DEPRECATED {
DEPRECATED void pushChild(Widget *child) {
addChild(child); addChild(child);
} }
void setChildMenu(Menu *menu); void setChildMenu(Menu *menu);


+ 1
- 1
include/util/common.hpp View File

@@ -118,7 +118,7 @@ float randomUniform();
/** Returns a normal random number with mean 0 and standard deviation 1 */ /** Returns a normal random number with mean 0 and standard deviation 1 */
float randomNormal(); float randomNormal();


inline float DEPRECATED randomf() {return randomUniform();}
DEPRECATED inline float randomf() {return randomUniform();}


//////////////////// ////////////////////
// String utilities // String utilities


+ 2
- 2
src/app/RackWidget.cpp View File

@@ -60,7 +60,7 @@ void RackWidget::clear() {
} }


void RackWidget::reset() { void RackWidget::reset() {
if (osdialog_message(OSDIALOG_INFO, OSDIALOG_OK_CANCEL, "Clear your patch and start over?")) {
if (osdialog_message(OSDIALOG_INFO, OSDIALOG_OK_CANCEL, "Clear patch and start over?")) {
clear(); clear();
// Fails silently if file does not exist // Fails silently if file does not exist
loadPatch(assetLocal("template.vcv")); loadPatch(assetLocal("template.vcv"));
@@ -159,7 +159,7 @@ void RackWidget::loadPatch(std::string path) {
void RackWidget::revert() { void RackWidget::revert() {
if (lastPath.empty()) if (lastPath.empty())
return; return;
if (osdialog_message(OSDIALOG_INFO, OSDIALOG_OK_CANCEL, "Revert your patch to the last saved state?")) {
if (osdialog_message(OSDIALOG_INFO, OSDIALOG_OK_CANCEL, "Revert patch to the last saved state?")) {
loadPatch(lastPath); loadPatch(lastPath);
} }
} }


Loading…
Cancel
Save