more -pedantic warnings fixed

svn-id: r6109

8 files changed, 10 insertions, 10 deletions

diff --git a/gui/ListWidget.h b/gui/ListWidget.h
index 1d1cb6c626..f679462a93 100644
--- a/gui/ListWidget.h
+++ b/gui/ListWidget.h
@@ -37,7 +37,7 @@ enum {
 enum {
 	kListItemDoubleClickedCmd	= 'LIdb',	// double click on item - 'data' will be item index
 	kListItemActivatedCmd		= 'LIac',	// item activated by return/enter - 'data' will be item index
-	kListSelectionChangedCmd	= 'Lsch',	// selection changed - 'data' will be item index
+	kListSelectionChangedCmd	= 'Lsch'	// selection changed - 'data' will be item index
 };
 
 /* ListWidget */
diff --git a/gui/console.h b/gui/console.h
index 149a2248a5..322bbc3545 100644
--- a/gui/console.h
+++ b/gui/console.h
@@ -31,7 +31,7 @@ enum {
 	kLineBufferSize = 256,
 	kCharWidth = 8,
 
-	kHistorySize = 20,
+	kHistorySize = 20
 };
 
 class ScrollBarWidget;
diff --git a/gui/newgui.h b/gui/newgui.h
index 90de55a933..5519f9ba24 100644
--- a/gui/newgui.h
+++ b/gui/newgui.h
@@ -40,7 +40,7 @@ enum {
 enum {
 	kTextAlignLeft,
 	kTextAlignCenter,
-	kTextAlignRight,
+	kTextAlignRight
 };
 
 // Extremly simple stack class, doesn't even do any error checking (for now)
diff --git a/gui/widget.h b/gui/widget.h
index 7bfac1074f..49362a838c 100644
--- a/gui/widget.h
+++ b/gui/widget.h
@@ -55,7 +55,7 @@ enum {
 
 enum {
 	kButtonWidth = 56,
-	kButtonHeight = 16,
+	kButtonHeight = 16
 };
 
 
diff --git a/scumm/debugger.h b/scumm/debugger.h
index b3972ed2b4..3bedf6b9cc 100644
--- a/scumm/debugger.h
+++ b/scumm/debugger.h
@@ -72,7 +72,7 @@ protected:
 	bool Cmd_Room(char _parameter[255][255]);
 	
 #ifdef USE_CONSOLE
-	static bool ScummDebugger::debuggerInputCallback(ConsoleDialog *console, const char *input, void *refCon);
+	static bool debuggerInputCallback(ConsoleDialog *console, const char *input, void *refCon);
 #endif
 };
 
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp
index a7d89c1aa3..e61e87d644 100644
--- a/scumm/dialogs.cpp
+++ b/scumm/dialogs.cpp
@@ -476,12 +476,12 @@ enum {
 	kMusicVolumeChanged		= 'muvc',
 	kSfxVolumeChanged		= 'sfvc',
 	kOKCmd					= 'ok  ',
-	kCancelCmd				= 'cncl',
+	kCancelCmd				= 'cncl'
 };
 
 enum {
 	kKeysCmd = 'KEYS',
-	kAboutCmd = 'ABOU',
+	kAboutCmd = 'ABOU'
 };
 
 OptionsDialog::OptionsDialog(NewGui *gui, Scumm *scumm)
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index 951c9bea55..9a0d6f9f20 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -287,7 +287,7 @@ public:
 		pcChorus = 128,
 		pcPitchBendFactor = 256,
 		pcPriority = 512,
-		pcAll = 1023,
+		pcAll = 1023
 	};
 
 private:
@@ -2964,7 +2964,7 @@ void Player::sequencer_timer()
 
 enum {
 	TYPE_PART = 1,
-	TYPE_PLAYER = 2,
+	TYPE_PLAYER = 2
 };
 
 int IMuseInternal::saveReference(void *me_ref, byte type, void *ref)
diff --git a/scumm/imuse.h b/scumm/imuse.h
index b3c5c92def..4b424c0689 100644
--- a/scumm/imuse.h
+++ b/scumm/imuse.h
@@ -44,7 +44,7 @@ public:
 	~IMuse();
 
 	enum {
-		PROP_TEMPO_BASE = 1,
+		PROP_TEMPO_BASE = 1
 	};
 
 	void on_timer();