Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/examples/network/qftp/ftpwindow.cpp

    r651 r769  
    325325        fileList->clear();
    326326        isDirectory.clear();
    327         currentPath += "/" + name;
     327        currentPath += '/';
     328        currentPath += name;
    328329        ftp->cd(name);
    329330        ftp->list();
  • trunk/examples/network/qftp/sym_iap_util.h

    r651 r769  
    6161
    6262_LIT(KIapNameSetting, "IAP\\Name");             // text - mandatory
     63_LIT(KIapTableIdField, "IAP\Id");
    6364_LIT(KIapDialogPref, "IAP\\DialogPref");        // TUnit32 - optional
    6465_LIT(KIapService, "IAP\\IAPService");           // TUnit32 - mandatory
     
    299300    return QString::fromLocal8Bit(aDescriptor.Ptr(), aDescriptor.Length());
    300301#else
    301     return QString::fromUtf16(aDescriptor.Ptr(), aDescriptor.Length());
     302    return QString((const QChar *)aDescriptor.Ptr(), aDescriptor.Length());
    302303#endif
    303304}
     
    368369
    369370    socketServ.Connect();
     371
     372    TCommDbConnPref prefs;
     373    prefs.SetDialogPreference(ECommDbDialogPrefPrompt);
     374
    370375    connection.Open(socketServ);
    371     connection.Start();
     376    connection.Start(prefs);
    372377
    373378    connection.GetDesSetting(TPtrC(KIapNameSetting), iapName);
    374 
    375379    //connection.Stop();
    376380
     
    379383
    380384    int error = 0;
    381     if(!qt_SetDefaultIapName(strIapName, error)) {
    382         //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error);
    383         strIapName = QString("");
     385    if(!strIapName.isEmpty()) {
     386        if(!qt_SetDefaultIapName(strIapName, error)) {
     387            //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error);
     388            strIapName = QString("");
     389        }
    384390    }
    385391
Note: See TracChangeset for help on using the changeset viewer.