Rename a number of libraries and executables to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 10 years ago
parent c6dbbd9042
commit a50cfb5969
  1. 8
      acinclude.m4
  2. 4
      amarok/src/Options2.ui.h
  3. 2
      amarok/src/amarok.h
  4. 2
      amarok/src/amarokcore/amarokconfig.kcfgc
  5. 2
      amarok/src/analyzers/blockanalyzer.cpp
  6. 4
      amarok/src/app.cpp
  7. 2
      amarok/src/browserbar.cpp
  8. 4
      amarok/src/collectionbrowser.cpp
  9. 6
      amarok/src/collectiondb.cpp
  10. 4
      amarok/src/configdialog.cpp
  11. 2
      amarok/src/configdialog.h
  12. 8
      amarok/src/contextbrowser.cpp
  13. 6
      amarok/src/coverfetcher.cpp
  14. 6
      amarok/src/covermanager.cpp
  15. 6
      amarok/src/database_refactor/collectiondb.cpp
  16. 4
      amarok/src/deletedialog.cpp
  17. 2
      amarok/src/device/massstorage/massstoragedevicehandler.cpp
  18. 2
      amarok/src/device/nfs/nfsdevicehandler.cpp
  19. 2
      amarok/src/device/smb/smbdevicehandler.cpp
  20. 2
      amarok/src/directorylist.cpp
  21. 2
      amarok/src/engine/helix/Makefile.test
  22. 2
      amarok/src/engine/helix/config/helixconfig.kcfgc
  23. 4
      amarok/src/engine/kdemm/kdemmengine.cpp
  24. 4
      amarok/src/engine/mas/masengine.cpp
  25. 2
      amarok/src/engine/nmm/nmm_engine.cpp
  26. 2
      amarok/src/engine/nmm/nmm_kdeconfig.kcfgc
  27. 2
      amarok/src/engine/xine/xinecfg.kcfgc
  28. 10
      amarok/src/enginecontroller.cpp
  29. 2
      amarok/src/filebrowser.cpp
  30. 2
      amarok/src/filebrowser.h
  31. 2
      amarok/src/firstrunwizard.ui.h
  32. 4
      amarok/src/ktrm.cpp
  33. 4
      amarok/src/lastfm.cpp
  34. 2
      amarok/src/lastfm.h
  35. 4
      amarok/src/magnatunebrowser/magnatunealbumdownloader.h
  36. 4
      amarok/src/magnatunebrowser/magnatuneartistinfobox.h
  37. 4
      amarok/src/magnatunebrowser/magnatunebrowser.h
  38. 2
      amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
  39. 4
      amarok/src/magnatunebrowser/magnatunepurchasehandler.h
  40. 4
      amarok/src/mediabrowser.cpp
  41. 2
      amarok/src/mediabrowser.h
  42. 8
      amarok/src/mediadevice/generic/genericmediadevice.cpp
  43. 2
      amarok/src/mediadevice/ifp/CMakeLists.txt
  44. 2
      amarok/src/mediadevice/ifp/ifpmediadevice.cpp
  45. 2
      amarok/src/mediadevice/ipod/ipodmediadevice.h
  46. 2
      amarok/src/mediadevice/njb/njbmediadevice.cpp
  47. 4
      amarok/src/mediadevice/njb/njbmediadevice.h
  48. 2
      amarok/src/medium.cpp
  49. 2
      amarok/src/mediumpluginmanager.cpp
  50. 2
      amarok/src/mediumpluginmanager.h
  51. 10
      amarok/src/metabundle.cpp
  52. 10
      amarok/src/metabundlesaver.cpp
  53. 2
      amarok/src/metadata/tplugins.cpp
  54. 4
      amarok/src/metadata/wavpack/Makefile.am
  55. 2
      amarok/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.cpp
  56. 0
      amarok/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.h
  57. 2
      amarok/src/mountpointmanager.h
  58. 2
      amarok/src/multitabbar.cpp
  59. 2
      amarok/src/mydirlister.h
  60. 2
      amarok/src/playlist.cpp
  61. 4
      amarok/src/playlistbrowser.cpp
  62. 4
      amarok/src/playlistbrowseritem.cpp
  63. 2
      amarok/src/playlistbrowseritem.h
  64. 2
      amarok/src/playlistitem.cpp
  65. 2
      amarok/src/playlistloader.cpp
  66. 2
      amarok/src/playlistwindow.cpp
  67. 2
      amarok/src/prettypopupmenu.cpp
  68. 6
      amarok/src/refreshimages.cpp
  69. 4
      amarok/src/scriptmanager.cpp
  70. 4
      amarok/src/scrobbler.cpp
  71. 2
      amarok/src/statusbar/statusBarBase.cpp
  72. 2
      amarok/src/tagguesser.cpp
  73. 2
      amarok/src/transferdialog.cpp
  74. 2
      doc/da/config.docbook
  75. 2
      doc/nl/faq.docbook
  76. 2
      doc/sv/config.docbook
  77. 4
      po/af/amarok.po
  78. 2
      po/ar/amarok.po
  79. 2
      po/az/amarok.po
  80. 2
      po/be/amarok.po
  81. 4
      po/bg/amarok.po
  82. 2
      po/bn/amarok.po
  83. 2
      po/br/amarok.po
  84. 4
      po/ca/amarok.po
  85. 4
      po/cs/amarok.po
  86. 2
      po/cy/amarok.po
  87. 10
      po/da/amarok.po
  88. 4
      po/de/amarok.po
  89. 4
      po/el/amarok.po
  90. 4
      po/en_GB/amarok.po
  91. 2
      po/eo/amarok.po
  92. 4
      po/es/amarok.po
  93. 4
      po/et/amarok.po
  94. 4
      po/eu/amarok.po
  95. 4
      po/fa/amarok.po
  96. 4
      po/fi/amarok.po
  97. 4
      po/fr/amarok.po
  98. 2
      po/ga/amarok.po
  99. 4
      po/gl/amarok.po
  100. 4
      po/he/amarok.po
  101. 2
      po/hi/amarok.po
  102. 4
      po/hu/amarok.po
  103. 2
      po/id/amarok.po
  104. 4
      po/is/amarok.po
  105. 4
      po/it/amarok.po
  106. 4
      po/ja/amarok.po
  107. 2
      po/ka/amarok.po
  108. 4
      po/km/amarok.po
  109. 4
      po/ko/amarok.po
  110. 2
      po/ku/amarok.po
  111. 4
      po/lo/amarok.po
  112. 4
      po/lt/amarok.po
  113. 4
      po/mk/amarok.po
  114. 2
      po/ms/amarok.po
  115. 12
      po/nb/amarok.po
  116. 4
      po/nds/amarok.po
  117. 4
      po/ne/amarok.po
  118. 4
      po/nl/amarok.po
  119. 10
      po/nn/amarok.po
  120. 4
      po/pa/amarok.po
  121. 4
      po/pl/amarok.po
  122. 6
      po/pt/amarok.po
  123. 4
      po/pt_BR/amarok.po
  124. 2
      po/ro/amarok.po
  125. 4
      po/ru/amarok.po
  126. 2
      po/rw/amarok.po
  127. 4
      po/se/amarok.po
  128. 4
      po/sk/amarok.po
  129. 4
      po/sl/amarok.po
  130. 2
      po/sq/amarok.po
  131. 4
      po/sr/amarok.po
  132. 4
      po/sr@Latn/amarok.po
  133. 4
      po/ss/amarok.po
  134. 10
      po/sv/amarok.po
  135. 2
      po/ta/amarok.po
  136. 4
      po/tg/amarok.po
  137. 4
      po/th/amarok.po
  138. 4
      po/tr/amarok.po
  139. 4
      po/uk/amarok.po
  140. 2
      po/uz/amarok.po
  141. 2
      po/uz@cyrillic/amarok.po
  142. 4
      po/zh_CN/amarok.po
  143. 4
      po/zh_TW/amarok.po

