Who stole the ! from main.cpp?

[quassel.git] / src / qtui / coreconnectdlg.cpp

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index 16d4552..643b0ff 100644 (file)
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -59,8 +59,8 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialo
   connect(Client::instance(), SIGNAL(showConfigWizard(const QVariantMap &)), this, SLOT(showConfigWizard(const QVariantMap &)));
 
   AccountSettings s;
+  QString lastacc = s.lastAccount();
   ui.accountList->addItems(s.knownAccounts());
-  curacc = s.lastAccount();
   if(!ui.accountList->count()) {
     //if(doAutoConnect) reject();
 
@@ -71,7 +71,7 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialo
     if(!newacc.isEmpty()) {
       ui.accountList->addItem(newacc);
       ui.hostEdit->setText("localhost");
-      ui.port->setValue(DEFAULT_PORT);
+      ui.port->setValue(Global::defaultPort);
       ui.internalCore->setChecked(false);
       setAccountEditEnabled(true);
     }
@@ -90,7 +90,7 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialo
     autoConnectToggled(true);
     */
   } else {
-    if(!curacc.isEmpty()) {
+    if(!lastacc.isEmpty()) {
       //if(doAutoConnect) { qDebug() << "auto";
       //  AccountSettings s;
       //  int idx = ui.accountList->findText(s.autoConnectAccount());
@@ -100,7 +100,7 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool /*doAutoConnect*/) : QDialo
       //    doConnect();
       //  }
       //} else {
-        int idx = ui.accountList->findText(curacc);
+        int idx = ui.accountList->findText(lastacc);
         ui.accountList->setCurrentIndex(idx);
       //}
     }