Reorganize headers to fix a ton of Krazy reports. At first I thought it was just

busy work but quite a few headers were missing necessary includes and were not caught
because the required includes had been processed beforehand by coincidence.

svn path=/trunk/KDE/kdemultimedia/juk/; revision=666183

actioncollection.cpp

@@ -13,11 +13,11 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "actioncollection.h"
+
 #include <kactioncollection.h>
 #include <kdebug.h>
 
-#include "actioncollection.h"
-
 namespace ActionCollection
 {
     KActionCollection *actions()

advancedsearchdialog.cpp

@@ -13,6 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "advancedsearchdialog.h"
+
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
@@ -22,14 +24,11 @@
 #include <QRadioButton>
 #include <QLabel>
 #include <QLayout>
-
 #include <QHBoxLayout>
 #include <QVBoxLayout>
-#include <QBoxLayout>
 #include <QGroupBox>
 
 #include "collectionlist.h"
-#include "advancedsearchdialog.h"
 #include "searchwidget.h"
 
 ////////////////////////////////////////////////////////////////////////////////

cache.cpp

@@ -13,6 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "cache.h"
+
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kconfig.h>
@@ -23,7 +25,6 @@
 #include <QDir>
 #include <QBuffer>
 
-#include "cache.h"
 #include "tag.h"
 #include "searchplaylist.h"
 #include "historyplaylist.h"

categoryreaderinterface.cpp

@@ -13,10 +13,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QString>
-
-#include "filerenameroptions.h"
 #include "categoryreaderinterface.h"
+#include "filerenameroptions.h"
+
+#include <QString>
 
 QString CategoryReaderInterface::value(const CategoryID &category) const
 {

collectionlist.cpp

@@ -13,6 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "collectionlist.h"
+
 #include <k3urldrag.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -22,9 +24,14 @@
 #include <kconfig.h>
 #include <kaction.h>
 #include <kurl.h>
+#include <kactioncollection.h>
+#include <kconfiggroup.h>
 #include <ktoolbarpopupaction.h>
 
-#include "collectionlist.h"
+#include <Q3ValueList>
+#include <QDragMoveEvent>
+#include <QDropEvent>
+
 #include "playlistcollection.h"
 #include "splashscreen.h"
 #include "stringshare.h"
@@ -34,11 +41,6 @@
 #include "viewmode.h"
 #include "coverinfo.h"
 #include "covermanager.h"
-#include <kactioncollection.h>
-#include <Q3ValueList>
-#include <QDragMoveEvent>
-#include <QDropEvent>
-#include <kconfiggroup.h>
 
 using ActionCollection::action;
 

coverdialog.cpp

@@ -13,6 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "coverdialog.h"
+
 #include <k3listview.h>
 #include <k3iconview.h>
 #include <k3iconviewsearchline.h>
@@ -22,11 +24,9 @@
 #include <klocale.h>
 
 #include <QTimer>
-#include <qtoolbutton.h>
-
+#include <QToolButton>
 #include <Q3ValueList>
 
-#include "coverdialog.h"
 #include "covericonview.h"
 #include "covermanager.h"
 #include "collectionlist.h"

coverinfo.cpp

@@ -13,6 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "coverinfo.h"
+
 #include <kglobal.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>
@@ -21,8 +23,7 @@
 #include <QRegExp>
 #include <QLayout>
 #include <QLabel>
-#include <qcursor.h>
-
+#include <QCursor>
 #include <QPixmap>
 #include <QMouseEvent>
 #include <QFrame>
@@ -33,7 +34,6 @@
 #include "collectionlist.h"
 #include "playlistsearch.h"
 #include "playlistitem.h"
-#include "coverinfo.h"
 #include "tag.h"
 
 struct CoverPopup : public QWidget

covermanager.cpp

@@ -13,17 +13,19 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qpixmap.h>
+#include "covermanager.h"
+
+#include <QPixmap>
 #include <QMap>
 #include <QString>
 #include <QFile>
-#include <qimage.h>
+#include <QImage>
 #include <QDir>
 #include <QDataStream>
-#include <q3dict.h>
-#include <q3cache.h>
-#include <qmime.h>
-#include <qbuffer.h>
+#include <Q3Dict>
+#include <Q3Cache>
+#include <QMimeSource>
+#include <QBuffer>
 #include <Q3ValueList>
 
 #include <kdebug.h>
@@ -31,8 +33,6 @@
 #include <kstandarddirs.h>
 #include <kglobal.h>
 
-#include "covermanager.h"
-
 // This is a dictionary to map the track path to their ID.  Otherwise we'd have
 // to store this info with each CollectionListItem, which would break the cache
 // of users who upgrade, and would just generally be a big mess.

deletedialog.cpp

@@ -13,20 +13,20 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "deletedialog.h"
+
 #include <kdialog.h>
 #include <KApplication>
 #include <KStandardGuiItem>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kconfig.h>
+#include <kconfiggroup.h>
 
-#include <qstringlist.h>
+#include <QStringList>
 #include <QCheckBox>
 #include <QLayout>
 #include <QLabel>
-#include <kconfiggroup.h>
-
-#include "deletedialog.h"
 
 //////////////////////////////////////////////////////////////////////////////
 // DeleteWidget implementation

directorylist.cpp

@@ -13,15 +13,15 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "directorylist.h"
+
+#include <QCheckBox>
+
 #include <kfiledialog.h>
 #include <klocale.h>
 #include <k3listview.h>
 #include <kpushbutton.h>
 
-#include <QCheckBox>
-
-#include "directorylist.h"
-
 ////////////////////////////////////////////////////////////////////////////////
 // public methods
 ////////////////////////////////////////////////////////////////////////////////

dynamicplaylist.cpp

@@ -13,13 +13,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kdebug.h>
-
 #include "dynamicplaylist.h"
 #include "collectionlist.h"
 #include "playlistcollection.h"
 #include "tracksequencemanager.h"
-//Added by qt3to4:
+
+#include <kdebug.h>
+
 #include <QShowEvent>
 #include <Q3ValueList>
 #include <QPaintEvent>

exampleoptions.cpp

@@ -13,17 +13,16 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kurlrequester.h>
-#include <klocale.h>
+#include "exampleoptions.h"
 
-#include <qradiobutton.h>
+#include <QRadioButton>
 #include <QLayout>
-
 #include <QHideEvent>
 #include <QShowEvent>
 #include <QVBoxLayout>
 
-#include "exampleoptions.h"
+#include <kurlrequester.h>
+#include <klocale.h>
 
 ExampleOptions::ExampleOptions(QWidget *parent) :
     QWidget(parent)

filehandle.cpp

@@ -13,14 +13,15 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <limits.h>
-#include <stdlib.h>
+#include "filehandle.h"
 
 #include <kdebug.h>
 
-#include <qfileinfo.h>
+#include <QFileInfo>
+
+#include <limits.h>
+#include <stdlib.h>
 
-#include "filehandle.h"
 #include "filehandleproperties.h"
 #include "tag.h"
 #include "cache.h"

filerenamer.cpp

@@ -14,6 +14,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "filerenamer.h"
+
 #include <algorithm>
 
 #include <kdebug.h>
@@ -29,15 +31,15 @@
 #include <kglobal.h>
 #include <klineedit.h>
 #include <klocale.h>
+#include <kconfiggroup.h>
 #include <kpushbutton.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <kvbox.h>
+#include <khbox.h>
 
+#include <Q3ScrollView>
 #include <QFile>
-#include <khbox.h>
-#include <kvbox.h>
-#include <q3scrollview.h>
 #include <QObject>
 #include <QTimer>
 #include <QRegExp>
@@ -45,18 +47,15 @@
 #include <QDir>
 #include <QLabel>
 #include <QLayout>
-#include <qsignalmapper.h>
-#include <q3header.h>
-#include <qpalette.h>
-
+#include <QSignalMapper>
+#include <Q3Header>
+#include <QPalette>
 #include <QPixmap>
 #include <QFrame>
 #include <Q3ValueList>
-#include <kconfiggroup.h>
 
 #include "tag.h"
 #include "filehandle.h"
-#include "filerenamer.h"
 #include "exampleoptions.h"
 #include "playlistitem.h"
 #include "playlist.h"

filerenamerconfigdlg.cpp

@@ -14,10 +14,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
-
-#include "filerenamer.h"
 #include "filerenamerconfigdlg.h"
+#include "filerenamer.h"
+
+#include <klocale.h>
 
 FileRenamerConfigDlg::FileRenamerConfigDlg(QWidget *parent) :
     KDialog(parent),

filerenamerconfigdlg.h

@@ -17,6 +17,7 @@
 #ifndef FILERENAMERCONFIGDLG_H
 #define FILERENAMERCONFIGDLG_H
 
+#include <kdialog.h>
 
 class FileRenamerWidget;
 

filerenameroptions.cpp

@@ -13,17 +13,17 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "filerenameroptions.h"
+
 #include <klocale.h>
 #include <kdebug.h>
 #include <knuminput.h>
 
 #include <QLayout>
 #include <QLabel>
-#include <qradiobutton.h>
+#include <QRadioButton>
 #include <QLineEdit>
-#include <q3buttongroup.h>
-
-#include "filerenameroptions.h"
+#include <Q3ButtonGroup>
 
 FileRenamerTagOptions::FileRenamerTagOptions(QWidget *parent,
                                              const TagRenamerOptions &options) :

googlefetcher.cpp

@@ -12,6 +12,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "googlefetcher.h"
+
 #include <dom/html_document.h>
 #include <dom/html_misc.h>
 #include <dom/html_table.h>
@@ -19,7 +21,6 @@
 #include <dom/dom2_traversal.h>
 
 #include <khtml_part.h>
-
 #include <kapplication.h>
 #include <kstatusbar.h>
 #include <kxmlguiwindow.h>
@@ -27,7 +28,6 @@
 #include <kinputdialog.h>
 #include <kurl.h>
 
-#include "googlefetcher.h"
 #include "googlefetcherdialog.h"
 #include "tag.h"
 #include "juk.h"

googlefetcherdialog.cpp

@@ -12,24 +12,24 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "googlefetcherdialog.h"
+#include "tag.h"
+
 #include <kapplication.h>
 #include <kio/netaccess.h>
 #include <klocale.h>
 #include <kdebug.h>
+#include <k3iconview.h>
 #include <kmessagebox.h>
 #include <kcombobox.h>
-
 #include <khbox.h>
-#include <qimage.h>
+
+#include <QImage>
 #include <QLabel>
 #include <QPushButton>
-#include <qeventloop.h>
-//Added by qt3to4:
+#include <QEventLoop>
 #include <QPixmap>
 
-#include "googlefetcherdialog.h"
-#include "tag.h"
-
 GoogleFetcherDialog::GoogleFetcherDialog(const QString &name,
                                          const GoogleImageList &imageList,
                                          const FileHandle &file,
@@ -224,7 +224,7 @@ CoverIconViewItem::CoverIconViewItem(Q3IconView *parent, const GoogleImage &imag
     // Start downloading the image.
 
     m_job = KIO::get(image.thumbURL(), false, false);
-    connect(m_job, SIGNAL(result(KJob *)), this, SLOT(imageResult(KJob *)));
+    connect(m_job, SIGNAL(result(KIO::Job *)), this, SLOT(imageResult(KIO::Job *)));
     connect(m_job, SIGNAL(data(KIO::Job *, const QByteArray &)),
             this, SLOT(imageData(KIO::Job *, const QByteArray &)));
 }
@@ -249,7 +249,7 @@ void CoverIconViewItem::imageData(KIO::Job *, const QByteArray &data)
     memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size());
 }
 
-void CoverIconViewItem::imageResult(KJob *job)
+void CoverIconViewItem::imageResult(KIO::Job *job)
 {
     if(job->error())
         return;

googlefetcherdialog.h

@@ -15,13 +15,14 @@
 #ifndef GOOGLEFETCHERDIALOG_H
 #define GOOGLEFETCHERDIALOG_H
 
-#include <k3iconview.h>
+#include <kdialog.h>
 #include <kio/job.h>
-
+#include <k3iconview.h>
 
 #include "googlefetcher.h"
-//Added by qt3to4:
+
 #include <QPixmap>
+#include <QPointer>
 
 class KUrl;
 
@@ -72,6 +73,7 @@ private:
 namespace KIO
 {
     class TransferJob;
+    class Job;
 }
 
 class CoverIconViewItem : public QObject, public K3IconViewItem
@@ -84,7 +86,7 @@ public:
 
 private slots:
     void imageData(KIO::Job *job, const QByteArray &data);
-    void imageResult(KJob* job);
+    void imageResult(KIO::Job *job);
 
 private:
     QByteArray m_buffer;

historyplaylist.cpp

@@ -13,14 +13,14 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
-#include <kglobal.h>
-#include <kdebug.h>
-
 #include "historyplaylist.h"
 #include "collectionlist.h"
 #include "playermanager.h"
 
+#include <klocale.h>
+#include <kglobal.h>
+#include <kdebug.h>
+
 ////////////////////////////////////////////////////////////////////////////////
 // HistoryPlayList public members
 ////////////////////////////////////////////////////////////////////////////////

juk.cpp

@@ -13,6 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "juk.h"
+
 #include <config.h>
 
 #include <kcmdlineargs.h>
@@ -25,7 +27,11 @@
 #include <ktoggleaction.h>
 #include <kactionmenu.h>
 #include <kicon.h>
-#include "juk.h"
+#include <kaction.h>
+#include <kconfiggroup.h>
+
+#include <QKeyEvent>
+
 #include "slideraction.h"
 #include "statuslabel.h"
 #include "splashscreen.h"
@@ -40,13 +46,6 @@
 #include "covermanager.h"
 #include "tagtransactionmanager.h"
 
-#include <QKeyEvent>
-#include <kaction.h>
-#include <ktoggleaction.h>
-#include <kactionmenu.h>
-#include <kconfiggroup.h>
-
-
 using namespace ActionCollection;
 
 JuK* JuK::m_instance;

k3bexporter.cpp

@@ -13,6 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "k3bexporter.h"
+
 #include <k3process.h>
 #include <kmessagebox.h>
 #include <kurl.h>
@@ -25,10 +27,8 @@
 #include <kapplication.h>
 
 #include <QMap>
-
 #include <Q3ValueList>
 
-#include "k3bexporter.h"
 #include "playlistitem.h"
 #include "playlist.h"
 #include "playlistbox.h"

mediafiles.cpp

@@ -13,17 +13,18 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qwidget.h>
+#include "mediafiles.h"
+
 #include <kfiledialog.h>
 #include <kdebug.h>
 #include <klocale.h>
+#include <kurl.h>
 #include <kio/netaccess.h>
 
-#include "mediafiles.h"
+#include <QWidget>
 
 #include <taglib.h>
 #include <tag.h>
-#include <kurl.h>
 
 #if (TAGLIB_MAJOR_VERSION > 1) || \
     ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 2))

