Browse Source

Additional k => tde renaming and fixes

tags/r14.0.0
Slávek Banko 5 years ago
parent
commit
a5859b795e
50 changed files with 56 additions and 56 deletions
  1. 1
    1
      TODO
  2. 1
    1
      admin
  3. 1
    1
      amarok/configure.in.in
  4. 1
    1
      amarok/src/Makefile.am
  5. 1
    1
      amarok/src/collectiondb.cpp
  6. 2
    2
      amarok/src/collectionscanner/Makefile.am
  7. 1
    1
      amarok/src/contextbrowser.cpp
  8. 1
    1
      amarok/src/enginecontroller.cpp
  9. 2
    2
      amarok/src/filebrowser.cpp
  10. 1
    1
      amarok/src/filebrowser.h
  11. 1
    1
      amarok/src/ktrm.cpp
  12. 1
    1
      amarok/src/lastfm.cpp
  13. 1
    1
      amarok/src/lastfm.h
  14. 1
    1
      amarok/src/loader/Makefile.am
  15. 1
    1
      amarok/src/mediadevice/daap/Makefile.am
  16. 1
    1
      amarok/src/mediadevice/daap/daapreader/Makefile.am
  17. 1
    1
      amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am
  18. 1
    1
      amarok/src/mediadevice/generic/Makefile.am
  19. 1
    1
      amarok/src/mediadevice/generic/genericmediadevice.cpp
  20. 1
    1
      amarok/src/mediadevice/generic/genericmediadevice.h
  21. 1
    1
      amarok/src/mediadevice/ifp/Makefile.am
  22. 1
    1
      amarok/src/mediadevice/ifp/ifpmediadevice.cpp
  23. 1
    1
      amarok/src/mediadevice/ifp/ifpmediadevice.h
  24. 1
    1
      amarok/src/mediadevice/ipod/Makefile.am
  25. 1
    1
      amarok/src/mediadevice/njb/Makefile.am
  26. 2
    2
      amarok/src/metabundle.h
  27. 1
    1
      amarok/src/metabundlesaver.cpp
  28. 1
    1
      amarok/src/mountpointmanager.h
  29. 2
    2
      amarok/src/playlistbrowseritem.cpp
  30. 1
    1
      amarok/src/refreshimages.cpp
  31. 1
    1
      amarok/src/scripts/graphequalizer/Makefile.am
  32. 3
    3
      amarok/src/scrobbler.cpp
  33. 1
    1
      doc/amarok/faq.docbook
  34. 1
    1
      doc/es/faq.docbook
  35. 1
    1
      doc/et/faq.docbook
  36. 1
    1
      doc/fr/faq.docbook
  37. 1
    1
      doc/it/faq.docbook
  38. 1
    1
      doc/nl/using.docbook
  39. 1
    1
      doc/pt/faq.docbook
  40. 1
    1
      po/ca/amarok.po
  41. 1
    1
      po/de/amarok.po
  42. 1
    1
      po/eo/amarok.po
  43. 1
    1
      po/fa/amarok.po
  44. 1
    1
      po/it/amarok.po
  45. 1
    1
      po/nds/amarok.po
  46. 1
    1
      po/nl/amarok.po
  47. 1
    1
      po/pl/amarok.po
  48. 1
    1
      po/pt/amarok.po
  49. 1
    1
      po/pt_BR/amarok.po
  50. 1
    1
      po/sr/amarok.po

+ 1
- 1
TODO View File

@@ -96,7 +96,7 @@ SHORT-TERM (URGENT):
96 96
  <sebr>    More consistent playlistbrowser drag and drop actions; No dropping of default streams, set
97 97
            e->accept( false ) if dropping one type onto another.
98 98
 
99
- <sebr>    Use KIO queues for podcast download queues.  Should simplify the lot.  Problems atm included
99
+ <sebr>    Use TDEIO queues for podcast download queues.  Should simplify the lot.  Problems atm included
100 100
            selecting multiple downloads individually, and automatic downloads occuring for more that one
101 101
            podcast item.
102 102
 

+ 1
- 1
admin

@@ -1 +1 @@
1
-Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360
1
+Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461

+ 1
- 1
amarok/configure.in.in View File

