hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

several small Qt4-fixes

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@598 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2007-11-18 16:19:35 +00:00
parent ca18ad46dd
commit 0802a8be09
5 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@@ -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:

15
acinclude.m4
View File

@@ -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

2
include/main_window.h
View File

@@ -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;

14
include/track_container.h
View File

@@ -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;

2
plugins/vst_base/lvsl_client.cpp
View File

@@ -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 );