some include + coding guideline cleanups

svn path=/trunk/KDE/kdebase/apps/; revision=653049

diff --git a/src/pixmapviewer.cpp b/src/pixmapviewer.cpp
index 81f93105307d9e60e56c864f406b5841332f5064..4fe451a8c6416a869d4dff7c3314edc491f24fa9 100644 (file)
--- a/src/pixmapviewer.cpp
+++ b/src/pixmapviewer.cpp
@@ -20,22 +20,21 @@
 
 #include "pixmapviewer.h"
 
 
 #include "pixmapviewer.h"
 

-#include <kglobalsettings.h>

 #include <kiconloader.h>
 #include <QtGui/QPainter>
 #include <kiconloader.h>
 #include <QtGui/QPainter>

-//Added by qt3to4:
-#include <QPixmap>
-#include <QPaintEvent>
+#include <QtGui/QPixmap>
+#include <QtGui/QPaintEvent>

 
 PixmapViewer::PixmapViewer(QWidget* parent) :
 
 PixmapViewer::PixmapViewer(QWidget* parent) :

-        QWidget(parent)
+    QWidget(parent)

 {
     setMinimumWidth(K3Icon::SizeEnormous);
     setMinimumWidth(K3Icon::SizeEnormous);
 }
 
 PixmapViewer::~PixmapViewer()
 {
     setMinimumWidth(K3Icon::SizeEnormous);
     setMinimumWidth(K3Icon::SizeEnormous);
 }
 
 PixmapViewer::~PixmapViewer()

-{}
+{
+}

 
 void PixmapViewer::setPixmap(const QPixmap& pixmap)
 {
 
 void PixmapViewer::setPixmap(const QPixmap& pixmap)
 {

diff --git a/src/pixmapviewer.h b/src/pixmapviewer.h
index d49f89ac00f1e60eccd77e273bffc88e1fb5bc02..a4c0dd7f5c342d938998d57d9f83fba95a6e7d31 100644 (file)
--- a/src/pixmapviewer.h
+++ b/src/pixmapviewer.h
@@ -23,8 +23,8 @@
 
 #include <QtGui/QWidget>
 #include <QtGui/QPixmap>
 
 #include <QtGui/QWidget>
 #include <QtGui/QPixmap>

-//Added by qt3to4:
-#include <QPaintEvent>
+
+class QPaintEvent;

 
 /**
  * @brief Widget which shows a pixmap centered inside the boundaries.
 
 /**
  * @brief Widget which shows a pixmap centered inside the boundaries.

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index 4322658d29cc05d4decf0dd5b7e6c771614327a6..09976372ab7c569bb2422f462eb79529668d66ea 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -20,9 +20,9 @@
 
 #include "statusbarspaceinfo.h"
 
 
 #include "statusbarspaceinfo.h"
 

-#include <QPainter>
-#include <QPaintEvent>
-#include <QTimer>
+#include <QtCore/QTimer>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>

 
 #include <kglobalsettings.h>
 #include <kdiskfreesp.h>
 
 #include <kglobalsettings.h>
 #include <kdiskfreesp.h>


@@ -30,10 +30,10 @@
 #include <kio/job.h>
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
 #include <kio/job.h>
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :

-        QWidget(parent),
-        m_gettingSize(false),
-        m_kBSize(0),
-        m_kBAvailable(0)
+    QWidget(parent),
+    m_gettingSize(false),
+    m_kBSize(0),
+    m_kBAvailable(0)

 {
     setMinimumWidth(200);
 
 {
     setMinimumWidth(200);
 


@@ -45,7 +45,8 @@ StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
 }
 
 StatusBarSpaceInfo::~StatusBarSpaceInfo()
 }
 
 StatusBarSpaceInfo::~StatusBarSpaceInfo()

-{}
+{
+}

 
 void StatusBarSpaceInfo::setUrl(const KUrl& url)
 {
 
 void StatusBarSpaceInfo::setUrl(const KUrl& url)
 {


@@ -109,10 +110,13 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
 
 
 void StatusBarSpaceInfo::slotFoundMountPoint(const unsigned long& kBSize,
 
 
 void StatusBarSpaceInfo::slotFoundMountPoint(const unsigned long& kBSize,

-        const unsigned long& /* kBUsed */,
-        const unsigned long& kBAvailable,
-        const QString& /* mountPoint */)
+                                             const unsigned long& kBUsed,
+                                             const unsigned long& kBAvailable,
+                                             const QString& mountPoint)

 {
 {

+    Q_UNUSED(kBUsed);
+    Q_UNUSED(mountPoint);
+

     m_gettingSize = false;
     m_kBSize = kBSize;
     m_kBAvailable = kBAvailable;
     m_gettingSize = false;
     m_kBSize = kBSize;
     m_kBAvailable = kBAvailable;

diff --git a/src/statusbarspaceinfo.h b/src/statusbarspaceinfo.h
index 32ef447cc9b48c8a7427f33a9ee906285ced60d6..8f0c60a134cfa56127813246bdfd22a1d1126f19 100644 (file)
--- a/src/statusbarspaceinfo.h
+++ b/src/statusbarspaceinfo.h
@@ -21,10 +21,10 @@
 #define STATUSBARSPACEINFO_H
 
 #include <kurl.h>
 #define STATUSBARSPACEINFO_H
 
 #include <kurl.h>

-#include <QtGui/QColor>

 
 

-#include <QPaintEvent>
-#include <QWidget>
+#include <QtGui/QColor>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QWidget>

 
 class KDiskFreeSp;
 class QTimer;
 
 class KDiskFreeSp;
 class QTimer;