Cleanup includes a bit.

src/gui/createvolumedialog.cpp

@@ -25,14 +25,9 @@
 #include <util/capacity.h>
 #include <util/helpers.h>
 
+#include <KConfigGroup>
 #include <KLocalizedString>
 #include <KSharedConfig>
-#include <KConfigGroup>
-#include <KIconLoader>
-
-#include <QPointer>
-#include <QPushButton>
-#include <QDialogButtonBox>
 
 CreateVolumeDialog::CreateVolumeDialog(QWidget* parent, QString& vgname, QStringList& pvlist, qint32& pesize) :
     VolumeDialog(parent, vgname, pvlist),

src/gui/devicepropsdialog.cpp

@@ -29,15 +29,14 @@
 #include <util/capacity.h>
 #include <util/helpers.h>
 
-#include <KLocalizedString>
-#include <KSharedConfig>
 #include <KConfigGroup>
 #include <KIconLoader>
+#include <KLocalizedString>
+#include <KSharedConfig>
 
 #include <QDialogButtonBox>
 #include <QPointer>
 #include <QPushButton>
-#include <QTreeWidgetItem>
 
 /** Creates a new DevicePropsDialog
     @param parent pointer to the parent widget

src/gui/editmountoptionsdialog.cpp

@@ -20,12 +20,11 @@
 #include "gui/editmountoptionsdialogwidget.h"
 
 #include <QDialogButtonBox>
-#include <QString>
 #include <QStringList>
 
 #include <KConfigGroup>
-#include <KSharedConfig>
 #include <KLocalizedString>
+#include <KSharedConfig>
 
 EditMountOptionsDialog::EditMountOptionsDialog(QWidget* parent, const QStringList& options) :
     QDialog(parent),

src/gui/editmountoptionsdialogwidget.cpp

@@ -17,8 +17,7 @@
 
 #include "gui/editmountoptionsdialogwidget.h"
 
-#include <QString>
-#include <QPlainTextEdit>
+#include <QStringList>
 
 EditMountOptionsDialogWidget::EditMountOptionsDialogWidget(QWidget* parent, const QStringList& options) :
     QWidget(parent)

src/gui/editmountpointdialog.cpp

@@ -22,12 +22,12 @@
 
 #include <core/partition.h>
 
-#include <KMessageBox>
-#include <KGuiItem>
-#include <KStandardGuiItem>
-#include <KLocalizedString>
 #include <KConfigGroup>
+#include <KGuiItem>
+#include <KLocalizedString>
+#include <KMessageBox>
 #include <KSharedConfig>
+#include <KStandardGuiItem>
 
 #include <QDialogButtonBox>
 

src/gui/editmountpointdialogwidget.cpp

@@ -26,15 +26,14 @@
 #include <fs/luks.h>
 
 #include <KLocalizedString>
-#include <KIOCore/KMountPoint>
 #include <KMessageBox>
+#include <KMountPoint>
 
-#include <QString>
-#include <QWidget>
+#include <QDebug>
 #include <QFile>
 #include <QFileDialog>
 #include <QPointer>
-#include <QDebug>
+#include <QString>
 
 #include <mntent.h>
 #include <blkid/blkid.h>

src/gui/editmountpointdialogwidget.h

@@ -23,16 +23,16 @@
 
 #include <QMap>
 #include <QString>
+#include <QWidget>
 
 class Partition;
 
-class QWidget;
+class QFile;
 class QSpinBox;
 class QCheckBox;
 class QLineEdit;
 class QPushButton;
 class QStringList;
-class QFile;
 
 class MountEntry;
 

src/gui/filesystemsupportdialog.cpp

@@ -25,9 +25,9 @@
 #include <QDialogButtonBox>
 #include <QDialog>
 
+#include <KConfigGroup>
 #include <KIconLoader>
 #include <KLocalizedString>
-#include <KConfigGroup>
 #include <KSharedConfig>
 
 /** Creates a new FileSystemSupportDialog

src/gui/infopane.cpp

@@ -29,7 +29,6 @@
 
 #include <util/capacity.h>
 
-#include <QDockWidget>
 #include <QFontDatabase>
 #include <QFrame>
 #include <QGridLayout>

src/gui/insertdialog.cpp

@@ -27,8 +27,8 @@
 #include <ops/resizeoperation.h>
 
 #include <KConfigGroup>
-#include <KSharedConfig>
 #include <KLocalizedString>
+#include <KSharedConfig>
 
 /** Creates a new InsertDialog instance.
     @param parent the parent widget

src/gui/listphysicalvolumes.cpp

@@ -21,8 +21,6 @@
 #include <util/globallog.h>
 #include <util/capacity.h>
 
-#include <KIconLoader>
-
 class ListPhysicalVolumeWidgetItem : public QListWidgetItem
 {
 public:

src/gui/partitionmanagerwidget.cpp

@@ -53,7 +53,6 @@
 
 #include "util/guihelpers.h"
 
-#include <QCursor>
 #include <QFileDialog>
 #include <QLocale>
 #include <QPointer>

src/gui/parttablewidget.cpp

@@ -24,7 +24,6 @@
 
 #include <gui/partwidget.h>
 
-#include <QApplication>
 #include <QMouseEvent>
 
 #include <KLocalizedString>

src/gui/parttablewidget.h

@@ -21,7 +21,6 @@
 
 #include <gui/partwidgetbase.h>
 
-#include <QList>
 #include <QLabel>
 
 class PartWidget;

src/gui/resizedialog.h

@@ -21,8 +21,6 @@
 
 #include "gui/sizedialogbase.h"
 
-#include <QtGlobal>
-
 class Partition;
 class Device;
 
@@ -62,7 +60,6 @@ protected:
         m_ResizedLastSector = s;
     }
 
-protected:
     qint64 originalFirstSector() const {
         return m_OriginalFirstSector;
     }

src/gui/resizevolumedialog.cpp

@@ -27,15 +27,9 @@
 #include <util/capacity.h>
 #include <util/helpers.h>
 
+#include <KConfigGroup>
 #include <KLocalizedString>
 #include <KSharedConfig>
-#include <KConfigGroup>
-#include <KIconLoader>
-
-#include <QPointer>
-#include <QPushButton>
-#include <QTreeWidgetItem>
-#include <QDialogButtonBox>
 
 /** Creates a new ResizeVolumeDialog
     @param parent pointer to the parent widget

src/gui/sizedialogbase.cpp

@@ -34,8 +34,10 @@
 
 #include <KLocalizedString>
 
+#include <QFrame>
 #include <QDialogButtonBox>
 #include <QPushButton>
+#include <QVBoxLayout>
 
 #include <config.h>
 

src/gui/smartdialog.cpp

@@ -31,7 +31,6 @@
 #include <QFontDatabase>
 #include <QPushButton>
 #include <QTemporaryFile>
-#include <QTextDocument>
 #include <QTextStream>
 #include <QTreeWidgetItem>
 #include <QtGlobal>
@@ -43,6 +42,7 @@
 #include <KIO/CopyJob>
 #include <KJobUiDelegate>
 #include <KMessageBox>
+#include <KSharedConfig>
 
 #include <sys/utsname.h>
 #include <unistd.h>

src/gui/smartdialogwidget.cpp

@@ -22,10 +22,10 @@
 #include <KLocalizedString>
 
 #include <QStyledItemDelegate>
+#include <QStyleOptionViewItem>
 #include <QPainter>
-#include <QTextDocument>
-#include <QAbstractTextDocumentLayout>
 #include <QPoint>
+#include <QTextDocument>
 
 #include <config.h>
 

src/gui/treelog.cpp

@@ -27,7 +27,6 @@
 #include <QDebug>
 #include <QFile>
 #include <QFileDialog>
-#include <QMenu>
 #include <QTemporaryFile>
 #include <QTextStream>
 #include <QTreeWidget>

src/gui/volumedialog.cpp

@@ -25,32 +25,28 @@
 #include <util/capacity.h>
 #include <util/helpers.h>
 
+#include <KConfigGroup>
 #include <KLocalizedString>
 #include <KSharedConfig>
-#include <KConfigGroup>
-#include <KIconLoader>
 
-#include <QPointer>
-#include <QPushButton>
 #include <QListWidgetItem>
-#include <QDialogButtonBox>
 
 /** Creates a new VolumeDialog
     @param parent pointer to the parent widget
-    @param d the Device to show properties for
+    @param vgName Volume Group name
+    @param pvList List of LVM Physical Volumes used to create Volume Group
 */
