diff --git a/rbutil/rbutilqt/installbl.cpp b/rbutil/rbutilqt/installbootloaderwindow.cpp similarity index 84% rename from rbutil/rbutilqt/installbl.cpp rename to rbutil/rbutilqt/installbootloaderwindow.cpp index 9d9dba4760..95084e87f7 100644 --- a/rbutil/rbutilqt/installbl.cpp +++ b/rbutil/rbutilqt/installbootloaderwindow.cpp @@ -7,7 +7,7 @@ * \/ \/ \/ \/ \/ * * Copyright (C) 2007 by Dominik Wenger - * $Id: installbl.cpp 14027 2007-07-27 17:42:49Z domonoky $ + * $Id: installbootloaderwindow.cpp 14027 2007-07-27 17:42:49Z domonoky $ * * All files in this archive are subject to the GNU General Public License. * See the file COPYING in the source tree root for full license agreement. @@ -17,11 +17,11 @@ * ****************************************************************************/ -#include "installbl.h" +#include "installbootloaderwindow.h" #include "ui_installprogressfrm.h" -InstallBl::InstallBl(QWidget *parent) : QDialog(parent) +InstallBootloaderWindow::InstallBootloaderWindow(QWidget *parent) : QDialog(parent) { ui.setupUi(this); connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder())); @@ -29,13 +29,13 @@ InstallBl::InstallBl(QWidget *parent) : QDialog(parent) } -void InstallBl::setProxy(QUrl proxy_url) +void InstallBootloaderWindow::setProxy(QUrl proxy_url) { proxy = proxy_url; qDebug() << "Install::setProxy" << proxy; } -void InstallBl::setMountPoint(QString mount) +void InstallBootloaderWindow::setMountPoint(QString mount) { QFileInfo m(mount); if(m.isDir()) { @@ -44,7 +44,7 @@ void InstallBl::setMountPoint(QString mount) } } -void InstallBl::setOFPath(QString path) +void InstallBootloaderWindow::setOFPath(QString path) { QFileInfo m(path); if(m.exists()) { @@ -53,7 +53,7 @@ void InstallBl::setOFPath(QString path) } } -void InstallBl::browseFolder() +void InstallBootloaderWindow::browseFolder() { QFileDialog browser(this); if(QFileInfo(ui.lineMountPoint->text()).isDir()) @@ -70,7 +70,7 @@ void InstallBl::browseFolder() } } -void InstallBl::browseOF() +void InstallBootloaderWindow::browseOF() { QFileDialog browser(this); if(QFileInfo(ui.lineOriginalFirmware->text()).exists()) @@ -86,7 +86,7 @@ void InstallBl::browseOF() } } -void InstallBl::accept() +void InstallBootloaderWindow::accept() { // create logger logger = new ProgressLoggerGui(this); @@ -134,7 +134,7 @@ void InstallBl::accept() } -void InstallBl::done(bool error) +void InstallBootloaderWindow::done(bool error) { qDebug() << "Install::done, error:" << error; @@ -149,13 +149,13 @@ void InstallBl::done(bool error) } -void InstallBl::setDeviceSettings(QSettings *dev) +void InstallBootloaderWindow::setDeviceSettings(QSettings *dev) { devices = dev; qDebug() << "Install::setDeviceSettings:" << devices; } -void InstallBl::setUserSettings(QSettings *user) +void InstallBootloaderWindow::setUserSettings(QSettings *user) { userSettings = user; if(userSettings->value("defaults/platform").toString() == "h100" || diff --git a/rbutil/rbutilqt/installbl.h b/rbutil/rbutilqt/installbootloaderwindow.h similarity index 91% rename from rbutil/rbutilqt/installbl.h rename to rbutil/rbutilqt/installbootloaderwindow.h index 09e3492e43..6baafd0bf1 100644 --- a/rbutil/rbutilqt/installbl.h +++ b/rbutil/rbutilqt/installbootloaderwindow.h @@ -7,7 +7,7 @@ * \/ \/ \/ \/ \/ * * Copyright (C) 2007 by Dominik Wenger - * $Id: installbl.h 14027 2007-07-27 17:42:49Z domonoky $ + * $Id: installbootloaderwindow.h 14027 2007-07-27 17:42:49Z domonoky $ * * All files in this archive are subject to the GNU General Public License. * See the file COPYING in the source tree root for full license agreement. @@ -30,11 +30,11 @@ #include "installbootloader.h" #include "irivertools/irivertools.h" -class InstallBl : public QDialog +class InstallBootloaderWindow : public QDialog { Q_OBJECT public: - InstallBl(QWidget *parent = 0); + InstallBootloaderWindow(QWidget *parent = 0); void setProxy(QUrl); void setMountPoint(QString); void setOFPath(QString); diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 9532ba1c99..def0e15e47 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -25,7 +25,7 @@ #include "ui_aboutbox.h" #include "configure.h" #include "install.h" -#include "installbl.h" +#include "installbootloaderwindow.h" #include "installtalkwindow.h" #include "httpget.h" #include "installbootloader.h" @@ -279,7 +279,7 @@ void RbUtilQt::install() void RbUtilQt::installBl() { - InstallBl *installWindow = new InstallBl(this); + InstallBootloaderWindow *installWindow = new InstallBootloaderWindow(this); installWindow->setUserSettings(userSettings); installWindow->setDeviceSettings(devices); if(userSettings->value("defaults/proxytype") == "manual") diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 4fa90ff089..ed61288edc 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -21,7 +21,7 @@ SOURCES += rbutilqt.cpp \ zip/unzip.cpp \ installzip.cpp \ installbootloader.cpp \ - installbl.cpp \ + installbootloaderwindow.cpp \ progressloggergui.cpp \ installtalkwindow.cpp \ talkfile.cpp \ @@ -45,7 +45,7 @@ HEADERS += rbutilqt.h \ version.h \ installzip.h \ installbootloader.h \ - installbl.h \ + installbootloaderwindow.h \ installtalkwindow.h \ talkfile.h \ autodetection.h \