Since the annotate is going to be screwed anyway by the time this is ported,

running my script to remove tabs and extra whitespace at the end of lines.

svn path=/trunk/KDE/kdemultimedia/juk/; revision=513916

advancedsearchdialog.cpp

@@ -39,7 +39,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 AdvancedSearchDialog::AdvancedSearchDialog(const QString &defaultName,
-					   const PlaylistSearch &defaultSearch,
+                                           const PlaylistSearch &defaultSearch,
                                            QWidget *parent,
                                            const char *name) :
     KDialogBase(parent, name, true, i18n("Create Search Playlist"), Ok|Cancel)

artsplayer.cpp

@@ -289,6 +289,6 @@ bool ArtsPlayer::serverRunning() const
 
 #include "artsplayer.moc"
 
-#endif 
+#endif
 
 // vim: sw=4 ts=8 et

cache.cpp

@@ -316,7 +316,7 @@ void Cache::load()
     while(!s.atEnd()) {
         QString fileName;
         s >> fileName;
-        fileName.squeeze();        
+        fileName.squeeze();
 
         FileHandle f(fileName, s);
     }

cache.h

@@ -61,7 +61,7 @@ public:
 
     int cacheVersion() const { return m_cacheVersion; }
     void setCacheVersion(int v) { m_cacheVersion = v; }
-    
+
 private:
     int m_cacheVersion;
 };

collectionlist.h

@@ -51,13 +51,13 @@ typedef Q3DictIterator<int> TagCountDictIterator;
 
 typedef Q3ValueVector<TagCountDict*> TagCountDicts;
 
-/** 
+/**
  * This is the "collection", or all of the music files that have been opened
  * in any playlist and not explicitly removed from the collection.
  *
  * It is being implemented as a "semi-singleton" because I need universal access
- * to just one instance.  However, because the collection needs initialization 
- * parameters (that will not always be available when an instance is needed).  
+ * to just one instance.  However, because the collection needs initialization
+ * parameters (that will not always be available when an instance is needed).
  * Hence there will be the familiar singleton "instance()" method allong with an
  * "initialize()" method.
  */
@@ -68,7 +68,7 @@ class CollectionList : public Playlist
 
     Q_OBJECT
 
-public: 
+public:
     /**
      * A variety of unique value lists will be kept in the collection.  This
      * enum can be used as an index into those structures.
@@ -84,10 +84,10 @@ public:
     QStringList uniqueSet(UniqueSetType t) const;
 
     CollectionListItem *lookup(const QString &file) { return m_itemsDict.find(file); }
-    
+
     virtual PlaylistItem *createItem(const FileHandle &file,
-				     Q3ListViewItem * = 0,
-				     bool = false);
+                                     Q3ListViewItem * = 0,
+                                     bool = false);
 
     void emitVisibleColumnsChanged() { emit signalVisibleColumnsChanged(); }
 
@@ -104,7 +104,7 @@ public slots:
 
     void slotRemoveItem(const QString &file);
     void slotRefreshItem(const QString &file);
-    
+
     void slotNewItems(const KFileItemList &items);
     void slotRefreshItems(const KFileItemList &items);
     void slotDeleteItem(KFileItem *item);
@@ -165,7 +165,7 @@ class CollectionListItem : public PlaylistItem
     friend class CollectionList;
     friend class PlaylistItem;
 
-    /** 
+    /**
      * Needs access to the destructor, even though the destructor isn't used by QDict.
      */
     friend class Q3Dict<CollectionListItem>;

coverdialog.cpp

 /***************************************************************************
-    begin                : Sun May 15 2005 
+    begin                : Sun May 15 2005
     copyright            : (C) 2005 by Michael Pyne
     email                : michael.pyne@kdemail.net
 ***************************************************************************/

coverdialog.h

 /***************************************************************************
-    begin                : Sun May 15 2005 
+    begin                : Sun May 15 2005
     copyright            : (C) 2005 by Michael Pyne
     email                : michael.pyne@kdemail.net
 ***************************************************************************/

covericonview.cpp

 /***************************************************************************
-    begin                : Sat Jul 9 2005 
+    begin                : Sat Jul 9 2005
     copyright            : (C) 2005 by Michael Pyne
     email                : michael.pyne@kdemail.net
 ***************************************************************************/
