devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Rename "interface" parameter.

Browse source 
Current MinGW #defines interface, causing the preprocessor messing up the
function parameter. Rename it to avoid this.

Change-Id: Id49edbfc056a42456d88c9e260e54844e8b1ca07
This commit is contained in:
Dominik Riebeling 2013-04-03 23:36:13 +02:00
parent 7271ff603d
commit 801f3bbec4
2 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rbutil/rbutilqt/encttscfggui.cpp
View file

@ -33,9 +33,10 @@
#include <QProgressDialog> #include <QProgressDialog>
#include "encttscfggui.h" #include "encttscfggui.h"
EncTtsCfgGui::EncTtsCfgGui(QDialog* parent,EncTtsSettingInterface* interface,QString name) : QDialog(parent) EncTtsCfgGui::EncTtsCfgGui(QDialog* parent, EncTtsSettingInterface* iface, QString name)
: QDialog(parent)
{ {
m_settingInterface = interface; m_settingInterface = iface;
m_busyCnt=0; m_busyCnt=0;
// create a busy Dialog // create a busy Dialog
@ -45,8 +46,8 @@ EncTtsCfgGui::EncTtsCfgGui(QDialog* parent,EncTtsSettingInterface* interface,QSt
m_busyDlg->setLabel(0); m_busyDlg->setLabel(0);
m_busyDlg->setCancelButton(0); m_busyDlg->setCancelButton(0);
m_busyDlg->hide(); m_busyDlg->hide();
connect(interface,SIGNAL(busy()),this,SLOT(showBusy())); connect(iface,SIGNAL(busy()),this,SLOT(showBusy()));
connect(interface,SIGNAL(busyEnd()),this,SLOT(hideBusy())); connect(iface,SIGNAL(busyEnd()),this,SLOT(hideBusy()));
//setup the window //setup the window
setWindowTitle(name); setWindowTitle(name);
@ -379,5 +380,3 @@ void EncTtsCfgGui::browse(QObject* settingObj)
setting->setCurrent(exe); setting->setCurrent(exe);
} }

3
rbutil/rbutilqt/encttscfggui.h
View file

@ -22,6 +22,7 @@
#define ENCTTSCFGGUI_H #define ENCTTSCFGGUI_H
#include <QDialog> #include <QDialog>
#include <QString>
#include <QProgressDialog> #include <QProgressDialog>
#include "encttssettings.h" #include "encttssettings.h"
@ -32,7 +33,7 @@ class EncTtsCfgGui: public QDialog
Q_OBJECT Q_OBJECT
public: public:
//! Creates the UI. give it a endoer or tts engine with already set config. uses show() or exec() to show it. //! Creates the UI. give it a endoer or tts engine with already set config. uses show() or exec() to show it.
EncTtsCfgGui(QDialog* parent, EncTtsSettingInterface* interface,QString name); EncTtsCfgGui(QDialog* parent, EncTtsSettingInterface* iface, QString name);
private slots: private slots:
//! accept current configuration values and close window //! accept current configuration values and close window