@@ -1059,7 +1059,7 @@ AC_COMPILE_IFELSE([
1059 1059
 #endif
1060 1060
 ],
1061 1061
     have_trinity4="yes"
1062
-    DNSSD_LIBS=$LIB_KDNSSD
1062
+    DNSSD_LIBS=$LIB_TDEDNSSD
1063 1063
 #    echo "yes"
1064 1064
 ,
1065 1065
     have_trinity4="no"

+ 1
- 1
amarok/src/Makefile.am View File

@@ -158,7 +158,7 @@ libamarok_la_LIBADD = \
158 158
     $(top_builddir)/amarok/src/statusbar/libstatusbar.la \
159 159
     $(top_builddir)/amarok/src/metadata/libmetadata.la \
160 160
     $(top_builddir)/amarok/src/magnatunebrowser/libmagnatunebrowser.la \
161
-    $(LIB_QT) $(LIB_KPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEHTML) $(LIB_KNEWSTUFF) \
161
+    $(LIB_QT) $(LIB_TDEPARTS) -lDCOP -ltdefx $(KDE_MT_LIBS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEHTML) $(LIB_KNEWSTUFF) \
162 162
     $(TAGLIB_LIBS) $(gl_libs) $(LIB_SQLITE) $(LIB_SQLITE_LOCAL) \
163 163
     $(LIB_TUNEPIMP) \
164 164
     $(mysql_libs) \

+ 1
- 1
amarok/src/collectiondb.cpp View File

@@ -1942,7 +1942,7 @@ CollectionDB::podcastImage( const TQString &remoteURL, const bool withShadow, ui
1942 1942
         s = notAvailCover( withShadow, width );
1943 1943
 
1944 1944
         const KURL url = KURL::fromPathOrURL( remoteURL );
1945
-        if( url.isValid() ) //KIO crashes with invalid URLs
1945
+        if( url.isValid() ) //TDEIO crashes with invalid URLs
1946 1946
         {
1947 1947
             TDEIO::Job *job = TDEIO::storedGet( url, false, false );
1948 1948
             m_podcastImageJobs[job] = remoteURL;

+ 2
- 2
amarok/src/collectionscanner/Makefile.am View File

@@ -22,7 +22,7 @@ amarokcollectionscanner_LDADD = \
22 22
     $(LIB_QT) \
23 23
     $(LIB_TDECORE) \
24 24
     $(TAGLIB_LIBS) \
25
-    $(LIB_KIO)
25
+    $(LIB_TDEIO)
26 26
 
27 27
 amarokcollectionscanner_LDFLAGS = \
28 28
     $(all_libraries) \
@@ -31,4 +31,4 @@ amarokcollectionscanner_LDFLAGS = \
31 31
     -lDCOP \
32 32
     $(LIB_TDECORE) \
33 33
     $(LIB_TDEUI) \
34
-    $(LIB_KIO)
34
+    $(LIB_TDEIO)

+ 1
- 1
amarok/src/contextbrowser.cpp View File

@@ -4123,7 +4123,7 @@ ContextBrowser::wikiResult( TDEIO::Job* job ) //SLOT
4123 4123
         //m_wikiPage = NULL; // FIXME: what for? leads to crashes
4124 4124
         saveHtmlData(); // Send html code to file
4125 4125
 
4126
-        warning() << "[WikiFetcher] KIO error! errno: " << job->error() << endl;
4126
+        warning() << "[WikiFetcher] TDEIO error! errno: " << job->error() << endl;
4127 4127
         return;
4128 4128
     }
4129 4129
     if ( job != m_wikiJob )

+ 1
- 1
amarok/src/enginecontroller.cpp View File

@@ -392,7 +392,7 @@ void EngineController::play( const MetaBundle &bundle, uint offset )
392 392
 
393 393
     // WebDAV protocol is HTTP with extensions (and the "webdav" scheme
394 394
     // is a KDE-ism anyway). Most engines cope with HTTP streaming, but
395
-    // not through KIO, so they don't support KDE-isms.
395
+    // not through TDEIO, so they don't support KDE-isms.
396 396
     if ( url.protocol() == "webdav" )
397 397
         url.setProtocol( "http" );
398 398
     else if ( url.protocol() == "webdavs" )

+ 2
- 2
amarok/src/filebrowser.cpp View File

@@ -1,7 +1,7 @@
1 1
 /* This file is part of the KDE project
2 2
    Copyright (C) 2004 Mark Kretschmann <markey@web.de>
3 3
    Copyright (C) 2003 Alexander Dymo <cloudtemple@mksat.net>
4
-   Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
4
+   Copyright (C) 2003 Roberto Raggi <roberto@kdevelop.org>
5 5
    Copyright (C) 2001 Christoph Cullmann <cullmann@kde.org>
6 6
    Copyright (C) 2001 Joseph Wenninger <jowenn@kde.org>
7 7
    Copyright (C) 2001 Anders Lund <anders.lund@lund.tdcadsl.dk>
@@ -79,7 +79,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium )
79 79
         m_medium = 0;
80 80
         location = new KURL( Amarok::config( "Filebrowser" )->readPathEntry( "Location", TQDir::homeDirPath() ) );
81 81
         KFileItem *currentFolder = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, *location );
82
-        //KIO sucks, NetAccess::exists puts up a dialog and has annoying error message boxes
82
+        //TDEIO sucks, NetAccess::exists puts up a dialog and has annoying error message boxes
83 83
         //if there is a problem so there is no point in using it anyways.
84 84
         //so... setting the diroperator to ~ is the least sucky option
85 85
         if ( !location->isLocalFile() || !currentFolder->isReadable() ) {

+ 1
- 1
amarok/src/filebrowser.h View File

@@ -1,7 +1,7 @@
1 1
 /* This file is part of the KDE project
2 2
    Copyright (C) 2004 Max Howell
3 3
    Copyright (C) 2004 Mark Kretschmann <markey@web.de>
4
-   Copyright (C) 2003 Roberto Raggi <roberto@tdevelop.org>
4
+   Copyright (C) 2003 Roberto Raggi <roberto@kdevelop.org>
5 5
    Copyright (C) 2001 Christoph Cullmann <cullmann@kde.org>
6 6
    Copyright (C) 2001 Joseph Wenninger <jowenn@kde.org>
7 7
    Copyright (C) 2001 Anders Lund <anders.lund@lund.tdcadsl.dk>

+ 1
- 1
amarok/src/ktrm.cpp View File

@@ -745,7 +745,7 @@ void KTRMLookup::lookupResult( TDEIO::Job* job )
745 745
 #if HAVE_TUNEPIMP >= 5
746 746
     DEBUG_BLOCK
747 747
     if ( !job->error() == 0 ) {
748
-        warning() << "[MusicBrainzLookup] KIO error! errno: " << job->error() << endl;
748
+        warning() << "[MusicBrainzLookup] TDEIO error! errno: " << job->error() << endl;
749 749
         Amarok::StatusBar::instance()->longMessage( "Couldn't connect to MusicBrainz server." );
750 750
         finished();
751 751
         return;

+ 1
- 1
amarok/src/lastfm.cpp View File

@@ -48,7 +48,7 @@ using namespace LastFm;
48 48
 ///////////////////////////////////////////////////////////////////////////////
49 49
 // CLASS AmarokHttp
50 50
 // AmarokHttp is a hack written so that lastfm code could easily use something proxy aware.
51
-// DO NOT use this class for anything else, use KIO directly instead.
51
+// DO NOT use this class for anything else, use TDEIO directly instead.
52 52
 ////////////////////////////////////////////////////////////////////////////////
53 53
 AmarokHttp::AmarokHttp ( const TQString& hostname, TQ_UINT16 port,
54 54
                          TQObject* parent )

+ 1
- 1
amarok/src/lastfm.h View File

@@ -37,7 +37,7 @@ class TQTimer;
37 37
 namespace TDEIO { class Job; }
38 38
 
39 39
 /* AmarokHttp is a hack written so that lastfm code could easily use something proxy aware.
40
-   DO NOT use this class for anything else, use KIO directly instead. */
40
+   DO NOT use this class for anything else, use TDEIO directly instead. */
41 41
 class AmarokHttp : public TQObject
42 42
 {
43 43
     Q_OBJECT

+ 1
- 1
amarok/src/loader/Makefile.am View File

@@ -10,7 +10,7 @@ amarok_LDADD = \
10 10
         $(LIB_QT) \
11 11
         $(LIB_TDEUI)
12 12
 
13
-amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
13
+amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
14 14
 
15 15
 METASOURCES = AUTO
16 16
 

+ 1
- 1
amarok/src/mediadevice/daap/Makefile.am View File

@@ -17,7 +17,7 @@ METASOURCES = AUTO
17 17
 libamarok_daap_mediadevice_la_LIBADD  = \
18 18
     $(top_builddir)/amarok/src/libamarok.la \
19 19
     $(top_builddir)/amarok/src/mediadevice/daap/daapreader/libdaapreader.la \
20
-    $(DNSSD_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_QT)
20
+    $(DNSSD_LIBS) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT)
21 21
 
22 22
 libamarok_daap_mediadevice_la_LDFLAGS = \
23 23
     $(KDE_PLUGIN) \

+ 1
- 1
amarok/src/mediadevice/daap/daapreader/Makefile.am View File

@@ -12,7 +12,7 @@ libdaapreader_la_LIBADD = \
12 12
         $(LIB_TDEUI) \
13 13
         $(top_builddir)/amarok/src/mediadevice/daap/daapreader/authentication/libauthentication.la
14 14
 
15
-libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
15
+libdaapreader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
16 16
 
17 17
 METASOURCES = AUTO
18 18
 

+ 1
- 1
amarok/src/mediadevice/daap/daapreader/authentication/Makefile.am View File

@@ -15,7 +15,7 @@ libauthentication_la_LIBADD = \
15 15
         $(LIB_TDECORE) \
16 16
         $(LIB_TDEUI)
17 17
 
18
-libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
18
+libauthentication_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
19 19
 
20 20
 METASOURCES = AUTO
21 21
 

+ 1
- 1
amarok/src/mediadevice/generic/Makefile.am View File

@@ -15,7 +15,7 @@ METASOURCES = AUTO
15 15
 
16 16
 libamarok_generic_mediadevice_la_LIBADD  = \
17 17
     $(top_builddir)/amarok/src/libamarok.la \
18
-    $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_QT)
18
+    $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT)
19 19
 