@@ -40,7 +40,7 @@ Q3DragObject *CoverIconView::dragObject()
 {
     CoverIconViewItem *item = currentItem();
     if(item)
-	return new CoverDrag(item->id(), this);
+        return new CoverDrag(item->id(), this);
 
     return 0;
 }

covericonview.h

 /***************************************************************************
-    begin                : Sat Jul 9 2005 
+    begin                : Sat Jul 9 2005
     copyright            : (C) 2005 by Michael Pyne
     email                : michael.pyne@kdemail.net
 ***************************************************************************/
@@ -30,12 +30,12 @@ namespace CoverUtility
     class CoverIconViewItem : public KIconViewItem
     {
     public:
-	CoverIconViewItem(coverKey id, Q3IconView *parent);
+        CoverIconViewItem(coverKey id, Q3IconView *parent);
 
-	coverKey id() const { return m_id; }
+        coverKey id() const { return m_id; }
 
     private:
-	coverKey m_id;
+        coverKey m_id;
     };
 }
 

coverinfo.cpp

@@ -201,7 +201,7 @@ void CoverInfo::popup() const
     QPixmap image = pixmap(FullSize);
     QPoint mouse  = QCursor::pos();
     QRect desktop = KApplication::desktop()->screenGeometry(mouse);
-    
+
     int x = mouse.x();
     int y = mouse.y();
     int height = image.size().height() + 4;

covermanager.cpp

 /***************************************************************************
-    begin                : Sun May 15 2005 
+    begin                : Sun May 15 2005
     copyright            : (C) 2005 by Michael Pyne
     email                : michael.pyne@kdemail.net
 ***************************************************************************/
@@ -198,7 +198,7 @@ void CoverManagerPrivate::loadCovers()
 
         return;
     }
