History

Add default values for alert, confirm, and prompt

Ryan Huffman committed 12 years ago

Commit a7dd1911 parent 8e633521 file · +4 −5Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.h (1 of 1 file). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.h+4−5
@@ -12,9 +12,8 @@ · 11 unmodified lines
12#ifndef hifi_WindowScriptingInterface_h12#ifndef hifi_WindowScriptingInterface_h
13#define hifi_WindowScriptingInterface_h13#define hifi_WindowScriptingInterface_h
14 14
15#include <QDebug>
16#include <QMutex>
17#include <QObject>15#include <QObject>
16#include <QScriptValue>
18#include <QString>17#include <QString>
19 18
20class WindowScriptingInterface : public QObject {19class WindowScriptingInterface : public QObject {
@@ -28,9 +27,9 @@ public: · 7 unmodified lines
28 int getInnerHeight();27 int getInnerHeight();
29 28
30public slots:29public slots:
31 QScriptValue alert(const QString& message);30 QScriptValue alert(const QString& message = "");
32 QScriptValue confirm(const QString& message);31 QScriptValue confirm(const QString& message = "");
33 QScriptValue prompt(const QString& message, const QString& defaultText="");32 QScriptValue prompt(const QString& message = "", const QString& defaultText = "");
34 33
35private slots:34private slots:
36 QScriptValue showAlert(const QString& message);35 QScriptValue showAlert(const QString& message);

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