20 20
 libamarok_generic_mediadevice_la_LDFLAGS = \
21 21
     $(KDE_PLUGIN) \

+ 1
- 1
amarok/src/mediadevice/generic/genericmediadevice.cpp View File

@@ -3,7 +3,7 @@
3 3
  *                       (C) 2005 Jeff Mitchell <kde-dev@emailgoeshere.com> *
4 4
  *                       (C) 2005 Seb Ruiz <me@sebruiz.net>                 *
5 5
  *                                                                          *
6
- * With some code helpers from KIO_VFAT                                     *
6
+ * With some code helpers from TDEIO_VFAT                                     *
7 7
  *                        (c) 2004 Thomas Loeber <vfat@loeber1.de>          *
8 8
  ***************************************************************************/
9 9
 

+ 1
- 1
amarok/src/mediadevice/generic/genericmediadevice.h View File

@@ -3,7 +3,7 @@
3 3
  *                       (C) 2005 Jeff Mitchell <kde-dev@emailgoeshere.com> *
4 4
  *                       (C) 2005 Seb Ruiz <me@sebruiz.net>                 *
5 5
  *                                                                          *
6
- * With some code helpers from KIO_GENERIC                                  *
6
+ * With some code helpers from TDEIO_GENERIC                                  *
7 7
  *                        (c) 2004 Thomas Loeber <vfat@loeber1.de>          *
