Qt4-compat fixes

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@385 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Javier Serrano Polo
2006-09-03 20:10:16 +00:00
parent b1f31a036f
commit 784dcbc7a5
23 changed files with 291 additions and 105 deletions

View File

@@ -37,8 +37,6 @@
#include <QtGui/QWidget>
#include <QtGui/QPushButton>
#include <QtGui/QLayout>
#include <QtGui/QScrollView>
#include <QtGui/QVBox>
#else

View File

@@ -78,6 +78,7 @@ inline QString baseName( const QString & _file )
#define vstack QValueStack
#define vvector QValueVector
#define qSort qHeapSort
#define QMenu QPopupMenu
#define QAbstractButton QButton
@@ -149,7 +150,6 @@ inline QString baseName( const QString & _file )
#define toLower lower
#define toUpper upper
// QTextEdit
#define setLineWrapMode setWordWrap
#define setPlainText setText
@@ -199,7 +199,8 @@ inline QString baseName( const QString & _file )
// Qt-namespace
#define ShiftModifier ShiftButton
#define ControlModifier ControlButton
#define Alignment AlignmentFlags
#define TextWordWrap WordBreak
typedef unsigned int csize;

View File

@@ -31,8 +31,8 @@
#include <QtGui/QWidget>
#include <QtGui/QLayout>
#include <QtGui/QScrollView>
#include <QtGui/QVBox>
#include <QtGui/QScrollArea>
#include <QtGui/QVBoxLayout>
#else
@@ -82,7 +82,7 @@ private:
vvector<rackPlugin *> m_rackInserts;
QVBoxLayout * m_mainLayout;
QScrollView * m_scrollView;
QScrollArea * m_scrollArea;
track * m_track;
audioPort * m_port;

View File

@@ -515,7 +515,7 @@ protected:
private:
trackContainer * m_trackContainer;
trackWidget * m_trackWidget;
QPtrList<automationPattern> m_automation_patterns;
vlist<automationPattern *> m_automation_patterns;
} ;