Browse Source

Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 9 years ago
parent
commit
13ea8e1fd7
  1. 2
      amarok/src/CMakeLists.txt
  2. 2
      amarok/src/Makefile.am
  3. 6
      amarok/src/Options2.ui
  4. 6
      amarok/src/actionclasses.cpp
  5. 4
      amarok/src/actionclasses.h
  6. 2
      amarok/src/amarokcore/amarokdcophandler.cpp
  7. 2
      amarok/src/analyzers/blockanalyzer.cpp
  8. 8
      amarok/src/app.cpp
  9. 2
      amarok/src/browserToolBar.h
  10. 8
      amarok/src/collectionbrowser.cpp
  11. 2
      amarok/src/collectionbrowser.h
  12. 2
      amarok/src/columnlist.cpp
  13. 6
      amarok/src/contextbrowser.cpp
  14. 2
      amarok/src/contextbrowser.h
  15. 2
      amarok/src/coverfetcher.cpp
  16. 8
      amarok/src/covermanager.cpp
  17. 2
      amarok/src/deletedialogbase.ui
  18. 2
      amarok/src/editfilterdialog.cpp
  19. 2
      amarok/src/engine/nmm/HostList.h
  20. 2
      amarok/src/engine/nmm/HostListItem.h
  21. 2
      amarok/src/equalizerpresetmanager.cpp
  22. 2
      amarok/src/equalizersetup.cpp
  23. 8
      amarok/src/filebrowser.cpp
  24. 2
      amarok/src/filebrowser.h
  25. 4
      amarok/src/htmlview.cpp
  26. 2
      amarok/src/konquisidebar/universalamarok.cpp
  27. 10
      amarok/src/ktrm.cpp
  28. 4
      amarok/src/lastfm.cpp
  29. 2
      amarok/src/magnatunebrowser/magnatunelistview.h
  30. 2
      amarok/src/magnatunebrowser/magnatunelistviewitems.h
  31. 2
      amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp
  32. 2
      amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
  33. 6
      amarok/src/mediabrowser.cpp
  34. 4
      amarok/src/mediabrowser.h
  35. 6
      amarok/src/mediadevice/daap/daapclient.cpp
  36. 2
      amarok/src/mediadevice/generic/genericmediadevice.cpp
  37. 2
      amarok/src/mediadevice/ifp/ifpmediadevice.cpp
  38. 4
      amarok/src/mediadevice/ipod/ipodmediadevice.cpp
  39. 6
      amarok/src/mediadevice/mtp/mtpmediadevice.cpp
  40. 4
      amarok/src/mediadevice/njb/njbmediadevice.cpp
  41. 2
      amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
  42. 2
      amarok/src/multitabbar.cpp
  43. 4
      amarok/src/mydiroperator.h
  44. 2
      amarok/src/playerwindow.cpp
  45. 6
      amarok/src/playlist.cpp
  46. 4
      amarok/src/playlist.h
  47. 8
      amarok/src/playlistbrowser.cpp
  48. 4
      amarok/src/playlistbrowser.h
  49. 2
      amarok/src/playlistbrowseritem.cpp
  50. 2
      amarok/src/playlistbrowseritem.h
  51. 2
      amarok/src/playlistitem.cpp
  52. 2
      amarok/src/playlistitem.h
  53. 2
      amarok/src/playlistselection.cpp
  54. 2
      amarok/src/playlistselection.h
  55. 8
      amarok/src/playlistwindow.cpp
  56. 2
      amarok/src/prettypopupmenu.h
  57. 2
      amarok/src/queuemanager.h
  58. 4
      amarok/src/scriptmanager.cpp
  59. 2
      amarok/src/scripts/graphequalizer/equalizercanvasview.h
  60. 2
      amarok/src/sliderwidget.cpp
  61. 2
      amarok/src/socketserver.cpp
  62. 4
      amarok/src/statistics.cpp
  63. 2
      amarok/src/statistics.h
  64. 4
      amarok/src/statusbar/queueLabel.cpp
  65. 2
      amarok/src/statusbar/toggleLabel.h
  66. 4
      amarok/src/systray.cpp
  67. 2
      amarok/src/tagguesserconfigdialog.ui
  68. 2
      amarok/src/trackpickerdialog.cpp
  69. 2
      amarok/src/trackpickerdialogbase.ui
  70. 6
      amarok/src/tractdetooltip.cpp
  71. 2
      amarok/src/tractdetooltip.h
  72. 2
      doc/et/develop.docbook
  73. 2
      doc/it/develop.docbook
  74. 2
      doc/nl/develop.docbook
  75. 2
      doc/pt/develop.docbook
  76. 2
      doc/sv/develop.docbook
  77. 2
      po/af/amarok.po
  78. 2
      po/ar/amarok.po
  79. 2
      po/az/amarok.po
  80. 2
      po/be/amarok.po
  81. 2
      po/bg/amarok.po
  82. 2
      po/bn/amarok.po
  83. 2
      po/br/amarok.po
  84. 2
      po/ca/amarok.po
  85. 2
      po/cs/amarok.po
  86. 2
      po/cy/amarok.po
  87. 2
      po/da/amarok.po
  88. 2
      po/de/amarok.po
  89. 2
      po/el/amarok.po
  90. 2
      po/en_GB/amarok.po
  91. 2
      po/eo/amarok.po
  92. 2
      po/es/amarok.po
  93. 2
      po/et/amarok.po
  94. 2
      po/eu/amarok.po
  95. 2
      po/fa/amarok.po
  96. 2
      po/fi/amarok.po
  97. 2
      po/fr/amarok.po
  98. 2
      po/ga/amarok.po
  99. 2
      po/gl/amarok.po
  100. 2
      po/he/amarok.po
  101. 2
      po/hi/amarok.po
  102. 2
      po/hu/amarok.po
  103. 2
      po/id/amarok.po
  104. 2
      po/is/amarok.po
  105. 2
      po/it/amarok.po
  106. 2
      po/ja/amarok.po
  107. 2
      po/ka/amarok.po
  108. 2
      po/km/amarok.po
  109. 2
      po/ko/amarok.po
  110. 2
      po/ku/amarok.po
  111. 2
      po/lo/amarok.po
  112. 2
      po/lt/amarok.po
  113. 2
      po/mk/amarok.po
  114. 2
      po/ms/amarok.po
  115. 2
      po/nb/amarok.po
  116. 4
      po/nds/amarok.po
  117. 2
      po/ne/amarok.po
  118. 2
      po/nl/amarok.po
  119. 2
      po/nn/amarok.po
  120. 2
      po/pa/amarok.po
  121. 2
      po/pl/amarok.po
  122. 2
      po/pt/amarok.po
  123. 2
      po/pt_BR/amarok.po
  124. 2
      po/ro/amarok.po
  125. 2
      po/ru/amarok.po
  126. 2
      po/rw/amarok.po
  127. 2
      po/se/amarok.po
  128. 2
      po/sk/amarok.po
  129. 2
      po/sl/amarok.po
  130. 2
      po/sq/amarok.po
  131. 2
      po/sr/amarok.po
  132. 2
      po/sr@Latn/amarok.po
  133. 2
      po/ss/amarok.po
  134. 8
      po/sv/amarok.po
  135. 2
      po/ta/amarok.po
  136. 2
      po/tg/amarok.po
  137. 2
      po/th/amarok.po
  138. 2
      po/tr/amarok.po
  139. 2
      po/uk/amarok.po
  140. 2
      po/uz/amarok.po
  141. 2
      po/uz@cyrillic/amarok.po
  142. 2
      po/zh_CN/amarok.po
  143. 2
      po/zh_TW/amarok.po

