--- a/QTfrontend/hwform.h	Sun Dec 02 00:03:16 2012 +0100
+++ b/QTfrontend/hwform.h	Tue Dec 25 04:45:22 2012 +0100
@@ -61,7 +61,6 @@
         HWForm(QWidget *parent = 0, QString styleSheet = "");
         Ui_HWForm ui;
         static GameUIConfig * config;
-        static QSettings * gameSettings; // Same file GameUIConfig points to but without the baggage.  Needs sync() calls if you want to get GameUIConfig changes though
         void updateXfire();
         void PlayDemoQuick(const QString & demofilename);
         void exit();
@@ -106,8 +105,11 @@
         void NetWarning(const QString & wrnmsg);
         void NetGameEnter();
         void NetPassword(const QString & nick);
+        void NetNickRegistered(const QString & nick);
+        void NetNickNotRegistered(const QString & nick);
         void NetNickTaken(const QString & nick);
         void NetAuthFailed();
+    bool RetryDialog(const QString & title, const QString & label);
         void NetTeamAccepted(const QString& team);
         void AddNetTeam(const HWTeam& team);
         void RemoveNetTeam(const HWTeam& team);
@@ -126,13 +128,8 @@
         void InitCampaignPage();
         //Starts the transmission process for the feedback
         void SendFeedback();
-        //Make a xml representation of the issue to be created
-        bool CreateIssueXml();
-        //Called the first time when receiving authorization token from google,
-        //second time when receiving the response after posting the issue
+        //Called after submitting new feedback
         void finishedSlot(QNetworkReply* reply);
-        //Filter the auth token from the reply from google
-        bool getAuthToken(QString str);
 
         void NetGameChangeStatus(bool isMaster);
         void NetGameMaster();
@@ -146,7 +143,7 @@
 
     private:
         void _NetConnect(const QString & hostName, quint16 port, QString nick);
-        void UpdateTeamsLists(const QStringList* editable_teams=0);
+        void UpdateTeamsLists();
         void CreateGame(GameCFGWidget * gamecfg, TeamSelWidget* pTeamSelWidget, QString ammo);
         void closeEvent(QCloseEvent *event);
         void CustomizePalettes();
@@ -173,13 +170,12 @@
             ID_PAGE_CONNECTING     ,
             ID_PAGE_SCHEME         ,
             ID_PAGE_ADMIN          ,
-            ID_PAGE_NETTYPE        ,
             ID_PAGE_CAMPAIGN       ,
             ID_PAGE_DRAWMAP        ,
             ID_PAGE_DATADOWNLOAD   ,
-            ID_PAGE_FEEDBACK	   ,
-            ID_PAGE_VIDEOS,
-	    MAX_PAGE
+            ID_PAGE_FEEDBACK       ,
+            ID_PAGE_VIDEOS     ,
+            MAX_PAGE
         };
         QPointer<HWGame> game;
         QPointer<HWNetServer> pnetserver;
@@ -194,8 +190,6 @@
         QSignalMapper * pageSwitchMapper;
         QByteArray m_lastDemo;
         QNetworkAccessManager * nam;
-        QString issueXml;
-        QString authToken;
 
         QPropertyAnimation *animationNewSlide;
         QPropertyAnimation *animationOldSlide;