[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [dragon/frameworks] src: cleanup includes
From:       Lukáš Tinkl <lukas () kde ! org>
Date:       2014-11-30 21:33:29
Message-ID: E1XvC7V-000485-2f () scm ! kde ! org
[Download RAW message or body]

Git commit 36baea12020bb520dd20287db5f71eaf3264fbf0 by Luk=C3=A1=C5=A1 Tink=
l.
Committed on 30/11/2014 at 20:45.
Pushed by lukas into branch 'frameworks'.

cleanup includes

M  +1    -1    src/app/discSelectionDialog.cpp
M  +0    -1    src/app/fullScreenToolBarHandler.cpp
M  +19   -21   src/app/mainWindow.cpp
M  +1    -2    src/app/playerApplication.cpp
M  +2    -1    src/app/recentlyPlayedList.h
M  +4    -3    src/app/theStream.cpp
M  +2    -5    src/app/videoWindow.cpp
M  +1    -1    src/mpris2/mediaplayer2.cpp

http://commits.kde.org/dragon/36baea12020bb520dd20287db5f71eaf3264fbf0

diff --git a/src/app/discSelectionDialog.cpp b/src/app/discSelectionDialog.=
cpp
index 41fc2fb..3dda6f6 100644
--- a/src/app/discSelectionDialog.cpp
+++ b/src/app/discSelectionDialog.cpp
@@ -29,8 +29,8 @@
 #include <QVBoxLayout>
 #include <QIcon>
 #include <QDialogButtonBox>
-
 #include <QListWidget>
+
 #include <KLocalizedString>
 #include <Solid/Device>
 #include <Solid/OpticalDisc>
diff --git a/src/app/fullScreenToolBarHandler.cpp b/src/app/fullScreenToolB=
arHandler.cpp
index ca7e73d..312009a 100644
--- a/src/app/fullScreenToolBarHandler.cpp
+++ b/src/app/fullScreenToolBarHandler.cpp
@@ -26,7 +26,6 @@
 =

 #include <QEvent>
 #include <QMouseEvent>
-#include <QPoint>
 #include <QDebug>
 =

 #include <KToolBar>
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
index 1379cc0..a8788b2 100644
--- a/src/app/mainWindow.cpp
+++ b/src/app/mainWindow.cpp
@@ -22,18 +22,28 @@
 #include "mainWindow.h"
 #include "timeLabel.h"
 =

-#include <KActionMenu>
+#include <QActionGroup>
+#include <QDockWidget>
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QEvent>        //::stateChanged()
+#include <QKeyEvent>
+#include <QLabel>
+#include <QLayout>      //ctor
+#include <QMouseEvent>
+#include <QObject>
+#include <QTimer>
+#include <QMimeData>
+#include <QFileDialog>
 #include <QApplication>
-#include <KCursor>
 #include <QDebug>
 #include <QInputDialog>
-#include <KIO/StatJob>
-#include <KLocalizedString>
 #include <QMenu>
 #include <QMenuBar>
+#include <QStatusBar>
+
 //#include <KNotificationRestrictions> // kf5 FIXME
 #include <KSqueezedTextLabel>
-#include <QStatusBar>
 #include <KToggleFullScreenAction>
 #include <KToolBar>
 #include <KXMLGUIFactory>
@@ -41,6 +51,10 @@
 #include <KIO/UDSEntry>
 #include <KSharedConfig>
 #include <KJobWidgets>
+#include <KCursor>
+#include <KIO/StatJob>
+#include <KLocalizedString>
+#include <KActionMenu>
 =

 #include <Phonon/VideoWidget>
 #include <Phonon/BackendCapabilities>
@@ -51,22 +65,6 @@
 #include <solid/powermanagement.h>
 #endif
 =

-#include <QActionGroup>
-#include <QDesktopWidget>
-#include <QDockWidget>
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QEvent>        //::stateChanged()
-#include <QKeyEvent>
-#include <QLabel>
-#include <QLayout>      //ctor
-#include <QMouseEvent>
-#include <QObject>
-#include <QTimer>
-#include <QStackedWidget>
-#include <QMimeData>
-#include <QFileDialog>
-
 #include "actions.h"
 #include "discSelectionDialog.h"
 #include "mpris2/mpris2.h"
diff --git a/src/app/playerApplication.cpp b/src/app/playerApplication.cpp
index e7a1c59..96b361c 100644
--- a/src/app/playerApplication.cpp
+++ b/src/app/playerApplication.cpp
@@ -19,10 +19,9 @@
  ***********************************************************************/
 =

 #include "playerApplication.h"
-
 #include "mainWindow.h"
 =

-#include <kwindowsystem.h>
+#include <KWindowSystem>
 =

 namespace Dragon
 {
diff --git a/src/app/recentlyPlayedList.h b/src/app/recentlyPlayedList.h
index c3992b4..c4d70de 100644
--- a/src/app/recentlyPlayedList.h
+++ b/src/app/recentlyPlayedList.h
@@ -22,9 +22,10 @@
 #define RECENTLYPLAYEDLIST_H
 =

 #include <QListWidget>
-#include <KConfigGroup>
 #include <QUrl>
 =

+#include <KConfigGroup>
+
 class RecentlyPlayedList : public QListWidget
 {
     Q_OBJECT
diff --git a/src/app/theStream.cpp b/src/app/theStream.cpp
index 7f51f45..58a2dd2 100644
--- a/src/app/theStream.cpp
+++ b/src/app/theStream.cpp
@@ -23,14 +23,15 @@
 =

 #include <QHash>
 #include <QDebug>
-#include <QUrl>
 =

-#include <KLocalizedString>
-#include <KSharedConfig>
 #include <Phonon/MediaController>
 #include <Phonon/MediaObject>
 #include <Phonon/MediaSource>
 #include <Phonon/VideoWidget>
+
+#include <KLocalizedString>
+#include <KSharedConfig>
+
 #include <Solid/Device>
 #include <Solid/StorageVolume>
 =

diff --git a/src/app/videoWindow.cpp b/src/app/videoWindow.cpp
index 48d27ff..3619e31 100644
--- a/src/app/videoWindow.cpp
+++ b/src/app/videoWindow.cpp
@@ -35,28 +35,25 @@
 #include <QTimer>
 #include <QVBoxLayout>
 #include <QPainter>
-
 #include <QApplication>
 #include <QDebug>
 #include <QIcon>
-#include <KLocalizedString>
 #include <QMenu>
 #include <QMimeDatabase>
+
+#include <KLocalizedString>
 #include <KSharedConfig>
 =

 #include <Phonon/AudioOutput>
 #include <phonon/audiodataoutput.h>
 #include <Phonon/MediaController>
 #include <Phonon/MediaObject>
-#include <Phonon/MediaSource>
-#include <Phonon/Path>
 #include <Phonon/SeekSlider>
 #include <Phonon/VideoWidget>
 #include <Phonon/VolumeFaderEffect>
 #include <Phonon/VolumeSlider>
 =

 #include <Solid/Block>
-#include <Solid/Device>
 #include <Solid/OpticalDisc>
 =

 #ifdef Q_OS_WIN
diff --git a/src/mpris2/mediaplayer2.cpp b/src/mpris2/mediaplayer2.cpp
index 2f4a290..b8e4721 100644
--- a/src/mpris2/mediaplayer2.cpp
+++ b/src/mpris2/mediaplayer2.cpp
@@ -25,9 +25,9 @@
 #include "theStream.h"
 #include "videoWindow.h"
 =

+#include <QApplication>
 =

 #include <KAboutData>
-#include <QApplication>
 #include <KProtocolInfo>
 #include <KService>
 #include <KWindowSystem>

[prev in list] [next in list] [prev in thread] [next in thread]