From 0802a8be094ea69c818da005ed9a6597dd18f87d Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Sun, 18 Nov 2007 16:19:35 +0000
Subject: [PATCH] several small Qt4-fixes

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@598 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog                        | 14 ++++++++++++++
 acinclude.m4                     | 15 ++++++---------
 include/main_window.h            |  2 +-
 include/track_container.h        | 14 ++++++++------
 plugins/vst_base/lvsl_client.cpp |  2 +-
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b2c19c530..b8c8e3051 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-11-18	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* plugins/vst_base/lvsl_client.cpp:
+	fixed usage of QMdiArea instead of QWorkspace
+
+	* include/main_window.h:
+	added inclusion of QMdiArea-header
+
+	* include/track_container.h:
+	fixed some code to match coding-style-guidelines
+
+	* acinclude.m4:
+	reverted Paul's private changes
+
 2007-11-14	Javier Serrano Polo <jasp00/at/terra/dot/es>
 
 	* configure.in:
diff --git a/acinclude.m4 b/acinclude.m4
index d7582b8a1..1eeb3e7ad 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -7,13 +7,13 @@ AC_REQUIRE([AC_PATH_X])
 AC_MSG_CHECKING([QTDIR])
 AC_ARG_WITH([qtdir], [  --with-qtdir=DIR        Qt installation directory [default=$QTDIR]], QTDIR=$withval)
 # Check that QTDIR is defined or that --with-qtdir given
-#if test x"$QTDIR" = x ; then
+if test x"$QTDIR" = x ; then
 	# some usual Qt-locations
-	QT_SEARCH="/home/llama/projects/lmms/lmms/qtdir /usr/local/Trolltech/Qt-4.3.0 /usr/local/Trolltech/Qt-4.3.1 /usr/local/Trolltech/Qt-4.1.0"
-#else
-#	QT_SEARCH=$QTDIR
-#	QTDIR=""
-#fi
+	QT_SEARCH="/usr /usr/lib/qt4 /usr/share/qt4 /usr/local/Trolltech/Qt-4.3.0 /usr/local/Trolltech/Qt-4.3.1 /usr/local/Trolltech/Qt-4.3.2 /usr/local/Trolltech/Qt-4.1.0"
+else
+	QT_SEARCH=$QTDIR
+	QTDIR=""
+fi
 for i in $QT_SEARCH ; do
 	QT_INCLUDE_SEARCH="include/qt4 include"
 	for j in $QT_INCLUDE_SEARCH ; do
@@ -23,9 +23,6 @@ for i in $QT_SEARCH ; do
 		fi
 	done
 done
-
-QTDIR="/home/llama/projects/lmms/qtdir"
-QT_INCLUDES="/home/llama/projects/lmms/qtdir/include"
 if test x"$QTDIR" = x ; then
 	AC_MSG_ERROR([*** QTDIR must be defined, or --with-qtdir option given])
 fi
diff --git a/include/main_window.h b/include/main_window.h
index ba73aacb3..4a0016b96 100644
--- a/include/main_window.h
+++ b/include/main_window.h
@@ -28,13 +28,13 @@
 
 #include <QtCore/QList>
 #include <QtGui/QMainWindow>
+#include <QtGui/QMdiArea>
 #include <QtGui/QWhatsThis>
 
 class QAction;
 class QDomElement;
 class QGridLayout;
 class QSplashScreen;
-class QMdiArea;
 
 class configManager;
 class tool;
diff --git a/include/track_container.h b/include/track_container.h
index a1276c06b..6fb77d58c 100644
--- a/include/track_container.h
+++ b/include/track_container.h
@@ -55,13 +55,15 @@ public:
 	}
 
 #warning centralWidget is obsolete
-	QWidget * centralWidget() const {
-		return (QWidget*)this;
+	QWidget * centralWidget( void ) const
+	{
+		return( (QWidget *) this );
 	}
 
-	void setCentralWidget( QWidget *cw ) {
+/*	void setCentralWidget( QWidget *cw )
+	{
 		//m_centralWidget = cw;
-	}
+	}*/
 
 	virtual void FASTCALL saveSettings( QDomDocument & _doc,
 							QDomElement & _parent );
@@ -140,13 +142,13 @@ protected:
 	virtual void dragEnterEvent( QDragEnterEvent * _dee );
 	virtual void dropEvent( QDropEvent * _de );
 	
-    virtual void mousePressEvent( QMouseEvent * _me );
+	virtual void mousePressEvent( QMouseEvent * _me );
 	virtual void mouseMoveEvent( QMouseEvent * _me );
 	virtual void mouseReleaseEvent( QMouseEvent * _me );
 
 	virtual void resizeEvent( QResizeEvent * );
 
-	void addToWorkspace();
+	void addToWorkspace( void );
 
 	constTrackVector tracks( void ) const;
 
diff --git a/plugins/vst_base/lvsl_client.cpp b/plugins/vst_base/lvsl_client.cpp
index 26f2c1b7e..c1e9bb6ba 100644
--- a/plugins/vst_base/lvsl_client.cpp
+++ b/plugins/vst_base/lvsl_client.cpp
@@ -221,7 +221,7 @@ void remoteVSTPlugin::showEditor( void )
 	m_pluginWidget = new QWidget( engine::getMainWindow()->workspace() );
 	m_pluginWidget->setFixedSize( m_pluginGeometry );
 	m_pluginWidget->setWindowTitle( name() );
-	engine::getMainWindow()->workspace()->addWindow( m_pluginWidget );
+	engine::getMainWindow()->workspace()->addSubWindow( m_pluginWidget );
 	m_pluginWidget->show();
 
 	QX11EmbedContainer * xe = new QX11EmbedContainer( m_pluginWidget );