-    
+
     // Read in the count next, then the data.
     in >> count;
     for(Q_UINT32 i = 0; i < count; ++i) {

covermanager.h

 /***************************************************************************
-    begin                : Sun May 15 2005 
+    begin                : Sun May 15 2005
     copyright            : (C) 2005 by Michael Pyne
     email                : michael.pyne@kdemail.net
 ***************************************************************************/
@@ -35,7 +35,7 @@ class QDataStream;
  * Don't assume that the artist or album information is filled out, it is
  * there to allow the CoverManager to try to automatically assign covers to
  * new tracks.
- * 
+ *
  * @author Michael Pyne <michael.pyne@kdemail.net>
  * @see CoverManager
  */
@@ -174,7 +174,7 @@ public:
 
     /**
      * Function to determine if @p id matches any covers in the database.
-     * 
+     *
      * @param id The id of the cover to search for.
      * @return true if the database has a cover identified by @p id, false
      *         otherwise.

directorylist.cpp

@@ -28,7 +28,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 DirectoryList::DirectoryList(const QStringList &directories, bool importPlaylists,
-			     QWidget *parent, const char *name) :
+                             QWidget *parent, const char *name) :
     KDialogBase(parent, name, true, i18n("Folder List"), Ok | Cancel, Ok, true),
     m_dirList(directories),
     m_importPlaylists(importPlaylists)
@@ -81,7 +81,7 @@ void DirectoryList::slotAddDirectory()
     if(!dir.isEmpty() && m_dirList.find(dir) == m_dirList.end()) {
         m_dirList.append(dir);
         new KListViewItem(m_base->directoryListView, dir);
-	m_result.addedDirs.append(dir);
+        m_result.addedDirs.append(dir);
     }
 }
 

directorylist.h

@@ -27,14 +27,14 @@ class DirectoryList : public KDialogBase
 public:
     struct Result
     {
-	QStringList addedDirs;
-	QStringList removedDirs;
-	DialogCode status;
-	bool addPlaylists;
+        QStringList addedDirs;
+        QStringList removedDirs;
+        DialogCode status;
+        bool addPlaylists;
     };
 
     DirectoryList(const QStringList &directories, bool importPlaylists,
-		  QWidget *parent = 0, const char *name = 0);
+                  QWidget *parent = 0, const char *name = 0);
     virtual ~DirectoryList();
 
 public slots:

dynamicplaylist.cpp

@@ -28,8 +28,8 @@ class PlaylistDirtyObserver : public PlaylistObserver
 {
 public:
     PlaylistDirtyObserver(DynamicPlaylist *parent, Playlist *playlist) :
-	PlaylistObserver(playlist),
-        m_parent(parent) 
+        PlaylistObserver(playlist),
+        m_parent(parent)
     {
 
     }
@@ -100,7 +100,7 @@ void DynamicPlaylist::slotReload()
 void DynamicPlaylist::lower(QWidget *top)
 {
     if(top == this)
-	return;
+        return;
 
     if(playing()) {
         PlaylistList l;

dynamicplaylist.h

@@ -38,7 +38,7 @@ public:
                     const QString &name = QString::null,
                     const QString &iconName = "midi",
                     bool setupPlaylist = true,
-		    bool synchronizePlaying = false);
+                    bool synchronizePlaying = false);
 
     virtual ~DynamicPlaylist();
 

filehandle.cpp

@@ -100,8 +100,8 @@ FileHandle::FileHandle(const FileHandle &f) :
     d(f.d)
 {
     if(!d) {
-	kDebug(65432) << "The source FileHandle was not initialized." << endl;
-	d = null().d;
+        kDebug(65432) << "The source FileHandle was not initialized." << endl;
+        d = null().d;
     }
     d->ref();
 }

filerenamer.cpp

@@ -238,7 +238,7 @@ FileRenamerWidget::FileRenamerWidget(QWidget *parent) :
     delete temp;
 
     layout()->setMargin(0); // We'll be wrapped by KDialogBase
-    
+
     // This must be created before createTagRows() is called.
 
     m_exampleDialog = new ExampleOptionsDialog(this);
@@ -480,7 +480,7 @@ void FileRenamerWidget::createTagRows()
 
     if(categoryOrder.isEmpty())
         categoryOrder << Artist << Album << Artist << Title << Track;
-    
+
     // Setup arrays.
     m_rows.reserve(categoryOrder.count());
     m_folderSwitches.reserve(categoryOrder.count() - 1);
@@ -548,7 +548,7 @@ void FileRenamerWidget::exampleTextChanged()
 {
     // Just use .mp3 as an example
 
-    if(m_exampleFromFile && (m_exampleFile.isEmpty() || 
+    if(m_exampleFromFile && (m_exampleFile.isEmpty() ||
                              !FileHandle(m_exampleFile).tag()->isValid()))
     {
         m_exampleText->setText(i18n("No file selected, or selected file has no tags."));
@@ -949,7 +949,7 @@ void FileRenamer::setFolderIcon(const KURL &dst, const PlaylistItem *item)
         {
             // Seems to be a match, let's set the folder icon for the current
             // path.  First we should write out the file.
-            
+
             QPixmap thumb = item->file().coverInfo()->pixmap(CoverInfo::Thumbnail);
             thumb.save(path + "/.juk-thumbnail.png", "PNG");
 

filerenamer.h

@@ -315,7 +315,7 @@ private:
         CategoryID id(Track, categoryNum);
         return m_rows[findIdentifier(id)].options.trackWidth();
     }
-    
+
     /**
      * @param  index, the 0-based index for the folder boundary.
      * @return true if there should be a folder separator between category
@@ -467,7 +467,7 @@ private:
      */
     Rows m_rows;
 
-    /** 
+    /**
      * This holds an array of checkboxes that allow the user to insert folder
      * separators in between categories.
      */

googlefetcher.cpp

@@ -61,7 +61,7 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size)
     KUrl url("http://images.google.com/images");
     url.addQueryItem("q", m_searchString);
     url.addQueryItem("hl", "en");
-    
+
     switch (size) {
         case XLarge:
             url.addQueryItem("imgsz", "xlarge|xxlarge");
@@ -81,7 +81,7 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size)
         default:
             break;
     }
-    
+
     m_loadedQuery = m_searchString;
     m_loadedSize = size;
 
@@ -109,7 +109,7 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size)
 
     if(!hasImageResults(search))
     {
-	kDebug(65432) << "Search returned no results.\n";
+        kDebug(65432) << "Search returned no results.\n";
         emit signalNewSearch(m_imageList);
         return;
     }