@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
if test -n "$trinity2ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
if test -n "$trinity3ornewer"; then
@ -1812,7 +1812,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la"
else
kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la"
kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
@ -2118,7 +2118,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2128,7 +2128,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])

@ -16,7 +16,7 @@
#include "contextbrowser.h"
#include <kapplication.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <knewstuff/downloaddialog.h> // knewstuff theme fetching
#include <knewstuff/engine.h> // "
@ -24,7 +24,7 @@
#include <knewstuff/provider.h> // "
#include <kstandarddirs.h>
#include <ktar.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <tqdir.h>
#include <tqfileinfo.h>

@ -8,7 +8,7 @@
#include <kurl.h> // recursiveUrlExpand
#include <kprocio.h> //Amarok::ProcIO
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <tdeversion.h>
#include "amarok_export.h"

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler
# Code generation options for tdeconfig_compiler
File=amarok.kcfg
ClassName=AmarokConfig
Singleton=true

@ -13,7 +13,7 @@
#include <cmath>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kglobalsettings.h> //paletteChange()
#include <kiconloader.h> //mousePressEvent
#include <klocale.h> //mousePressEvent

@ -51,7 +51,7 @@ email : markey@web.de
#include <iostream>
#include <kconfigdialogmanager.h>
#include <tdeconfigdialogmanager.h>
#include <kcombobox.h> //firstRunWizard()
#include <kcmdlineargs.h> //initCliArgs()
#include <kcursor.h> //Amarok::OverrideCursor
@ -66,7 +66,7 @@ email : markey@web.de
#include <kstandarddirs.h>
#include <kurldrag.h> //genericEventHandler()
#include <kaboutdata.h>
#include <kio/job.h>
#include <tdeio/job.h>
#include <tqevent.h> //genericEventHandler()
#include <tqeventloop.h> //applySettings()

