reindent and add a switch for the role

svn path=/trunk/KDE/kdegraphics/okular/; revision=779693

ui/propertiesdialog.cpp

@@ -261,15 +261,12 @@ static QString descriptionForEmbedType( Okular::FontInfo::EmbedType type )
 
 QVariant FontsListModel::data( const QModelIndex &index, int role ) const
 {
-  if ( !index.isValid() )
+    if ( !index.isValid() || index.row() < 0 || index.row() >= m_fonts.count() )
-    return QVariant();
-
-  if ( ( index.row() < 0 ) || ( index.row() >= m_fonts.size() ) )
-    return QVariant();
-
-  if ( role != Qt::DisplayRole )
         return QVariant();
 
+    switch ( role )
+    {
+        case Qt::DisplayRole:
             switch ( index.column() )
             {
                 case 0:
@@ -278,10 +275,19 @@ QVariant FontsListModel::data( const QModelIndex &index, int role ) const
                     return fontname.isEmpty() ? QString::fromLatin1( "-" ) : fontname; // TODO i18n
                     break;
                 }
-        case 1: return descriptionForFontType( m_fonts.at( index.row() ).type() ); break;
+                case 1:
-        case 2: return descriptionForEmbedType( m_fonts.at( index.row() ).embedType() ); break;
+                    return descriptionForFontType( m_fonts.at( index.row() ).type() );
-        case 3: return m_fonts.at( index.row() ).file(); break;
+                    break;
+                case 2:
+                    return descriptionForEmbedType( m_fonts.at( index.row() ).embedType() );
+                    break;
+                case 3:
+                    return m_fonts.at( index.row() ).file();
+                    break;
             }
+            break;
+    }
+
   return QVariant();
 }