aboutsummaryrefslogtreecommitdiff
path: root/src/scenes
diff options
context:
space:
mode:
authorDaniel Teichmann <daniel.teichmann@das-netzwerkteam.de>2021-08-01 02:36:42 +0200
committerDaniel Teichmann <daniel.teichmann@das-netzwerkteam.de>2021-08-01 02:36:42 +0200
commit0e8f295868e826b89114b55a0aa360cb30d7494f (patch)
tree64b93cf0c608abc5a7b09e090868b487cd4ef826 /src/scenes
parentea9c15a88a645887cda6022b9c304eba806ff17d (diff)
downloadRWA.Support.DesktopApp-0e8f295868e826b89114b55a0aa360cb30d7494f.tar.gz
RWA.Support.DesktopApp-0e8f295868e826b89114b55a0aa360cb30d7494f.tar.bz2
RWA.Support.DesktopApp-0e8f295868e826b89114b55a0aa360cb30d7494f.zip
add_server_wizard/add_server_wizard -> add_rwahost_wizard/add_rwahost_wizard
Diffstat (limited to 'src/scenes')
-rw-r--r--src/scenes/add_rwahost_wizard/Scene_step_1.qml (renamed from src/scenes/add_server_wizard/Scene_step_1.qml)6
-rw-r--r--src/scenes/add_rwahost_wizard/add_rwahost_wizard.cpp (renamed from src/scenes/add_server_wizard/add_server_wizard.cpp)12
-rw-r--r--src/scenes/add_rwahost_wizard/add_rwahost_wizard.h (renamed from src/scenes/add_server_wizard/add_server_wizard.h)8
-rw-r--r--src/scenes/remote_control/remote_control_manager.h4
4 files changed, 15 insertions, 15 deletions
diff --git a/src/scenes/add_server_wizard/Scene_step_1.qml b/src/scenes/add_rwahost_wizard/Scene_step_1.qml
index bfbe2ae..873e0fd 100644
--- a/src/scenes/add_server_wizard/Scene_step_1.qml
+++ b/src/scenes/add_rwahost_wizard/Scene_step_1.qml
@@ -15,7 +15,7 @@ Item {
objectName: "Scene_step_1"
Connections {
- target: add_server_wizard
+ target: add_rwahost_wizard
function onStep1Success() {
// Go onto the first page of the stack.
main_content_pop(null)
@@ -26,7 +26,7 @@ Item {
}
Connections {
- target: add_server_wizard
+ target: add_rwahost_wizard
function onStep1Failed(reason, toast_type) {
mainqmladaptor.showToast(reason,
5000,
@@ -48,7 +48,7 @@ Item {
anchors.rightMargin: 15
onClicked: {
- add_server_wizard.processStep1(host_url.text, host_alias.text)
+ add_rwahost_wizard.processStep1(host_url.text, host_alias.text)
}
}
diff --git a/src/scenes/add_server_wizard/add_server_wizard.cpp b/src/scenes/add_rwahost_wizard/add_rwahost_wizard.cpp
index caac344..7adbdf9 100644
--- a/src/scenes/add_server_wizard/add_server_wizard.cpp
+++ b/src/scenes/add_rwahost_wizard/add_rwahost_wizard.cpp
@@ -23,11 +23,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#include "add_server_wizard.h"
+#include "add_rwahost_wizard.h"
#include "../../RWADBusAdaptor.h"
#include "../../RWAHost.h"
-Add_Server_wizard::Add_Server_wizard(QObject *parent,
+AddRWAHostWizard::AddRWAHostWizard(QObject *parent,
MainQMLAdaptor *main_gui, DBusAPI *dbus_api) : QObject(parent) {
Q_ASSERT(main_gui != nullptr);
Q_ASSERT(dbus_api != nullptr);
@@ -42,7 +42,7 @@ Add_Server_wizard::Add_Server_wizard(QObject *parent,
SLOT(add_web_app_host_response(QJsonDocument*)));
}
-void Add_Server_wizard::processStep1(QString host_url, QString host_alias) {
+void AddRWAHostWizard::processStep1(QString host_url, QString host_alias) {
qDebug() << "Processing Step 1 with args: " << host_url << host_alias;
if(host_alias == "" || host_url == "") {
@@ -55,18 +55,18 @@ void Add_Server_wizard::processStep1(QString host_url, QString host_alias) {
return add_server(host_url, host_alias);
}
-void Add_Server_wizard::processStep2() {
+void AddRWAHostWizard::processStep2() {
qDebug() << "Processing Step 2 with args: No Args.";
emit step2Failed(tr("The features you expected here are not yet implemented."), Toast::ToastType::ToastWarning);
// Just show placeholder scene now.
emit step2Success();
}
-void Add_Server_wizard::add_server(QString host_url, QString host_alias) {
+void AddRWAHostWizard::add_server(QString host_url, QString host_alias) {
_dbus_api->add_web_app_host_request(host_url, host_alias);
}
-void Add_Server_wizard::add_web_app_host_response(QJsonDocument *doc) {
+void AddRWAHostWizard::add_web_app_host_response(QJsonDocument *doc) {
// Q_ASSERT lets the program crash immediatly at startup,
// when the session service is not started.
// Don't use Q_ASSERT(doc != nullptr); instead use:
diff --git a/src/scenes/add_server_wizard/add_server_wizard.h b/src/scenes/add_rwahost_wizard/add_rwahost_wizard.h
index dc205d1..f019be1 100644
--- a/src/scenes/add_server_wizard/add_server_wizard.h
+++ b/src/scenes/add_rwahost_wizard/add_rwahost_wizard.h
@@ -23,8 +23,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#ifndef ADD_SERVER_WIZARD_H
-#define ADD_SERVER_WIZARD_H
+#ifndef ADD_RWAHOST_WIZARD_H
+#define ADD_RWAHOST_WIZARD_H
#include <QObject>
@@ -32,11 +32,11 @@
#include "../../DBusAPI.h"
#include "../../main_qmladaptor.h"
-class Add_Server_wizard : public QObject
+class AddRWAHostWizard : public QObject
{
Q_OBJECT
public:
- explicit Add_Server_wizard(QObject *parent = nullptr,
+ explicit AddRWAHostWizard(QObject *parent = nullptr,
MainQMLAdaptor *main_gui = nullptr,
DBusAPI *dbus_api = nullptr);
void add_server(QString host_url, QString host_alias);
diff --git a/src/scenes/remote_control/remote_control_manager.h b/src/scenes/remote_control/remote_control_manager.h
index 6f2fbdb..4554724 100644
--- a/src/scenes/remote_control/remote_control_manager.h
+++ b/src/scenes/remote_control/remote_control_manager.h
@@ -1,5 +1,5 @@
-#ifndef REMOTECONTROLMANAGER_H
-#define REMOTECONTROLMANAGER_H
+#ifndef REMOTE_CONTROL_MANAGER_H
+#define REMOTE_CONTROL_MANAGER_H
#include <QObject>