From f41720a15d5f29bc9032497694ff8c60fc43f580 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 9 Sep 2016 11:11:17 +0200 Subject: [PATCH] fix(app): use camelCase instead of snake_case for qml files --- tests/languages/en.ts | 4 ++-- tests/languages/fr.ts | 4 ++-- tests/resources.qrc | 4 ++-- tests/src/main.cpp | 2 +- tests/ui/views/{main_window.qml => mainWindow.qml} | 2 +- tests/ui/views/{manage_accounts.qml => manageAccounts.qml} | 0 6 files changed, 8 insertions(+), 8 deletions(-) rename tests/ui/views/{main_window.qml => mainWindow.qml} (98%) rename tests/ui/views/{manage_accounts.qml => manageAccounts.qml} (100%) diff --git a/tests/languages/en.ts b/tests/languages/en.ts index 96cb25eeb..b8847179f 100644 --- a/tests/languages/en.ts +++ b/tests/languages/en.ts @@ -2,14 +2,14 @@ - main_window + mainWindow mainSearchBarPlaceholder Search contact, start call, start chat... - manage_accounts + manageAccounts manageAccountsTitle Presence and accounts diff --git a/tests/languages/fr.ts b/tests/languages/fr.ts index 88b9c797d..0c6d68f0b 100644 --- a/tests/languages/fr.ts +++ b/tests/languages/fr.ts @@ -2,14 +2,14 @@ - main_window + mainWindow mainSearchBarPlaceholder Chercher contact, commencer appel ou chat... - manage_accounts + manageAccounts manageAccountsTitle Présence et comptes diff --git a/tests/resources.qrc b/tests/resources.qrc index 812aede8c..6bda8e9d7 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -12,8 +12,8 @@ ui/components/form/DialogComboBox.qml ui/components/form/RoundButton.qml ui/components/form/ToolBarButton.qml - ui/views/main_window.qml - ui/views/manage_accounts.qml + ui/views/mainWindow.qml + ui/views/manageAccounts.qml imgs/collapse.svg diff --git a/tests/src/main.cpp b/tests/src/main.cpp index fdde7ecfb..71a2c6359 100644 --- a/tests/src/main.cpp +++ b/tests/src/main.cpp @@ -8,7 +8,7 @@ int main (int argc, char *argv[]) { App app(argc, argv); - QQmlApplicationEngine engine(QUrl("qrc:/ui/views/main_window.qml")); + QQmlApplicationEngine engine(QUrl("qrc:/ui/views/mainWindow.qml")); if (engine.rootObjects().isEmpty()) return EXIT_FAILURE; diff --git a/tests/ui/views/main_window.qml b/tests/ui/views/mainWindow.qml similarity index 98% rename from tests/ui/views/main_window.qml rename to tests/ui/views/mainWindow.qml index f97571cc3..618257d4b 100644 --- a/tests/ui/views/main_window.qml +++ b/tests/ui/views/mainWindow.qml @@ -29,7 +29,7 @@ ApplicationWindow { // User actions. ToolBarButton { onClicked: { - var component = Qt.createComponent('qrc:/ui/views/manage_accounts.qml'); + var component = Qt.createComponent('qrc:/ui/views/manageAccounts.qml'); if (component.status !== Component.Ready) { console.debug('Window not ready.') if(component.status === Component.Error) { diff --git a/tests/ui/views/manage_accounts.qml b/tests/ui/views/manageAccounts.qml similarity index 100% rename from tests/ui/views/manage_accounts.qml rename to tests/ui/views/manageAccounts.qml