diff options
| -rw-r--r-- | src/pixmapviewer.cpp | 11 | ||||
| -rw-r--r-- | src/pixmapviewer.h | 4 | ||||
| -rw-r--r-- | src/statusbarspaceinfo.cpp | 26 | ||||
| -rw-r--r-- | src/statusbarspaceinfo.h | 6 |
4 files changed, 25 insertions, 22 deletions
diff --git a/src/pixmapviewer.cpp b/src/pixmapviewer.cpp index 81f931053..4fe451a8c 100644 --- a/src/pixmapviewer.cpp +++ b/src/pixmapviewer.cpp @@ -20,22 +20,21 @@ #include "pixmapviewer.h" -#include <kglobalsettings.h> #include <kiconloader.h> #include <QtGui/QPainter> -//Added by qt3to4: -#include <QPixmap> -#include <QPaintEvent> +#include <QtGui/QPixmap> +#include <QtGui/QPaintEvent> PixmapViewer::PixmapViewer(QWidget* parent) : - QWidget(parent) + QWidget(parent) { setMinimumWidth(K3Icon::SizeEnormous); setMinimumWidth(K3Icon::SizeEnormous); } PixmapViewer::~PixmapViewer() -{} +{ +} void PixmapViewer::setPixmap(const QPixmap& pixmap) { diff --git a/src/pixmapviewer.h b/src/pixmapviewer.h index d49f89ac0..a4c0dd7f5 100644 --- a/src/pixmapviewer.h +++ b/src/pixmapviewer.h @@ -23,8 +23,8 @@ #include <QtGui/QWidget> #include <QtGui/QPixmap> -//Added by qt3to4: -#include <QPaintEvent> + +class QPaintEvent; /** * @brief Widget which shows a pixmap centered inside the boundaries. diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp index 4322658d2..09976372a 100644 --- a/src/statusbarspaceinfo.cpp +++ b/src/statusbarspaceinfo.cpp @@ -20,9 +20,9 @@ #include "statusbarspaceinfo.h" -#include <QPainter> -#include <QPaintEvent> -#include <QTimer> +#include <QtCore/QTimer> +#include <QtGui/QPainter> +#include <QtGui/QPaintEvent> #include <kglobalsettings.h> #include <kdiskfreesp.h> @@ -30,10 +30,10 @@ #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); @@ -45,7 +45,8 @@ StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) : } StatusBarSpaceInfo::~StatusBarSpaceInfo() -{} +{ +} void StatusBarSpaceInfo::setUrl(const KUrl& url) { @@ -109,10 +110,13 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */) 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; diff --git a/src/statusbarspaceinfo.h b/src/statusbarspaceinfo.h index 32ef447cc..8f0c60a13 100644 --- a/src/statusbarspaceinfo.h +++ b/src/statusbarspaceinfo.h @@ -21,10 +21,10 @@ #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; |