@@ -119,73 +119,73 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size)
     for(uint i = 0; i < topLevelNodes.length(); i++) {
         DOM::Node thisTopNode = topLevelNodes.item(i);
 
-	// The get named item test seems to accurately determine whether a
-	// <TABLE> tag contains the actual images or is just layout filler.
-	// The parent node check is due to the fact that we only want top-level
-	// tables, but the getElementsByTagName returns all tables in the
-	// tree.
-	DOM::HTMLTableElement table = thisTopNode;
-	if(table.isNull() || table.parentNode() != body || table.getAttribute("align").isEmpty())
-	    continue;
-
-	DOM::HTMLCollection rows = table.rows();
-	uint imageIndex = 0;
-
-	// Some tables will have an extra row saying "Displaying only foo-size
-	// images".  These tables have three rows, so we need to have
-	// increment imageIndex for these.
-	if(rows.length() > 2)
-	    imageIndex = 1;
-
-	// A list of <TDs> containing the hyperlink to the site, with image.
-	DOM::NodeList images = rows.item(imageIndex).childNodes();
-
-	// For each table node, pull the images out of the first row
-	    
-	for(uint j = 0; j < images.length(); j++) {
-	    DOM::Element tdElement = images.item(j);
-	    if(tdElement.isNull()) {
-		// Whoops....
-		kError(65432) << "Expecting a <TD> in a <TR> parsing Google Images!\n";
-		continue;
-	    }
-
-	    // Grab first item out of list of images.  There should only be
-	    // one anyways.
-	    DOM::Element imgElement = tdElement.getElementsByTagName("img").item(0);
-	    if(imgElement.isNull()) {
-		kError(65432) << "Expecting a <IMG> in a <TD> parsing Google Images!\n";
-		continue;
-	    }
-
-	    QString imageURL = "http://images.google.com" +
-		imgElement.getAttribute("src").string();
-
-	    // Pull the matching <TD> node for the row under the one we've
-	    // got.
-	    tdElement = rows.item(imageIndex + 1).childNodes().item(j);
-
-	    // Iterate over it until we find a string with "pixels".
-	    unsigned long whatToShow = DOM::NodeFilter::SHOW_TEXT;
-	    DOM::NodeIterator it = search.createNodeIterator(tdElement, whatToShow, 0, false);
-	    DOM::Node node;
-
-	    for(node = it.nextNode(); !node.isNull(); node = it.nextNode()) {
-		if(node.nodeValue().string().contains("pixels")) {
-		    m_imageList.append(GoogleImage(imageURL, node.nodeValue().string()));
-		    break;
-		}
-	    }
-	}
+        // The get named item test seems to accurately determine whether a
+        // <TABLE> tag contains the actual images or is just layout filler.
+        // The parent node check is due to the fact that we only want top-level
+        // tables, but the getElementsByTagName returns all tables in the
+        // tree.
+        DOM::HTMLTableElement table = thisTopNode;
+        if(table.isNull() || table.parentNode() != body || table.getAttribute("align").isEmpty())
+            continue;
+
+        DOM::HTMLCollection rows = table.rows();
+        uint imageIndex = 0;
+
+        // Some tables will have an extra row saying "Displaying only foo-size
+        // images".  These tables have three rows, so we need to have
+        // increment imageIndex for these.
+        if(rows.length() > 2)
+            imageIndex = 1;
+
+        // A list of <TDs> containing the hyperlink to the site, with image.
+        DOM::NodeList images = rows.item(imageIndex).childNodes();
+
+        // For each table node, pull the images out of the first row
+
+        for(uint j = 0; j < images.length(); j++) {
+            DOM::Element tdElement = images.item(j);
+            if(tdElement.isNull()) {
+                // Whoops....
+                kError(65432) << "Expecting a <TD> in a <TR> parsing Google Images!\n";
+                continue;
+            }
+
+            // Grab first item out of list of images.  There should only be
+            // one anyways.
+            DOM::Element imgElement = tdElement.getElementsByTagName("img").item(0);
+            if(imgElement.isNull()) {
+                kError(65432) << "Expecting a <IMG> in a <TD> parsing Google Images!\n";
+                continue;
+            }
+
+            QString imageURL = "http://images.google.com" +
+                imgElement.getAttribute("src").string();
+
+            // Pull the matching <TD> node for the row under the one we've
+            // got.
+            tdElement = rows.item(imageIndex + 1).childNodes().item(j);
+
+            // Iterate over it until we find a string with "pixels".
+            unsigned long whatToShow = DOM::NodeFilter::SHOW_TEXT;
+            DOM::NodeIterator it = search.createNodeIterator(tdElement, whatToShow, 0, false);
+            DOM::Node node;
+
+            for(node = it.nextNode(); !node.isNull(); node = it.nextNode()) {
+                if(node.nodeValue().string().contains("pixels")) {
+                    m_imageList.append(GoogleImage(imageURL, node.nodeValue().string()));
+                    break;
+                }
+            }
+        }
     }
     } // try
     catch (DOM::DOMException &e)
     {
-	kError(65432) << "Caught DOM Exception: " << e.code << endl;
+        kError(65432) << "Caught DOM Exception: " << e.code << endl;
     }
     catch (...)
     {
-	kError(65432) << "Caught unknown exception.\n";
+        kError(65432) << "Caught unknown exception.\n";
     }
 
     emit signalNewSearch(m_imageList);