@ -16,7 +16,7 @@
#include "multitabbar.h" //m_tabBar
#include <kapplication.h> //kapp
#include <kconfig.h>
#include <tdeconfig.h>
#include <kiconloader.h> //multiTabBar icons
#include <klocale.h>

@ -54,7 +54,7 @@
#include <kactioncollection.h>
#include <kapplication.h> //kapp
#include <kconfig.h>
#include <tdeconfig.h>
#include <kcombobox.h>
#include <kcursor.h>
#include <kdialogbase.h>
@ -65,7 +65,7 @@
#include <kpopupmenu.h>
#include <ktoolbarbutton.h> //ctor
#include <kurldrag.h> //dragObject()
#include <kio/job.h>
#include <tdeio/job.h>
#include <kpushbutton.h>
extern "C"

@ -52,7 +52,7 @@
#include <kcharsets.h> //setHTMLLyrics()
#include <kcombobox.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdialogbase.h> //checkDatabase()
#include <kglobal.h>
#include <kinputdialog.h> //setupCoverFetcher()
@ -62,8 +62,8 @@
#include <kmessagebox.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <kio/job.h>
#include <kio/netaccess.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
#include <cmath> //DbConnection::sqlite_power()
#include <ctime> //query()

@ -62,7 +62,7 @@ email : markey@web.de
namespace Amarok {
int databaseTypeCode( const TQString type )
{
// can't use kconfigxt for the database comboxbox since we need the DBConnection id and not the index
// can't use tdeconfigxt for the database comboxbox since we need the DBConnection id and not the index
int dbType = DbConnection::sqlite;
if ( type == "MySQL")
dbType = DbConnection::mysql;
@ -283,7 +283,7 @@ void AmarokConfigDialog::updateSettings()
}
if ( m_opt2->styleComboBox->currentText() != AmarokConfig::contextBrowserStyleSheet() ) {
//can't use kconfigxt for the style comboxbox's since we need the string, not the index
//can't use tdeconfigxt for the style comboxbox's since we need the string, not the index
AmarokConfig::setContextBrowserStyleSheet( m_opt2->styleComboBox->currentText() );
ContextBrowser::instance()->reloadStyleSheet();
}

@ -19,7 +19,7 @@ email : markey@web.de
#include <tqmap.h>
#include <tqvaluelist.h>
#include <kconfigdialog.h>
#include <tdeconfigdialog.h>
class TQComboBox;
class TQGroupBox;

@ -55,13 +55,13 @@
#include <kaction.h>
#include <kapplication.h> //kapp
#include <kcalendarsystem.h> // for Amarok::verboseTimeSince()
#include <kconfig.h> // suggested/related/favorite box visibility
#include <tdeconfig.h> // suggested/related/favorite box visibility
#include <kdialog.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <kmdcodec.h> // for data: URLs
#include <kmessagebox.h>
#include <kpopupmenu.h>

@ -23,9 +23,9 @@
#include <kcursor.h> //waiting cursor
#include <kdialog.h>
#include <kiconloader.h>
#include <kfiledialog.h>
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <tdefiledialog.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <klineedit.h>
#include <klocale.h>
#include <kmessagebox.h>

@ -35,15 +35,15 @@
#include <tqvbox.h>
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kcursor.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <klistview.h>
#include <klocale.h>
#include <kmessagebox.h> //showCoverMenu()
#include <tdemultipledrag.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <kpopupmenu.h> //showCoverMenu()
#include <kprogress.h>
#include <kpushbutton.h>

@ -29,16 +29,16 @@
#include <tqtimer.h>
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <kinputdialog.h> //setupCoverFetcher()
#include <kio/job.h>
#include <tdeio/job.h>
#include <klineedit.h> //setupCoverFetcher()
#include <klocale.h>
#include <kmdcodec.h>
#include <kstandarddirs.h>
#include <kurl.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <cmath> //DbConnection::sqlite_power()
#include <ctime> //query()

@ -13,12 +13,12 @@
* *
***************************************************************************/
#include <kconfig.h>
#include <tdeconfig.h>
#include <tdeversion.h>
#include <kdialogbase.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <kio/job.h>
#include <tdeio/job.h>
#include <klocale.h>
#include <kstdguiitem.h>
#include <kurl.h>

@ -24,7 +24,7 @@ AMAROK_EXPORT_PLUGIN( MassStorageDeviceHandlerFactory )
#include "collectiondb.h"
#include "debug.h"
#include <kconfig.h>
#include <tdeconfig.h>
#include <kurl.h>
#include <tqvaluelist.h>

@ -21,7 +21,7 @@ AMAROK_EXPORT_PLUGIN( NfsDeviceHandlerFactory )
#include "debug.h"
#include <kconfig.h>
#include <tdeconfig.h>
#include <kurl.h>
#include <tqvaluelist.h>

@ -21,7 +21,7 @@ AMAROK_EXPORT_PLUGIN( SmbDeviceHandlerFactory )
#include "debug.h"
#include <kconfig.h>
#include <tdeconfig.h>
#include <kurl.h>
#include <tqvaluelist.h>

@ -20,7 +20,7 @@
#include "directorylist.h"
#include "mountpointmanager.h"
#include <kfileitem.h>
#include <tdefileitem.h>
#include <klocale.h>
#include <tqfile.h>

@ -61,7 +61,7 @@ install:
install -p -C -m 755 $(SLIBRARY) /usr/lib/trinity/$(SLIBRARY)
install -p -C -m 755 $(SLIBRARY:.so=.la) /usr/lib/trinity/$(SLIBRARY:.so=.la)
install -p -C -m 644 amarok_helixengine_plugin.desktop /usr/share/services/amarok_helixengine_plugin.desktop
# kbuildsycoca
# tdebuildsycoca
uninstall:
rm -f /usr/lib/trinity/$(SLIBRARY:.so=.la)

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler
# Code generation options for tdeconfig_compiler
File=helixconfig.kcfg
ClassName=HelixConfig
Singleton=true

@ -33,9 +33,9 @@ what : interface to the KDE Multimedia interface (KDEMM)
#include <tqtimer.h>
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kfileitem.h>
#include <tdefileitem.h>
#include <kgenericfactory.h>
#include <klocale.h>
#include <kmessagebox.h>

@ -31,8 +31,8 @@ what : interface to the Media Application Server (MAS)
#include <tqfile.h>
#include <kapplication.h>
#include <kconfig.h>
#include <kfileitem.h>
#include <tdeconfig.h>
#include <tdefileitem.h>
#include <kgenericfactory.h>
#include <klocale.h>
#include <kmessagebox.h>

@ -49,7 +49,7 @@
#include <tqapplication.h>
#include <tqtimer.h>
#include <kfileitem.h>
#include <tdefileitem.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kmimetype.h>

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler
# Code generation options for tdeconfig_compiler
File=nmm_kdeconfig.kcfg
ClassName=NmmKDEConfig
Singleton=true

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler
# Code generation options for tdeconfig_compiler
File=xinecfg.kcfg
ClassName=XineCfg
Singleton=true

@ -30,9 +30,9 @@
#include <tqtimer.h>
#include <kapplication.h>
#include <kfileitem.h>
#include <kio/global.h>
#include <kio/job.h>
#include <tdefileitem.h>
#include <tdeio/global.h>
#include <tdeio/job.h>
#include <kmessagebox.h>
#include <krun.h>
@ -187,7 +187,7 @@ EngineController::loadEngine( const TQString &engineName )
}
}
KRun::runCommand( "kbuildsycoca" );
KRun::runCommand( "tdebuildsycoca" );
KMessageBox::error( 0, i18n(
"<p>Amarok could not find any sound-engine plugins. "
@ -197,7 +197,7 @@ EngineController::loadEngine( const TQString &engineName )
"$ cd /path/to/amarok/source-code/<br>"
"$ su -c \"make uninstall\"<br>"
"$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\"<br>"
"$ kbuildsycoca<br>"
"$ tdebuildsycoca<br>"
"$ amarok</pre>"
"More information can be found in the README file. For further assistance join us at #amarok on irc.freenode.net.</p>" ) );

