Fix a pile of warnings

Originally committed to SVN as r5483.

aegisub/libaegisub/config.h

@@ -1,4 +1,4 @@
-#ifndef AGI_PRE
+#if !defined(AGI_PRE) && !defined(LAGI_PRE)
 
 #ifdef _WIN32 // Windows specific settings
 #define HAVE_PTHREAD 1

aegisub/libaegisub/include/libaegisub/mutex.h

@@ -102,8 +102,6 @@
 #ifndef GOOGLE_MUTEX_H_
 #define GOOGLE_MUTEX_H_
 
-#include "config.h"           // to figure out pthreads support
-
 #if defined(NO_THREADS)
   typedef int MutexType;      // to keep a lock-count
 #elif defined(_WIN32) || defined(__CYGWIN32__) || defined(__CYGWIN64__)

aegisub/libaegisub/include/libaegisub/types.h

@@ -18,10 +18,6 @@
 /// @brief Platform specific types.
 /// @ingroup libaegisub
 
-#ifdef LAGI
-#include "config.h"
-#endif
-
 #ifndef LAGI_PRE
 #ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>

aegisub/libaegisub/lagi_pre.h

@@ -1,7 +1,7 @@
-#define LAGI_PRE
-
 #include "config.h"
 
+#define LAGI_PRE
+
 // Common C
 #include <cassert>
 #include <cerrno>

aegisub/src/audio_renderer_spectrum.cpp

@@ -118,7 +118,6 @@ AudioSpectrumRenderer::AudioSpectrumRenderer()
 , colors_selected(12)
 , derivation_size(8)
 , derivation_dist(8)
-, audio_scratch(0)
 #ifdef WITH_FFTW
 , dft_plan(0)
 , dft_input(0)
@@ -126,6 +125,7 @@ AudioSpectrumRenderer::AudioSpectrumRenderer()
 #else
 , fft_scratch(0)
 #endif
+, audio_scratch(0)
 {
 	colors_normal.InitIcyBlue_Normal();
 	colors_selected.InitIcyBlue_Selected();

aegisub/src/audio_timing_dialogue.cpp

@@ -250,10 +250,10 @@ void AudioMarkerDialogueTiming::InitPair(AudioMarkerDialogueTiming *marker1, Aud
 AudioTimingControllerDialogue::AudioTimingControllerDialogue(AudioController *audio_controller, SelectionController<AssDialogue> *selection_controller, AssFile *ass)
 : timing_modified(false)
 , commit_id(-1)
-, ass(ass)
-, auto_commit(OPT_GET("Audio/Auto/Commit"))
 , audio_controller(audio_controller)
+, auto_commit(OPT_GET("Audio/Auto/Commit"))
 , selection_controller(selection_controller)
+, ass(ass)
 {
 	assert(audio_controller != 0);
 

aegisub/src/base_grid.cpp

@@ -77,16 +77,16 @@ BaseGrid::BaseGrid(wxWindow* parent, agi::Context *context, const wxSize& size,
 : wxWindow(parent, -1, wxDefaultPosition, size, style, name)
 , lineHeight(1) // non-zero to avoid div by 0
 , lastRow(-1)
-, extendRow(-1)
 , holding(false)
+, scrollBar(new wxScrollBar(this, GRID_SCROLLBAR, wxDefaultPosition, wxDefaultSize, wxSB_VERTICAL))
 , bmp(0)
+, byFrame(false)
+, extendRow(-1)
 , active_line(0)
 , batch_level(0)
 , batch_active_line_changed(false)
 , context(context)
 , yPos(0)
-, byFrame(false)
-, scrollBar(new wxScrollBar(this, GRID_SCROLLBAR, wxDefaultPosition, wxDefaultSize, wxSB_VERTICAL))
 {
 	scrollBar->SetScrollbar(0,10,100,10);
 
@@ -456,7 +456,6 @@ void BaseGrid::DrawImage(wxDC &dc) {
 	for (int i = 0; i < nDraw + 1; i++) {
 		int curRow = i + yPos - 1;
 		int curColor = 0;
-		bool collides = false;
 
 		wxArrayString strings;
 		strings.reserve(11);

aegisub/src/command/time.cpp

@@ -198,7 +198,7 @@ struct time_snap_frame : public validate_video_loaded {
 		int shiftBy = c->videoController->TimeAtFrame(c->videoController->GetFrameN(),agi::vfr::START) - cur->Start.GetMS();
 
 		for (size_t i = 0; i < sels.size(); ++i) {
-			if (cur = c->subsGrid->GetDialogue(sels[i])) {
+			if ((cur = c->subsGrid->GetDialogue(sels[i]))) {
 				cur->Start.SetMS(cur->Start.GetMS() + shiftBy);
 				cur->End.SetMS(cur->End.GetMS() + shiftBy);
 			}