TDE
/
amarok
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/amarok
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent c6dbbd9042
commit a50cfb5969
143 changed files with 255 additions and 255 deletions
Show Stats Download Patch File Download Diff File

8
acinclude.m4
Unescape View File

@ -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
])

4
amarok/src/Options2.ui.h
Unescape View File

@ -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>

2
amarok/src/amarok.h
Unescape View File

@ -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"

2
amarok/src/amarokcore/amarokconfig.kcfgc
Unescape View File

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

2
amarok/src/analyzers/blockanalyzer.cpp
Unescape View File

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

4
amarok/src/app.cpp
Unescape View File

@ -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()

2
amarok/src/browserbar.cpp
Unescape View File

@ -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>

4
amarok/src/collectionbrowser.cpp
Unescape View File

@ -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"

6
amarok/src/collectiondb.cpp
Unescape View File

@ -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()

4
amarok/src/configdialog.cpp
Unescape View File

@ -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();
}

2
amarok/src/configdialog.h
Unescape View File

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

8
amarok/src/contextbrowser.cpp
Unescape View File

@ -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>

6
amarok/src/coverfetcher.cpp
Unescape View File

@ -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>

6
amarok/src/covermanager.cpp
Unescape View File

@ -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>

6
amarok/src/database_refactor/collectiondb.cpp
Unescape View File

@ -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()

4
amarok/src/deletedialog.cpp
Unescape View File

@ -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>

2
amarok/src/device/massstorage/massstoragedevicehandler.cpp
Unescape View File

@ -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>

2
amarok/src/device/nfs/nfsdevicehandler.cpp
Unescape View File

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

2
amarok/src/device/smb/smbdevicehandler.cpp
Unescape View File

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

2
amarok/src/directorylist.cpp
Unescape View File

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

2
amarok/src/engine/helix/Makefile.test
Unescape View File

@ -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)

2
amarok/src/engine/helix/config/helixconfig.kcfgc
Unescape View File

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

4
amarok/src/engine/kdemm/kdemmengine.cpp
Unescape View File

@ -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>

4
amarok/src/engine/mas/masengine.cpp
Unescape View File

@ -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>

2
amarok/src/engine/nmm/nmm_engine.cpp
Unescape View File

@ -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>

2
amarok/src/engine/nmm/nmm_kdeconfig.kcfgc
Unescape View File

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

2
amarok/src/engine/xine/xinecfg.kcfgc
Unescape View File

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

10
amarok/src/enginecontroller.cpp
Unescape View File

@ -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>" ) );

2
amarok/src/filebrowser.cpp
Unescape View File

@ -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>

2
amarok/src/filebrowser.h
Unescape View File

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

2
amarok/src/firstrunwizard.ui.h
Unescape View File

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

4
amarok/src/ktrm.cpp
Unescape View File

@ -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>

4
amarok/src/lastfm.cpp
Unescape View File

@ -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>

2
amarok/src/lastfm.h
Unescape View File

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

4
amarok/src/magnatunebrowser/magnatunealbumdownloader.h
Unescape View File

@ -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>

4
amarok/src/magnatunebrowser/magnatuneartistinfobox.h
Unescape View File

@ -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

4
amarok/src/magnatunebrowser/magnatunebrowser.h
Unescape View File

@ -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>

2
amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
Unescape View File

@ -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>

4
amarok/src/magnatunebrowser/magnatunepurchasehandler.h
Unescape View File

@ -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"

4
amarok/src/mediabrowser.cpp
Unescape View File

@ -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>

2
amarok/src/mediabrowser.h
Unescape View File

@ -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"

8
amarok/src/mediadevice/generic/genericmediadevice.cpp
Unescape View File

@ -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>

2
amarok/src/mediadevice/ifp/CMakeLists.txt
Unescape View File

@ -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}
)

2
amarok/src/mediadevice/ifp/ifpmediadevice.cpp
Unescape View File

@ -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>

2
amarok/src/mediadevice/ipod/ipodmediadevice.h
Unescape View File

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

