chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-07 03:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mac build cleanup #2

Browse Source
This commit is contained in:
Mark Watkins 2011-12-17 16:59:40 +10:00
parent 4c711f6b0b
commit ff47ff25cb
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UpdaterWindow.cpp
View File

@ -408,10 +408,8 @@ void UpdaterWindow::replyFinished(QNetworkReply * reply)
ui->tableWidget->item(current_row,0)->setData(Qt::UserRole+1,failed); ui->tableWidget->item(current_row,0)->setData(Qt::UserRole+1,failed);
QTimer::singleShot(100,this,SLOT(upgradeNext())); QTimer::singleShot(100,this,SLOT(upgradeNext()));
ui->plainTextEdit->appendPlainText("Download Complete"); ui->plainTextEdit->appendPlainText("Download Complete");
} else if (requestmode==RM_UpdateQT) {
ui->plainTextEdit->appendPlainText("Received "+QString::number(reply->size())+" bytes");
} }
} else { } else {
mainwin->Notify("There was an error completing a network request:\n\n("+reply->errorString()+")"); mainwin->Notify("There was an error completing a network request:\n\n("+reply->errorString()+")");
} }

2
UpdaterWindow.h
View File

@ -14,7 +14,7 @@ namespace Ui {
class UpdaterWindow; class UpdaterWindow;
} }
enum RequestMode { RM_None, RM_CheckUpdates, RM_GetFile, RM_UpdateQT }; enum RequestMode { RM_None, RM_CheckUpdates, RM_GetFile };
class UpdaterWindow : public QMainWindow class UpdaterWindow : public QMainWindow
{ {

3
UpdaterWindow.ui
View File

@ -28,7 +28,7 @@
<item> <item>
<widget class="QStackedWidget" name="stackedWidget"> <widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="frontPage"> <widget class="QWidget" name="frontPage">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
@ -365,7 +365,6 @@
</customwidgets> </customwidgets>
<resources> <resources>
<include location="Resources.qrc"/> <include location="Resources.qrc"/>
<include location="resources.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

4
updateparser.cpp
View File

@ -43,6 +43,8 @@ bool UpdateParser::startDocument()
bool UpdateParser::endElement(const QString &namespaceURI, const QString &localName, const QString &qName) bool UpdateParser::endElement(const QString &namespaceURI, const QString &localName, const QString &qName)
{ {
Q_UNUSED(namespaceURI)
Q_UNUSED(localName)
QString name=qName.toLower(); QString name=qName.toLower();
if (name=="release") { if (name=="release") {
inRelease=false; 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) 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(); QString name=qName.toLower();
if (inRelease && name=="update") { if (inRelease && name=="update") {
QString ver, type; QString ver, type;

6
updateparser.h
View File

@ -8,9 +8,9 @@
class Update class Update
{ {
public: public:
explicit Update(); Update();
explicit Update(const Update & copy); Update(const Update & copy);
explicit Update(QString _type, QString _version, QString _platform, QDate _date); Update(QString _type, QString _version, QString _platform, QDate _date);
QString type; QString type;
QString version; QString version;
QString platform; QString platform;