move sound constants to separate file.

18 files changed, 54 insertions, 12 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1edd97ca1..4ed28c69b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -682,6 +682,7 @@ SET(SRCS
     shopitem.h
     simpleanimation.cpp
     simpleanimation.h
+    soundconsts.h
     soundmanager.cpp
     soundmanager.h
     sprite.h
diff --git a/src/Makefile.am b/src/Makefile.am
index ddb7f6800..8147ed384 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -683,6 +683,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      shopitem.h \
 	      simpleanimation.cpp \
 	      simpleanimation.h \
+	      soundconsts.h \
 	      soundmanager.cpp \
 	      soundmanager.h \
 	      sprite.h \
diff --git a/src/being.cpp b/src/being.cpp
index 393b37d3b..e92dccaa3 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -32,6 +32,7 @@
 #include "particle.h"
 #include "party.h"
 #include "playerrelations.h"
+#include "soundconsts.h"
 #include "soundmanager.h"
 #include "text.h"
 
diff --git a/src/client.cpp b/src/client.cpp
index 74abd5f7d..5f3803b30 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -41,6 +41,7 @@
 #include "keyboardconfig.h"
 #include "party.h"
 #include "playerrelations.h"
+#include "soundconsts.h"
 #include "soundmanager.h"
 #include "statuseffect.h"
 #include "units.h"
diff --git a/src/gui/confirmdialog.cpp b/src/gui/confirmdialog.cpp
index a2441c63b..e9c8d1db7 100644
--- a/src/gui/confirmdialog.cpp
+++ b/src/gui/confirmdialog.cpp
@@ -22,6 +22,8 @@
 
 #include "gui/confirmdialog.h"
 
+#include "soundmanager.h"
+
 #include "gui/gui.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/confirmdialog.h b/src/gui/confirmdialog.h
index f2ac75bbb..76e3c2d18 100644
--- a/src/gui/confirmdialog.h
+++ b/src/gui/confirmdialog.h
@@ -25,7 +25,7 @@
 
 #include "localconsts.h"
 
-#include "soundmanager.h"
+#include "soundconsts.h"
 
 #include "gui/widgets/window.h"
 
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 0d9a27bcc..be2404875 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -26,6 +26,7 @@
 #include "being.h"
 #include "configuration.h"
 #include "client.h"
+#include "soundconsts.h"
 #include "soundmanager.h"
 
 #include "gui/gui.h"
diff --git a/src/gui/okdialog.cpp b/src/gui/okdialog.cpp
index e7f0a669e..348d57bb4 100644
--- a/src/gui/okdialog.cpp
+++ b/src/gui/okdialog.cpp
@@ -22,6 +22,7 @@
 
 #include "gui/okdialog.h"
 
+#include "soundconsts.h"
 #include "soundmanager.h"
 
 #include "gui/gui.h"
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 77bd26b8e..cfdfb03c2 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -27,6 +27,7 @@
 #include "game.h"
 #include "keydata.h"
 #include "keyevent.h"
+#include "soundconsts.h"
 #include "soundmanager.h"
 
 #include "gui/chatwindow.h"
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index 36a67a2af..0f14d8ad5 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -49,6 +49,7 @@
 #include "playerinfo.h"
 #include "playerrelations.h"
 #include "shopitem.h"
+#include "soundconsts.h"
 #include "soundmanager.h"
 #include "units.h"
 
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 41b57c035..a596c5e7f 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -28,6 +28,7 @@
 #include "commandhandler.h"
 #include "configuration.h"
 #include "localplayer.h"
+#include "soundconsts.h"
 #include "soundmanager.h"
 
 #include "gui/helpwindow.h"
diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp
index dd55b3a39..f25ac562d 100644
--- a/src/gui/widgets/guildchattab.cpp
+++ b/src/gui/widgets/guildchattab.cpp
@@ -27,6 +27,7 @@
 #include "guild.h"
 #include "guildmanager.h"
 #include "localplayer.h"
+#include "soundconsts.h"
 #include "soundmanager.h"
 
 #include "resources/iteminfo.h"
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 674fc171d..ad510d363 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -26,6 +26,7 @@
 #include "configuration.h"
 #include "dragdrop.h"
 #include "graphicsvertexes.h"
+#include "soundconsts.h"
 #include "soundmanager.h"
 
 #include "gui/gui.h"
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 4f1aa1f10..1c0d7f139 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -37,6 +37,7 @@
 #include "playerinfo.h"
 #include "playerrelations.h"
 #include "simpleanimation.h"
+#include "soundconsts.h"
 #include "soundmanager.h"
 #include "statuseffect.h"
 #include "walklayer.h"
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp
index 38a384629..46fa9c0ca 100644
--- a/src/net/ea/gui/guildtab.cpp
+++ b/src/net/ea/gui/guildtab.cpp
@@ -26,6 +26,7 @@
 #include "configuration.h"
 #include "guild.h"
 #include "localplayer.h"
+#include "soundconsts.h"
 #include "soundmanager.h"
 
 #include "net/net.h"
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
index 78105d3ad..27db82fad 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/net/ea/gui/partytab.cpp
@@ -26,6 +26,7 @@
 #include "commandhandler.h"
 #include "localplayer.h"
 #include "party.h"
+#include "soundconsts.h"
 #include "soundmanager.h"
 
 #include "net/net.h"
diff --git a/src/soundconsts.h b/src/soundconsts.h
new file mode 100644
index 000000000..17117f021
--- /dev/null
+++ b/src/soundconsts.h
@@ -0,0 +1,37 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SOUNDCONSTS_H
+#define SOUNDCONSTS_H
+
+#include <string>
+
+static const std::string SOUND_INFO = "soundinfo";
+static const std::string SOUND_ERROR = "sounderror";
+static const std::string SOUND_REQUEST = "soundrequest";
+static const std::string SOUND_TRADE = "soundtrade";
+static const std::string SOUND_WHISPER = "soundwhisper";
+static const std::string SOUND_HIGHLIGHT = "soundhighlight";
+static const std::string SOUND_GLOBAL = "soundglobal";
+static const std::string SOUND_GUILD = "soundguild";
+static const std::string SOUND_SHOW_WINDOW = "soundshowwindow";
+static const std::string SOUND_HIDE_WINDOW = "soundhidewindow";
+
+#endif  // SOUNDCONSTS_H
diff --git a/src/soundmanager.h b/src/soundmanager.h
index 09e424238..b66520ab1 100644
--- a/src/soundmanager.h
+++ b/src/soundmanager.h
@@ -33,17 +33,6 @@
 
 class SDLMusic;
 
-static const std::string SOUND_INFO = "soundinfo";
-static const std::string SOUND_ERROR = "sounderror";
-static const std::string SOUND_REQUEST = "soundrequest";
-static const std::string SOUND_TRADE = "soundtrade";
-static const std::string SOUND_WHISPER = "soundwhisper";
-static const std::string SOUND_HIGHLIGHT = "soundhighlight";
-static const std::string SOUND_GLOBAL = "soundglobal";
-static const std::string SOUND_GUILD = "soundguild";
-static const std::string SOUND_SHOW_WINDOW = "soundshowwindow";
-static const std::string SOUND_HIDE_WINDOW = "soundhidewindow";
-
 /** SoundManager
  *
  * \ingroup CORE