2
amarok/src/mediadevice/njb/njbmediadevice.cpp
Unescape View File

@ -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>

4
amarok/src/mediadevice/njb/njbmediadevice.h
Unescape View File

@ -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.

2
amarok/src/medium.cpp
Unescape View File

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

2
amarok/src/mediumpluginmanager.cpp
Unescape View File

@ -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>

2
amarok/src/mediumpluginmanager.h
Unescape View File

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

10
amarok/src/metabundle.cpp
Unescape View File

@ -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()

10
amarok/src/metabundlesaver.cpp
Unescape View File

@ -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()

2
amarok/src/metadata/tplugins.cpp
Unescape View File

@ -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"

4
amarok/src/metadata/wavpack/Makefile.am
Unescape View File

@ -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

2
amarok/src/metadata/wavpack/taglib_wavpackfiletyperesolver.cpp → amarok/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.cpp
Unescape View File

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

0
amarok/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h → amarok/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.h
Unescape View File

2
amarok/src/mountpointmanager.h
Unescape View File

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

2
amarok/src/multitabbar.cpp
Unescape View File

@ -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>

2
amarok/src/mydirlister.h
Unescape View File

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

2
amarok/src/playlist.cpp
Unescape View File

@ -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>

4
amarok/src/playlistbrowser.cpp
Unescape View File

@ -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()

4
amarok/src/playlistbrowseritem.cpp
Unescape View File

@ -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>

2
amarok/src/playlistbrowseritem.h
Unescape View File

@ -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>

2
amarok/src/playlistitem.cpp
Unescape View File

@ -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>

2
amarok/src/playlistloader.cpp
Unescape View File

@ -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 )

2
amarok/src/playlistwindow.cpp
Unescape View File

@ -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

2
amarok/src/prettypopupmenu.cpp
Unescape View File

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

6
amarok/src/refreshimages.cpp
Unescape View File

@ -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>

4
amarok/src/scriptmanager.cpp
Unescape View File

@ -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>

4
amarok/src/scrobbler.cpp
Unescape View File

@ -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>

2
amarok/src/statusbar/statusBarBase.cpp
Unescape View File

@ -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>

2
amarok/src/tagguesser.cpp
Unescape View File

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

2
amarok/src/transferdialog.cpp
Unescape View File

@ -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>

2
doc/da/config.docbook
Unescape View File

@ -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

2
doc/nl/faq.docbook
Unescape View File

@ -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>

2
doc/sv/config.docbook
Unescape View File

@ -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

4
po/af/amarok.po
Unescape View File

@ -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>"

2
po/ar/amarok.po
Unescape View File

@ -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 ""

2
po/az/amarok.po
Unescape View File

@ -979,7 +979,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 ""

2
po/be/amarok.po
Unescape View File

@ -926,7 +926,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 ""

4
po/bg/amarok.po
Unescape View File

@ -1002,7 +1002,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 ""
@ -1013,7 +1013,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"
"<br>$ tdebuildsycoca"
"<br>$ amarok</pre>Повече информация може да бъде намерена във файла README. За "
"повече помощ елате в #amarok в irc.freenode.net.</p>"

2
po/bn/amarok.po
Unescape View File

@ -986,7 +986,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 ""

2
po/br/amarok.po
Unescape View File

@ -950,7 +950,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 ""

4
po/ca/amarok.po
Unescape View File

@ -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 ""
@ -1021,7 +1021,7 @@ msgstr ""
"<pre>$ cd /ruta/al/codi-font/amarok/ "
"<br>$ su -c \"make uninstall\" "
"<br>$ ./configure --prefix=`tde-config --prefix` && su -c \"make install\" "
"<br>$ kbuildsycoca "
"<br>$ tdebuildsycoca "
"<br>$ amarok </pre> Podeu trobar més informació al fitxer README. Per a més "
"ajuda busqueu-nos al canal #amarok a irc.freenode.net.</p>"

4
po/cs/amarok.po
Unescape View File

@ -951,7 +951,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.fr