← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kvirc/trusty-proposed

« back to all changes in this revision

Viewing changes to src/kvirc/kvs/KviKvsVariant.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Kai Wasserbäch
  • Date: 2011-02-23 13:19:39 UTC
  • mfrom: (14.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110223131939-fmb8l4arvgul8hy0
The "Cunning Advisor" release.

* Synced to upstream's SVN revision 5507.
* debian/kvirc-data.preinst: Removed. Upgrades from stable won't need it.
* debian/watch: Replace the "latest" part with "([\d\.]+)" to make us
  independent of the upstream symlink.
* debian/README.Debian:
  - Removed obsolete parts about Python and upgrades from 3.4.
  - Added notice about handling default script issues.
* debian/README.source: Updated for 4.1.1.
* debian/{compat,control,rules}: Updates for debhelper 8.
* debian/patches/10_fix_desktop_entry.patch: Refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/kvirc/kvs/KviKvsVariant.cpp
1350
1350
 
1351
1351
KviKvsVariant * KviKvsVariant::unserialize(const QString & szBuffer)
1352
1352
{
1353
 
        KviKvsVariant * pResult = 0;
 
1353
        KviKvsVariant * pResult = NULL;
1354
1354
 
1355
1355
        const QChar * pAux = (const QChar *)szBuffer.constData();
1356
1356
 
1361
1361
                //strange extra characters?
1362
1362
                if(pResult)
1363
1363
                        delete pResult;
1364
 
                pResult = 0;
 
1364
                pResult = NULL;
1365
1365
        }
1366
1366
 
1367
1367
        return pResult;
1369
1369
 
1370
1370
KviKvsVariant * KviKvsVariant::unserialize(const QChar ** ppAux)
1371
1371
{
1372
 
        KviKvsVariant * pResult = 0;
 
1372
        KviKvsVariant * pResult = NULL;
1373
1373
 
1374
1374
        while((*ppAux)->isSpace())
1375
1375
                (*ppAux)++;
1416
1416
                break;
1417
1417
                default:
1418
1418
                        //incorrect value
1419
 
                        return 0;
 
1419
                        return NULL;
1420
1420
        }
1421
1421
 
1422
1422
        while((*ppAux)->isSpace())
1446
1446
 
1447
1447
        if(bOk)
1448
1448
                return new KviKvsVariant(bBool);
1449
 
        return 0;
 
1449
        return NULL;
1450
1450
}
1451
1451
 
1452
1452
KviKvsVariant * KviKvsVariant::unserializeNull(const QChar ** ppAux)
1456
1456
                (*ppAux) += 4;
1457
1457
                return new KviKvsVariant();
1458
1458
        }
1459
 
        return 0;
 
1459
        return NULL;
1460
1460
}
1461
1461
 
1462
1462
KviKvsVariant * KviKvsVariant::unserializeNumber(const QChar ** ppAux)
1470
1470
        }
1471
1471
 
1472
1472
        if(!(*ppAux)->isDigit())
1473
 
        {
1474
 
                return 0;
1475
 
        }
 
1473
                return NULL;
1476
1474
 
1477
1475
        while((*ppAux)->isDigit())
1478
1476
        {
1481
1479
        }
1482
1480
 
1483
1481
        if((*ppAux)->unicode() == '.')
1484
 
        {
1485
1482
                return unserializeReal(ppAux,szData);
1486
 
        }
1487
1483
 
1488
1484
        return unserializeInteger(ppAux,szData);
1489
1485
}