[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeutils/kdf
From: Arto Hytönen <amthpublic () gmail ! com>
Date: 2007-08-24 21:26:01
Message-ID: 1187990761.272765.5162.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 704434 by amth:
deprecated-- + header fixes
M +1 -1 disklist.cpp
M +2 -3 disklist.h
M +2 -2 disks.cpp
M +5 -6 disks.h
M +2 -2 kcmdf.cpp
M +1 -1 kcmdf.h
M +1 -3 kconftest.cpp
M +13 -13 kdfconfig.cpp
M +3 -3 kdfconfig.h
M +12 -13 kdfwidget.cpp
M +6 -7 kdfwidget.h
M +8 -8 kwikdisk.cpp
M +3 -3 kwikdisk.h
M +4 -4 listview.cpp
M +2 -2 listview.h
M +8 -10 mntconfig.cpp
M +2 -2 mntconfig.h
M +2 -2 optiondialog.cpp
M +0 -1 stdoption.cpp
M +1 -1 stdoption.h
--- trunk/KDE/kdeutils/kdf/disklist.cpp #704433:704434
@@ -27,7 +27,7 @@
#include <stdlib.h>
#include <kdebug.h>
-#include <QTextStream>
+#include <QtCore/QTextStream>
#include <kglobal.h>
#include <kdefakes.h>
--- trunk/KDE/kdeutils/kdf/disklist.h #704433:704434
@@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
#ifndef __DISKLIST_H__
#define __DISKLIST_H__
@@ -31,9 +30,9 @@
//#include <kcontrol.h>
// defines the os-type
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
//Added by qt3to4:
-#include <Q3PtrList>
+#include <Qt3Support/Q3PtrList>
#include "disks.h"
--- trunk/KDE/kdeutils/kdf/disks.cpp #704433:704434
@@ -23,8 +23,8 @@
#include "disks.h"
-#include <qfileinfo.h>
-#include <QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
#include <kglobal.h>
#include <kdebug.h>
--- trunk/KDE/kdeutils/kdf/disks.h #704433:704434
@@ -21,16 +21,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
#ifndef __DISKS_H__
#define __DISKS_H__
-#include <QObject>
+#include <QtCore/QObject>
-#include <QLabel>
-#include <QPushButton>
-#include <q3progressbar.h>
-#include <QFile>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <Qt3Support/Q3ProgressBar>
+#include <QtCore/QFile>
#include <kio/global.h>
#include <k3process.h>
--- trunk/KDE/kdeutils/kdf/kcmdf.cpp #704433:704434
@@ -29,9 +29,9 @@
#include <kdialog.h>
-#include <QLayout>
+#include <QtGui/QLayout>
//Added by qt3to4:
-#include <QVBoxLayout>
+#include <QtGui/QVBoxLayout>
#include <kcomponentdata.h>
KDiskFreeWidget::KDiskFreeWidget( const KComponentData &inst, QWidget *parent )
--- trunk/KDE/kdeutils/kdf/kcmdf.h #704433:704434
@@ -28,7 +28,7 @@
#include "mntconfig.h"
#include <kcmodule.h>
-#include <qtabwidget.h>
+#include <QtGui/QTabWidget>
class KDiskFreeWidget : public KCModule
{
--- trunk/KDE/kdeutils/kdf/kconftest.cpp #704433:704434
@@ -25,15 +25,13 @@
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-
/* compile with
* gcc -I$QTDIR/include -I$KDEDIR/include -L/opt/kde/lib -L/usr/X11R6/lib -lkfm \
-lkdeui -lkdecore -lqt -lX11 -lXext -fno-rtti kconftest.cpp \
*/
-
#include <iostream>
-#include <q3dict.h>
+#include <Qt3Support/Q3Dict>
#include <kconfig.h>
#include <kdebug.h>
#include <kapplication.h>
--- trunk/KDE/kdeutils/kdf/kdfconfig.cpp #704433:704434
@@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
//
// 1999-11-29 Espen Sand
// Converted to QLayout and QListView + cleanups
@@ -29,17 +28,17 @@
#include "kdfconfig.h"
-#include <QCheckBox>
-#include <q3header.h>
-#include <QLabel>
-#include <QLayout>
-#include <qlcdnumber.h>
+#include <QtGui/QCheckBox>
+#include <Qt3Support/Q3Header>
+#include <QtGui/QLabel>
+#include <QtGui/QLayout>
+#include <QtGui/QLCDNumber>
#include <KLineEdit>
//Added by qt3to4:
-#include <QVBoxLayout>
-#include <QFrame>
-#include <QGridLayout>
-#include <QCloseEvent>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QFrame>
+#include <QtGui/QGridLayout>
+#include <QtGui/QCloseEvent>
#include <kapplication.h>
#include <kconfig.h>
@@ -103,12 +102,13 @@
QGridLayout *gl = new QGridLayout( );
topLayout->addLayout( gl );
- gl->setColStretch( 1, 10 );
+ gl->setColumnStretch( 1, 10 );
mScroll = new QScrollBar( this );
Q_CHECK_PTR(mScroll);
mScroll->setOrientation( Qt::Horizontal );
- mScroll->setSteps(1,20);
+ mScroll->setSingleStep(1);
+ mScroll->setPageStep(20);
mScroll->setRange(0, 180 );
gl->addWidget( mScroll, 1, 1 );
connect(mScroll,SIGNAL(valueChanged(int)),this,SLOT(slotChanged()));
@@ -118,7 +118,7 @@
mLCD->setNumDigits( 3 );
mLCD->setSegmentStyle(QLCDNumber::Filled);
connect(mScroll,SIGNAL(valueChanged(int)),mLCD,SLOT(display(int)));
- gl->addMultiCellWidget( mLCD, 0, 1, 0, 0 );
+ gl->addWidget( mLCD, 0, 0, 1, 0 );
text = i18n("Update frequency [seconds]. The value 0 disables update" );
QLabel *label = new QLabel( text, this );
--- trunk/KDE/kdeutils/kdf/kdfconfig.h #704433:704434
@@ -25,11 +25,11 @@
#ifndef __KDFCONFIG_H__
#define __KDFCONFIG_H__
-#include <q3memarray.h>
+#include <Qt3Support/Q3MemArray>
//Added by qt3to4:
-#include <QLabel>
-#include <QCloseEvent>
+#include <QtGui/QLabel>
+#include <QtGui/QCloseEvent>
#include "stdoption.h"
--- trunk/KDE/kdeutils/kdf/kdfwidget.cpp #704433:704434
@@ -31,18 +31,18 @@
#include "kdfwidget.h"
#include <stdlib.h>
-#include <q3header.h>
-#include <QTimer>
-#include <QLayout>
-#include <qpainter.h>
+#include <Qt3Support/Q3Header>
+#include <QtCore/QTimer>
+#include <QtGui/QLayout>
+#include <QtGui/QPainter>
//Added by qt3to4:
-#include <QPixmap>
-#include <QTimerEvent>
-#include <QVBoxLayout>
-#include <QFrame>
-#include <QResizeEvent>
-#include <QCloseEvent>
-#include <QAbstractEventDispatcher>
+#include <QtGui/QPixmap>
+#include <QtCore/QTimerEvent>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QFrame>
+#include <QtGui/QResizeEvent>
+#include <QtGui/QCloseEvent>
+#include <QtCore/QAbstractEventDispatcher>
#include <kapplication.h>
#include <kmessagebox.h>
#include <kmenu.h>
@@ -52,7 +52,6 @@
#include "listview.h"
#include "optiondialog.h"
-
#define BAR_COLUMN 7
#define FULL_PERCENT 95.0
@@ -137,7 +136,7 @@
this, SLOT(columnSizeChanged(int, int, int)) );
makeColumns();
- mIsTopLevel = QString(parent->className()) == "KDFTopLevel" ? true : false;
+ mIsTopLevel = QString(parent->metaObject()->className()) == "KDFTopLevel" ? true \
: false; }
loadSettings();
--- trunk/KDE/kdeutils/kdf/kdfwidget.h #704433:704434
@@ -21,18 +21,17 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
#ifndef __KDFWIDGET_H__
#define __KDFWIDGET_H__
-#include <q3memarray.h>
-#include <qglobal.h>
+#include <Qt3Support/Q3MemArray>
+#include <QtCore/qglobal.h>
-#include <q3listview.h>
+#include <Qt3Support/Q3ListView>
//Added by qt3to4:
-#include <QTimerEvent>
-#include <QResizeEvent>
-#include <QCloseEvent>
+#include <QtCore/QTimerEvent>
+#include <QtGui/QResizeEvent>
+#include <QtGui/QCloseEvent>
#include "disks.h"
#include "disklist.h"
--- trunk/KDE/kdeutils/kdf/kwikdisk.cpp #704433:704434
@@ -31,15 +31,15 @@
#include <stdlib.h>
-#include <qpen.h>
-#include <qbitmap.h>
-#include <qpainter.h>
+#include <QtGui/QPen>
+#include <QtGui/QBitmap>
+#include <QtGui/QPainter>
//Added by qt3to4:
-#include <QMouseEvent>
-#include <QPixmap>
-#include <QTimerEvent>
-#include <QEvent>
-#include <QAbstractEventDispatcher>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPixmap>
+#include <QtGui/QTimerEvent>
+#include <QtGui/QEvent>
+#include <QtCore/QAbstractEventDispatcher>
#include <kxmlguiwindow.h>
#include <klocale.h>
#include <kapplication.h>
--- trunk/KDE/kdeutils/kdf/kwikdisk.h #704433:704434
@@ -30,9 +30,9 @@
#include <kxmlguiwindow.h>
#include <ksystemtrayicon.h>
-#include <QMouseEvent>
-#include <QTimerEvent>
-#include <QEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QTimerEvent>
+#include <QtGui/QEvent>
/**
* @short Application Main Window (however in Tray)
--- trunk/KDE/kdeutils/kdf/listview.cpp #704433:704434
@@ -25,11 +25,11 @@
//
#include "listview.h"
-#include <qbitmap.h>
-#include <q3header.h>
-#include <qpainter.h>
+#include <QtGui/QBitmap>
+#include <Qt3Support/Q3Header>
+#include <QtGui/QPainter>
//Added by qt3to4:
-#include <QPixmap>
+#include <QtGui/QPixmap>
#include <kiconloader.h>
--- trunk/KDE/kdeutils/kdf/listview.h #704433:704434
@@ -20,8 +20,8 @@
#ifndef _LISTVIEW_H_
#define _LISTVIEW_H_
-#include <q3dict.h>
-#include <qpixmap.h>
+#include <Qt3Support/Q3Dict>
+#include <QtGui/QPixmap>
#include <k3listview.h>
--- trunk/KDE/kdeutils/kdf/mntconfig.cpp #704433:704434
@@ -21,7 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
//
// 1999-11-29 Espen Sand
// Converted to QLayout and QListView + cleanups
@@ -29,16 +28,16 @@
#include "mntconfig.h"
-#include <q3groupbox.h>
-#include <q3header.h>
-#include <QLayout>
+#include <Qt3Support/Q3GroupBox>
+#include <Qt3Support/Q3Header>
+#include <QtGui/QLayout>
#include <KLineEdit>
//Added by qt3to4:
-#include <QPixmap>
-#include <QVBoxLayout>
-#include <QFrame>
-#include <QGridLayout>
-#include <QCloseEvent>
+#include <QtGui/QPixmap>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QFrame>
+#include <QtGui/QGridLayout>
+#include <QtGui/QCloseEvent>
#undef Unsorted
@@ -53,7 +52,6 @@
static bool GUI;
#endif
-
MntConfigWidget::MntConfigWidget(QWidget *parent, bool init)
: QWidget(parent)
{
--- trunk/KDE/kdeutils/kdf/mntconfig.h #704433:704434
@@ -32,8 +32,8 @@
#include "disks.h"
#include "disklist.h"
//Added by qt3to4:
-#include <QCloseEvent>
-#include <Q3MemArray>
+#include <QtGui/QCloseEvent>
+#include <Qt3Support/Q3MemArray>
class Q3GroupBox;
class QPushButton;
--- trunk/KDE/kdeutils/kdf/optiondialog.cpp #704433:704434
@@ -19,9 +19,9 @@
#include "optiondialog.h"
-#include <QLayout>
+#include <QtGui/QLayout>
//Added by qt3to4:
-#include <QVBoxLayout>
+#include <QtGui/QVBoxLayout>
#include "kdfconfig.h"
#include "mntconfig.h"
--- trunk/KDE/kdeutils/kdf/stdoption.cpp #704433:704434
@@ -25,7 +25,6 @@
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-
#include "stdoption.h"
#include <kapplication.h>
--- trunk/KDE/kdeutils/kdf/stdoption.h #704433:704434
@@ -27,7 +27,7 @@
#ifndef _STD_OPTION_H_
#define _STD_OPTION_H_
-#include <QString>
+#include <QtCore/QString>
class CStdOption
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic