standalone -> hfstandalone (for consistency, suggested by Marek Janukowicz)

git-svn-id: http://nohands.svn.sourceforge.net/svnroot/nohands/trunk@17 126591fb-c623-4b62-a76d-97a8e4f34109

4 files changed, 15 insertions, 15 deletions

diff --git a/README b/README
index 89dbdd4..67bdbe9 100644
--- a/README
+++ b/README
@@ -13,7 +13,7 @@ package inclues three main pieces:
 
 Plus, a set of secondary programs as examples:
 
-- standalone, a libhfp Qt application that does not use hfpd
+- hfstandalone, a libhfp Qt application that does not use hfpd
 - hfpdtext, a variant of hfpd with a text protocol instead of D-Bus
 - nhandsfree, an hfpdtext client plugin for nGhost
 
@@ -33,8 +33,8 @@ Features
 - libhfp is adaptable and can be plugged in to different environments easily
 - libhfp includes detailed Doxygen documentation
 - hfpd is a D-Bus service compatible with any environmental D-Bus bindings
-- hfpd and standalone support multiple concurrently connected devices
-- hfpd and standalone support ring tones in WAV format
+- hfpd and hfstandalone support multiple concurrently connected devices
+- hfpd and hfstandalone support ring tones in WAV format
 
 
 Requirements
@@ -44,7 +44,7 @@ Requirements
 - (optional) libaudiofile
 - (optional) libasound, for the ALSA backend
 - (optional) D-Bus for hfpd and the D-Bus clients
-- (optional) Qt >= 3.3, for the standalone program
+- (optional) Qt >= 3.3, for the hfstandalone program
 - (optional) nghost, for the nhandsfree plugin
 
 You will need a full duplex sound card.  Just about any integrated motherboard
diff --git a/doxymain.h b/doxymain.h
index 4bc2b17..66e0690 100644
--- a/doxymain.h
+++ b/doxymain.h
@@ -17,8 +17,8 @@
  * - @b hfconsole, a PyGTK console application for controlling the
  * D-Bus service daemon.
  *
- * The package also includes @b standalone, a demonstration
- * monolithic speakerphone program built with Trolltech Qt.  Standalone
+ * The package also includes @b hfstandalone, a demonstration
+ * monolithic speakerphone program built with Trolltech Qt.  hfstandalone
  * uses its own instance of libhfp and operates independently of hfpd.
  *
  * The developer of HFP for Linux believes that HFP is most useful in 
diff --git a/qt/Makefile.am b/qt/Makefile.am
index 307eacf..1a6b49d 100644
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -2,7 +2,7 @@
 
 INCLUDES = -I$(top_srcdir)/include -include config.h $(QT_INCLUDES)
 
-bin_PROGRAMS = standalone
+bin_PROGRAMS = hfstandalone
 
 uic_files = nohands.ui prefs.ui scandialog.ui
 uic_built_hdrs = $(uic_files:.ui=.h)
@@ -12,12 +12,12 @@ moc_built_srcs = $(moc_inputs:.h=.moc.cpp)
 commonbuiltsrc = $(uic_built_hdrs) $(uic_built_srcs) $(moc_built_srcs)
 commonsrc = events-qt.h nohands.ui.h prefs.ui.h scandialog.ui.h 
 
-nodist_standalone_SOURCES = $(commonbuiltsrc)
-standalone_SOURCES = $(commonsrc) standalone.cpp
-standalone_LDADD = $(QT_LDFLAGS) $(QT_LIBS) -L../libhfp -lhfp $(libhfp_LIBS)
-standalone_DEPENDENCIES = ../libhfp/libhfp.a
+nodist_hfstandalone_SOURCES = $(commonbuiltsrc)
+hfstandalone_SOURCES = $(commonsrc) hfstandalone.cpp
+hfstandalone_LDADD = $(QT_LDFLAGS) $(QT_LIBS) -L../libhfp -lhfp $(libhfp_LIBS)
+hfstandalone_DEPENDENCIES = ../libhfp/libhfp.a
 
-CLEANFILES = $(commonbuiltsrc) standalone.moc.cpp
+CLEANFILES = $(commonbuiltsrc) hfstandalone.moc.cpp
 
 .ui.h: $(@:.h=.ui)
 	$(UIC) $^ -o $@
@@ -28,7 +28,7 @@ CLEANFILES = $(commonbuiltsrc) standalone.moc.cpp
 $(moc_built_srcs): $(@:.moc.cpp=.h)
 	$(MOC) $(@:.moc.cpp=.h) -o $@
 
-standalone.moc.cpp: standalone.cpp
+hfstandalone.moc.cpp: hfstandalone.cpp
 	$(MOC) $< -o $@
 
-standalone.o: nohands.h scandialog.h prefs.h standalone.moc.cpp
+hfstandalone.o: nohands.h scandialog.h prefs.h hfstandalone.moc.cpp
diff --git a/qt/standalone.cpp b/qt/hfstandalone.cpp
index 5a52bff..c2bf61a 100644
--- a/qt/standalone.cpp
+++ b/qt/hfstandalone.cpp
@@ -1805,4 +1805,4 @@ main(int argc, char **argv)
 	return app.exec();
 }
 
-#include "standalone.moc.cpp"
+#include "hfstandalone.moc.cpp"