summaryrefslogtreecommitdiffstats
path: root/servers/sensor_monitor_server_lin/src
diff options
context:
space:
mode:
Diffstat (limited to 'servers/sensor_monitor_server_lin/src')
-rw-r--r--servers/sensor_monitor_server_lin/src/Makefile.am8
-rw-r--r--servers/sensor_monitor_server_lin/src/main.cpp4
-rw-r--r--servers/sensor_monitor_server_lin/src/sensor_conn.cpp2
3 files changed, 7 insertions, 7 deletions
diff --git a/servers/sensor_monitor_server_lin/src/Makefile.am b/servers/sensor_monitor_server_lin/src/Makefile.am
index b246bb0..cffd105 100644
--- a/servers/sensor_monitor_server_lin/src/Makefile.am
+++ b/servers/sensor_monitor_server_lin/src/Makefile.am
@@ -1,11 +1,11 @@
INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde -I/usr/include/sasl
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-bin_PROGRAMS = remotefpga_sensormonserver
+bin_PROGRAMS = ulab_sensormonserver
-remotefpga_sensormonserver_SOURCES = main.cpp sensor_conn.cpp
+ulab_sensormonserver_SOURCES = main.cpp sensor_conn.cpp
-remotefpga_sensormonserver_METASOURCES = AUTO
-remotefpga_sensormonserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
+ulab_sensormonserver_METASOURCES = AUTO
+ulab_sensormonserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal
diff --git a/servers/sensor_monitor_server_lin/src/main.cpp b/servers/sensor_monitor_server_lin/src/main.cpp
index 74421e0..eec0c8d 100644
--- a/servers/sensor_monitor_server_lin/src/main.cpp
+++ b/servers/sensor_monitor_server_lin/src/main.cpp
@@ -45,7 +45,7 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[])
{
- TDEAboutData aboutData( "remotefpga_sensormon_server", I18N_NOOP("uLab Sensor Monitor Server"),
+ TDEAboutData aboutData( "ulab_sensormon_server", I18N_NOOP("uLab Sensor Monitor Server"),
version, description, TDEAboutData::License_GPL,
"(c) 2012, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
TDEStartupInfo::appStarted();
- KSimpleConfig config(TQDir::currentDirPath() + "/remotefpga_sensormonserver.conf", false);
+ KSimpleConfig config(TQDir::currentDirPath() + "/ulab_sensormonserver.conf", false);
config.setGroup("Server");
SensorServer sensorsvr(0, config.readNumEntry("port", 4014), &config);
return app.exec();
diff --git a/servers/sensor_monitor_server_lin/src/sensor_conn.cpp b/servers/sensor_monitor_server_lin/src/sensor_conn.cpp
index b65648d..76ca699 100644
--- a/servers/sensor_monitor_server_lin/src/sensor_conn.cpp
+++ b/servers/sensor_monitor_server_lin/src/sensor_conn.cpp
@@ -81,7 +81,7 @@ SensorSocket::SensorSocket(int sock, TQObject *parent, const char *name) :
initializeSensors();
- setServiceName("remotefpga");
+ setServiceName("ulab");
connect(this, SIGNAL(connectionClosed()), SLOT(connectionClosedHandler()));
connect(this, SIGNAL(connectionClosed()), parent, SLOT(remoteConnectionClosed()));