-VolumeDialog::VolumeDialog(QWidget* parent, QString& vgname, QStringList& pvlist) :
+VolumeDialog::VolumeDialog(QWidget* parent, QString& vgName, QStringList& pvList) :
     QDialog(parent),
     m_DialogWidget(new VolumeWidget(this)),
-    m_TargetName(vgname),
-    m_TargetPVList(pvlist),
+    m_TargetName(vgName),
+    m_TargetPVList(pvList),
     m_IsValidSize(false),
     m_IsValidName(true),
     m_TotalSize(0),
     m_TotalUsedSize(0),
     m_ExtentSize(0)
 {
-    Q_UNUSED(pvlist);
     mainLayout = new QVBoxLayout(this);
     setLayout(mainLayout);
     mainLayout->addWidget(&dialogWidget());

src/gui/volumedialog.h

@@ -20,22 +20,19 @@
 #define VOLUMEDIALOG__H
 
 #include <QDialog>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 class VolumeWidget;
 class Partition;
 
-class QDialogButtonBox;
-class QPushButton;
-class QVBoxLayout;
-class QWidget;
-class QString;
-
 class VolumeDialog : public QDialog
 {
     Q_DISABLE_COPY(VolumeDialog)
 
 public:
-    VolumeDialog(QWidget* parent, QString& vgname, QStringList& pvlist);
+    VolumeDialog(QWidget* parent, QString& vgName, QStringList& pvList);
     ~VolumeDialog();
 
 protected: