The error() and warning() functions add ! and newline automatically. (I didn't

look at debug() and debugC(), since I'm really bored with this now. :-)

svn-id: r41061

3 files changed, 3 insertions, 3 deletions

diff --git a/backends/keymapper/keymap.cpp b/backends/keymapper/keymap.cpp
index 840ba5a0c5..95b64f88e7 100644
--- a/backends/keymapper/keymap.cpp
+++ b/backends/keymapper/keymap.cpp
@@ -54,7 +54,7 @@ Keymap::~Keymap() {
 
 void Keymap::addAction(Action *action) {
 	if (findAction(action->id))
-		error("Action with id %s already in KeyMap!", action->id);
+		error("Action with id %s already in KeyMap", action->id);
 
 	_actions.push_back(action);
 }
diff --git a/backends/keymapper/keymapper.cpp b/backends/keymapper/keymapper.cpp
index c74aa45b17..7d888828c6 100644
--- a/backends/keymapper/keymapper.cpp
+++ b/backends/keymapper/keymapper.cpp
@@ -69,7 +69,7 @@ Keymapper::~Keymapper() {
 
 void Keymapper::registerHardwareKeySet(HardwareKeySet *keys) {
 	if (_hardwareKeys)
-		error("Hardware key set already registered!");
+		error("Hardware key set already registered");
 
 	if (!keys) {
 		warning("No hardware keys are supplied");
diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp
index 389ca7d1f9..d53ae588f8 100644
--- a/backends/keymapper/remap-dialog.cpp
+++ b/backends/keymapper/remap-dialog.cpp
@@ -147,7 +147,7 @@ void RemapDialog::reflowLayout() {
 	_colCount = (areaW - scrollbarWidth) / colWidth;
 	_rowCount = (areaH + spacing) / (buttonHeight + spacing);
 	if (_colCount <= 0 || _rowCount <= 0)
-		error("Remap dialog too small to display any keymaps!");
+		error("Remap dialog too small to display any keymaps");
 
 	_scrollBar->resize(areaX + areaW - scrollbarWidth, areaY, scrollbarWidth, areaH);
 	_scrollBar->_entriesPerPage = _rowCount;