From e48ae9d43c075cb9f66b01611dbc31971d1165f9 Mon Sep 17 00:00:00 2001 From: Liran BN Date: Mon, 13 Oct 2014 16:00:58 +0300 Subject: [PATCH] fixed win compilation error --- main/jceWidgets/jcestatusbar.cpp | 2 +- main/jceWidgets/jcestatusbar.h | 7 ++++--- main/mainscreen.cpp | 2 +- src/jceSettings/jcelogin.cpp | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/main/jceWidgets/jcestatusbar.cpp b/main/jceWidgets/jcestatusbar.cpp index 0127f2c..e4f060b 100644 --- a/main/jceWidgets/jcestatusbar.cpp +++ b/main/jceWidgets/jcestatusbar.cpp @@ -46,7 +46,7 @@ void jceStatusBar::setIconConnectionStatus(jceProgressStatus update) QPixmap iconPix; switch (update) { - case jceProgressStatus::ERROR: + case jceProgressStatus::Error: setProgressValue(0); iconPix.load(":/icons/redStatusIcon.png"); showMessage(tr("Error")); diff --git a/main/jceWidgets/jcestatusbar.h b/main/jceWidgets/jcestatusbar.h index bfff49e..226980c 100644 --- a/main/jceWidgets/jcestatusbar.h +++ b/main/jceWidgets/jcestatusbar.h @@ -12,6 +12,7 @@ class jceStatusBar : public QStatusBar { Q_OBJECT + public: enum jceProgressStatus @@ -25,7 +26,7 @@ public: Recieving, Inserting, Done, - ERROR + Error }; jceStatusBar(QWidget *parent = 0); @@ -45,8 +46,8 @@ private slots: private: - QProgressBar * progressBar; - QLabel *iconButtomStatusLabel; + QProgressBar * progressBar; + QLabel *iconButtomStatusLabel; }; #endif // JCESTATUSBAR_H diff --git a/main/mainscreen.cpp b/main/mainscreen.cpp index 39eb484..6a98d5b 100644 --- a/main/mainscreen.cpp +++ b/main/mainscreen.cpp @@ -163,7 +163,7 @@ void MainScreen::on_ratesButton_clicked() } else { - statusBar->setIconConnectionStatus(jceStatusBar::ERROR); + statusBar->setIconConnectionStatus(jceStatusBar::Error); qCritical() << Q_FUNC_INFO << "grade get ended with" << status; } } diff --git a/src/jceSettings/jcelogin.cpp b/src/jceSettings/jcelogin.cpp index 9774bbf..8bdad6f 100644 --- a/src/jceSettings/jcelogin.cpp +++ b/src/jceSettings/jcelogin.cpp @@ -97,7 +97,7 @@ int jceLogin::makeConnection() status = jceStatus::JCE_NOT_CONNECTED; if (status != jceStatus::JCE_YOU_ARE_IN) - statusBar->setIconConnectionStatus(jceStatusBar::ERROR); + statusBar->setIconConnectionStatus(jceStatusBar::Error); //we throw status even if we are IN! qDebug() << Q_FUNC_INFO << "return status: " << status; return status;