8 8
  ***************************************************************************/
9 9
 

+ 1
- 1
amarok/src/mediadevice/ifp/Makefile.am View File

@@ -15,7 +15,7 @@ INCLUDES = \
15 15
 libamarok_ifp_mediadevice_la_LIBADD = \
16 16
     $(top_builddir)/amarok/src/libamarok.la \
17 17
     -lusb -lifp \
18
-    $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO) $(LIB_QT)
18
+    $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT)
19 19
 
20 20
 libamarok_ifp_mediadevice_la_LDFLAGS = \
21 21
     $(KDE_PLUGIN) \

+ 1
- 1
amarok/src/mediadevice/ifp/ifpmediadevice.cpp View File

@@ -1,7 +1,7 @@
1 1
 /***************************************************************************
2 2
  * copyright            : (C) 2005-2006 Seb Ruiz <me@sebruiz.net>          *
3 3
  *                                                                         *
4
- * With some code helpers from KIO_IFP                                     *
4
+ * With some code helpers from TDEIO_IFP                                     *
5 5
  *                        (c) 2004 Thomas Loeber <ifp@loeber1.de>          *
6 6
  ***************************************************************************/
7 7
 

+ 1
- 1
amarok/src/mediadevice/ifp/ifpmediadevice.h View File

@@ -1,7 +1,7 @@
1 1
 /***************************************************************************
2 2
  * copyright            : (C) 2005-2006 Seb Ruiz <me@sebruiz.net>          *
3 3
  *                                                                         *
4
- * With some code helpers from KIO_IFP                                     *
4
+ * With some code helpers from TDEIO_IFP                                     *
5 5
  *                        (c) 2004 Thomas Loeber <ifp@loeber1.de>          *
6 6
  ***************************************************************************/
7 7
 

+ 1
- 1
amarok/src/mediadevice/ipod/Makefile.am View File

@@ -16,7 +16,7 @@ INCLUDES = \
16 16
 METASOURCES = AUTO
17 17
 
18 18
 libamarok_ipod_mediadevice_la_LIBADD  = \
19
-    $(top_builddir)/amarok/src/libamarok.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO)
19
+    $(top_builddir)/amarok/src/libamarok.la $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO)
20 20
 
21 21
 libamarok_ipod_mediadevice_la_LDFLAGS = \
22 22
     $(KDE_PLUGIN) \

+ 1
- 1
amarok/src/mediadevice/njb/Makefile.am View File

@@ -16,7 +16,7 @@ METASOURCES = AUTO
16 16
 kde_module_LTLIBRARIES = libamarok_njb-mediadevice.la
17 17
 
18 18
 libamarok_njb_mediadevice_la_LIBADD = $(top_builddir)/amarok/src/libamarok.la \
19
-	$(LIB_TDEUI) $(LIB_TDECORE) -lnjb $(LIB_QT) $(LIB_KIO)
19
+	$(LIB_TDEUI) $(LIB_TDECORE) -lnjb $(LIB_QT) $(LIB_TDEIO)
20 20
 
21 21
 libamarok_njb_mediadevice_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
22 22
 

+ 2
- 2
amarok/src/metabundle.h View File

@@ -179,10 +179,10 @@ public:
179 179
     /** Returns whether the url referred to is a local file */
180 180
     bool isFile() const;
181 181
 
182
-    /** Returns whether the url referred to can be accessed via kio slaves */
182
+    /** Returns whether the url referred to can be accessed via tdeio slaves */
183 183
     bool isKioUrl() const;
