use QString for videoSourceLabel passed to MainWindow constructor

git-svn-id: https://gambatte.svn.sourceforge.net/svnroot/gambatte@151 9dfb2916-2d38-0410-aef4-c5fe6c9ffc24
This commit is contained in:
sinamas 2008-05-27 06:19:33 +00:00
parent 761db80d31
commit 0ad3fd9580
5 changed files with 11 additions and 12 deletions

View File

@ -29,12 +29,12 @@ int main(int argc, char *argv[]) {
QCoreApplication::setOrganizationName("gambatte");
QCoreApplication::setApplicationName("gambatte_qt");
GambatteSource source;
MainWindow * mw = new MainWindow(&source,
source.generateButtonInfos(),
source.generateVideoSourceInfos(),
"Video filter:",
QSize(160, 144),
source.generateSampleRates());
MainWindow *mw = new MainWindow(&source,
source.generateButtonInfos(),
source.generateVideoSourceInfos(),
MainWindow::tr("Video filter:"),
QSize(160, 144),
source.generateSampleRates());
GambatteMenuHandler mh(mw, &source, argc, argv);
mw->show();
return app.exec();

View File

@ -99,7 +99,7 @@ MainWindow::JoystickIniter::~JoystickIniter() {
MainWindow::MainWindow(MediaSource *source,
const std::vector<MediaSource::ButtonInfo> &buttonInfos,
const std::vector<MediaSource::VideoSourceInfo> &videoSourceInfos,
const std::string &videoSourceLabel,
const QString &videoSourceLabel,
const QSize &aspectRatio,
const std::vector<int> &sampleRates) :
source(source),

View File

@ -160,7 +160,7 @@ public:
MainWindow(MediaSource *source,
const std::vector<MediaSource::ButtonInfo> &buttonInfos,
const std::vector<MediaSource::VideoSourceInfo> &videoSourceInfos,
const std::string &videoSourceLabel,
const QString &videoSourceLabel,
const QSize &aspectRatio,
const std::vector<int> &sampleRates);

View File

@ -31,7 +31,6 @@
#include <QGroupBox>
#include <QApplication>
#include <QDesktopWidget>
#include <string>
// #include <iostream>
@ -46,7 +45,7 @@ static int filterValue(const int value, const int upper, const int lower = 0, co
VideoDialog::VideoDialog(const std::vector<BlitterWidget*> &blitters,
const std::vector<MediaSource::VideoSourceInfo> &sourceInfos,
const std::string &sourcesLabel,
const QString &sourcesLabel,
const FullModeToggler *resHandler,
const QSize &aspectRatio,
QWidget *parent) :
@ -106,7 +105,7 @@ sourceIndexStore(0)
}
hLayout = new QHBoxLayout;
hLayout->addWidget(new QLabel(sourcesLabel.c_str()));
hLayout->addWidget(new QLabel(sourcesLabel));
hLayout->addWidget(sourceSelector);
topLayout->addLayout(hLayout);

View File

@ -74,7 +74,7 @@ private slots:
public:
VideoDialog(const std::vector<BlitterWidget*> &engines,
const std::vector<MediaSource::VideoSourceInfo> &sourceInfos,
const std::string &sourcesLabel,
const QString &sourcesLabel,
const FullModeToggler *resHandler,
const QSize &aspectRatio,
QWidget *parent = 0);