MainWindow: renamed class to match new style
Renamed mainWindow to MainWindow and engine::getMainWindow() to engine::mainWindow(). Additionally reduced some header dependencies.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
/*
|
||||
* ladspa_effect.h - class for handling LADSPA effect plugins
|
||||
*
|
||||
* Copyright (c) 2006-2008 Danny McRae <khjklujn/at/users.sourceforge.net>
|
||||
*
|
||||
* Copyright (c) 2006-2009 Danny McRae <khjklujn/at/users.sourceforge.net>
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
@@ -28,11 +28,8 @@
|
||||
#include <QtCore/QMutex>
|
||||
|
||||
#include "effect.h"
|
||||
#include "engine.h"
|
||||
#include "ladspa_base.h"
|
||||
#include "ladspa_controls.h"
|
||||
#include "main_window.h"
|
||||
#include "mixer.h"
|
||||
|
||||
|
||||
typedef QVector<port_desc_t *> multi_proc_t;
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
#include "config_mgr.h"
|
||||
#include "pattern.h"
|
||||
#include "instrument.h"
|
||||
#include "main_window.h"
|
||||
#include "MainWindow.h"
|
||||
#include "debug.h"
|
||||
#include "embed.h"
|
||||
#include "song.h"
|
||||
@@ -100,7 +100,7 @@ bool midiImport::tryImport( trackContainer * _tc )
|
||||
if( engine::hasGUI() &&
|
||||
configManager::inst()->defaultSoundfont() == NULL )
|
||||
{
|
||||
QMessageBox::information( engine::getMainWindow(),
|
||||
QMessageBox::information( engine::mainWindow(),
|
||||
tr( "Setup incomplete" ),
|
||||
tr( "You do not have set up a default soundfont in "
|
||||
"the settings dialog (Edit->Settings). "
|
||||
@@ -112,7 +112,7 @@ bool midiImport::tryImport( trackContainer * _tc )
|
||||
#else
|
||||
if( engine::hasGUI() )
|
||||
{
|
||||
QMessageBox::information( engine::getMainWindow(),
|
||||
QMessageBox::information( engine::mainWindow(),
|
||||
tr( "Setup incomplete" ),
|
||||
tr( "You did not compile LMMS with support for "
|
||||
"SoundFont2 player, which is used to add default "
|
||||
@@ -273,7 +273,7 @@ bool midiImport::readSMF( trackContainer * _tc )
|
||||
|
||||
const int preTrackSteps = 2;
|
||||
QProgressDialog pd( trackContainer::tr( "Importing MIDI-file..." ),
|
||||
trackContainer::tr( "Cancel" ), 0, preTrackSteps, engine::getMainWindow() );
|
||||
trackContainer::tr( "Cancel" ), 0, preTrackSteps, engine::mainWindow() );
|
||||
pd.setWindowTitle( trackContainer::tr( "Please wait..." ) );
|
||||
pd.setWindowModality(Qt::WindowModal);
|
||||
pd.setMinimumDuration( 0 );
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* peak_controller_effect.h - PeakController effect plugin
|
||||
*
|
||||
* Copyright (c) 2008 Paul Giblock <drfaygo/at/gmail/dot/com>
|
||||
*
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
@@ -22,16 +22,10 @@
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _PEAK_CONTROLLER_EFFECT_H
|
||||
#define _PEAK_CONTROLLER_EFFECT_H
|
||||
|
||||
#include <QtGui/QWorkspace>
|
||||
|
||||
#include "effect.h"
|
||||
#include "effect_lib.h"
|
||||
#include "engine.h"
|
||||
#include "main_window.h"
|
||||
#include "peak_controller_effect_controls.h"
|
||||
|
||||
class peakControllerEffect : public effect
|
||||
|
||||
@@ -39,7 +39,6 @@
|
||||
#include "knob.h"
|
||||
#include "song.h"
|
||||
|
||||
#include "main_window.h"
|
||||
#include "patches_dialog.h"
|
||||
#include "tooltip.h"
|
||||
#include "lcd_spinbox.h"
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <QtGui/QPainter>
|
||||
|
||||
#include "spectrum_analyzer.h"
|
||||
#include "main_window.h"
|
||||
#include "MainWindow.h"
|
||||
#include "led_checkbox.h"
|
||||
#include "embed.h"
|
||||
|
||||
@@ -60,7 +60,7 @@ public:
|
||||
m_background( PLUGIN_NAME::getIconPixmap( "spectrum_background" ).toImage() )
|
||||
{
|
||||
setFixedSize( 249, 151 );
|
||||
connect( engine::getMainWindow(), SIGNAL( periodicUpdate() ),
|
||||
connect( engine::mainWindow(), SIGNAL( periodicUpdate() ),
|
||||
this, SLOT( update() ) );
|
||||
setAttribute( Qt::WA_OpaquePaintEvent, TRUE );
|
||||
}
|
||||
|
||||
@@ -26,12 +26,8 @@
|
||||
#ifndef _STEREO_ENHANCER_H
|
||||
#define _STEREO_ENHANCER_H
|
||||
|
||||
#include <QtGui/QWorkspace>
|
||||
|
||||
#include "effect.h"
|
||||
#include "effect_lib.h"
|
||||
#include "engine.h"
|
||||
#include "main_window.h"
|
||||
#include "stereoenhancer_controls.h"
|
||||
|
||||
class stereoEnhancerEffect : public effect
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* stereo_matrix.h - stereo-matrix-effect-plugin
|
||||
*
|
||||
* Copyright (c) 2008 Paul Giblock <drfaygo/at/gmail/dot/com>
|
||||
*
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
@@ -22,16 +22,10 @@
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _STEREO_MATRIX_H
|
||||
#define _STEREO_MATRIX_H
|
||||
|
||||
#include <QtGui/QWorkspace>
|
||||
|
||||
#include "effect.h"
|
||||
#include "effect_lib.h"
|
||||
#include "engine.h"
|
||||
#include "main_window.h"
|
||||
#include "stereomatrix_controls.h"
|
||||
|
||||
class stereoMatrixEffect : public effect
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
#include "config_mgr.h"
|
||||
#include "engine.h"
|
||||
#include "main_window.h"
|
||||
#include "MainWindow.h"
|
||||
#include "song.h"
|
||||
#include "templates.h"
|
||||
|
||||
@@ -145,7 +145,7 @@ vstPlugin::vstPlugin( const QString & _plugin ) :
|
||||
{
|
||||
target->setFixedSize( m_pluginGeometry );
|
||||
vstSubWin * sw = new vstSubWin(
|
||||
engine::getMainWindow()->workspace() );
|
||||
engine::mainWindow()->workspace() );
|
||||
sw->setWidget( helper );
|
||||
helper->setWindowTitle( name() );
|
||||
m_pluginWidget = helper;
|
||||
@@ -195,7 +195,7 @@ void vstPlugin::showEditor( QWidget * _parent )
|
||||
if( _parent == NULL )
|
||||
{
|
||||
vstSubWin * sw = new vstSubWin(
|
||||
engine::getMainWindow()->workspace() );
|
||||
engine::mainWindow()->workspace() );
|
||||
sw->setWidget( m_pluginWidget );
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/*
|
||||
* vst_effect_control_dialog.cpp - dialog for displaying VST-effect GUI
|
||||
*
|
||||
* Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
|
||||
*
|
||||
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
@@ -27,7 +27,6 @@
|
||||
|
||||
#include "vst_effect_control_dialog.h"
|
||||
#include "vst_effect.h"
|
||||
#include "main_window.h"
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user