@@ -248,14 +248,14 @@ bool GoogleFetcher::requestNewSearchTerms(bool noResults)
 bool GoogleFetcher::hasImageResults(DOM::HTMLDocument &search)
 {
     unsigned long typesToShow = DOM::NodeFilter::SHOW_TEXT;
-    
+
     DOM::NodeIterator it = search.createNodeIterator(search.body(), typesToShow, 0, false);
     DOM::Node node;
 
     for(node = it.nextNode(); !node.isNull(); node = it.nextNode()) {
-	// node should be a text node.
-	if(node.nodeValue().string().contains("did not match any"))
-	    return false;
+        // node should be a text node.
+        if(node.nodeValue().string().contains("did not match any"))
+            return false;
     }
 
     return true;

googlefetcher.h

@@ -54,7 +54,7 @@ class GoogleFetcher : public QObject
 
 public:
     enum ImageSize { All, Icon, Small, Medium, Large, XLarge };
-    
+
     GoogleFetcher(const FileHandle &file);
     QPixmap pixmap();
 

googlefetcherdialog.cpp

@@ -52,7 +52,7 @@ GoogleFetcherDialog::GoogleFetcherDialog(const QString &name,
     m_iconWidget->arrangeItemsInGrid();
     m_iconWidget->setItemsMovable(FALSE);
     connect(m_iconWidget, SIGNAL(executed(Q3IconViewItem *)),
-	    this, SLOT(slotOk()));
+            this, SLOT(slotOk()));
 
     Q3HBox *imgSize = new Q3HBox(actionButton(User1)->parentWidget());
     QLabel *label = new QLabel(imgSize);

googlefetcherdialog.h

@@ -40,7 +40,7 @@ public:
     QPixmap result() const { return m_pixmap; }
     bool takeIt() const { return m_takeIt; }
     bool newSearch() const { return m_newSearch; }
-    
+
     void setLayout();
     void setImageList(const GoogleImageList &urlList);
 

gstreamerplayer.cpp

@@ -165,9 +165,9 @@ void GStreamerPlayer::setupPipeline()
     else {
         m_sink = gst_element_factory_make("alsasink", "sink");
         if(!m_sink)
-            m_sink = gst_element_factory_make("osssink", "sink");            
+            m_sink = gst_element_factory_make("osssink", "sink");
     }
-    
+
 
     gst_bin_add_many(GST_BIN(m_pipeline), m_source, m_decoder, m_volume, m_sink, 0);
     gst_element_link_many(m_source, m_decoder, m_volume, m_sink, 0);

juk.cpp

@@ -55,17 +55,17 @@ JuK::JuK(QWidget *parent, const char *name) :
     readSettings();
 
     if(m_showSplash && !m_startDocked && Cache::cacheFileExists()) {
-	SplashScreen::instance()->show();
-	kapp->processEvents();
+        SplashScreen::instance()->show();
+        kapp->processEvents();
     }
 
     setupActions();
     setupLayout();
-	 
+
     if(QApplication::reverseLayout())
-	setupGUI(ToolBar | Save | Create, "jukui-rtl.rc");
+        setupGUI(ToolBar | Save | Create, "jukui-rtl.rc");
     else
-	setupGUI(ToolBar | Save | Create);
+        setupGUI(ToolBar | Save | Create);
 
     readConfig();
     setupSystemTray();
@@ -149,7 +149,7 @@ void JuK::setupActions()
     new KToggleAction(i18n("&Loop Playlist"), 0, KShortcut(), actions(), "loopPlaylist");
     KToggleAction *resizeColumnAction =
         new KToggleAction(i18n("&Resize Playlist Columns Manually"),
-	                  KShortcut(), actions(), "resizeColumnsManually");
+                          KShortcut(), actions(), "resizeColumnsManually");
     resizeColumnAction->setCheckedState(i18n("&Resize Column Headers Automatically"));
 
     // the following are not visible by default
@@ -166,23 +166,23 @@ void JuK::setupActions()
     //////////////////////////////////////////////////
 
     m_toggleSplashAction =
