From ff47ff25cb547bc0cbf9a2b13ae8f45d82445df0 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Sat, 17 Dec 2011 16:59:40 +1000
Subject: [PATCH] Mac build cleanup #2
---
UpdaterWindow.cpp | 4 +---
UpdaterWindow.h | 2 +-
UpdaterWindow.ui | 3 +--
updateparser.cpp | 4 ++++
updateparser.h | 6 +++---
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/UpdaterWindow.cpp b/UpdaterWindow.cpp
index 40daba7e..95268fc9 100644
--- a/UpdaterWindow.cpp
+++ b/UpdaterWindow.cpp
@@ -408,10 +408,8 @@ void UpdaterWindow::replyFinished(QNetworkReply * reply)
ui->tableWidget->item(current_row,0)->setData(Qt::UserRole+1,failed);
QTimer::singleShot(100,this,SLOT(upgradeNext()));
ui->plainTextEdit->appendPlainText("Download Complete");
-
- } else if (requestmode==RM_UpdateQT) {
- ui->plainTextEdit->appendPlainText("Received "+QString::number(reply->size())+" bytes");
}
+
} else {
mainwin->Notify("There was an error completing a network request:\n\n("+reply->errorString()+")");
}
diff --git a/UpdaterWindow.h b/UpdaterWindow.h
index 5ece6dab..83550027 100644
--- a/UpdaterWindow.h
+++ b/UpdaterWindow.h
@@ -14,7 +14,7 @@ namespace Ui {
class UpdaterWindow;
}
-enum RequestMode { RM_None, RM_CheckUpdates, RM_GetFile, RM_UpdateQT };
+enum RequestMode { RM_None, RM_CheckUpdates, RM_GetFile };
class UpdaterWindow : public QMainWindow
{
diff --git a/UpdaterWindow.ui b/UpdaterWindow.ui
index 47f5910f..522d5c4a 100644
--- a/UpdaterWindow.ui
+++ b/UpdaterWindow.ui
@@ -28,7 +28,7 @@
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
- <number>1</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="frontPage">
<layout class="QGridLayout" name="gridLayout">
@@ -365,7 +365,6 @@
</customwidgets>
<resources>
<include location="Resources.qrc"/>
- <include location="resources.qrc"/>
</resources>
<connections/>
</ui>
diff --git a/updateparser.cpp b/updateparser.cpp
index 91757ef6..caaa6781 100644
--- a/updateparser.cpp
+++ b/updateparser.cpp
@@ -43,6 +43,8 @@ bool UpdateParser::startDocument()
bool UpdateParser::endElement(const QString &namespaceURI, const QString &localName, const QString &qName)
{
+ Q_UNUSED(namespaceURI)
+ Q_UNUSED(localName)
QString name=qName.toLower();
if (name=="release") {
inRelease=false;
@@ -68,6 +70,8 @@ bool UpdateParser::characters(const QString &ch)
bool UpdateParser::startElement(const QString &namespaceURI, const QString &localName, const QString &qName, const QXmlAttributes &atts)
{
+ Q_UNUSED(namespaceURI)
+ Q_UNUSED(localName)
QString name=qName.toLower();
if (inRelease && name=="update") {
QString ver, type;
diff --git a/updateparser.h b/updateparser.h
index e99eb1da..fb5f3174 100644
--- a/updateparser.h
+++ b/updateparser.h
@@ -8,9 +8,9 @@
class Update
{
public:
- explicit Update();
- explicit Update(const Update & copy);
- explicit Update(QString _type, QString _version, QString _platform, QDate _date);
+ Update();
+ Update(const Update & copy);
+ Update(QString _type, QString _version, QString _platform, QDate _date);
QString type;
QString version;
QString platform;