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

List:       kde-commits
Subject:    kdemultimedia/noatun/modules/splitplaylist
From:       Stefan Gehn <sgehn () gmx ! net>
Date:       2003-12-05 22:12:58
[Download RAW message or body]

CVS commit by metz: 

Fix for bug #66182 and some deprecated--


  M +15 -7     view.cpp   1.135


--- kdemultimedia/noatun/modules/splitplaylist/view.cpp  #1.134:1.135
@@ -482,5 +482,5 @@ void View::exportTo(const KURL &url)
         saver.close();
 
-        KIO::NetAccess::upload(local, url);
+        KIO::NetAccess::upload(local, url, this);
 
         saver.remove();
@@ -804,5 +804,10 @@ void View::init()
 void View::save()
 {
-        if (!mPlaylistFile.isValid()) { saveAs(); return; }
+        if(mPlaylistFile.isEmpty() || !mPlaylistFile.isValid())
+        {
+                saveAs();
+                return;
+        }
+
         if(saveToURL(mPlaylistFile))
                 setModified(false);
@@ -812,5 +817,6 @@ void View::saveAs()
 {
         KURL u=KFileDialog::getSaveURL(0, "*.xml splitplaylistdata *.pls *.m3u\n*", \
                this, i18n("Save Playlist"));
-        if (!u.isValid()) return;
+        if(!u.isValid())
+                return;
         mPlaylistFile = u;
         save();
@@ -820,5 +826,6 @@ void View::open()
 {
         KURL u=KFileDialog::getOpenURL(0, "*.xml splitplaylistdata *.pls *.m3u\n*", \
                this, i18n("Insert Playlist"));
-        if (!u.isValid()) return;
+        if(!u.isValid())
+                return;
         list->openGlobal(u);
         setModified(false);
@@ -828,5 +835,6 @@ void View::openNew()
 {
         KURL u=KFileDialog::getOpenURL(0, "*.xml splitplaylistdata *.pls *.m3u\n*", \
                this, i18n("Open New Playlist"));
-        if (!u.isValid()) return;
+        if(!u.isValid())
+                return;
         mPlaylistFile = u;
 
@@ -911,5 +919,5 @@ void View::saveState(void)
         saveToURL(napp->dirs()->saveLocation("data", "noatun/") + \
"splitplaylist.xml");  
-        int i;
+        unsigned int i;
         PlaylistItem item=SPL->getFirst();
         for(i = 0; item && item != SPL->current(); )


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