summaryrefslogtreecommitdiffstats
path: root/servers/fpga_programming_server_lin/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-01-13 05:10:18 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-01-13 05:10:18 -0600
commit87834696493fdc51c2375aff7f307d854766dd42 (patch)
treec122d72e897735e0c033829e786b37745320c4b8 /servers/fpga_programming_server_lin/src
parentc912b0f1d3994cde07d472e2c53f0375518a74df (diff)
downloadulab-87834696493fdc51c2375aff7f307d854766dd42.tar.gz
ulab-87834696493fdc51c2375aff7f307d854766dd42.zip
Fix incorrect file names
Diffstat (limited to 'servers/fpga_programming_server_lin/src')
-rw-r--r--servers/fpga_programming_server_lin/src/Makefile.am2
-rw-r--r--servers/fpga_programming_server_lin/src/fpga_progserver.cpp (renamed from servers/fpga_programming_server_lin/src/fpga_conn.cpp)4
-rw-r--r--servers/fpga_programming_server_lin/src/fpga_progserver.h (renamed from servers/fpga_programming_server_lin/src/fpga_conn.h)0
-rw-r--r--servers/fpga_programming_server_lin/src/main.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/servers/fpga_programming_server_lin/src/Makefile.am b/servers/fpga_programming_server_lin/src/Makefile.am
index c094655..579bb6a 100644
--- a/servers/fpga_programming_server_lin/src/Makefile.am
+++ b/servers/fpga_programming_server_lin/src/Makefile.am
@@ -3,7 +3,7 @@ KDE_CXXFLAGS = $(USE_EXCEPTIONS)
bin_PROGRAMS = ulab_fpgaprogserver
-ulab_fpgaprogserver_SOURCES = main.cpp fpga_conn.cpp
+ulab_fpgaprogserver_SOURCES = main.cpp fpga_progserver.cpp
ulab_fpgaprogserver_METASOURCES = AUTO
ulab_fpgaprogserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
diff --git a/servers/fpga_programming_server_lin/src/fpga_conn.cpp b/servers/fpga_programming_server_lin/src/fpga_progserver.cpp
index 663c7f9..a0c2afe 100644
--- a/servers/fpga_programming_server_lin/src/fpga_conn.cpp
+++ b/servers/fpga_programming_server_lin/src/fpga_progserver.cpp
@@ -40,7 +40,7 @@
#include <tdelocale.h>
-#include "fpga_conn.h"
+#include "fpga_progserver.h"
#define ABORT_SOCKET(s) s->close(); \
s->disconnect(); \
@@ -380,4 +380,4 @@ void FPGAServer::newConnection(int socket) {
void FPGAServer::remoteConnectionClosed() {
m_numberOfConnections--;
-} \ No newline at end of file
+}
diff --git a/servers/fpga_programming_server_lin/src/fpga_conn.h b/servers/fpga_programming_server_lin/src/fpga_progserver.h
index 597b4cc..597b4cc 100644
--- a/servers/fpga_programming_server_lin/src/fpga_conn.h
+++ b/servers/fpga_programming_server_lin/src/fpga_progserver.h
diff --git a/servers/fpga_programming_server_lin/src/main.cpp b/servers/fpga_programming_server_lin/src/main.cpp
index 7cd8e92..1ef7e87 100644
--- a/servers/fpga_programming_server_lin/src/main.cpp
+++ b/servers/fpga_programming_server_lin/src/main.cpp
@@ -37,7 +37,7 @@
#include <tdeaboutdata.h>
#include <ksimpleconfig.h>
-#include "fpga_conn.h"
+#include "fpga_progserver.h"
static const char description[] = I18N_NOOP("uLab FPGA Programming Server");