Mercurial > hg > forks > UniversalIndentGUI

diff src/UpdateCheckDialog.h @ 751:ac165b6ae67e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Done some refactoring: - Moved includes into the cpp files where possible and using class pre-declarations if possible - Made class member variable names begin with an underscore - Made by uic created header files be used as class members instead of inherting them - Renamed some variables to reflect their purpose better - Added some NULL initializations and added some comments - Rearranged some include and declaration code parts to be consistent and better readable - Updated for QScintilla 2.4.5 - Made UiGuiSettings be accessed via a shared pointer only git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@1028 59b1889a-e5ac-428c-b0c7-476e01d41282
author thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
date Thu, 14 Oct 2010 19:52:47 +0000
parents d1493c2ffca1
children f3631db17328
line wrap: on
line diff
--- a/src/UpdateCheckDialog.h	Sat Oct 02 12:48:56 2010 +0000
+++ b/src/UpdateCheckDialog.h	Thu Oct 14 19:52:47 2010 +0000
@@ -20,46 +20,53 @@
 #ifndef UPDATECHECKDIALOG_H
 #define UPDATECHECKDIALOG_H
 
-#include <QMessageBox>
+#include <QDialog>
+#include <QDialogButtonBox>
+
+class UiGuiSettings;
+namespace Ui {
+	class UpdateCheckDialog;
+}
+
 class QTimer;
 class QDesktopServices;
 class QNetworkAccessManager;
 class QNetworkReply;
 
-#include "ui_UpdateCheckDialog.h"
-#include "UiGuiSettings.h"
 
-class UpdateCheckDialog : public QDialog, public Ui::UpdateCheckDialog
+class UpdateCheckDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    UpdateCheckDialog(UiGuiSettings *settings, QWidget *parent=0);
+    UpdateCheckDialog(QSharedPointer<UiGuiSettings> settings, QWidget *parent = NULL);
     ~UpdateCheckDialog();
 
 public slots:
     void checkForUpdateAndShowDialog();
     void checkForUpdate();
 
+private slots:
+    void checkResultsOfFetchedPadXMLFile(QNetworkReply *networkReply);
+    void handleUpdateCheckDialogButtonClicked(QAbstractButton *clickedButton);
+    void updateUpdateCheckProgressBar();
+
 private:
+	Ui::UpdateCheckDialog *_updateCheckDialogForm;
+
     void getPadXMLFile();
     void showCheckingForUpdateDialog();
     void showNewVersionAvailableDialog(QString newVersion);
     void showNoNewVersionAvailableDialog();
-
-    UiGuiSettings *settings;
-    bool manualUpdateRequested;
-    QNetworkAccessManager *networkAccessManager;
-    QNetworkReply *currentNetworkReply;
-    QDialogButtonBox::ButtonRole roleOfClickedButton;
-    QTimer *updateCheckProgressTimer;
-    int updateCheckProgressCounter;
     int convertVersionStringToNumber(QString versionString);
 
-private slots:
-    void checkResultsOfFetchedPadXMLFile(QNetworkReply *networkReply);
-    void handleUpdateCheckDialogButtonClicked(QAbstractButton *clickedButton);
-    void updateUpdateCheckProgressBar();
+    QSharedPointer<UiGuiSettings> _settings;
+    bool _manualUpdateRequested;
+    QNetworkAccessManager *_networkAccessManager;
+    QNetworkReply *_currentNetworkReply;
+    QDialogButtonBox::ButtonRole _roleOfClickedButton;
+    QTimer *_updateCheckProgressTimer;
+    int _updateCheckProgressCounter;
 };
 
 #endif // UPDATECHECKDIALOG_H