diff -r b8fa9171be6e -r c82a86ea87be src/prompts.cpp --- a/src/prompts.cpp Mon Jun 01 17:06:13 2015 +0300 +++ b/src/prompts.cpp Fri Jun 05 18:33:51 2015 +0300 @@ -1,6 +1,6 @@ /* * ZCinema: Zandronum demo launcher - * Copyright (C) 2013 Santeri Piippo + * Copyright (C) 2013-2015 Teemu Piippo * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,8 +26,8 @@ // ============================================================================= // ----------------------------------------------------------------------------- UnknownVersionPrompt::UnknownVersionPrompt ( - str fileName, - str binaryName, + QString fileName, + QString binaryName, bool isRelease, QWidget* parent, Qt::WindowFlags f @@ -40,7 +40,7 @@ ui->setupUi (this); // Replace the placeholders - str text = ui->m_description->text(); + QString text = ui->m_description->text(); text.replace ("", basename (fileName)); text.replace ("", binaryName); ui->m_description->setText (text); @@ -58,15 +58,16 @@ // ============================================================================= // ----------------------------------------------------------------------------- -void UnknownVersionPrompt::addBinary() { - addVersion (m_binaryString, m_isRelease, ui->m_binaryPath->text()); +void UnknownVersionPrompt::addBinary() +{ + addVersion (ZandronumVersion (m_binaryString, m_isRelease, ui->m_binaryPath->text())); accept(); } // ============================================================================= // ----------------------------------------------------------------------------- void UnknownVersionPrompt::findBinary() { - str path = ConfigBox::getBinaryPath (this); + QString path = ConfigWindow::getBinaryPath (this); if (path.isEmpty()) return; @@ -95,7 +96,7 @@ // ============================================================================= // ----------------------------------------------------------------------------- void FindFilePrompt::findDemo() { - str path = QFileDialog::getOpenFileName (this, tr ("Open Demo File"), + QString path = QFileDialog::getOpenFileName (this, tr ("Open Demo File"), QDir::homePath(), tr ("Demo files (*.cld);;All files (*.*)")); if (!path.isEmpty()) @@ -104,6 +105,6 @@ // ============================================================================= // ----------------------------------------------------------------------------- -str FindFilePrompt::path() const { +QString FindFilePrompt::path() const { return m_ui->m_path->text(); }