From 85998a7b7864d733f30913b74675fdc0ef47e9dc Mon Sep 17 00:00:00 2001
From: Garrett <g@floft.net>
Date: Mon, 20 Oct 2014 22:23:26 -0700
Subject: [PATCH] Rebased on master, minor changes

---
 plugins/gig_player/gig_player.cpp     | 11 ++++-------
 plugins/gig_player/gig_player.h       |  8 ++++----
 plugins/gig_player/patches_dialog.cpp |  9 +++++----
 plugins/gig_player/patches_dialog.h   |  4 ++--
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/plugins/gig_player/gig_player.cpp b/plugins/gig_player/gig_player.cpp
index 26a085473..35246da6d 100644
--- a/plugins/gig_player/gig_player.cpp
+++ b/plugins/gig_player/gig_player.cpp
@@ -28,10 +28,10 @@
  *
  */
 
-#include <QtCore/QDebug>
-#include <QtGui/QLayout>
-#include <QtGui/QLabel>
-#include <QtXml/QDomDocument>
+#include <QDebug>
+#include <QLayout>
+#include <QLabel>
+#include <QDomDocument>
 
 #include "FileDialog.h"
 #include "gig_player.h"
@@ -1081,6 +1081,3 @@ Plugin * PLUGIN_EXPORT lmms_plugin_main( Model *, void * _data )
 
 
 }
-
-#include "moc_gig_player.cxx"
-
diff --git a/plugins/gig_player/gig_player.h b/plugins/gig_player/gig_player.h
index 08fb136af..bd57e98fa 100644
--- a/plugins/gig_player/gig_player.h
+++ b/plugins/gig_player/gig_player.h
@@ -24,10 +24,10 @@
  */
 
 
-#ifndef _GIG_PLAYER_H
-#define _GIG_PLAYER_H
+#ifndef GIG_PLAYER_H
+#define GIG_PLAYER_H
 
-#include <QtCore/QMutex>
+#include <QMutex>
 #include <list>
 
 #include "Instrument.h"
@@ -140,7 +140,7 @@ public:
 
 	virtual Flags flags() const
 	{
-		return IsSingleStreamed | IsMidiBased;
+		return IsSingleStreamed;
 	}
 
 	virtual PluginView * instantiateView( QWidget * _parent );
diff --git a/plugins/gig_player/patches_dialog.cpp b/plugins/gig_player/patches_dialog.cpp
index e1a8dac6c..40853fcae 100644
--- a/plugins/gig_player/patches_dialog.cpp
+++ b/plugins/gig_player/patches_dialog.cpp
@@ -25,7 +25,7 @@
 
 #include "patches_dialog.h"
 
-#include <QtGui/QHeaderView>
+#include <QHeaderView>
 //#include <QFileInfo>
 
 
@@ -75,7 +75,11 @@ patchesDialog::patchesDialog( QWidget *pParent, Qt::WindowFlags wflags )
 //	pHeader->setResizeMode(QHeaderView::Custom);
 	pHeader->setDefaultAlignment(Qt::AlignLeft);
 //	pHeader->setDefaultSectionSize(200);
+#if QT_VERSION >= 0x050000
+	pHeader->setSectionsMovable(false);
+#else
 	pHeader->setMovable(false);
+#endif
 	pHeader->setStretchLastSection(true);
 
 	m_progListView->resizeColumnToContents(0);	// Prog.
@@ -379,6 +383,3 @@ void patchesDialog::progChanged (QTreeWidgetItem * _curr, QTreeWidgetItem * _pre
 	// Stabilize the form.
 	stabilizeForm();
 }
-
-
-#include "moc_patches_dialog.cxx"
diff --git a/plugins/gig_player/patches_dialog.h b/plugins/gig_player/patches_dialog.h
index 1dad78005..ebe68cb8a 100644
--- a/plugins/gig_player/patches_dialog.h
+++ b/plugins/gig_player/patches_dialog.h
@@ -31,8 +31,8 @@
 #include "gig_player.h"
 
 #include <fluidsynth.h>
-#include <QtGui/QWidget>
-#include <QtGui/QLabel>
+#include <QWidget>
+#include <QLabel>
 
 //----------------------------------------------------------------------------
 // qsynthPresetForm -- UI wrapper form.