@ -33,7 +33,7 @@
#include "kbookmarkhandler.h"
#include <kdiroperator.h>
#include <kiconloader.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <klistview.h>
#include <klocale.h>
#include <kpopupmenu.h>

@ -88,7 +88,7 @@ private:
#include <kfileitem.h> //KFileItemList
#include <tdefileitem.h> //KFileItemList
#include <tqregexp.h>
class KDirLister;

@ -15,7 +15,7 @@
#include "directorylist.h"
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <tqpushbutton.h>

@ -26,8 +26,8 @@
#include "ktrm.h"
#include <kapplication.h>
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <kprotocolmanager.h>
#include <kurl.h>
#include <kresolver.h>

@ -34,8 +34,8 @@
#include <klineedit.h>
#include <kmdcodec.h> //md5sum
#include <kmessagebox.h>
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <kprotocolmanager.h>
#include <kshortcut.h>
#include <kurl.h>

@ -25,7 +25,7 @@
#include <tqurl.h>
#include <tqvaluelist.h>
#include <kconfigdialog.h>
#include <tdeconfigdialog.h>
class KLineEdit;
class KAction;

@ -22,8 +22,8 @@
#include "magnatunedownloadinfo.h"
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <tqobject.h>

@ -25,8 +25,8 @@
#include "statusbar.h"
#include <tdehtml_part.h>
#include <kio/jobclasses.h>
#include <kio/job.h>
#include <tdeio/jobclasses.h>
#include <tdeio/job.h>
/**
A specialized KHTMLPart for displaying html info about a Magnatune artist or album

@ -30,8 +30,8 @@
#include "magnatuneredownloadhandler.h"
#include "magnatunexmlparser.h"
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>

@ -21,7 +21,7 @@ Boston, MA 02110-1301, USA.
#include "debug.h"
#include "magnatunedownloaddialog.h"
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kurlrequester.h>
#include <tqcheckbox.h>

@ -21,8 +21,8 @@
#define MAGNATUNEPURCHASEHANDLER_H
#include <tqobject.h>
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include "magnatunealbumdownloader.h"
#include "magnatunedownloaddialog.h"

@ -60,11 +60,11 @@
#include <kapplication.h> //kapp
#include <kcombobox.h>
#include <kdirlister.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <kinputdialog.h>
#include <kio/job.h>
#include <tdeio/job.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <tdemultipledrag.h>

@ -21,7 +21,7 @@
#include <klistview.h> //baseclass
#include <kurl.h> //stack allocated
#include <kio/global.h> //filesize_t
#include <tdeio/global.h> //filesize_t
#include "scrobbler.h" //SubmitItem
#include "metabundle.h"

@ -37,12 +37,12 @@ AMAROK_EXPORT_PLUGIN( GenericMediaDevice )
#include "genericmediadeviceconfigdialog.h"
#include <kapplication.h>
#include <kconfig.h> //download saveLocation
#include <tdeconfig.h> //download saveLocation
#include <kdiskfreesp.h>
#include <kiconloader.h> //smallIcon
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <kio/netaccess.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <tdeio/netaccess.h>
#include <kmessagebox.h>
#include <kmountpoint.h>
#include <kpopupmenu.h>

@ -35,6 +35,6 @@ install( FILES
tde_add_kpart( libamarok_ifp-mediadevice AUTOMOC
SOURCES ifpmediadevice.cpp
LINK amarok-shared kio-shared ${IFP_LIBRARY} ${USB_LIBRARIES}
LINK amarok-shared tdeio-shared ${IFP_LIBRARY} ${USB_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR}
)

@ -34,7 +34,7 @@ AMAROK_EXPORT_PLUGIN( IfpMediaDevice )
#include "transferdialog.h"
#include <kapplication.h>
#include <kconfig.h> //download saveLocation
#include <tdeconfig.h> //download saveLocation
#include <kiconloader.h> //smallIcon
#include <kmessagebox.h>
#include <kpopupmenu.h>

@ -36,7 +36,7 @@ extern "C" {
#include <tqptrlist.h>
#include <tqdict.h>
#include <kio/job.h>
#include <tdeio/job.h>
class TQCheckBox;
class TQLabel;

@ -39,7 +39,7 @@ AMAROK_EXPORT_PLUGIN( NjbMediaDevice )
// KDE
#include <kapplication.h>
#include <kdebug.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kiconloader.h> //smallIcon
#include <kinstance.h>
#include <klocale.h>

@ -41,8 +41,8 @@
// kde
#include <kurl.h>
#include <kio/global.h>
#include <kio/slavebase.h>
#include <tdeio/global.h>
#include <tdeio/slavebase.h>
/**
This class is used to manipulate Nomad Creative Jukebox and others media player that works with the njb libraries.

@ -19,7 +19,7 @@
#include "debug.h"
#include "medium.h"
#include <kconfig.h>
#include <tdeconfig.h>
#include <klocale.h>
const TQString Medium::SEPARATOR = "---";

@ -33,7 +33,7 @@
#include <kapplication.h>
#include <kactivelabel.h>
#include <kcombobox.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <klineedit.h>
#include <klocale.h>

@ -20,7 +20,7 @@
#include <tqmap.h>
#include <tqhbox.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdialogbase.h>
#include <klocale.h>

@ -22,11 +22,11 @@
#include "collectiondb.h"
#include "metabundlesaver.h"
#include <kapplication.h>
#include <kfilemetainfo.h>
#include <kio/global.h>
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <kio/netaccess.h>
#include <tdefilemetainfo.h>
#include <tdeio/global.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <tdeio/netaccess.h>
#include <kmdcodec.h>
#include <tqdeepcopy.h>
#include <tqfile.h> //decodePath()

@ -20,11 +20,11 @@
#include "metabundlesaver.h"
#include "scancontroller.h"
#include <kapplication.h>
#include <kfilemetainfo.h>
#include <kio/global.h>
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <kio/netaccess.h>
#include <tdefilemetainfo.h>
#include <tdeio/global.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <tdeio/netaccess.h>
#include <kmdcodec.h>
#include <kurl.h>
#include <tqfile.h> //decodePath()

@ -39,7 +39,7 @@
#ifndef TAGLIB_15
#include "trueaudio/taglib_trueaudiofiletyperesolver.h"
#include "trueaudio/ttafile.h"
#include "wavpack/taglib_wavpackfiletyperesolver.h"
#include "wavpack/taglib_wavpactdefiletyperesolver.h"
#include "wavpack/wvfile.h"
#include "speex/taglib_speexfiletyperesolver.h"
#include "speex/speexfile.h"

@ -8,9 +8,9 @@ noinst_LTLIBRARIES = libtagwavpack.la
libtagwavpack_la_SOURCES = \
wvfile.cpp \
wvproperties.cpp \
taglib_wavpackfiletyperesolver.cpp
taglib_wavpactdefiletyperesolver.cpp
noinst_HEADERS = wvfile.h \
wvproperties.h \
taglib_wavpackfiletyperesolver.h
taglib_wavpactdefiletyperesolver.h

@ -19,7 +19,7 @@
* MA 02110-1301 USA *
***************************************************************************/
#include "taglib_wavpackfiletyperesolver.h"
#include "taglib_wavpactdefiletyperesolver.h"
#include "wvfile.h"
#include <string.h>

