Merge remote-tracking branch 'upstream/master'

avdecoder.h

@@ -51,8 +51,7 @@ public:
     class AvInit
     {
     public:
-        AvInit()
-        {
+        AvInit() {
             av_register_all();
         }
     };

clientmanager.cpp

@@ -52,8 +52,7 @@ void ClientManager::showPinDialog(QString name, int pin)
 
 void ClientManager::start()
 {
-    if(VitaMTP_Init() < 0)
-    {
+    if(VitaMTP_Init() < 0) {
         emit messageSent(tr("Cannot initialize VitaMTP library"));
         return;
     }

cmaclient.cpp

@@ -149,8 +149,7 @@ int CmaClient::deviceRegistered(const char *deviceid)
 int CmaClient::generatePin(wireless_vita_info_t *info, int *p_err)
 {
     qDebug("Registration request from %s (MAC: %s)", info->name, info->mac_addr);
-    // generate correct values on 32bit
-    int pin = ((qrand() << 16) | qrand()) % 100000000;
+    int pin = rand() % 10000 * 10000 | rand() % 10000;
     qDebug("Your registration PIN for %s is: %08d", info->name, pin);
     *p_err = 0;
     emit this_object->receivedPin(info->name, pin);

configwidget.h

@@ -25,8 +25,7 @@
 #include <QSettings>
 #include <QSignalMapper>
 
-namespace Ui
-{
+namespace Ui {
 class ConfigWidget;
 }
 

database.cpp

@@ -446,8 +446,7 @@ int Database::filterObjects(int ohfiParent, metadata_t **p_head, int index, int
     for(map_list::iterator root = object_list.begin(); root != object_list.end(); ++root) {
         for(root_list::iterator object = (*root).begin(); object != (*root).end(); ++object) {
             if(acceptFilteredObject(parent, *object, type)) {
-                if(offset++ >= index)
-                {
+                if(offset++ >= index) {
                     tail->next_metadata = &(*object)->metadata;
                     tail = tail->next_metadata;
                     numObjects++;

sforeader.cpp

@@ -25,7 +25,8 @@ SfoReader::SfoReader()
 {
 }
 
-bool SfoReader::load(const QString &path) {
+bool SfoReader::load(const QString &path)
+{
     QFile file(path);
     if(file.open(QIODevice::ReadOnly)) {
         data = file.readAll();
@@ -37,7 +38,8 @@ bool SfoReader::load(const QString &path) {
     return false;
 }
 
-const char *SfoReader::value(const char *key, const char *defaultValue) {
+const char *SfoReader::value(const char *key, const char *defaultValue)
+{
     const char *base_key = key_offset + header->key_offset;
     for(uint i = 0; i < header->pair_count; i++) {
         const char *curr_key = base_key + index[i].key_offset;