From kde-commits  Thu Sep 11 20:41:56 2008
From: Urs Wolfer <uwolfer () kde ! org>
Date: Thu, 11 Sep 2008 20:41:56 +0000
To: kde-commits
Subject: KDE/kdenetwork/kopete/protocols/msn
Message-Id: <1221165716.498990.23309.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=122116573205870

SVN commit 860056 by uwolfer:

* ensure that always first tab is shown when constructing dialog (i.e. if you played around and forgot to switch back to the first tab before saving...)
remove some unused includes

 M  +0 -2      msnp2p.h  
 M  +3 -3      ui/msneditaccountui.ui  
 M  +2 -6      ui/msneditaccountwidget.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/msn/msnp2p.h #860055:860056
@@ -19,9 +19,7 @@
 #define MSNP2P_H
 
 #include <qobject.h>
-#include <q3strlist.h>
 
-
 #define MSN_NEWFILETRANSFER 0
 
 
--- trunk/KDE/kdenetwork/kopete/protocols/msn/ui/msneditaccountui.ui #860055:860056
@@ -21,9 +21,9 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QTabWidget" name="tabWidget3" >
+    <widget class="QTabWidget" name="mainTabWidget" >
      <property name="currentIndex" >
-      <number>3</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab_connection" >
       <attribute name="title" >
@@ -1229,7 +1229,7 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>tabWidget3</tabstop>
+  <tabstop>mainTabWidget</tabstop>
   <tabstop>m_login</tabstop>
   <tabstop>m_autologin</tabstop>
   <tabstop>buttonRegister</tabstop>
--- trunk/KDE/kdenetwork/kopete/protocols/msn/ui/msneditaccountwidget.cpp #860055:860056
@@ -19,19 +19,13 @@
 #include "msneditaccountwidget.h"
 
 #include <qcheckbox.h>
-#include <q3groupbox.h>
 #include <qimage.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
-#include <q3listbox.h>
 #include <qpushbutton.h>
 #include <qregexp.h>
 #include <qspinbox.h>
-//Added by qt3to4:
-#include <QPixmap>
-#include <QVBoxLayout>
-#include <QLatin1String>
 
 #include <kfiledialog.h>
 #include <klocale.h>
@@ -76,6 +70,8 @@
 	d->ui = new Ui::MSNEditAccountUI();
 	d->ui->setupUi( this );
 
+	d->ui->mainTabWidget->setCurrentIndex(0);
+
 	// FIXME: actually, I don't know how to set fonts for qlistboxitem - Olivier
 	d->ui->label_font->hide();