[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok/src (silent)
From:       Isaiah Damron <Xepo () trifault ! net>
Date:       2005-12-03 21:12:42
Message-ID: 1133644362.416045.26928.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 485344 by damron:

Fix style issues with my previous submissions
SVN_SILENT: Stylistic


 M  +11 -11    collectionbrowser.cpp  
 M  +1 -1      collectiondb.cpp  
 M  +5 -5      playlistbrowser.cpp  
 M  +1 -1      playlistbrowseritem.cpp  


--- trunk/extragear/multimedia/amarok/src/collectionbrowser.cpp #485343:485344
@@ -692,13 +692,13 @@
 
     QueryBuilder qb;
     bool c = false;
-    bool SortbyTrackFirst=false; 
+    bool SortbyTrackFirst = false; 
 
     //Sort by track number first if album is in one of the categories, otherwise by track name first
-    if (m_cat1 == CollectionBrowser::IdAlbum ||
-        m_cat2 == CollectionBrowser::IdAlbum ||
-        m_cat3 == CollectionBrowser::IdAlbum)
-            SortbyTrackFirst=true;
+    if ( m_cat1 == CollectionBrowser::IdAlbum ||
+         m_cat2 == CollectionBrowser::IdAlbum ||
+         m_cat3 == CollectionBrowser::IdAlbum )
+            SortbyTrackFirst = true;
 
     // initalization for year - album mode
     QString tmptext;
@@ -763,10 +763,10 @@
                 qb.addReturnValue( q_cat2, QueryBuilder::valTitle );
                 qb.addReturnValue( q_cat2, QueryBuilder::valURL );
                 if ( c ) qb.addReturnValue( QueryBuilder::tabArtist, QueryBuilder::valName );
-                if (SortbyTrackFirst)
+                if ( SortbyTrackFirst )
                     qb.sortBy( q_cat2, QueryBuilder::valTrack );
                 qb.sortBy( q_cat2, QueryBuilder::valTitle );
-                if (!SortbyTrackFirst)
+                if ( !SortbyTrackFirst )
                     qb.sortBy( q_cat2, QueryBuilder::valTrack );
                 qb.sortBy( q_cat2, QueryBuilder::valURL );
             }
@@ -836,10 +836,10 @@
                 qb.addReturnValue( q_cat3, QueryBuilder::valTitle );
                 qb.addReturnValue( q_cat3, QueryBuilder::valURL );
                 if ( c ) qb.addReturnValue( QueryBuilder::tabArtist, QueryBuilder::valName );
-                if (SortbyTrackFirst)
+                if ( SortbyTrackFirst )
                     qb.sortBy( q_cat3, QueryBuilder::valTrack );
                 qb.sortBy( q_cat3, QueryBuilder::valTitle );
-                if (!SortbyTrackFirst)
+                if ( !SortbyTrackFirst )
                     qb.sortBy( q_cat3, QueryBuilder::valTrack );
                 qb.sortBy( q_cat3, QueryBuilder::valURL );
             }
@@ -935,10 +935,10 @@
 
             if( c )
                 qb.addReturnValue( QueryBuilder::tabArtist, QueryBuilder::valName );
-            if (SortbyTrackFirst)
+            if ( SortbyTrackFirst )
                     qb.sortBy( QueryBuilder::tabSong, QueryBuilder::valTrack );
             qb.sortBy( QueryBuilder::tabSong, QueryBuilder::valTitle );
-            if (!SortbyTrackFirst)
+            if ( !SortbyTrackFirst )
                 qb.sortBy( QueryBuilder::tabSong, QueryBuilder::valTrack );
 
             qb.sortBy( QueryBuilder::tabSong, QueryBuilder::valURL );
--- trunk/extragear/multimedia/amarok/src/collectiondb.cpp #485343:485344
@@ -1084,7 +1084,7 @@
     qb.addReturnValue( QueryBuilder::tabGenre, QueryBuilder::valName );
 
     //Only report genres that currently have at least one song
-    qb.addFilter(QueryBuilder::tabSong, "");
+    qb.addFilter( QueryBuilder::tabSong, "" );
 
     if ( !withUnknowns )
         qb.excludeMatch( QueryBuilder::tabGenre, i18n( "Unknown" ) );
--- trunk/extragear/multimedia/amarok/src/playlistbrowser.cpp #485343:485344
@@ -1390,11 +1390,11 @@
         //Remove any items in Listview that have the same path as this one
         //  Should only happen when overwriting a playlist
         QListViewItem *item = parent->firstChild();
-        while (item)
+        while( item )
         {
-            if (static_cast<PlaylistEntry*>(item)->url() == path)
+            if( static_cast<PlaylistEntry*>( item )->url() == path )
             {
-                QListViewItem *todelete=item;
+                QListViewItem *todelete = item;
                 item = item->nextSibling();
                 delete todelete;
             }
@@ -1403,8 +1403,8 @@
         }
 
         //Remove existing playlist if it exists
-        if (QFileInfo(path).exists())
-            QFileInfo(path).dir().remove(path);
+        if ( QFileInfo( path ).exists() )
+            QFileInfo( path ).dir().remove( path );
 
         m_lastPlaylist = new PlaylistEntry( parent, 0, path );
         parent->sortChildItems( 0, true );
--- trunk/extragear/multimedia/amarok/src/playlistbrowseritem.cpp #485343:485344
@@ -331,7 +331,7 @@
 void PlaylistEntry::load()
 {
     debug() << "Loading playlist" << endl;
-    if (m_loading)
+    if ( m_loading )
 	    return;
     m_trackList.clear();
     m_length = 0;
[prev in list] [next in list] [prev in thread] [next in thread]