2
amarok/src/CMakeLists.txt

@ -97,7 +97,7 @@ tde_add_library( amarok SHARED AUTOMOC
scrobbler.cpp sliderwidget.cpp smartplaylisteditor.cpp socketserver.cpp
starmanager.cpp statistics.cpp systray.cpp tagdialog.cpp tagdialogbase.ui
tagguesser.cpp tagguesserconfigdialog.ui threadmanager.cpp tooltip.cpp
trackpickerdialog.cpp trackpickerdialogbase.ui tracktooltip.cpp
trackpickerdialog.cpp trackpickerdialogbase.ui tractdetooltip.cpp
transferdialog.cpp xmlloader.cpp xspfplaylist.cpp editfilterdialog.cpp
VERSION 0.0.0
EMBED

2
amarok/src/Makefile.am

@ -145,7 +145,7 @@ libamarok_la_SOURCES = \
tooltip.cpp \
trackpickerdialog.cpp \
trackpickerdialogbase.ui \
tracktooltip.cpp \
tractdetooltip.cpp \
transferdialog.cpp \
xmlloader.cpp \
xspfplaylist.cpp \

6
amarok/src/Options2.ui

@ -757,9 +757,9 @@
</functions>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kfontrequester.h</includehint>
<includehint>kfontrequester.h</includehint>
<includehint>kfontrequester.h</includehint>
<includehint>tdefontrequester.h</includehint>
<includehint>tdefontrequester.h</includehint>
<includehint>tdefontrequester.h</includehint>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>

6
amarok/src/actionclasses.cpp

@ -21,13 +21,13 @@
#include <tqpixmap.h>
#include <tqtooltip.h>
#include <kaction.h>
#include <tdeaction.h>
#include <khelpmenu.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kstandarddirs.h>
#include <ktoolbar.h>
#include <ktoolbarbutton.h>
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h>
#include <kurl.h>
extern TDEAboutData aboutData;

4
amarok/src/actionclasses.h

@ -11,8 +11,8 @@
#include "prettypopupmenu.h"
#include "sliderwidget.h"
#include <kaction.h>
#include <kactionclasses.h>
#include <tdeaction.h>
#include <tdeactionclasses.h>
#include <tqguardedptr.h>
class TDEActionCollection;

2
amarok/src/amarokcore/amarokdcophandler.cpp

@ -46,7 +46,7 @@
#include <tqfile.h>
#include <dcopclient.h>
#include <kactioncollection.h>
#include <tdeactioncollection.h>
#include <kstartupinfo.h>

2
amarok/src/analyzers/blockanalyzer.cpp

@ -17,7 +17,7 @@
#include <kglobalsettings.h> //paletteChange()
#include <kiconloader.h> //mousePressEvent
#include <klocale.h> //mousePressEvent
#include <kpopupmenu.h> //mousePressEvent
#include <tdepopupmenu.h> //mousePressEvent
#include <tqevent.h> //mousePressEvent
#include <tqpainter.h> //paletteChange()

8
amarok/src/app.cpp

@ -47,7 +47,7 @@ email : markey@web.de
#include "statusbar.h"
#include "systray.h"
#include "threadmanager.h"
#include "tracktooltip.h" //engineNewMetaData()
#include "tractdetooltip.h" //engineNewMetaData()
#include <iostream>
@ -427,8 +427,8 @@ void App::initCliArgs( int argc, char *argv[] ) //static
}
#include <kaction.h>
#include <kshortcutlist.h>
#include <tdeaction.h>
#include <tdeshortcutlist.h>
void App::initGlobalShortcuts()
{
EngineController* const ec = EngineController::instance();
@ -481,7 +481,7 @@ void App::initGlobalShortcuts()
m_pGlobalAccel->readSettings( kapp->config() );
m_pGlobalAccel->updateConnections();
//TODO fix kde accel system so that kactions find appropriate global shortcuts
//TODO fix kde accel system so that tdeactions find appropriate global shortcuts
// and there is only one configure shortcuts dialog
TDEActionCollection* const ac = Amarok::actionCollection();

2
amarok/src/browserToolBar.h

@ -11,7 +11,7 @@
#ifndef BROWSER_TOOLBAR_H
#define BROWSER_TOOLBAR_H
#include <ktoolbar.h>
#include <tdetoolbar.h>
namespace Browser
{

8
amarok/src/collectionbrowser.cpp

@ -52,7 +52,7 @@
#include <tqheader.h>
#include <tqregexp.h>
#include <kactioncollection.h>
#include <tdeactioncollection.h>
#include <kapplication.h> //kapp
#include <tdeconfig.h>
#include <kcombobox.h>
@ -62,8 +62,8 @@
#include <kiconloader.h> //renderView()
#include <klocale.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <ktoolbarbutton.h> //ctor
#include <tdepopupmenu.h>
#include <tdetoolbarbutton.h> //ctor
#include <kurldrag.h> //dragObject()
#include <tdeio/job.h>
#include <kpushbutton.h>
@ -4374,7 +4374,7 @@ CollectionItem::paintCell ( TQPainter * painter, const TQColorGroup & cg,
#if KDE_IS_VERSION( 3, 3, 91 )
if( listView()->shadeSortColumn() && !isSelected() && listView()->columnSorted() == column )
{
/* from klistview.cpp
/* from tdelistview.cpp
Copyright (C) 2000 Reginald Stadlbauer <reggie@kde.org>
Copyright (C) 2000,2003 Charles Samuels <charles@kde.org>
Copyright (C) 2000 Peter Putzer */

2
amarok/src/collectionbrowser.h

@ -11,7 +11,7 @@
#include <tqvaluelist.h> //stack allocated
#include <tqvbox.h> //baseclass
#include <klistview.h> //baseclass
#include <tdelistview.h> //baseclass
#include <tqstringlist.h> //stack allocated
#include <kurl.h> //stack allocated
#include <kdialogbase.h> //baseclass

2
amarok/src/columnlist.cpp

@ -23,7 +23,7 @@
#include <tqpainter.h>
#include <tqtooltip.h>
#include <tqvbox.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kpushbutton.h>
#include "amarokconfig.h"
#include "metabundle.h"

6
amarok/src/contextbrowser.cpp

@ -52,7 +52,7 @@
#include <tqtimer.h>
#include <tqtooltip.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h> //kapp
#include <kcalendarsystem.h> // for Amarok::verboseTimeSince()
#include <tdeconfig.h> // suggested/related/favorite box visibility
@ -64,10 +64,10 @@
#include <tdeio/jobclasses.h>
#include <kmdcodec.h> // for data: URLs
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <ktextedit.h>
#include <ktoolbarbutton.h>
#include <tdetoolbarbutton.h>
#include <unistd.h> //usleep()

2
amarok/src/contextbrowser.h

@ -13,7 +13,7 @@
#include "engineobserver.h"
#include <ktabwidget.h>
#include <ktoolbarbutton.h>
#include <tdetoolbarbutton.h>
#include <kurl.h>
class ClickLineEdit;

2
amarok/src/coverfetcher.cpp

@ -29,7 +29,7 @@
#include <klineedit.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kpushbutton.h>
#include <twin.h>

8
amarok/src/covermanager.cpp

@ -39,19 +39,19 @@
#include <kcursor.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h> //showCoverMenu()
#include <tdemultipledrag.h>
#include <tdeio/netaccess.h>
#include <kpopupmenu.h> //showCoverMenu()
#include <tdepopupmenu.h> //showCoverMenu()
#include <kprogress.h>
#include <kpushbutton.h>
#include <ksqueezedtextlabel.h> //status label
#include <kstatusbar.h>
#include <kstringhandler.h> //paintItem
#include <ktoolbar.h>
#include <ktoolbarbutton.h> //clear filter button
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h> //clear filter button
#include <kurl.h>
#include <kurldrag.h>
#include <twin.h>

2
amarok/src/deletedialogbase.ui

@ -130,6 +130,6 @@
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistbox.h</includehint>
<includehint>tdelistbox.h</includehint>
</includehints>
</UI>

2
amarok/src/editfilterdialog.cpp

@ -18,7 +18,7 @@
#include <klocale.h>
#include <kpushbutton.h>
#include <kmessagebox.h>
#include <ktoolbarbutton.h>
#include <tdetoolbarbutton.h>
#include "amarokcore/amarokconfig.h"
#include "collectiondb.h"

2
amarok/src/engine/nmm/HostList.h

@ -25,7 +25,7 @@
#ifndef HOSTLIST_H
#define HOSTLIST_H
#include <klistview.h>
#include <tdelistview.h>
class HostListItem;

2
amarok/src/engine/nmm/HostListItem.h

@ -25,7 +25,7 @@
#ifndef HOSTLISTITEM_H
#define HOSTLISTITEM_H
#include <klistview.h>
#include <tdelistview.h>
#include <tqpixmap.h>
class HostListItem : public TDEListViewItem {

2
amarok/src/equalizerpresetmanager.cpp

@ -27,7 +27,7 @@
#include <kapplication.h>
#include <kinputdialog.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kstandarddirs.h> //locate()

2
amarok/src/equalizersetup.cpp

@ -42,7 +42,7 @@
#include <kinputdialog.h> //presets
#include <klocale.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h> //locate()
#include <twin.h>

8
amarok/src/filebrowser.cpp

@ -28,17 +28,17 @@
#include "filebrowser.h"
#include "k3bexporter.h"
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include "kbookmarkhandler.h"
#include <kdiroperator.h>
#include <kiconloader.h>
#include <tdeio/netaccess.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kpushbutton.h> ///@see SearchPane
#include <ktoolbarbutton.h> ///@see ctor
#include <tdetoolbarbutton.h> ///@see ctor
#include <kurlcombobox.h>
#include <kurlcompletion.h>

2
amarok/src/filebrowser.h

@ -26,7 +26,7 @@
#include <tqvbox.h> //baseclass
#include <kdiroperator.h> //some inline functions
#include <ktoolbar.h> //baseclass
#include <tdetoolbar.h> //baseclass
#include <kurl.h> //stack allocated
class ClickLineEdit;

4
amarok/src/htmlview.cpp

@ -15,10 +15,10 @@
#include <tqimage.h> // External CSS opening
#include <kapplication.h> //kapp
#include <kactioncollection.h>
#include <tdeactioncollection.h>
#include <kglobal.h> //kapp
#include <kimageeffect.h> // gradient background image
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h> //locate file
#include <ktempfile.h>

2
amarok/src/konquisidebar/universalamarok.cpp

@ -37,7 +37,7 @@
#include <kiconloader.h>
#include <tqdatetime.h>
#include <tqfileinfo.h>
#include <ktoolbar.h>
#include <tdetoolbar.h>
#include <kapplication.h>
#include <tqslider.h>
#include <kdebug.h>

10
amarok/src/ktrm.cpp

@ -780,11 +780,11 @@ void KTRMLookup::lookupResult( TDEIO::Job* job )
TQDomElement release = releaseNode.toElement();
tmpResult.d->album = release.namedItem( "title" ).toElement().text();
TQDomNode tracklistN = release.namedItem( "track-list" );
if ( !tracklistN.isNull() ) {
TQDomElement tracklist = tracklistN.toElement();
if ( !tracklist.attribute( "offset" ).isEmpty() )
tmpResult.d->track = tracklist.attribute( "offset" ).toInt() + 1;
TQDomNode tractdelistN = release.namedItem( "track-list" );
if ( !tractdelistN.isNull() ) {
TQDomElement tractdelist = tractdelistN.toElement();
if ( !tractdelist.attribute( "offset" ).isEmpty() )
tmpResult.d->track = tractdelist.attribute( "offset" ).toInt() + 1;
}
//tmpResult.d->year = ???;
tmpResult.d->relevance =

4
amarok/src/lastfm.cpp

@ -30,14 +30,14 @@
#include <tqlabel.h>
#include <tqregexp.h>
#include <kaction.h>
#include <tdeaction.h>
#include <klineedit.h>
#include <kmdcodec.h> //md5sum
#include <kmessagebox.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <kprotocolmanager.h>
#include <kshortcut.h>
#include <tdeshortcut.h>
#include <kurl.h>
#include <time.h>

2
amarok/src/magnatunebrowser/magnatunelistview.h

@ -22,7 +22,7 @@
#include "magnatunelistviewitems.h"
#include <klistview.h>
#include <tdelistview.h>
#include <kurldrag.h>
/**

2
amarok/src/magnatunebrowser/magnatunelistviewitems.h

@ -24,7 +24,7 @@
#include "magnatunedatabasehandler.h"
#include "magnatunetypes.h"
#include <klistview.h>
#include <tdelistview.h>
/**
A specialized TDEListViewItem that encapsulates a MagnatuneArtist

2
amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp

@ -21,7 +21,7 @@
#include "magnatuneredownloaddialog.h"
#include <tqpushbutton.h>
#include <klistview.h>
#include <tdelistview.h>
MagnatuneRedownloadDialog::MagnatuneRedownloadDialog(TQWidget* parent, const char* name, bool modal, WFlags fl)
: magnatuneReDownloadDialogBase(parent,name, modal,fl)

2
amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui

@ -104,6 +104,6 @@
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
</includehints>
</UI>

6
amarok/src/mediabrowser.cpp

@ -68,7 +68,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <tdemultipledrag.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kprocess.h>
#include <kprogress.h>
#include <kpushbutton.h>
@ -76,9 +76,9 @@
#include <kstandarddirs.h> //locate file
#include <ktabbar.h>
#include <ktempfile.h>
#include <ktoolbarbutton.h> //ctor
#include <tdetoolbarbutton.h> //ctor
#include <kurldrag.h> //dragObject()
#include <kactioncollection.h>
#include <tdeactioncollection.h>
MediaBrowser *MediaBrowser::s_instance = 0;

4
amarok/src/mediabrowser.h

@ -19,7 +19,7 @@
#include <tqvbox.h> //baseclass
#include <tqdatetime.h>
#include <klistview.h> //baseclass
#include <tdelistview.h> //baseclass
#include <kurl.h> //stack allocated
#include <tdeio/global.h> //filesize_t
#include "scrobbler.h" //SubmitItem
@ -592,7 +592,7 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin
virtual void copyTrackFromDevice(MediaItem *item);
/**
* Recursively remove MediaItem from the tracklist and the device
* Recursively remove MediaItem from the tractdelist and the device
* @param item MediaItem to remove
* @param onlyPlayed True if item should be deleted only if it has been played
* @return -1 on failure, number of files deleted otherwise

6
amarok/src/mediadevice/daap/daapclient.cpp

@ -42,12 +42,12 @@
#include <klineedit.h>
#include <knuminput.h>
#include <kpassdlg.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kresolver.h>
#include <kstandarddirs.h> //loading icons
#include <ktempfile.h>
#include <ktoolbar.h>
#include <ktoolbarbutton.h>
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h>
#if DNSSD_SUPPORT
#include <dnssd/remoteservice.h>

2
amarok/src/mediadevice/generic/genericmediadevice.cpp

@ -45,7 +45,7 @@ AMAROK_EXPORT_PLUGIN( GenericMediaDevice )
#include <tdeio/netaccess.h>
#include <kmessagebox.h>
#include <kmountpoint.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kurlrequester.h> //downloadSelectedItems()
#include <kurlrequesterdlg.h> //downloadSelectedItems()

2
amarok/src/mediadevice/ifp/ifpmediadevice.cpp

@ -37,7 +37,7 @@ AMAROK_EXPORT_PLUGIN( IfpMediaDevice )
#include <tdeconfig.h> //download saveLocation
#include <kiconloader.h> //smallIcon
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kurlrequester.h> //downloadSelectedItems()
#include <kurlrequesterdlg.h> //downloadSelectedItems()

4
amarok/src/mediadevice/ipod/ipodmediadevice.cpp

@ -42,14 +42,14 @@ AMAROK_EXPORT_PLUGIN( IpodMediaDevice )
#include <metadata/tplugins.h>
#include <hintlineedit.h>
#include <kactionclasses.h>
#include <tdeactionclasses.h>
#include <kapplication.h>
#include <kmountpoint.h>
#include <kpushbutton.h>
#include <kprogress.h>
#include <kmessagebox.h>
#include <kiconloader.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tqcheckbox.h>
#include <tqdir.h>

6
amarok/src/mediadevice/mtp/mtpmediadevice.cpp

@ -41,9 +41,9 @@ AMAROK_EXPORT_PLUGIN( MtpMediaDevice )
// KDE
#include <kapplication.h>
#include <kiconloader.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kmessagebox.h>
#include <ktoolbarbutton.h>
#include <tdetoolbarbutton.h>
#include <ktempdir.h>
// TQt
@ -1482,7 +1482,7 @@ MtpMediaDevice::readMtpMusic()
kapp->processEvents( 100 );
LIBMTP_track_t *tracks = LIBMTP_Get_Tracklisting_With_Callback( m_device, progressCallback, this );
LIBMTP_track_t *tracks = LIBMTP_Get_Tractdelisting_With_Callback( m_device, progressCallback, this );
debug() << "Got tracks from device" << endl;

4
amarok/src/mediadevice/njb/njbmediadevice.cpp

@ -44,9 +44,9 @@ AMAROK_EXPORT_PLUGIN( NjbMediaDevice )
#include <kinstance.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <ktempdir.h>
#include <ktoolbarbutton.h>
#include <tdetoolbarbutton.h>
#include <kurl.h>
#include <kurlrequester.h> //downloadSelectedItems()
#include <kurlrequesterdlg.h> //downloadSelectedItems()

2
amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp

@ -33,7 +33,7 @@ AMAROK_EXPORT_PLUGIN( RioKarmaMediaDevice )
// KDE
#include <kapplication.h>
#include <kiconloader.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
// TQt
#include <tqdir.h>

2
amarok/src/multitabbar.cpp

@ -45,7 +45,7 @@
#include <kiconeffect.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstringhandler.h>
#define NEARBYINT(i) ((int(float(i) + 0.5)))

4
amarok/src/mydiroperator.h

@ -3,9 +3,9 @@
#include "mydirlister.h"
#include <kaction.h>
#include <tdeaction.h>
#include <kdiroperator.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
class Medium;

2
amarok/src/playerwindow.cpp

@ -24,7 +24,7 @@ email : markey@web.de
#include "metabundle.h" //setScroll()
#include "playerwindow.h"
#include "sliderwidget.h"
#include "tracktooltip.h" //setScroll()
#include "tractdetooltip.h" //setScroll()
#include <tqaccel.h> //our quit shortcut in the ctor
#include <tqevent.h> //various events

6
amarok/src/playlist.cpp

@ -64,7 +64,7 @@
#include <tqvaluevector.h> //playNextTrack()
#include <tqlayout.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kcursor.h> //setOverrideCursor()
#include <kdialogbase.h>
@ -75,7 +75,7 @@
#include <klineedit.h> //setCurrentTrack()
#include <klocale.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <krandomsequence.h> //random Mode
#include <kstandarddirs.h> //TDEGlobal::dirs()
#include <kstdaction.h>
@ -695,7 +695,7 @@ Playlist::restoreSession()
}
/*
The following two functions (saveLayout(), restoreLayout()), taken from klistview.cpp, are largely
The following two functions (saveLayout(), restoreLayout()), taken from tdelistview.cpp, are largely
Copyright (C) 2000 Reginald Stadlbauer <reggie@kde.org>
Copyright (C) 2000,2003 Charles Samuels <charles@kde.org>
Copyright (C) 2000 Peter Putzer

4
amarok/src/playlist.h

@ -29,9 +29,9 @@
#include "playlistitem.h"
#include "metabundle.h"
#include "tooltip.h" //baseclass
#include "tracktooltip.h"
#include "tractdetooltip.h"
#include <klistview.h> //baseclass
#include <tdelistview.h> //baseclass
#include <kurl.h> //KURL::List
#include <tqdir.h> //stack allocated
#include <tqpoint.h> //stack allocated

8
amarok/src/playlistbrowser.cpp

@ -41,9 +41,9 @@
#include <tqpixmap.h> //paintCell()
#include <tqtextstream.h> //loadPlaylists(), saveM3U(), savePLS()
#include <kaction.h>
#include <kactionclasses.h>
#include <kactioncollection.h>
#include <tdeaction.h>
#include <tdeactionclasses.h>
#include <tdeactioncollection.h>
#include <kapplication.h>
#include <tdefiledialog.h> //openPlaylist()
#include <tdeio/job.h> //deleteSelectedPlaylists()
@ -54,7 +54,7 @@
#include <kmessagebox.h> //renamePlaylist(), deleteSelectedPlaylist()
#include <kmimetype.h>
#include <tdemultipledrag.h> //dragObject()
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kpushbutton.h>
#include <kstandarddirs.h> //TDEGlobal::dirs()
#include <kurldrag.h> //dragObject()

4
amarok/src/playlistbrowser.h

@ -14,8 +14,8 @@
#include "playlistbrowseritem.h"
#include "podcastsettings.h"
#include <kaction.h>
#include <klistview.h>
#include <tdeaction.h>
#include <tdelistview.h>
#include <kpushbutton.h>
#include <kurl.h>
#include <tqdom.h>

2
amarok/src/playlistbrowseritem.cpp

@ -45,7 +45,7 @@
#include <klocale.h>
#include <kmessagebox.h> //podcast info box
#include <kmimetype.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <krun.h>
#include <kstandarddirs.h> //podcast loading icons
#include <kstringhandler.h>

2
amarok/src/playlistbrowseritem.h

@ -17,7 +17,7 @@
#include <kdialogbase.h> // StreamEditor baseclass
#include <tdeio/job.h>
#include <klineedit.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kurl.h>
#include <tqdom.h>

2
amarok/src/playlistitem.cpp

@ -699,7 +699,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co
#if KDE_IS_VERSION( 3, 3, 91 )
if( listView()->shadeSortColumn() && !isSelected() && listView()->columnSorted() == column )
{
/* from klistview.cpp
/* from tdelistview.cpp
Copyright (C) 2000 Reginald Stadlbauer <reggie@kde.org>
Copyright (C) 2000,2003 Charles Samuels <charles@kde.org>
Copyright (C) 2000 Peter Putzer */

2
amarok/src/playlistitem.h

@ -12,7 +12,7 @@
#include "metabundle.h" //baseclass
#include "amarok_export.h"
#include <klistview.h> //baseclass
#include <tdelistview.h> //baseclass
#include <kurl.h> //stack allocated
#include <tqcolor.h> //stack allocated

2
amarok/src/playlistselection.cpp

@ -28,7 +28,7 @@
#include <kapplication.h>
#include <kiconloader.h>
#include <knuminput.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
PlaylistSelection::PlaylistSelection( TQWidget* parent, const char* name )

2
amarok/src/playlistselection.h

@ -10,7 +10,7 @@
#ifndef PLAYLISTSELECTION_H
#define PLAYLISTSELECTION_H
#include <klistview.h>
#include <tdelistview.h>
class NewDynamic;
class KDialogBase;

8
amarok/src/playlistwindow.cpp

@ -55,7 +55,7 @@
#include <tqtooltip.h> //TQToolTip::add()
#include <tqvbox.h> //contains the playlist
#include <kaction.h> //m_actionCollection
#include <tdeaction.h> //m_actionCollection
#include <kapplication.h> //kapp
#include <tdefiledialog.h> //savePlaylist(), openPlaylist()
#include <kglobal.h>
@ -65,11 +65,11 @@
#include <klocale.h>
#include <kmenubar.h>
#include <kmessagebox.h> //savePlaylist()
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kpushbutton.h>
#include <kstandarddirs.h> //Welcome Tab, locate welcome.html
#include <ktoolbar.h>
#include <ktoolbarbutton.h> //createGUI()
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h> //createGUI()
#include <kxmlguibuilder.h> //XMLGUI
#include <kxmlguifactory.h> //XMLGUI

2
amarok/src/prettypopupmenu.h

@ -21,7 +21,7 @@
#ifndef AMAROK_PRETTYPOPUPMENU_H
#define AMAROK_PRETTYPOPUPMENU_H
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tqcolor.h>
#include <tqimage.h>

2
amarok/src/queuemanager.h

@ -17,7 +17,7 @@
#include "playlistitem.h"
#include <kdialogbase.h> //baseclass
#include <klistview.h> //baseclass
#include <tdelistview.h> //baseclass
#include <tqmap.h>

4
amarok/src/scriptmanager.cpp

@ -48,10 +48,10 @@
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <tdeio/netaccess.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kprocio.h>
#include <kprotocolmanager.h>
#include <kpushbutton.h>

2
amarok/src/scripts/graphequalizer/equalizercanvasview.h

@ -15,7 +15,7 @@
#endif
#include <kmainwindow.h>
#include <tdemainwindow.h>
class EqualizerCircle : public TQCanvasEllipse
{

2
amarok/src/sliderwidget.cpp

@ -38,7 +38,7 @@
#include <kimageeffect.h>
#include <klocale.h>
#include <kpixmapeffect.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
Amarok::Slider::Slider( Qt::Orientation orientation, TQWidget *parent, uint max )

2
amarok/src/socketserver.cpp

@ -17,7 +17,7 @@
#include "enginecontroller.h" //to get the engine
#include "statusbar.h"
#include <klocale.h>
#include <kpopupmenu.h> //Vis::Selector
#include <tdepopupmenu.h> //Vis::Selector
#include <kprocess.h> //Vis::Selector
#include <twin.h> //Vis::Selector
#include <kstandarddirs.h> //locateLocal()

4
amarok/src/statistics.cpp

@ -25,9 +25,9 @@
#include <kiconloader.h>
#include <klocale.h>
#include <tdemultipledrag.h> //startDrag()
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstringhandler.h> //paintCell
#include <ktoolbarbutton.h> //ctor
#include <tdetoolbarbutton.h> //ctor
#include <kurldrag.h> //startDrag()
#include <twin.h>

2
amarok/src/statistics.h

@ -17,7 +17,7 @@
#include "playlistwindow.h"
#include <kdialogbase.h> //baseclass
#include <klistview.h> //baseclass
#include <tdelistview.h> //baseclass
#include <tqtimer.h>

4
amarok/src/statusbar/queueLabel.cpp

@ -31,10 +31,10 @@
#include <tqpixmap.h>
#include <tqtimer.h>
#include <kactioncollection.h>
#include <tdeactioncollection.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kstringhandler.h>
static const uint MAX_TO_SHOW = 20;

2
amarok/src/statusbar/toggleLabel.h

@ -27,7 +27,7 @@
#include "overlayWidget.h"
#include "popupMessage.h"
#include <kactionclasses.h>
#include <tdeactionclasses.h>
#include <kglobalsettings.h>
#include <kiconloader.h>
#include <tqiconset.h>

4
amarok/src/systray.cpp

@ -15,9 +15,9 @@
#include <tqevent.h>
#include <tqimage.h>
#include <kaction.h>
#include <tdeaction.h>
#include <kapplication.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kiconeffect.h>
#include <kstandarddirs.h>

2
amarok/src/tagguesserconfigdialog.ui

@ -212,7 +212,7 @@ Note that the order in which the schemes appear in the list is relevant, since t
<layoutfunctions spacing="KDialog::spacingHint"/>
<includehints>
<includehint>kdialog.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

2
amarok/src/trackpickerdialog.cpp

@ -20,7 +20,7 @@
#include <tqlabel.h>
#include <kapplication.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klocale.h>
#include "trackpickerdialog.h"

2
amarok/src/trackpickerdialogbase.ui

@ -177,6 +177,6 @@
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
</includehints>
</UI>

6
amarok/src/tractdetooltip.cpp

@ -6,7 +6,7 @@
*/
/*
tracktooltip.cpp
tractdetooltip.cpp
begin: Tue 10 Feb 2004
copyright: (C) 2004 by Christian Muehlhaeuser
email: chris@chris.de
@ -29,7 +29,7 @@
#include <kstandarddirs.h>
#include "tracktooltip.h"
#include "tractdetooltip.h"
TrackToolTip *TrackToolTip::instance()
@ -348,4 +348,4 @@ void TrackToolTip::updateWidgets()
Amarok::ToolTip::updateTip();
}
#include "tracktooltip.moc"
#include "tractdetooltip.moc"

2
amarok/src/tractdetooltip.h

@ -6,7 +6,7 @@
*/
/*
tracktooltip.h - Provides an interface to a plain TQWidget, which is independent of KDE (bypassed to X11)
tractdetooltip.h - Provides an interface to a plain TQWidget, which is independent of KDE (bypassed to X11)
begin: Tue 10 Feb 2004
copyright: (C) 2004 by Christian Muehlhaeuser
email: chris@chris.de

2
doc/et/develop.docbook

@ -201,7 +201,7 @@
<row>
<entry
>tracktooltip.cpp</entry>
>tractdetooltip.cpp</entry>
<entry
>Ei ole tegelikult seotud PlaylistWidget-iga. Seda kasutab PlayerWidget teatud info näitamiseks parajasti mängitava pala kohta.</entry>
</row>

2
doc/it/develop.docbook

@ -201,7 +201,7 @@
<row>
<entry
>tracktooltip.cpp</entry>
>tractdetooltip.cpp</entry>
<entry
>Attualmente non in relazione con PlaylistWidget. Usato da PlayerWidget per mostrare alcune informazioni sulla traccia in esecuzione.</entry>
</row>

2
doc/nl/develop.docbook

@ -201,7 +201,7 @@
<row>
<entry
>tracktooltip.cpp</entry>
>tractdetooltip.cpp</entry>
<entry
>Niet echt gerelateerd aan de PlaListWidget. Wordt gebruikt door de PlayerWidget om wat informatie over de huidige afgespeelde track te tonen.</entry>
</row>

2
doc/pt/develop.docbook

@ -201,7 +201,7 @@
<row>
<entry
>tracktooltip.cpp</entry>
>tractdetooltip.cpp</entry>
<entry
>Não está relacionada de facto com o PlaylistWidget. É usada pelo PlayerWidget para mostrar algumas informações sobre a faixa a tocar de momento.</entry>
</row>

2
doc/sv/develop.docbook

@ -201,7 +201,7 @@
<row>
<entry
>tracktooltip.cpp</entry>
>tractdetooltip.cpp</entry>
<entry
>Har egentligen inget att göra med PlaylistWidget. Används av PlayerWidget för att visa viss information om spåret som för närvarande spelas.</entry>
</row>

2
po/af/amarok.po

@ -219,7 +219,7 @@ msgid "For this feature, a script of type \"Transcode\" has to be running"
msgstr ""
"Vir hierdie eienskap, moet 'n skrip van tipe \"Transkodeer\", gehardloop word."
#: tracktooltip.cpp:266
#: tractdetooltip.cpp:266
msgid "Amarok - rediscover your music"
msgstr "Amarok – herontdek jou musiek"

2
po/ar/amarok.po

@ -212,7 +212,7 @@ msgstr ""
"لِإستعمال هذه الميّزة يجب أن يكون هناك نص أوامر من نوع \"Transcode\" قيد "
"التنفيذ"
#: tracktooltip.cpp:266
#: tractdetooltip.cpp:266
msgid "Amarok - rediscover your music"
msgstr "إكتشف الموسيقى مجدداً ، إستعمل Amarok"

2
po/az/amarok.po

@ -212,7 +212,7 @@ msgstr ""
msgid "For this feature, a script of type \"Transcode\" has to be running"
msgstr ""
#: tracktooltip.cpp:266
#: tractdetooltip.cpp:266
msgid "Amarok - rediscover your music"
msgstr ""

2
po/be/amarok.po

@ -204,7 +204,7 @@ msgstr ""
msgid "For this feature, a script of type \"Transcode\" has to be running"
msgstr ""
#: tracktooltip.cpp:266
#: tractdetooltip.cpp:266
msgid "Amarok - rediscover your music"
msgstr ""

2
po/bg/amarok.po

@ -223,7 +223,7 @@ msgstr "Премахване на транскодираните файлове
msgid "For this feature, a script of type \"Transcode\" has to be running"
msgstr "За тази функция трябва да се стартира скрипт от рода на \"Transcode\""
#: tracktooltip.cpp:266
#: tractdetooltip.cpp:266
msgid "Amarok - rediscover your music"
msgstr "Amarok - преоткрийте музиката"

2
po/bn/amarok.po

@ -219,7 +219,7 @@ msgstr ""
msgid "For this feature, a script of type \"Transcode\" has to be running"
msgstr ""
#: tracktooltip.cpp:266
#: tractdetooltip.cpp:266
#, fuzzy
msgid "Amarok - rediscover your music"
msgstr "আমারক - আপনার সঙ্গীত পুনরায় আবিষ্কার করুন"

2
po/br/amarok.po

@ -205,7 +205,7 @@ msgstr ""
msgid "For this feature, a script of type \"Transcode\" has to be running"
msgstr ""
#: tracktooltip.cpp:266
#: tractdetooltip.cpp:266
msgid "Amarok - rediscover your music"
msgstr ""

2
po/ca/amarok.po

@ -218,7 +218,7 @@ msgstr ""
"Per a aquesta funcionalitat, s'ha d'estar executant un guió del tipus "
"«Recodificar»"
#: tracktooltip.cpp:266
#: tractdetooltip.cpp:266
msgid "Amarok - rediscover your music"
msgstr "Amarok - redescobreix la teva música"

2
po/cs/amarok.po