Changeset 769 for trunk/examples/network/qftp
- Timestamp:
- Aug 2, 2010, 9:27:30 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.3 (added) merged: 768 /branches/vendor/nokia/qt/current merged: 767 /branches/vendor/nokia/qt/4.6.2 removed
- Property svn:mergeinfo changed
-
trunk/examples/network/qftp/ftpwindow.cpp
r651 r769 325 325 fileList->clear(); 326 326 isDirectory.clear(); 327 currentPath += "/" + name; 327 currentPath += '/'; 328 currentPath += name; 328 329 ftp->cd(name); 329 330 ftp->list(); -
trunk/examples/network/qftp/sym_iap_util.h
r651 r769 61 61 62 62 _LIT(KIapNameSetting, "IAP\\Name"); // text - mandatory 63 _LIT(KIapTableIdField, "IAP\Id"); 63 64 _LIT(KIapDialogPref, "IAP\\DialogPref"); // TUnit32 - optional 64 65 _LIT(KIapService, "IAP\\IAPService"); // TUnit32 - mandatory … … 299 300 return QString::fromLocal8Bit(aDescriptor.Ptr(), aDescriptor.Length()); 300 301 #else 301 return QString ::fromUtf16(aDescriptor.Ptr(), aDescriptor.Length());302 return QString((const QChar *)aDescriptor.Ptr(), aDescriptor.Length()); 302 303 #endif 303 304 } … … 368 369 369 370 socketServ.Connect(); 371 372 TCommDbConnPref prefs; 373 prefs.SetDialogPreference(ECommDbDialogPrefPrompt); 374 370 375 connection.Open(socketServ); 371 connection.Start( );376 connection.Start(prefs); 372 377 373 378 connection.GetDesSetting(TPtrC(KIapNameSetting), iapName); 374 375 379 //connection.Stop(); 376 380 … … 379 383 380 384 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 } 384 390 } 385 391
Note:
See TracChangeset
for help on using the changeset viewer.