184 184
 
185
-    /** Returns whether url can be accessed via kio slaves */
185
+    /** Returns whether url can be accessed via tdeio slaves */
186 186
     static bool isKioUrl( const KURL &url );
187 187
 
188 188
     /** Returns whether composer, disc number and bpm fields are available. */

+ 1
- 1
amarok/src/metabundlesaver.cpp View File

@@ -82,7 +82,7 @@ MetaBundleSaver::prepareToSave()
82 82
                         ".pid-" + pid.setNum( getpid() ) + ".random-" + randomString + '.' + m_bundle->type();
83 83
 
84 84
 
85
-    //The next long step is to copy the file over.  We can't use KIO because it's not thread save,
85
+    //The next long step is to copy the file over.  We can't use TDEIO because it's not thread save,
86 86
     //and std and TQFile only have provisions for renaming and removing, so manual it is
87 87
     //doing it block-by-block results it not needing a huge amount of memory overhead
88 88
 

+ 1
- 1
amarok/src/mountpointmanager.h View File

@@ -107,7 +107,7 @@ public:
107 107
     /**
108 108
      * returns an absolute path which is guaranteed to be playable by amarok's current engine. (based on an
109 109
      * idea by andrewt512: this method would only be called when we actually want to play the file, not when we
110
-     * simply want to show it to the user. It could for example download a file using KIO and return a path to a
110
+     * simply want to show it to the user. It could for example download a file using TDEIO and return a path to a
111 111
      * temporary file. Needs some more thought and is not actually used at the moment.
112 112
      * @param absolutePath
113 113
      * @param relativePath

+ 2
- 2
amarok/src/playlistbrowseritem.cpp View File

@@ -1830,7 +1830,7 @@ PodcastChannel::fetchResult( TDEIO::Job* job ) //SLOT
1830 1830
     if ( job->error() != 0 )
1831 1831
     {
1832 1832
         Amarok::StatusBar::instance()->shortMessage( i18n( "Unable to connect to Podcast server." ) );
1833
-        debug() << "Unable to retrieve podcast information. KIO Error: " << job->error() << endl;
1833
+        debug() << "Unable to retrieve podcast information. TDEIO Error: " << job->error() << endl;
1834 1834
 
1835 1835
         title().isEmpty() ?
1836 1836
             setText( 0, m_url.prettyURL() ) :
@@ -2622,7 +2622,7 @@ void PodcastEpisode::downloadResult( TDEIO::Job * transferJob )
2622 2622
     if( transferJob->error() )
2623 2623
     {
2624 2624
         Amarok::StatusBar::instance()->shortMessage( i18n( "Media download aborted, unable to connect to server." ) );
2625
-        debug() << "Unable to retrieve podcast media. KIO Error: " << transferJob->error() << endl;
2625
+        debug() << "Unable to retrieve podcast media. TDEIO Error: " << transferJob->error() << endl;
2626 2626
 
2627 2627
         m_localUrl = KURL();
2628 2628
         setPixmap( 0, SmallIcon("cancel") );

+ 1
- 1
amarok/src/refreshimages.cpp View File

@@ -107,7 +107,7 @@ RefreshImages::finishedXmlFetch( TDEIO::Job* xmlJob ) //SLOT
107 107
     }
108 108
     debug() << imageUrl << endl;
109 109
     KURL testUrl( imageUrl );
110
-    if( !testUrl.isValid() ) //KIO crashs on empty strings!!!
110
+    if( !testUrl.isValid() ) //TDEIO crashs on empty strings!!!
111 111
     {
112 112
         //Amazon sometimes takes down covers
113 113
         CollectionDB::instance()->removeInvalidAmazonInfo(xmlJob->name());

+ 1
- 1
amarok/src/scripts/graphequalizer/Makefile.am View File

@@ -21,7 +21,7 @@ graphequalizer_LDADD = \
21 21
         $(LIB_TDEUI) \
22 22
         $(LIB_TDECORE)
23 23
 
24
-graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
24
+graphequalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
25 25
 
26 26
 METASOURCES = AUTO
27 27
 

+ 3
- 3
amarok/src/scrobbler.cpp View File

@@ -97,7 +97,7 @@ void Scrobbler::audioScrobblerSimilarArtistsResult( TDEIO::Job* job ) //SLOT
97 97
 
98 98
     if ( job->error() )
99 99
     {
100
-        warning() << "KIO error! errno: " << job->error() << endl;
100
+        warning() << "TDEIO error! errno: " << job->error() << endl;
101 101
         return;
102 102
     }
103 103
 
@@ -669,7 +669,7 @@ void ScrobblerSubmitter::audioScrobblerHandshakeResult( TDEIO::Job* job ) //SLOT
669 669
     m_inProgress = false;
670 670
 
671 671
     if ( job->error() ) {
672
-        warning() << "KIO error! errno: " << job->error() << endl;
672
+        warning() << "TDEIO error! errno: " << job->error() << endl;
673 673
         schedule( true );
674 674
         return;
675 675
     }
@@ -749,7 +749,7 @@ void ScrobblerSubmitter::audioScrobblerSubmitResult( TDEIO::Job* job ) //SLOT
749 749
     m_inProgress = false;
750 750
 
751 751
     if ( job->error() ) {
752
-        warning() << "KIO error! errno: " << job->error() << endl;
752
+        warning() << "TDEIO error! errno: " << job->error() << endl;
753 753
         enqueueJob( job );
754 754
         return;
755 755
     }

+ 1
- 1
doc/amarok/faq.docbook View File

@@ -665,7 +665,7 @@ Tray icon is also a song position indicator.</para>
665 665
 
666 666
 <answer>
667 667
 <para>Insert your CD, then click on "Play Audio CD" in the menu. The File-Browser will come up and show a tree with several folders. For normal ripping, go to the "wav" folder, select some tracks and drag them to the desired destination in a Konqueror window. For automatic encoding, drag files from the "mp3" or "ogg" folder instead.</para>
668
-<note><para>CD-ripping requires the "AudioCD KIO-slave" to be installed. It is part of KDE-Multimedia.</para></note>
668
+<note><para>CD-ripping requires the "AudioCD TDEIO-slave" to be installed. It is part of KDE-Multimedia.</para></note>
669 669
 </answer>
670 670
 </qandaentry>
671 671
 

+ 1
- 1
doc/es/faq.docbook View File

@@ -864,7 +864,7 @@ print "Error al escribir las etiquetas de $ARGV[0]\n" unless $mp3->set_v2tag($v2
864 864
 >Inserte su CD, pulse sobre «Reproducir CD de audio» en el menú. Aparecerá el navegador de archivos y mostrará un árbol con varias carpetas. Para una extracción normal, vaya a la carpeta «wav», seleccione algunas pistas y arrástrelas al destino deseado en una ventana de Konqueror. Para que se realice la codificación de forma automática arrastre los archivos desde las carpetas «mp3» u «ogg».</para>
865 865
 <note
866 866
 ><para
867
->La extracción de audio del CD precisa que esté instalado el «KIO-slave AudioCD». Éste forma parte de KDE-Multimedia.</para
867
+>La extracción de audio del CD precisa que esté instalado el «TDEIO-slave AudioCD». Éste forma parte de KDE-Multimedia.</para
868 868
 ></note>
869 869
 </answer>
870 870
 </qandaentry>

+ 1
- 1
doc/et/faq.docbook View File

@@ -864,7 +864,7 @@ print "Error writing tags of $ARGV[0]\n" unless $mp3->set_v2tag($v2tag,&amp;UTF8
864 864
 >Sisesta CD ja vali menüükäsk "Esita audio CD". Ilmub failisirvija, kus on näha mitu kataloogi. Tavaliseks rippimiseks mine kataloogi "wav", vali mõned palad ja lohista need vajalikku kohta Konquerori aknas. Automaatseks kodeerimiseks lohista faile aga kataloogidest "mp3" või "ogg".</para>
865 865
 <note
866 866
 ><para
867
->CD rippimiseks peab olema paigaldatud "AudioCD KIO-moodul". See kuulub KDE-Multimedia koosseisu.</para
867
+>CD rippimiseks peab olema paigaldatud "AudioCD TDEIO-moodul". See kuulub KDE-Multimedia koosseisu.</para
868 868
 ></note>
869 869
 </answer>
870 870
 </qandaentry>

+ 1
- 1
doc/fr/faq.docbook View File

@@ -928,7 +928,7 @@ print "Erreur a l'écriture des balises de $ARGV[0]\n" unless $mp3->set_v2tag($v
928 928
 >. Le navigateur de fichiers va apparaître et vous montrer plusieurs dossiers. Pour faire une extraction normale, allez dans le dossier « wav », sélectionnez quelques pistes, et déposez-les dans le dossier désiré dans une fenêtre de votre navigateur de fichiers. Pour un encodage automatique, allez plutôt dans le dossier « mp3 » ou « ogg ».</para>
929 929
 <note
930 930
 ><para
931
->Pour extraire des CD audio, il faut que le AudioCD KIO-slave soit installé. Il fait partie de KDE-Multimedia.</para
931
+>Pour extraire des CD audio, il faut que le AudioCD TDEIO-slave soit installé. Il fait partie de KDE-Multimedia.</para
932 932
 ></note>
933 933
 </answer>
934 934
 </qandaentry>

+ 1
- 1
doc/it/faq.docbook View File

@@ -866,7 +866,7 @@ print "Error writing tags of $ARGV[0]\n" unless $mp3->set_v2tag($v2tag,&amp;UTF8
866 866
 >Inserire il CD, poi premere su "Riproduci cd audio" nel menu. Si aprirà il navigatore dei file a mostrare un albero con numerose cartelle. Per estrazioni normali, andare nella cartella "wav", selezionare alcune tracce e trascinarle nella destinazione desiderata in una finestra di Konqueror. Per una codifica automatica, trascinare invece file da cartelle "mp3" o "ogg".</para>
867 867
 <note
868 868
 ><para
869
->L'estrazione da CD richiede che sia installato "CD audio KIO-slave". Fa parte di KDE-Multimedia.</para
869
+>L'estrazione da CD richiede che sia installato "CD audio TDEIO-slave". Fa parte di KDE-Multimedia.</para
870 870
 ></note>
871 871
 </answer>
872 872
 </qandaentry>

+ 1
- 1
doc/nl/using.docbook View File

@@ -781,7 +781,7 @@
781 781
 ></term>
782 782
 <listitem
783 783
 ><para
784
->Hiermee kunt u een audio-cd openen en afspelen via de kio-slave audiocd:/.</para
784
+>Hiermee kunt u een audio-cd openen en afspelen via de tdeio-slave audiocd:/.</para
785 785
 ></listitem>
786 786
 </varlistentry>
787 787
 

+ 1
- 1
doc/pt/faq.docbook View File

@@ -872,7 +872,7 @@ print "Erro ao escrever as marcas em $ARGV[0]\n" unless $mp3->set_v2tag($v2tag,&
872 872
 >Introduza o seu CD e carregue depois em "Tocar o CD de Áudio" do menu. O Navegador de Ficheiros irá aparecer e mostrar uma árvore com várias pastas. Para uma extracção normal, vá à pasta "wav", seleccione algumas faixas e arraste-as para o local de destino, numa janela do Konqueror. Para uma codificação automática, arraste os ficheiros da pasta "mp3" em alternativa.</para>
873 873
 <note
874 874
 ><para
875
->A extracção de áudio dos CDs necessita do "KIO-slave AudioCD" instalado. Este faz parte do KDE-Multimedia.</para
875
+>A extracção de áudio dos CDs necessita do "TDEIO-slave AudioCD" instalado. Este faz parte do KDE-Multimedia.</para
876 876
 ></note>
877 877
 </answer>
878 878
 </qandaentry>

+ 1
- 1
po/ca/amarok.po View File

@@ -13,7 +13,7 @@ msgstr ""
13 13
 "POT-Creation-Date: 2008-07-08 01:26+0200\n"
14 14
 "PO-Revision-Date: 2008-05-12 12:43+0200\n"
15 15
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
16
-"Language-Team: Catalan <tde-i18n-ca@kde.org>\n"
16
+"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
17 17
 "MIME-Version: 1.0\n"
18 18
 "Content-Type: text/plain; charset=UTF-8\n"
19 19
 "Content-Transfer-Encoding: 8bit\n"

+ 1
- 1
po/de/amarok.po View File

@@ -9,7 +9,7 @@ msgstr ""
9 9
 "POT-Creation-Date: 2008-07-08 01:26+0200\n"
10 10
 "PO-Revision-Date: 2008-07-06 16:25+0200\n"
11 11
 "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
12
-"Language-Team: German <tde-i18n-de@kde.org>\n"
12
+"Language-Team: German <kde-i18n-de@kde.org>\n"
13 13
 "MIME-Version: 1.0\n"
14 14
 "Content-Type: text/plain; charset=UTF-8\n"
15 15
 "Content-Transfer-Encoding: 8bit\n"

+ 1
- 1
po/eo/amarok.po View File

@@ -7,7 +7,7 @@ msgstr ""
7 7
 "POT-Creation-Date: 2008-07-08 01:26+0200\n"
8 8
 "PO-Revision-Date: 2007-03-22 00:20+0100\n"
9 9
 "Last-Translator: Stéphane Fillod <f8cfe@free.fr>\n"
10
-"Language-Team: Esperanto <tde-i18n-eo@kde.org>\n"
10
+"Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
11 11
 "MIME-Version: 1.0\n"
12 12
 "Content-Type: text/plain; charset=UTF-8\n"
13 13
 "Content-Transfer-Encoding: 8bit\n"

+ 1
- 1
po/fa/amarok.po View File

@@ -8,7 +8,7 @@ msgstr ""
8 8
 "POT-Creation-Date: 2008-07-08 01:26+0200\n"
9 9
 "PO-Revision-Date: 2007-02-19 09:46+0330\n"
10 10
 "Last-Translator: MaryamSadat Razavi <razavi@itland.ir>\n"
11
-"Language-Team: Persian <tde-i18n-fa@kde.org>\n"
11
+"Language-Team: Persian <kde-i18n-fa@kde.org>\n"
12 12
 "MIME-Version: 1.0\n"
13 13
 "Content-Type: text/plain; charset=UTF-8\n"
14 14
 "Content-Transfer-Encoding: 8bit\n"

+ 1
- 1
po/it/amarok.po View File

@@ -9,7 +9,7 @@ msgstr ""
9 9
 "POT-Creation-Date: 2008-07-08 01:26+0200\n"
10 10
 "PO-Revision-Date: 2008-06-17 00:59+0100\n"
11 11
 "Last-Translator: Vincenzo Reale <smart2128@baslug.org>\n"
12
-"Language-Team: Italian <tde-i18n-it@mail.kde.org>\n"
12
+"Language-Team: Italian <kde-i18n-it@mail.kde.org>\n"
13 13
 "MIME-Version: 1.0\n"
14 14
 "Content-Type: text/plain; charset=UTF-8\n"
15 15
 "Content-Transfer-Encoding: 8bit\n"

+ 1
- 1
po/nds/amarok.po View File

@@ -8,7 +8,7 @@ msgstr ""
8 8
 "POT-Creation-Date: 2008-07-08 01:26+0200\n"
9 9
 "PO-Revision-Date: 2008-05-06 23:40+0200\n"
10 10
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
11
-"Language-Team: Low Saxon <tde-i18n-nds@kde.org>\n"
11
+"Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
12 12
 "MIME-Version: 1.0\n"
13 13
 "Content-Type: text/plain; charset=UTF-8\n"
14 14
 "Content-Transfer-Encoding: 8bit\n"

+ 1
- 1
po/nl/amarok.po View File

@@ -15,7 +15,7 @@ msgstr ""
15 15
 "POT-Creation-Date: 2008-07-08 01:26+0200\n"
16 16
 "PO-Revision-Date: 2008-04-06 01:39+0200\n"
17 17
 "Last-Translator: Bram Schoenmakers <bramschoenmakers@kde.nl>\n"
18
-"Language-Team: Nederlands <tde-i18n-nl@kde.org>\n"
18
+"Language-Team: Nederlands <kde-i18n-nl@kde.org>\n"
19 19
 "MIME-Version: 1.0\n"
20 20
 "Content-Type: text/plain; charset=UTF-8\n"
21 21
 "Content-Transfer-Encoding: 8bit\n"

+ 1
- 1
po/pl/amarok.po View File

@@ -1,6 +1,6 @@
1 1
 # translation of amarok.po to Polish
2 2
 # Cezary Morga <cezarym@pf.pl>, 2004, 2005.
3
-# Michal Rudolf <mrudolf@tdewebdev.org>, 2004, 2005.
3
+# Michal Rudolf <mrudolf@kdewebdev.org>, 2004, 2005.
4 4
 # Krzysztof Lichota <lichota@mimuw.edu.pl>, 2005, 2006, 2007.
5 5
 # Łukasz Derkacz <nikko@ift.uni.wroc.pl>, 2005.
6 6
 # Łukasz Derkacz <nibbana@interia.pl>, 2005, 2006.

+ 1
- 1
po/pt/amarok.po View File

@@ -4,7 +4,7 @@ msgstr ""
4 4
 "POT-Creation-Date: 2008-07-08 01:26+0200\n"
5 5
 "PO-Revision-Date: 2007-11-25 13:18+0000\n"
6 6
 "Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n"
7
-"Language-Team: pt <tde-i18n-pt@kde.org>\n"
7
+"Language-Team: pt <kde-i18n-pt@kde.org>\n"
8 8
 "MIME-Version: 1.0\n"
9 9
 "Content-Type: text/plain; charset=UTF-8\n"
10 10
 "Content-Transfer-Encoding: 8bit\n"

+ 1
- 1
po/pt_BR/amarok.po View File

@@ -17,7 +17,7 @@ msgstr ""
17 17
 "POT-Creation-Date: 2008-07-08 01:26+0200\n"
18 18
 "PO-Revision-Date: 2008-04-05 07:29-0300\n"
19 19
 "Last-Translator: doutor.zero <doutor.zero@gmail.com>\n"
20
-"Language-Team: Português do Brasil <tde-i18n-pt_br@kde.org>\n"
20
+"Language-Team: Português do Brasil <kde-i18n-pt_br@kde.org>\n"
21 21
 "MIME-Version: 1.0\n"
22 22
 "Content-Type: text/plain; charset=UTF-8\n"
23 23
 "Content-Transfer-Encoding: 8bit\n"

+ 1
- 1
po/sr/amarok.po View File

@@ -11,7 +11,7 @@ msgstr ""
11 11
 "POT-Creation-Date: 2008-07-08 01:26+0200\n"
12 12
 "PO-Revision-Date: 2008-06-19 11:52+0200\n"
13 13
 "Last-Translator: Slobodan Simic <simicsl@verat.net>\n"
14
-"Language-Team: Serbian <tde-i18n-sr@kde.org>\n"
14
+"Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
15 15
 "MIME-Version: 1.0\n"
16 16
 "Content-Type: text/plain; charset=UTF-8\n"
17 17
 "Content-Transfer-Encoding: 8bit\n"

Loading…
Cancel
Save