-	new KToggleAction(i18n("Show Splash Screen on Startup"),
-			  KShortcut(), actions(), "showSplashScreen");
+        new KToggleAction(i18n("Show Splash Screen on Startup"),
+                          KShortcut(), actions(), "showSplashScreen");
     m_toggleSplashAction->setCheckedState(i18n("Hide Splash Screen on Startup"));
     m_toggleSystemTrayAction =
-	new KToggleAction(i18n("&Dock in System Tray"),
-			  KShortcut(), actions(), "toggleSystemTray");
+        new KToggleAction(i18n("&Dock in System Tray"),
+                          KShortcut(), actions(), "toggleSystemTray");
     m_toggleDockOnCloseAction =
-	new KToggleAction(i18n("&Stay in System Tray on Close"),
-			  KShortcut(), actions(), "dockOnClose");
+        new KToggleAction(i18n("&Stay in System Tray on Close"),
+                          KShortcut(), actions(), "dockOnClose");
     m_togglePopupsAction =
-	new KToggleAction(i18n("Popup &Track Announcement"),
-			  KShortcut(), this, 0, actions(), "togglePopups");
+        new KToggleAction(i18n("Popup &Track Announcement"),
+                          KShortcut(), this, 0, actions(), "togglePopups");
     new KToggleAction(i18n("Save &Play Queue on Exit"),
                       KShortcut(), this, 0, actions(), "saveUpcomingTracks");
 
     connect(m_toggleSystemTrayAction, SIGNAL(toggled(bool)),
-	    this, SLOT(slotToggleSystemTray(bool)));
+            this, SLOT(slotToggleSystemTray(bool)));
 
 
     m_outputSelectAction = PlayerManager::playerSelectAction(actions());
@@ -191,10 +191,10 @@ void JuK::setupActions()
         m_outputSelectAction->setCurrentItem(0);
 
     new KAction(i18n("&Tag Guesser..."), 0, 0, this, SLOT(slotConfigureTagGuesser()),
-		actions(), "tagGuesserConfig");
+                actions(), "tagGuesserConfig");
 
     new KAction(i18n("&File Renamer..."), 0, 0, this, SLOT(slotConfigureFileRenamer()),
-		actions(), "fileRenamerConfig");
+                actions(), "fileRenamerConfig");
 
     KStdAction::keyBindings(this, SLOT(slotEditKeys()), actions());
 
@@ -203,24 +203,24 @@ void JuK::setupActions()
     //////////////////////////////////////////////////
 
     m_sliderAction = new SliderAction(i18n("Track Position"), actions(),
-				      "trackPositionAction");
+                                      "trackPositionAction");
 }
 
 void JuK::setupSystemTray()
 {
     if(m_toggleSystemTrayAction && m_toggleSystemTrayAction->isChecked()) {
-	m_systemTray = new SystemTray(this, "systemTray");
-	m_systemTray->show();
+        m_systemTray = new SystemTray(this, "systemTray");
+        m_systemTray->show();
 
-	m_toggleDockOnCloseAction->setEnabled(true);
-	m_togglePopupsAction->setEnabled(true);
+        m_toggleDockOnCloseAction->setEnabled(true);
+        m_togglePopupsAction->setEnabled(true);
 
-	connect(m_systemTray, SIGNAL(quitSelected()), this, SLOT(slotAboutToQuit()));
+        connect(m_systemTray, SIGNAL(quitSelected()), this, SLOT(slotAboutToQuit()));
     }
     else {
-	m_systemTray = 0;
-	m_toggleDockOnCloseAction->setEnabled(false);
-	m_togglePopupsAction->setEnabled(false);
+        m_systemTray = 0;
+        m_toggleDockOnCloseAction->setEnabled(false);
+        m_togglePopupsAction->setEnabled(false);
     }
 }
 
@@ -292,9 +292,9 @@ void JuK::readConfig()
     KConfigGroup playerConfig(KGlobal::config(), "Player");
 
     if(m_sliderAction->volumeSlider()) {
-	int maxVolume = m_sliderAction->volumeSlider()->maxValue();
-	int volume = playerConfig.readNumEntry("Volume", maxVolume);
-	m_sliderAction->volumeSlider()->setVolume(volume);
+        int maxVolume = m_sliderAction->volumeSlider()->maxValue();
+        int volume = playerConfig.readNumEntry("Volume", maxVolume);