Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public

2 files changed, 8 insertions, 13 deletions

diff --git a/examples/network/ftp/sym_iap_util.h b/examples/network/ftp/sym_iap_util.h
index 5f6e41a..487aa8b 100644
--- a/examples/network/ftp/sym_iap_util.h
+++ b/examples/network/ftp/sym_iap_util.h
@@ -41,10 +41,11 @@
 #ifndef QSYM_IAP_UTIL_H
 #define QSYM_IAP_UTIL_H
 
+// Symbian
 #include <es_sock.h>
 #include <es_enum.h>
-#include <commdbconnpref.h>
 
+// OpenC
 #include <sys/socket.h>
 #include <net/if.h>
 
@@ -69,8 +70,6 @@ static void qt_SetDefaultIapL()
 {
     TUint count;
     TBool activeLanConnectionFound = EFalse;
-    TRequestStatus status;
-    TCommDbConnPref prefs;
 
     RSocketServ serv;
     CleanupClosePushL(serv);
@@ -117,8 +116,7 @@ static void qt_SetDefaultIapL()
          */
         conn.Close(); // might be opened after attach
         User::LeaveIfError(conn.Open(serv));
-        prefs.SetDialogPreference( ECommDbDialogPrefPrompt );
-        User::LeaveIfError(conn.Start(prefs));
+        User::LeaveIfError(conn.Start());
         User::LeaveIfError(conn.GetDesSetting(TPtrC(KIapNameSetting), iapName));
     }
 
@@ -131,9 +129,6 @@ static void qt_SetDefaultIapL()
 
     User::LeaveIfError(setdefaultif(&ifReq));
 
-    conn.Close();
-    serv.Close();
-
     CleanupStack::PopAndDestroy(&conn);
     CleanupStack::PopAndDestroy(&serv);
 }
diff --git a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp b/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
index d9a7d56..e235ff5 100644
--- a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
+++ b/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
@@ -59,13 +59,13 @@ void tst_QItemEditorFactory::createEditor()
     QCOMPARE(w->metaObject()->className(), "QExpandingLineEdit");
 }
 
-void tst_QItemEditorFactory::createCustomEditor()
+//we make it inherit from QObject so that we can use QPointer
+class MyEditor : public QObject, public QStandardItemEditorCreator<QDoubleSpinBox>
 {
-    //we make it inherit from QObject so that we can use QPointer
-    class MyEditor : public QObject, public QStandardItemEditorCreator<QDoubleSpinBox>
-    {
-    };
+};
 
+void tst_QItemEditorFactory::createCustomEditor()
+{
     QPointer<MyEditor> creator = new MyEditor;
     QPointer<MyEditor> creator2 = new MyEditor;