From 79587657e015e64af7cdff3f086310475b5bf048 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Thu, 2 Jul 2009 13:44:57 +0200
Subject: Fixed a compilation issue for tests/auto/qitemeditorfactory.

---
 tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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;
 
-- 
cgit v0.12


From b82e27ad7642ae76a5e918b41f0e65ecc27034fc Mon Sep 17 00:00:00 2001
From: Aleksandar Sasha Babic <aleksandar.babic@nokia.com>
Date: Fri, 3 Jul 2009 12:50:35 +0200
Subject: TCommDbPrefs removed as they don't help for 3.1 FP1 devices(N95). The
 access point will not be saved, it didn't exist previously. Good news is that
 access point will be saved on 3.2 and newer, even without prefs.

---
 examples/network/ftp/sym_iap_util.h | 11 +++--------
 1 file changed, 3 insertions(+), 8 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);
 }
-- 
cgit v0.12