mediafiles.h

@@ -16,6 +16,9 @@
 #ifndef MEDIAFILES_H
 #define MEDIAFILES_H
 
+class QWidget;
+class QString;
+class QStringList;
 
 /**
  * A namespace for file JuK's file related functions.  The goal is to hide

nowplaying.cpp

@@ -13,19 +13,21 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "nowplaying.h"
+
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdebug.h>
+#include <krandom.h>
 #include <k3urldrag.h>
 #include <kio/netaccess.h>
 
-#include <qimage.h>
+#include <QImage>
 #include <QLayout>
-#include <qevent.h>
-#include <q3dragobject.h>
+#include <QEvent>
+#include <Q3DragObject>
 #include <QTimer>
 #include <QPoint>
-
 #include <QFrame>
 #include <QDropEvent>
 #include <QLabel>
@@ -33,10 +35,8 @@
 #include <QVBoxLayout>
 #include <QDragEnterEvent>
 #include <QMouseEvent>
-#include <krandom.h>
 #include <QTextDocument>
 
-#include "nowplaying.h"
 #include "playlistcollection.h"
 #include "playermanager.h"
 #include "coverinfo.h"

playermanager.cpp

@@ -22,24 +22,29 @@
  * - mpyne
  */
 
+#include "playermanager.h"
+#include <config.h>
+
 #include <kdebug.h>
 #include <klocale.h>
+#include <kactioncollection.h>
+#include <kselectaction.h>
+#include <ktoggleaction.h>
 
 #include <phonon/mediaobject.h>
 #include <phonon/audiopath.h>
 #include <phonon/audiooutput.h>
 #include <phonon/volumefadereffect.h>
 
-#include <qslider.h>
-//Added by qt3to4:
+#include <QSlider>
 #include <QPixmap>
-#include <ktoggleaction.h>
-#include <kactioncollection.h>
-#include <kselectaction.h>
+#include <QtDBus>