diff options
author | Manpreet S. Bajwa <mbajwa3@ford.com> | 2015-03-20 15:01:31 -0400 |
---|---|---|
committer | Manpreet Bajwa <mbajwa3@ford.com> | 2015-03-24 14:57:25 +0000 |
commit | fd7b7bbfbe48d580609b5e337d3ad5bc8a01bd98 (patch) | |
tree | d4d8e508602e86541b32957e0faaf51a2ccb256a /examples | |
parent | c6df915984de3e9d4c9383b9beaeb8217cba5c54 (diff) |
Convert to lower case name of rep_*.h files in examples
In earlier version repc generated rep_Xxxx_Source.h as the name of auto
generated header. The name included the name for Xxxx the name of class
as in .rep file. However recently generated rep header file has name all
in lower case even if class name in .rep file started with upper case
letter. The examples were not compiling as #includes had the older
naming convention for repc generated header file.
Change-Id: If183ab3326d8db0d277f460fe5513cd35226cb63
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Diffstat (limited to 'examples')
16 files changed, 16 insertions, 13 deletions
diff --git a/examples/RemoteObjects/CppClient/CppClient.pro b/examples/RemoteObjects/CppClient/CppClient.pro index 05a89b9..14a1390 100644 --- a/examples/RemoteObjects/CppClient/CppClient.pro +++ b/examples/RemoteObjects/CppClient/CppClient.pro @@ -1,6 +1,6 @@ QT += core -REPC_REPLICA += TimeModel.rep +REPC_REPLICA += timemodel.rep QT += remoteobjects QT -= gui @@ -13,7 +13,7 @@ TEMPLATE = app SOURCES += main.cpp OTHER_FILES += \ - TimeModel.rep + timemodel.rep target.path = $$[QT_INSTALL_EXAMPLES]/RemoteObjects/CppClient INSTALLS += target diff --git a/examples/RemoteObjects/CppClient/main.cpp b/examples/RemoteObjects/CppClient/main.cpp index ee7ec65..70509f5 100644 --- a/examples/RemoteObjects/CppClient/main.cpp +++ b/examples/RemoteObjects/CppClient/main.cpp @@ -41,7 +41,7 @@ #include <QCoreApplication> #include <QTimer> -#include "rep_TimeModel_replica.h" +#include "rep_timemodel_replica.h" class tester : public QObject { diff --git a/examples/RemoteObjects/CppClient/TimeModel.rep b/examples/RemoteObjects/CppClient/timemodel.rep index cbfaf24..cbfaf24 100644 --- a/examples/RemoteObjects/CppClient/TimeModel.rep +++ b/examples/RemoteObjects/CppClient/timemodel.rep diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/DirectConnectClient.pro b/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/DirectConnectClient.pro index 9c8a805..6d29687 100644 --- a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/DirectConnectClient.pro +++ b/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/DirectConnectClient.pro @@ -18,4 +18,4 @@ HEADERS += \ client.h DISTFILES += \ - SimpleSwitch.rep + simpleswitch.rep diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/client.h b/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/client.h index 0d81d95..64d5eef 100644 --- a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/client.h +++ b/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/client.h @@ -45,7 +45,7 @@ #include <QObject> #include <QSharedPointer> -#include "rep_SimpleSwitch_replica.h" +#include "rep_simpleswitch_replica.h" class Client : public QObject { diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/SimpleSwitch.rep b/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/simpleswitch.rep index b2d7cd2..b2d7cd2 100644 --- a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/SimpleSwitch.rep +++ b/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/simpleswitch.rep diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectServer/simpleswitch.cpp b/examples/RemoteObjects/SimpleSwitch/DirectConnectServer/simpleswitch.cpp index 60eeae1..9623657 100644 --- a/examples/RemoteObjects/SimpleSwitch/DirectConnectServer/simpleswitch.cpp +++ b/examples/RemoteObjects/SimpleSwitch/DirectConnectServer/simpleswitch.cpp @@ -64,7 +64,7 @@ void SimpleSwitch::server_slot(bool clientState) void SimpleSwitch::timeout_slot(void) { // slot called on timer timeout - if (currState()) // check if current state is true, currState() is defined in repc generated rep_SimpleSwitch_source.h + if (currState()) // check if current state is true, currState() is defined in repc generated rep_simpleswitch_source.h setCurrState(false); // set state to false else setCurrState(true); // set state to true diff --git a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/RegistryConnectedServer.pro b/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/RegistryConnectedServer.pro index a344f61..071d50f 100644 --- a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/RegistryConnectedServer.pro +++ b/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/RegistryConnectedServer.pro @@ -12,7 +12,7 @@ TARGET = RegistryConnectedServer CONFIG += console CONFIG -= app_bundle -REPC_SOURCE = SimpleSwitch.rep +REPC_SOURCE = simpleswitch.rep TEMPLATE = app @@ -23,3 +23,6 @@ SOURCES += main.cpp \ HEADERS += \ simpleswitch.h + +DISTFILES += \ + simpleswitch.rep diff --git a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.cpp b/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.cpp index 60eeae1..9623657 100644 --- a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.cpp +++ b/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.cpp @@ -64,7 +64,7 @@ void SimpleSwitch::server_slot(bool clientState) void SimpleSwitch::timeout_slot(void) { // slot called on timer timeout - if (currState()) // check if current state is true, currState() is defined in repc generated rep_SimpleSwitch_source.h + if (currState()) // check if current state is true, currState() is defined in repc generated rep_simpleswitch_source.h setCurrState(false); // set state to false else setCurrState(true); // set state to true diff --git a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.h b/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.h index 73e6951..40193da 100644 --- a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.h +++ b/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.h @@ -42,7 +42,7 @@ #ifndef SIMPLESWITCH_H #define SIMPLESWITCH_H -#include "rep_SimpleSwitch_source.h" +#include "rep_simpleswitch_source.h" class SimpleSwitch : public SimpleSwitchSimpleSource { diff --git a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/SimpleSwitch.rep b/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.rep index 4f7c9c7..4f7c9c7 100644 --- a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/SimpleSwitch.rep +++ b/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.rep diff --git a/examples/RemoteObjects/plugins/plugin.cpp b/examples/RemoteObjects/plugins/plugin.cpp index 9a121f0..0303ad5 100644 --- a/examples/RemoteObjects/plugins/plugin.cpp +++ b/examples/RemoteObjects/plugins/plugin.cpp @@ -48,7 +48,7 @@ #include <QCoreApplication> #include <QRemoteObjectReplica> #include <QRemoteObjectNode> -#include "rep_TimeModel_replica.h" +#include "rep_timemodel_replica.h" // Implements a "TimeModel" class with hour and minute properties // that change on-the-minute yet efficiently sleep the rest diff --git a/examples/RemoteObjects/plugins/plugins.pro b/examples/RemoteObjects/plugins/plugins.pro index ce1518f..58f423d 100644 --- a/examples/RemoteObjects/plugins/plugins.pro +++ b/examples/RemoteObjects/plugins/plugins.pro @@ -3,7 +3,7 @@ QT += qml remoteobjects TEMPLATE = lib CONFIG += plugin -REPC_REPLICA += $$PWD/../TimeModel.rep +REPC_REPLICA += $$PWD/../timemodel.rep DESTDIR = imports/TimeExample TARGET = qmlqtimeexampleplugin diff --git a/examples/RemoteObjects/server/TimeModel.h b/examples/RemoteObjects/server/TimeModel.h index 0924108..cdec02c 100644 --- a/examples/RemoteObjects/server/TimeModel.h +++ b/examples/RemoteObjects/server/TimeModel.h @@ -40,7 +40,7 @@ ****************************************************************************/ #include <QtCore> -#include "rep_TimeModel_source.h" +#include "rep_timemodel_source.h" class MinuteTimer : public MinuteTimerSimpleSource { diff --git a/examples/RemoteObjects/server/server.pro b/examples/RemoteObjects/server/server.pro index 9d624fd..e9cefbd 100644 --- a/examples/RemoteObjects/server/server.pro +++ b/examples/RemoteObjects/server/server.pro @@ -1,7 +1,7 @@ CONFIG += console -REPC_SOURCE += ../TimeModel.rep +REPC_SOURCE += ../timemodel.rep QT = remoteobjects core SOURCES += TimeModel.cpp main.cpp diff --git a/examples/RemoteObjects/TimeModel.rep b/examples/RemoteObjects/timemodel.rep index 0c9ca6a..0c9ca6a 100644 --- a/examples/RemoteObjects/TimeModel.rep +++ b/examples/RemoteObjects/timemodel.rep |