@ -26,7 +26,7 @@
#include "pluginmanager.h"
#include "threadmanager.h"
#include <kconfig.h>
#include <tdeconfig.h>
#include <kurl.h>
#include <tqmap.h>

@ -40,7 +40,7 @@
#include <tqtimer.h>
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kiconeffect.h>
#include <kiconloader.h>

@ -8,7 +8,7 @@
#include "playlistloader.h"
#include <kdirlister.h>
#include <kfileitem.h>
#include <tdefileitem.h>
class MyDirLister : public KDirLister {
public:

@ -71,7 +71,7 @@
#include <kglobalsettings.h> //rename()
#include <kiconeffect.h>
#include <kiconloader.h> //slotShowContextMenu()
#include <kio/job.h> //deleteSelectedFiles()
#include <tdeio/job.h> //deleteSelectedFiles()
#include <klineedit.h> //setCurrentTrack()
#include <klocale.h>
#include <kmessagebox.h>

@ -45,8 +45,8 @@
#include <kactionclasses.h>
#include <kactioncollection.h>
#include <kapplication.h>
#include <kfiledialog.h> //openPlaylist()
#include <kio/job.h> //deleteSelectedPlaylists()
#include <tdefiledialog.h> //openPlaylist()
#include <tdeio/job.h> //deleteSelectedPlaylists()
#include <kiconloader.h> //smallIcon
#include <kinputdialog.h>
#include <klineedit.h> //rename()

@ -40,8 +40,8 @@
#include <kapplication.h> //Used for Shoutcast random name generation
#include <tdeversion.h> //TDE_VERSION ifndefs. Remove this once we reach a kde 4 dep
#include <kiconloader.h> //smallIcon
#include <kio/jobclasses.h> //podcast retrieval
#include <kio/job.h> //podcast retrieval
#include <tdeio/jobclasses.h> //podcast retrieval
#include <tdeio/job.h> //podcast retrieval
#include <klocale.h>
#include <kmessagebox.h> //podcast info box
#include <kmimetype.h>

@ -15,7 +15,7 @@
#include "podcastsettings.h"
#include <kdialogbase.h> // StreamEditor baseclass
#include <kio/job.h>
#include <tdeio/job.h>
#include <klineedit.h>
#include <klistview.h>
#include <kurl.h>

@ -39,7 +39,7 @@
#include <tqrect.h>
#include <tdeversion.h>
#include <kfilemetainfo.h>
#include <tdefilemetainfo.h>
#include <kglobal.h>
#include <kiconeffect.h>
#include <kstandarddirs.h>

@ -970,7 +970,7 @@ PlaylistFile::loadSMIL( TQTextStream &stream )
/// @class RemotePlaylistFetcher
#include <ktempfile.h>
#include <kio/job.h>
#include <tdeio/job.h>
#include <klocale.h>
RemotePlaylistFetcher::RemotePlaylistFetcher( const KURL &source, TQListViewItem *after, int options )

@ -57,7 +57,7 @@
#include <kaction.h> //m_actionCollection
#include <kapplication.h> //kapp
#include <kfiledialog.h> //savePlaylist(), openPlaylist()
#include <tdefiledialog.h> //savePlaylist(), openPlaylist()
#include <kglobal.h>
#include <tdehtml_part.h> //Welcome Tab
#include <kiconloader.h> //ClearFilter button

@ -25,7 +25,7 @@
#include <tqstyle.h>
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kiconeffect.h>
#include <kstandarddirs.h>

@ -17,9 +17,9 @@
#include <tqvaluelist.h>
#include <tqvariant.h>
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <kio/scheduler.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <tdeio/scheduler.h>
#include <klocale.h>

@ -45,9 +45,9 @@
#include <kaboutdialog.h>
#include <kapplication.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <klistview.h>
#include <klocale.h>
#include <kmessagebox.h>

@ -24,8 +24,8 @@
#include <tqdeepcopy.h>
#include <kapplication.h>
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <klocale.h>
#include <kmdcodec.h>
#include <kstandarddirs.h>

@ -27,7 +27,7 @@
#include "threadmanager.h"
#include "enginecontroller.h"
#include <kio/job.h>
#include <tdeio/job.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kstdguiitem.h>

@ -15,7 +15,7 @@
#include "tagguesser.h"
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <kmacroexpander.h>

@ -22,7 +22,7 @@
#include <kapplication.h>
#include <kcombobox.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <klineedit.h>
#include <klocale.h>
#include <kpushbutton.h>

@ -459,7 +459,7 @@
<para
><guilabel
>Overvåg mappe for ændringer</guilabel
>: Tillader &amarok; at overvåge de markerede mapper for at finde ændringer i filsystemet (for eksempel tilføjede eller fjernede musikfiler). En partiel søgning udføres også for at udføre de nødvendige ændringer i din samling.</para>
>: Tillader &amarok; at overvåge de markerede mapper for at finde ændringer i filsystemet (for eksempel tilføjede eller fjernede musitdefiler). En partiel søgning udføres også for at udføre de nødvendige ændringer i din samling.</para>
<para
><guilabel
>Importér spillelister</guilabel

@ -892,7 +892,7 @@ print "Error writing tags of $ARGV[0]\n" unless $mp3->set_v2tag($v2tag,&amp;UTF8
>Plaats uw cd, en klik op de menuoptie "Audio-cd afspelen". De bestandsbrowser wordt dan geopend en toont een boomstructuur met meerdere mappen. Voor gewoon rippen, open de map "wav", selecteer enkele tracks en sleep ze naar de gewenste locatie in een Konqueror-venster. Voor automatische codering, sleep de bestanden uit de map "mp3" of "ogg".</para>
<note
><para
>Voor het rippen van cd's is de kioslave "audiocd" nodig. Deze is onderdeel van KDE-Multimedia.</para
>Voor het rippen van cd's is de tdeioslave "audiocd" nodig. Deze is onderdeel van KDE-Multimedia.</para
></note>
</answer>
</qandaentry>

@ -459,7 +459,7 @@
<para
><guilabel
>Bevaka katalog efter ändringar</guilabel
>: Låter &amarok; bevaka markerade kataloger för att hitta ändringar i filsystemet (till exempel tillagda eller borttagna musikfiler). En partiell sökning utförs också för att göra nödvändiga ändringar i din samling.</para>
>: Låter &amarok; bevaka markerade kataloger för att hitta ändringar i filsystemet (till exempel tillagda eller borttagna musitdefiler). En partiell sökning utförs också för att göra nödvändiga ändringar i din samling.</para>
<para
><guilabel
>Importera spellistor</guilabel

@ -1009,7 +1009,7 @@ msgid ""
"<pre>$ cd /path/to/amarok/source-code/"
"<br>$ su -c \"make uninstall\""
"<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
"<br>$ kbuildsycoca"
"<br>$ tdebuildsycoca"
"<br>$ amarok</pre>More information can be found in the README file. For further "
"assistance join us at #amarok on irc.freenode.net.</p>"
msgstr ""
@ -1022,7 +1022,7 @@ msgstr ""
"<pre>$ cd /path/to/amarok/source-code/"
"<br>$ su -c \"make uninstall\""
"<br>$./configure --prefix=`tde-config --prefix` && su -c \"make install\"br>"
"$kbuildsycoca"
"$tdebuildsycoca"
"<br>$amaroK</pre>Verdere inligting kan in die README lêer gevind word. Vir meer "
"bystand kan jy m.b.v. IRC by kamer #amarok op irc.freenode.net inskakel.</p>"

@ -941,7 +941,7 @@ msgid ""
"<pre>$ cd /path/to/amarok/source-code/"
"<br>$ su -c \"make uninstall\""
"<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\""
"<br>$ kbuildsycoca"
"<br>$ tdebuildsycoca"
"<br>$ amarok</pre>More information can be found in the README file. For further "
"assistance join us at #amarok on irc.freenode.net.</p>"
msgstr ""