From a322c04c52ac456c2491bd5dfe93e300bdc6675d Mon Sep 17 00:00:00 2001 From: mlaurent Date: Mon, 1 Aug 2005 11:25:38 +0000 Subject: [PATCH] Qt3to4 git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdeartwork@442030 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kscreensaver/kdesavers/Euphoria.cpp | 4 + kscreensaver/kdesavers/Euphoria.h | 2 + kscreensaver/kdesavers/Flux.cpp | 4 + kscreensaver/kdesavers/Flux.h | 2 + kscreensaver/kdesavers/SolarWinds.cpp | 4 + kscreensaver/kdesavers/SolarWinds.h | 2 + kscreensaver/kdesavers/banner.cpp | 21 ++-- kscreensaver/kdesavers/banner.h | 5 +- kscreensaver/kdesavers/blob.cpp | 7 +- kscreensaver/kdesavers/blob.h | 6 +- kscreensaver/kdesavers/firesaver.cpp | 2 + kscreensaver/kdesavers/firesaver.h | 10 +- kscreensaver/kdesavers/firesaversetup.ui.h | 4 +- kscreensaver/kdesavers/firesaverwriter.cpp | 6 +- kscreensaver/kdesavers/firesaverwriter.h | 6 +- kscreensaver/kdesavers/kclock.cpp | 12 +- kscreensaver/kdesavers/kvm.cpp | 4 + kscreensaver/kdesavers/kvm.h | 4 +- kscreensaver/kdesavers/lines.cpp | 3 + kscreensaver/kdesavers/lines.h | 2 +- kscreensaver/kdesavers/lorenz.cpp | 3 + kscreensaver/kdesavers/pendulum.cpp | 8 +- kscreensaver/kdesavers/pendulum.h | 2 + kscreensaver/kdesavers/polygon.cpp | 12 +- kscreensaver/kdesavers/polygon.h | 9 +- kscreensaver/kdesavers/rotation.cpp | 28 ++--- kscreensaver/kdesavers/rotation.h | 2 + kscreensaver/kdesavers/science.cpp | 8 +- kscreensaver/kdesavers/science.h | 2 + kscreensaver/kdesavers/slideshow.cpp | 16 ++- kscreensaver/kdesavers/slideshow.h | 4 +- kscreensaver/kdesavers/sspreviewarea.cpp | 2 + kscreensaver/kdesavers/sspreviewarea.h | 2 + kscreensaver/kpartsaver/kpartsaver.cpp | 6 +- kscreensaver/kpartsaver/kpartsaver.h | 4 +- kscreensaver/xsavers/swarm.cpp | 6 +- styles/dotnet/dotnet.cpp | 173 +++++++++++++++-------------- styles/dotnet/dotnet.h | 10 +- styles/phase/phasestyle.cpp | 133 +++++++++++----------- styles/phase/phasestyle.h | 4 +- 40 files changed, 320 insertions(+), 224 deletions(-) diff --git a/kscreensaver/kdesavers/Euphoria.cpp b/kscreensaver/kdesavers/Euphoria.cpp index dfde3e12..8e136bf3 100644 --- a/kscreensaver/kdesavers/Euphoria.cpp +++ b/kscreensaver/kdesavers/Euphoria.cpp @@ -29,6 +29,10 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include #include "Euphoria.h" #include "Euphoria.moc" #include "EuphoriaTexture.h" diff --git a/kscreensaver/kdesavers/Euphoria.h b/kscreensaver/kdesavers/Euphoria.h index b7de2677..d4190096 100644 --- a/kscreensaver/kdesavers/Euphoria.h +++ b/kscreensaver/kdesavers/Euphoria.h @@ -11,6 +11,8 @@ #include +//Added by qt3to4: +#include #include diff --git a/kscreensaver/kdesavers/Flux.cpp b/kscreensaver/kdesavers/Flux.cpp index 04c43d94..cd181afe 100644 --- a/kscreensaver/kdesavers/Flux.cpp +++ b/kscreensaver/kdesavers/Flux.cpp @@ -37,6 +37,10 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include #include "Flux.h" #include "Flux.moc" diff --git a/kscreensaver/kdesavers/Flux.h b/kscreensaver/kdesavers/Flux.h index 7fe20172..9b2ec6d8 100644 --- a/kscreensaver/kdesavers/Flux.h +++ b/kscreensaver/kdesavers/Flux.h @@ -11,6 +11,8 @@ #include +//Added by qt3to4: +#include #define LIGHTSIZE 64 diff --git a/kscreensaver/kdesavers/SolarWinds.cpp b/kscreensaver/kdesavers/SolarWinds.cpp index e51ddb5e..dc0c92ff 100644 --- a/kscreensaver/kdesavers/SolarWinds.cpp +++ b/kscreensaver/kdesavers/SolarWinds.cpp @@ -29,6 +29,10 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include #include "SolarWinds.h" #include "SolarWinds.moc" diff --git a/kscreensaver/kdesavers/SolarWinds.h b/kscreensaver/kdesavers/SolarWinds.h index 8831c015..55c88a75 100644 --- a/kscreensaver/kdesavers/SolarWinds.h +++ b/kscreensaver/kdesavers/SolarWinds.h @@ -11,6 +11,8 @@ #include +//Added by qt3to4: +#include #define LIGHTSIZE 64 diff --git a/kscreensaver/kdesavers/banner.cpp b/kscreensaver/kdesavers/banner.cpp index 5309c05a..87136a73 100644 --- a/kscreensaver/kdesavers/banner.cpp +++ b/kscreensaver/kdesavers/banner.cpp @@ -18,12 +18,17 @@ #include #include #include -#include +#include #include #include #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -36,7 +41,7 @@ #include "banner.h" #include "banner.moc" - +#include // libkscreensaver interface extern "C" { @@ -74,7 +79,7 @@ KBannerSetup::KBannerSetup( QWidget *parent, const char *name ) QVBoxLayout *tl11 = new QVBoxLayout( 0, 0, spacingHint() ); tl1->addLayout(tl11); - QGroupBox *group = new QGroupBox( 0, Vertical, i18n("Font"), main ); + Q3GroupBox *group = new Q3GroupBox( 0, Vertical, i18n("Font"), main ); QGridLayout *gl = new QGridLayout(group->layout(), 6, 2, spacingHint() ); label = new QLabel( i18n("Family:"), group ); @@ -123,7 +128,7 @@ KBannerSetup::KBannerSetup( QWidget *parent, const char *name ) preview = new QWidget( main ); preview->setFixedSize( 220, 170 ); - preview->setBackgroundColor( black ); + preview->setBackgroundColor( Qt::black ); preview->show(); // otherwise saver does not get correct size saver = new KBannerSaver( preview->winId() ); tl1->addWidget(preview); @@ -326,7 +331,7 @@ void KBannerSetup::slotOk() QString colName; colName.sprintf( "#%02x%02x%02x", fontColor.red(), fontColor.green(), - fontColor.blue() ); + fontColor.Qt::blue() ); config->writeEntry( "FontColor", colName ); config->writeEntry( "CyclingColor", cyclingColor ); config->writeEntry( "FontBold", bold ); @@ -484,7 +489,7 @@ void KBannerSaver::slotTimeout() if ( rect.height() > pixmapSize.height() ) pixmapSize.setHeight( rect.height() ); pixmap = QPixmap( pixmapSize ); - pixmap.fill( black ); + pixmap.fill( Qt::black ); QPainter p( &pixmap ); p.setFont( font ); p.setPen( fontColor ); @@ -494,14 +499,14 @@ void KBannerSaver::slotTimeout() xpos -= step; if ( xpos < -pixmapSize.width() ) { QPainter p( this ); - p.fillRect( xpos + step, ypos, pixmapSize.width(), pixmapSize.height(), black ); + p.fillRect( xpos + step, ypos, pixmapSize.width(), pixmapSize.height(), Qt::black ); xpos = width(); ypos = fsize + (int) ((double)(height()-2.0*fsize)*krnd->getDouble()); } if ( needBlank ) { - setBackgroundColor( black ); + setBackgroundColor( Qt::black ); erase(); needBlank = FALSE; } diff --git a/kscreensaver/kdesavers/banner.h b/kscreensaver/kdesavers/banner.h index 026b817d..bdffad58 100644 --- a/kscreensaver/kdesavers/banner.h +++ b/kscreensaver/kdesavers/banner.h @@ -9,6 +9,9 @@ #define __BANNER_H__ #include +//Added by qt3to4: +#include +#include #include #include @@ -105,7 +108,7 @@ private: bool bold; bool italic; int speed; - QValueList sizes; + Q3ValueList sizes; }; #endif diff --git a/kscreensaver/kdesavers/blob.cpp b/kscreensaver/kdesavers/blob.cpp index e717c7ee..af61e1ce 100644 --- a/kscreensaver/kdesavers/blob.cpp +++ b/kscreensaver/kdesavers/blob.cpp @@ -24,11 +24,14 @@ #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -461,7 +464,7 @@ KBlobSetup::KBlobSetup // available algorithms label = new QLabel(i18n("Algorithm:"), main); - algs = new QListBox(main); + algs = new Q3ListBox(main); algs->setMinimumSize(150, 105); for (int i = 0; i <= ALG_RANDOM; i++) algs->insertItem(alg_str[i]); diff --git a/kscreensaver/kdesavers/blob.h b/kscreensaver/kdesavers/blob.h index 93a02998..0c3bae3c 100644 --- a/kscreensaver/kdesavers/blob.h +++ b/kscreensaver/kdesavers/blob.h @@ -9,7 +9,7 @@ #define __BLOB_H__ #include -#include +#include #include #include @@ -87,7 +87,7 @@ protected slots: void slotTimeout(); }; -class QListBox; +class Q3ListBox; class KIntNumInput; class KBlobSetup : public KDialogBase @@ -96,7 +96,7 @@ class KBlobSetup : public KDialogBase int showtime; int alg; - QListBox *algs; + Q3ListBox *algs; KIntNumInput *stime; public: diff --git a/kscreensaver/kdesavers/firesaver.cpp b/kscreensaver/kdesavers/firesaver.cpp index cf4963a6..47d145a2 100644 --- a/kscreensaver/kdesavers/firesaver.cpp +++ b/kscreensaver/kdesavers/firesaver.cpp @@ -42,6 +42,8 @@ #include #include +//Added by qt3to4: +#include class KFireSaverKSS : public KScreenSaver { diff --git a/kscreensaver/kdesavers/firesaver.h b/kscreensaver/kdesavers/firesaver.h index 37092dd7..7ffef544 100644 --- a/kscreensaver/kdesavers/firesaver.h +++ b/kscreensaver/kdesavers/firesaver.h @@ -31,10 +31,12 @@ #define FIELDW_4 (FIELDWIDTH/4.0) #include -#include +#include #include #include #include +//Added by qt3to4: +#include #include #include @@ -79,12 +81,12 @@ class KFireSaver : public QGLWidget void readConfig(); //list of particles and stars - QPtrList + Q3PtrList particleList, starList; //stuff for 'exploding' pixmaps (kde, tux, icons..) - QPtrList + Q3PtrList imageList; //texture stuff @@ -98,7 +100,7 @@ class KFireSaver : public QGLWidget //sound stuff KArtsDispatcher artsDispatcher; KArtsServer artsServer; - QPtrList playObjectList; + Q3PtrList playObjectList; QString sound_explosion, sound_debris; diff --git a/kscreensaver/kdesavers/firesaversetup.ui.h b/kscreensaver/kdesavers/firesaversetup.ui.h index 8cf478e2..a185a1b2 100644 --- a/kscreensaver/kdesavers/firesaversetup.ui.h +++ b/kscreensaver/kdesavers/firesaversetup.ui.h @@ -137,8 +137,8 @@ void KFireSaverSetup::readConfig() fireworksSlider->setValue(config.readNumEntry( "FireworksFrequency", 7 )); particlesSlider->setValue(config.readNumEntry( "ParticlesSize", 0 )); bottomfireBox->setChecked(config.readBoolEntry( "enable-BottomFire", true )); - QColor blue = Qt::darkBlue; - bottomfireColorButton->setColor(config.readColorEntry( "BottomFireColor", &blue )); + QColor Qt::blue = Qt::darkBlue; + bottomfireColorButton->setColor(config.readColorEntry( "BottomFireColor", &Qt::blue )); soundsBox->setChecked(config.readBoolEntry( "enable-Sounds", false )); overheadBox->setChecked(config.readBoolEntry( "enable-NoOverhead", true )); frameskipBox->setChecked(config.readBoolEntry( "enable-FrameSkip", true )); diff --git a/kscreensaver/kdesavers/firesaverwriter.cpp b/kscreensaver/kdesavers/firesaverwriter.cpp index 07209884..994f1073 100644 --- a/kscreensaver/kdesavers/firesaverwriter.cpp +++ b/kscreensaver/kdesavers/firesaverwriter.cpp @@ -15,6 +15,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include #include @@ -116,7 +118,7 @@ void Writer::spawnWords( QString phrase, effectType fX ) float xCenter = 0, yCenter = drand48()*40 - 20, wordsWidth = 0; - QPtrList localWords; + Q3PtrList localWords; while ( phrase.length() > 0 ) { QString letters = phrase.section(" ",0,0); @@ -187,7 +189,7 @@ void Writer::render( double dT ) bool Writer::loadMap( QString descFile ) { QFile desc( locate("data","kfiresaver/"+descFile) ); - if ( !desc.open( IO_ReadOnly ) ) + if ( !desc.open( QIODevice::ReadOnly ) ) return false; unsigned int currentNumber; diff --git a/kscreensaver/kdesavers/firesaverwriter.h b/kscreensaver/kdesavers/firesaverwriter.h index b7bd2e78..eb5a0a45 100644 --- a/kscreensaver/kdesavers/firesaverwriter.h +++ b/kscreensaver/kdesavers/firesaverwriter.h @@ -13,7 +13,7 @@ #define FIRESAVER_WRITER_H #include -#include +#include #include #include @@ -70,7 +70,7 @@ class Word float vScale, vX, vY; float activateTime, lifeTime, currentTime; float color[4]; - QPtrList symbolList; + Q3PtrList symbolList; }; @@ -103,7 +103,7 @@ class Writer unsigned int texArray[16]; //list of words and map of symbols - QPtrList wordList; + Q3PtrList wordList; QMap symbolMap; //disables standard constructor diff --git a/kscreensaver/kdesavers/kclock.cpp b/kscreensaver/kdesavers/kclock.cpp index ac24c4b1..831ca299 100644 --- a/kscreensaver/kdesavers/kclock.cpp +++ b/kscreensaver/kdesavers/kclock.cpp @@ -13,13 +13,17 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -83,7 +87,7 @@ KClockSetup::KClockSetup(QWidget *parent, const char *name) QHBoxLayout *hbox = new QHBoxLayout; top->addLayout( hbox ); - QGroupBox *colgroup = new QGroupBox(i18n("Colors"), main); + Q3GroupBox *colgroup = new Q3GroupBox(i18n("Colors"), main); colgroup->setColumnLayout( 0, Horizontal ); QGridLayout *grid = new QGridLayout( colgroup->layout(), 5, 2, spacingHint() ); @@ -151,7 +155,7 @@ KClockSetup::KClockSetup(QWidget *parent, const char *name) top->addWidget( qs ); bool rtl = kapp->reverseLayout(); - QHBox *qsscale = new QHBox(main); + Q3HBox *qsscale = new Q3HBox(main); label = new QLabel(i18n("Small"), qsscale); label->setAlignment(rtl ? AlignRight : AlignLeft); label = new QLabel(i18n("Medium"), qsscale); diff --git a/kscreensaver/kdesavers/kvm.cpp b/kscreensaver/kdesavers/kvm.cpp index 9d7a32fa..ddc47175 100644 --- a/kscreensaver/kdesavers/kvm.cpp +++ b/kscreensaver/kdesavers/kvm.cpp @@ -39,6 +39,10 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include diff --git a/kscreensaver/kdesavers/kvm.h b/kscreensaver/kdesavers/kvm.h index 44c7eeb3..118fee2c 100644 --- a/kscreensaver/kdesavers/kvm.h +++ b/kscreensaver/kdesavers/kvm.h @@ -7,7 +7,9 @@ #define __KVM_H__ #include -#include +#include +//Added by qt3to4: +#include #include #include diff --git a/kscreensaver/kdesavers/lines.cpp b/kscreensaver/kdesavers/lines.cpp index fbe31056..8275555e 100644 --- a/kscreensaver/kdesavers/lines.cpp +++ b/kscreensaver/kdesavers/lines.cpp @@ -14,6 +14,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include #include diff --git a/kscreensaver/kdesavers/lines.h b/kscreensaver/kdesavers/lines.h index d3f1062c..13f8bd92 100644 --- a/kscreensaver/kdesavers/lines.h +++ b/kscreensaver/kdesavers/lines.h @@ -9,7 +9,7 @@ #define __LINES_H__ #include -#include +#include #include #include diff --git a/kscreensaver/kdesavers/lorenz.cpp b/kscreensaver/kdesavers/lorenz.cpp index c9017bb0..30765dcb 100644 --- a/kscreensaver/kdesavers/lorenz.cpp +++ b/kscreensaver/kdesavers/lorenz.cpp @@ -16,6 +16,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include diff --git a/kscreensaver/kdesavers/pendulum.cpp b/kscreensaver/kdesavers/pendulum.cpp index 56fcc21b..502c7597 100644 --- a/kscreensaver/kdesavers/pendulum.cpp +++ b/kscreensaver/kdesavers/pendulum.cpp @@ -38,6 +38,8 @@ #include #include #include +//Added by qt3to4: +#include // KDE headers #include #include @@ -209,7 +211,7 @@ void PendulumGLWidget::setM2Color(const QColor& c) void PendulumGLWidget::initializeGL(void) { - qglClearColor(QColor(black)); // set color to clear the background + qglClearColor(QColor(Qt::black)); // set color to clear the background glClearDepth(1); // depth buffer setup glEnable(GL_DEPTH_TEST); // depth testing @@ -367,7 +369,7 @@ KPendulumSaver::KPendulumSaver(WId id) : m_E(EDefault), m_persChangeInterval(persChangeIntervalDefault) { - setEraseColor(black); + setEraseColor(Qt::black); erase(); // erase area glArea = new PendulumGLWidget(this); // create gl widget glArea->setEyePhi(eyePhiDefault); @@ -730,7 +732,7 @@ KPendulumSetup::KPendulumSetup(QWidget* parent, const char* name) .arg(KPendulumSaver::persChangeIntervalLimitUpper)); // init preview area - preview->setBackgroundColor(black); + preview->setBackgroundColor(Qt::black); preview->show(); // otherwise saver does not get correct size // read settings from saver and update GUI elements with these values, saver diff --git a/kscreensaver/kdesavers/pendulum.h b/kscreensaver/kdesavers/pendulum.h index 97f71bc1..b1b4b256 100644 --- a/kscreensaver/kdesavers/pendulum.h +++ b/kscreensaver/kdesavers/pendulum.h @@ -19,6 +19,8 @@ #include #include #include +//Added by qt3to4: +#include // GL headers #include #include diff --git a/kscreensaver/kdesavers/polygon.cpp b/kscreensaver/kdesavers/polygon.cpp index 55e052f1..a77b5b22 100644 --- a/kscreensaver/kdesavers/polygon.cpp +++ b/kscreensaver/kdesavers/polygon.cpp @@ -14,6 +14,10 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include #include @@ -276,7 +280,7 @@ void kPolygonSaver::slotTimeout() if ( polygons.count() > numLines ) polygons.removeFirst(); - polygons.append( new QPointArray( polygons.last()->copy() ) ); + polygons.append( new Q3PointArray( polygons.last()->copy() ) ); moveVertices(); } @@ -291,9 +295,9 @@ void kPolygonSaver::initialisePolygons() { int i; - polygons.append( new QPointArray( numVertices + 1 ) ); + polygons.append( new Q3PointArray( numVertices + 1 ) ); - QPointArray &poly = *polygons.last(); + Q3PointArray &poly = *polygons.last(); for ( i = 0; i < numVertices; i++ ) { @@ -313,7 +317,7 @@ void kPolygonSaver::initialisePolygons() void kPolygonSaver::moveVertices() { int i; - QPointArray &poly = *polygons.last(); + Q3PointArray &poly = *polygons.last(); for ( i = 0; i < numVertices; i++ ) { diff --git a/kscreensaver/kdesavers/polygon.h b/kscreensaver/kdesavers/polygon.h index bfaac8a4..e58cd397 100644 --- a/kscreensaver/kdesavers/polygon.h +++ b/kscreensaver/kdesavers/polygon.h @@ -9,7 +9,10 @@ #define __POLYGON_H__ #include -#include +#include +//Added by qt3to4: +#include +#include #include #include @@ -44,8 +47,8 @@ protected: int speed; QColor colors[64]; int currentColor; - QPtrList polygons; - QMemArray directions; + Q3PtrList polygons; + Q3MemArray directions; KRandomSequence rnd; }; diff --git a/kscreensaver/kdesavers/rotation.cpp b/kscreensaver/kdesavers/rotation.cpp index c82f03b0..e88bd176 100644 --- a/kscreensaver/kdesavers/rotation.cpp +++ b/kscreensaver/kdesavers/rotation.cpp @@ -38,6 +38,8 @@ #include #include #include +//Added by qt3to4: +#include // KDE headers #include #include @@ -187,7 +189,7 @@ RotationGLWidget::RotationGLWidget( void RotationGLWidget::initializeGL(void) { - qglClearColor(QColor(black)); // set color to clear the background + qglClearColor(QColor(Qt::black)); // set color to clear the background glClearDepth(1); // depth buffer setup glEnable(GL_DEPTH_TEST); // depth testing @@ -223,17 +225,17 @@ void RotationGLWidget::initializeGL(void) glLoadIdentity(); // z-axis, blue - qglColor(QColor(blue)); + qglColor(QColor(Qt::blue)); myGlArrow(fixedAxsesLength, 0.5f, 0.03f, 0.1f); // x-axis, red - qglColor(QColor(red)); + qglColor(QColor(Qt::red)); glRotatef(90, 0, 1, 0); myGlArrow(fixedAxsesLength, 0.5f, 0.03f, 0.1f); // y-axis, green - qglColor(QColor(green)); + qglColor(QColor(Qt::green)); glLoadIdentity(); glRotatef(-90, 1, 0, 0); myGlArrow(fixedAxsesLength, 0.5f, 0.03f, 0.1f); @@ -249,18 +251,18 @@ void RotationGLWidget::initializeGL(void) glNewList(bodyAxses, GL_COMPILE); // z-axis, blue - qglColor(QColor(blue)); + qglColor(QColor(Qt::blue)); myGlArrow(bodyAxsesLength, 0.5f, 0.03f, 0.1f); // x-axis, red - qglColor(QColor(red)); + qglColor(QColor(Qt::red)); glPushMatrix(); glRotatef(90, 0, 1, 0); myGlArrow(bodyAxsesLength, 0.5f, 0.03f, 0.1f); glPopMatrix(); // y-axis, green - qglColor(QColor(green)); + qglColor(QColor(Qt::green)); glPushMatrix(); glRotatef(-90, 1, 0, 0); myGlArrow(bodyAxsesLength, 0.5f, 0.03f, 0.1f); @@ -342,7 +344,7 @@ void RotationGLWidget::paintGL(void) 180./M_PI * vec3::angle(vec3(0,0,1), omega); glPushMatrix(); glRotatef(rotdeg, rotvec[0], rotvec[1], rotvec[2]); - qglColor(QColor(white)); + qglColor(QColor(Qt::white)); myGlArrow(7, .5f, .1f, 0.2f); glPopMatrix(); @@ -376,7 +378,7 @@ void RotationGLWidget::paintGL(void) // paint box glBegin(GL_QUADS); // front (z) - qglColor(QColor(blue)); + qglColor(QColor(Qt::blue)); glNormal3f( 0,0,1); glVertex3f( 1, 1, 1); glVertex3f(-1, 1, 1); @@ -389,7 +391,7 @@ void RotationGLWidget::paintGL(void) glVertex3f(-1, -1, -1); glVertex3f( 1, -1, -1); // top (y) - qglColor(QColor(green)); + qglColor(QColor(Qt::green)); glNormal3f( 0,1,0); glVertex3f( 1, 1, 1); glVertex3f( 1, 1, -1); @@ -403,7 +405,7 @@ void RotationGLWidget::paintGL(void) glVertex3f(-1, -1, -1); glVertex3f(-1, -1, 1); // left (-x) - qglColor(QColor(red)); + qglColor(QColor(Qt::red)); glNormal3f( -1,0,0); glVertex3f(-1, 1, 1); glVertex3f(-1, 1, -1); @@ -484,7 +486,7 @@ KRotationSaver::KRotationSaver(WId id) readSettings(); // read global settings initData(); // init e1,e2,e3,omega,solver - setEraseColor(black); + setEraseColor(Qt::black); erase(); // erase area glArea = new RotationGLWidget( this, 0, omega, e1, e2, e3, J); // create gl widget @@ -732,7 +734,7 @@ KRotationSetup::KRotationSetup(QWidget* parent, const char* name) .arg(KRotationSaver::initEulerThetaLimitUpper, 0, 'f', 2)); // init preview area - preview->setBackgroundColor(black); + preview->setBackgroundColor(Qt::black); preview->show(); // otherwise saver does not get correct size // read settings from saver and update GUI elements with these values, saver diff --git a/kscreensaver/kdesavers/rotation.h b/kscreensaver/kdesavers/rotation.h index 5cd47341..72a6e8ca 100644 --- a/kscreensaver/kdesavers/rotation.h +++ b/kscreensaver/kdesavers/rotation.h @@ -15,6 +15,8 @@ #include #include #include +//Added by qt3to4: +#include // GL headers #include #include diff --git a/kscreensaver/kdesavers/science.cpp b/kscreensaver/kdesavers/science.cpp index 185f3b55..fa3990ca 100644 --- a/kscreensaver/kdesavers/science.cpp +++ b/kscreensaver/kdesavers/science.cpp @@ -15,10 +15,14 @@ #include #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -865,7 +869,7 @@ KScienceSetup::KScienceSetup( QWidget *parent, const char *name ) QLabel *label = new QLabel( i18n("Mode:"), main ); ltm->addWidget( label ); - QListBox *c = new QListBox( main ); + Q3ListBox *c = new Q3ListBox( main ); for(int i = 0; iinsertItem( modeInfo[i].name ); c->setCurrentItem( mode ); diff --git a/kscreensaver/kdesavers/science.h b/kscreensaver/kdesavers/science.h index 7211f5d5..d6512c67 100644 --- a/kscreensaver/kdesavers/science.h +++ b/kscreensaver/kdesavers/science.h @@ -10,6 +10,8 @@ #include #include +//Added by qt3to4: +#include #include #include diff --git a/kscreensaver/kdesavers/slideshow.cpp b/kscreensaver/kdesavers/slideshow.cpp index bc614f35..a2522bd3 100644 --- a/kscreensaver/kdesavers/slideshow.cpp +++ b/kscreensaver/kdesavers/slideshow.cpp @@ -15,11 +15,15 @@ #include #include #include -#include +#include #include #include #include -#include +#include +//Added by qt3to4: +#include +#include +#include #include #include @@ -118,7 +122,7 @@ kSlideShowSaver::~kSlideShowSaver() //----------------------------------------------------------------------------- void kSlideShowSaver::initNextScreen() { - QPaintDeviceMetrics metric(this); + Q3PaintDeviceMetrics metric(this); int w, h; w = width(); @@ -173,7 +177,7 @@ int kSlideShowSaver::effectMultiCircleOut(bool aInit) { int x, y, i; double alpha; - static QPointArray pa(4); + static Q3PointArray pa(4); if (aInit) { @@ -332,7 +336,7 @@ int kSlideShowSaver::effectMeltdown(bool aInit) int kSlideShowSaver::effectCircleOut(bool aInit) { int x, y; - static QPointArray pa(4); + static Q3PointArray pa(4); if (aInit) { @@ -920,7 +924,7 @@ kSlideShowSetup::kSlideShowSetup(QWidget *aParent, const char *aName) top->addStretch(); cfg->mPreview->setFixedSize(220, 170); - cfg->mPreview->setBackgroundColor(black); + cfg->mPreview->setBackgroundColor(Qt::black); cfg->mPreview->show(); // otherwise saver does not get correct size mSaver = new kSlideShowSaver(cfg->mPreview->winId()); diff --git a/kscreensaver/kdesavers/slideshow.h b/kscreensaver/kdesavers/slideshow.h index 56ababb2..735c9a77 100644 --- a/kscreensaver/kdesavers/slideshow.h +++ b/kscreensaver/kdesavers/slideshow.h @@ -8,7 +8,7 @@ #define SLIDESHOW_H #include -#include +#include #include #include #include @@ -82,7 +82,7 @@ protected: protected: /** Init mPainter with next-screen's pixmap and call mPainter.begin(&mWidget) */ - void startPainter(Qt::PenStyle penStyle=NoPen); + void startPainter(Qt::PenStyle penStyle=Qt::NoPen); protected: bool mEffectRunning; diff --git a/kscreensaver/kdesavers/sspreviewarea.cpp b/kscreensaver/kdesavers/sspreviewarea.cpp index d189c409..d94844d4 100644 --- a/kscreensaver/kdesavers/sspreviewarea.cpp +++ b/kscreensaver/kdesavers/sspreviewarea.cpp @@ -8,6 +8,8 @@ #include "sspreviewarea.h" #include "sspreviewarea.moc" +//Added by qt3to4: +#include SsPreviewArea::SsPreviewArea(QWidget* parent, const char* name) : QWidget(parent, name) diff --git a/kscreensaver/kdesavers/sspreviewarea.h b/kscreensaver/kdesavers/sspreviewarea.h index d0552da2..0ee990d9 100644 --- a/kscreensaver/kdesavers/sspreviewarea.h +++ b/kscreensaver/kdesavers/sspreviewarea.h @@ -10,6 +10,8 @@ #define SSPREVIEWAREA_H #include +//Added by qt3to4: +#include /** @brief Reimplementation of QWidget emitting a signal if resized. * diff --git a/kscreensaver/kpartsaver/kpartsaver.cpp b/kscreensaver/kpartsaver/kpartsaver.cpp index 840a1199..abcfd4a1 100644 --- a/kscreensaver/kpartsaver/kpartsaver.cpp +++ b/kscreensaver/kpartsaver/kpartsaver.cpp @@ -25,12 +25,14 @@ #include #include #include -#include +#include #include #include #include #include #include +//Added by qt3to4: +#include #include #include @@ -52,7 +54,7 @@ #include -QPtrList g_savers; +Q3PtrList g_savers; bool g_inited = false; diff --git a/kscreensaver/kpartsaver/kpartsaver.h b/kscreensaver/kpartsaver/kpartsaver.h index 1cd4270b..83c3babe 100644 --- a/kscreensaver/kpartsaver/kpartsaver.h +++ b/kscreensaver/kpartsaver/kpartsaver.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -87,7 +87,7 @@ Q_OBJECT bool openURL( KURL url ); - QValueList m_media; + Q3ValueList m_media; QTimer *m_timer; KParts::ReadOnlyPart *m_part; int m_current; diff --git a/kscreensaver/xsavers/swarm.cpp b/kscreensaver/xsavers/swarm.cpp index 0afae901..3b17bf1b 100644 --- a/kscreensaver/xsavers/swarm.cpp +++ b/kscreensaver/xsavers/swarm.cpp @@ -261,8 +261,8 @@ kSwarmSaver::kSwarmSaver( Drawable drawable ) : kScreenSaver( drawable ) readSettings(); // Clear to background colour when exposed - XSetWindowBackground(qt_xdisplay(), mDrawable, - BlackPixel(qt_xdisplay(), qt_xscreen())); + XSetWindowBackground(QX11Info::display(), mDrawable, + BlackPixel(QX11Info::display(), qt_xscreen())); colorContext = QColor::enterAllocContext(); @@ -353,7 +353,7 @@ kSwarmSetup::kSwarmSetup( QWidget *parent, const char *name ) preview = new QWidget( main ); preview->setFixedSize( 220, 170 ); - preview->setBackgroundColor( black ); + preview->setBackgroundColor( Qt::black ); preview->show(); // otherwise saver does not get correct size saver = new kSwarmSaver( preview->winId() ); top->addWidget(preview); diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp index 2c9db46c..0e62b7fb 100644 --- a/styles/dotnet/dotnet.cpp +++ b/styles/dotnet/dotnet.cpp @@ -26,25 +26,28 @@ */ #include #include -#include +#include #include #include #include -#include +#include #include -#include +#include #include #include #include -#include +#include #include -#include +#include #include #include #include #include #include #include +//Added by qt3to4: +#include +#include #include #include "dotnet.h" @@ -156,7 +159,7 @@ void dotNETstyle::unPolish(QWidget* widget) void dotNETstyle::renderMenuBlendPixmap(KPixmap &pix, const QColorGroup &cg, - const QPopupMenu *popup) const + const Q3PopupMenu *popup) const { QPainter p( &pix ); if (reverseLayout) { @@ -193,11 +196,11 @@ void dotNETstyle::renderButton(QPainter *p, const QCOORD iCorners[] = { x, y + h - 2, x, y + 1, x + 1, y, x + w - 2, y, x + w - 1, y + 1, x + w - 1, y + h - 2, x + w - 2, y + h - 1, x + 1, y + h - 1 }; p->fillRect(x+1, y+1, w-2, h-2, g.button()); p->setPen(g.button().dark()); - p->drawLineSegments(QPointArray(8, iCorners)); + p->drawLineSegments(Q3PointArray(8, iCorners)); if (corners) { const QCOORD cPixels[] = { x, y, x + w - 1, y, x + w - 1, y + h - 1, x, y + h - 1 }; p->setPen(g.button()); - p->drawPoints(QPointArray(4, cPixels)); + p->drawPoints(Q3PointArray(4, cPixels)); } } else { p->setPen(g.button().dark()); @@ -206,7 +209,7 @@ void dotNETstyle::renderButton(QPainter *p, } const QCOORD oCorners[] = { x + 1, y + h - 2, x + 1, y + 1, x + w - 2, y + 1, x + w - 2, y + h - 2 }; - const QPointArray outline(4, oCorners); + const Q3PointArray outline(4, oCorners); p->setPen(g.button().dark(115)); p->setBrush(QBrush::NoBrush); p->drawConvexPolygon(outline); @@ -309,11 +312,11 @@ void dotNETstyle::renderPanel(QPainter *p, const QCOORD oCorners[] = { x, y2, x, y, x2, y, x2, y2 }; const QCOORD iCorners[] = { x+1, y2-1, x+1, y+1, x2-1, y+1, x2-1, y2-1 }; p->setPen(g.background().dark()); - p->drawConvexPolygon(QPointArray(4, oCorners)); + p->drawConvexPolygon(Q3PointArray(4, oCorners)); if (thick) { p->setPen(g.background().dark(115)); - p->drawConvexPolygon(QPointArray(4, iCorners)); + p->drawConvexPolygon(Q3PointArray(4, iCorners)); p->setPen(g.background().light()); if (sunken) { @@ -327,21 +330,21 @@ void dotNETstyle::renderPanel(QPainter *p, if (roundedCorners) { p->setPen(g.background()); - p->drawPoints(QPointArray(4, oCorners)); + p->drawPoints(Q3PointArray(4, oCorners)); } } else { if (sunken) { const QCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; p->setPen(g.background().dark()); - p->drawConvexPolygon(QPointArray(4, corners)); + p->drawConvexPolygon(Q3PointArray(4, corners)); p->setPen(g.background().light()); - p->drawPolyline(QPointArray(4, corners), 0, 3); + p->drawPolyline(Q3PointArray(4, corners), 0, 3); } else { const QCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 }; p->setPen(g.background().dark()); - p->drawPolygon(QPointArray(4, corners)); + p->drawPolygon(Q3PointArray(4, corners)); p->setPen(g.background().light()); - p->drawPolyline(QPointArray(4, corners), 0, 3); + p->drawPolyline(Q3PointArray(4, corners), 0, 3); } } @@ -351,15 +354,15 @@ void dotNETstyle::renderPanel(QPainter *p, if (sunken) { const QCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; p->setPen(g.background().dark()); - p->drawConvexPolygon(QPointArray(4, corners)); + p->drawConvexPolygon(Q3PointArray(4, corners)); p->setPen(g.background().light()); - p->drawPolyline(QPointArray(4, corners), 0, 3); + p->drawPolyline(Q3PointArray(4, corners), 0, 3); } else { const QCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 }; p->setPen(g.background().dark()); - p->drawPolygon(QPointArray(4, corners)); + p->drawPolygon(Q3PointArray(4, corners)); p->setPen(g.background().light()); - p->drawPolyline(QPointArray(4, corners), 0, 3); + p->drawPolyline(Q3PointArray(4, corners), 0, 3); } } } @@ -383,7 +386,7 @@ void dotNETstyle::drawKStylePrimitive(KStylePrimitive kpe, const QSlider* slider = (const QSlider*)widget; int x, y, w, h; r.rect(&x, &y, &w, &h); - bool horizontal = slider->orientation() == Horizontal; + bool horizontal = slider->orientation() == Qt::Horizontal; int gcenter = (horizontal ? h : w) / 2; if (horizontal) { @@ -519,7 +522,7 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe, if (pseudo3D && roundedCorners) { const QCOORD corners[] = { x, y, x, y2, x2, y, x2, y2 }; p->setPen(cg.background()); - p->drawPoints(QPointArray(4, corners)); + p->drawPoints(Q3PointArray(4, corners)); } break; @@ -547,9 +550,9 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe, p->fillRect(r, cg.background()); p->setPen(cg.background().dark()); p->setBrush(flags & Style_Enabled ? cg.light() : cg.background()); - p->drawPolygon(QPointArray(28, outline)); + p->drawPolygon(Q3PointArray(28, outline)); p->setPen(cg.background().dark(115)); - p->drawPoints(QPointArray(10, indark)); + p->drawPoints(Q3PointArray(10, indark)); break; } @@ -559,7 +562,7 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe, p->setPen(color1); p->setBrush(color1); p->translate(r.x(), r.y()); - p->drawPolygon(QPointArray(28, outline)); + p->drawPolygon(Q3PointArray(28, outline)); p->translate(-r.x(), -r.y()); break; } @@ -593,7 +596,7 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe, if (pseudo3D && roundedCorners) { const QCOORD corners[] = { x, y, x, y2, x2, y, x2, y2 }; p->setPen(cg.background()); - p->drawPoints(QPointArray(4, corners)); + p->drawPoints(Q3PointArray(4, corners)); } break; } @@ -670,7 +673,7 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe, case PE_CheckMark: { int x = r.center().x() - 3, y = r.center().y() - 3; const QCOORD check[] = { x, y + 2, x, y + 4, x + 2, y + 6, x + 6, y + 2, x + 6, y, x + 2, y + 4 }; - const QPointArray a(6, check); + const Q3PointArray a(6, check); p->setPen(flags & Style_Down ? cg.highlight() : p->pen()); p->setBrush(flags & Style_Down ? cg.highlight() : p->pen().color()); @@ -686,7 +689,7 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe, case PE_ArrowDown: case PE_ArrowLeft: case PE_ArrowRight: { - QPointArray a; + Q3PointArray a; switch (pe) { case PE_SpinWidgetUp: @@ -785,7 +788,7 @@ void dotNETstyle::drawControl(ControlElement element, } case CE_ProgressBarContents: { - const QProgressBar *pb = (const QProgressBar *)widget; + const Q3ProgressBar *pb = (const Q3ProgressBar *)widget; if (pb->totalSteps()) { int x, y, w, h; @@ -816,13 +819,13 @@ void dotNETstyle::drawControl(ControlElement element, } if (pseudo3D) { - QPointArray corners; + Q3PointArray corners; if (reverseLayout) { const QCOORD c[] = { x, h, x, y, x + w, y, x + w, h }; - corners = QPointArray(4, c); + corners = Q3PointArray(4, c); } else { const QCOORD c[] = { x, h, x, y, w, y, w, h }; - corners = QPointArray(4, c); + corners = Q3PointArray(4, c); } p->setPen(cg.highlight().dark(120)); p->drawConvexPolygon(corners); @@ -844,7 +847,7 @@ void dotNETstyle::drawControl(ControlElement element, if (flags & Style_On || flags & Style_Down) { QCOORD center[] = { 4, 5, 4, 7, 5, 8, 7, 8, 8, 7, 8, 5, 7, 4, 5, 4 }; - QPointArray c(8, center); + Q3PointArray c(8, center); p->setPen(flags & Style_Down ? cg.highlight() : cg.text()); p->setBrush(flags & Style_Down ? cg.highlight() : cg.text()); p->drawPolygon(c); @@ -865,24 +868,24 @@ void dotNETstyle::drawControl(ControlElement element, if (tb->parent()->inherits("QTabWidget")) { const QTabWidget *tw = (const QTabWidget *)tb->parent(); - QWidget *cw = tw->cornerWidget(Qt::TopLeft); + QWidget *cw = tw->cornerWidget(Qt::TopLeftCorner); if (cw) { cornerWidget = true; } } switch (tbs) { - case QTabBar::RoundedAbove: { + case QTabBar::RoundedNorth: { y2 -= 1; if (pseudo3D) { p->setPen(cg.background().dark()); if (selected) { const QCOORD oCorners[] = { x, y2, x, y, x2, y, x2, y2 }; - p->drawPolyline(QPointArray(4, oCorners)); + p->drawPolyline(Q3PointArray(4, oCorners)); if (roundedCorners) { p->setPen(cg.background()); - p->drawPoints(QPointArray(4, oCorners), 1, 2); + p->drawPoints(Q3PointArray(4, oCorners), 1, 2); } p->setPen(cg.background().dark(115)); @@ -898,7 +901,7 @@ void dotNETstyle::drawControl(ControlElement element, p->fillRect(r2, cg.mid().light(105)); const QCOORD oCorners[] = { x, y2, x, y + 2, x2, y + 2, x2, y2 }; - p->drawPolyline(QPointArray(4, oCorners)); + p->drawPolyline(Q3PointArray(4, oCorners)); p->setPen(cg.background()); @@ -947,12 +950,12 @@ void dotNETstyle::drawControl(ControlElement element, break; } - case QTabBar::RoundedBelow: { + case QTabBar:: RoundedSouth: { if (pseudo3D) { p->setPen(cg.background().dark()); if (selected) { const QCOORD oCorners[] = { x, y + 1, x, y2, x2, y2, x2, y + 1 }; - p->drawPolyline(QPointArray(4, oCorners)); + p->drawPolyline(Q3PointArray(4, oCorners)); p->setPen(cg.background().dark(115)); p->drawLine(x + 1, y + h - 2, x + w - 2, y + h - 2); @@ -967,7 +970,7 @@ void dotNETstyle::drawControl(ControlElement element, QRect r2(x + 1, y + 2, w - 2, h - 5); p->fillRect(r2, cg.mid().light(105)); - p->drawPolyline(QPointArray(4, oCorners)); + p->drawPolyline(Q3PointArray(4, oCorners)); p->setPen(cg.mid().dark(115)); /* Inner right border */ @@ -1026,8 +1029,8 @@ void dotNETstyle::drawControl(ControlElement element, } case CE_TabBarLabel: { - const int text_flags = AlignVCenter | AlignHCenter | ShowPrefix | - DontClip | SingleLine; + const int text_flags = Qt::AlignVCenter | Qt::AlignHCenter | Qt::TextShowMnemonic | + Qt::TextDontClip | Qt::TextSingleLine; p->save(); @@ -1071,8 +1074,8 @@ void dotNETstyle::drawControl(ControlElement element, case CE_PushButtonLabel: { const QPushButton *pb = (const QPushButton *)widget; const bool enabled = flags & Style_Enabled; - const int text_flags = AlignVCenter | AlignHCenter | ShowPrefix | - DontClip | SingleLine; + const int text_flags = Qt::AlignVCenter | Qt::AlignHCenter | Qt::TextShowMnemonic | + Qt::TextDontClip | Qt::TextSingleLine; QRect ur(r); if (flags & Style_Down) { @@ -1085,14 +1088,14 @@ void dotNETstyle::drawControl(ControlElement element, } if (pb->iconSet() && !pb->iconSet()->isNull()) { - QIconSet::Mode mode = enabled ? QIconSet::Normal : QIconSet::Disabled; - QPixmap pixmap = pb->iconSet()->pixmap(QIconSet::Small, mode); + QIcon::Mode mode = enabled ? QIcon::Normal : QIcon::Disabled; + QPixmap pixmap = pb->iconSet()->pixmap(QIcon::Small, mode); if (!pb->text().isEmpty()) { const int TextToIconMargin = 3; int length = pixmap.width() + TextToIconMargin - + p->fontMetrics().size(ShowPrefix, pb->text()).width(); + + p->fontMetrics().size(Qt::TextShowMnemonic, pb->text()).width(); int offset = (r.width() - length)/2; p->drawPixmap( r.x() + offset, r.y() + r.height() / 2 - pixmap.height() / 2, pixmap ); @@ -1140,7 +1143,7 @@ void dotNETstyle::drawControl(ControlElement element, bool focused = flags & Style_HasFocus; bool down = flags & Style_Down; const int text_flags = - AlignVCenter | AlignHCenter | ShowPrefix | DontClip | SingleLine; + Qt::AlignVCenter | Qt::AlignHCenter | Qt::TextShowMnemonic | Qt::TextDontClip | Qt::TextSingleLine; int x, x2, y, y2; r.coords(&x, &y, &x2, &y2); @@ -1151,7 +1154,7 @@ void dotNETstyle::drawControl(ControlElement element, if (pseudo3D && roundedCorners && !down) { const QCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 }; p->setPen(cg.background()); - p->drawPoints(QPointArray(4, corners)); + p->drawPoints(Q3PointArray(4, corners)); } if (down) { @@ -1186,7 +1189,7 @@ void dotNETstyle::drawControl(ControlElement element, return; } - const QPopupMenu *pum = (const QPopupMenu *) widget; + const Q3PopupMenu *pum = (const Q3PopupMenu *) widget; static const int itemFrame = 2; static const int itemHMargin = 3; static const int itemVMargin = 3; @@ -1235,20 +1238,20 @@ void dotNETstyle::drawControl(ControlElement element, if (pseudo3D && roundedCorners) { const QCOORD segments[] = { x+2, y+1, x2-2, y+1, x2-1, y+2, x2-1, y2-2, x2-2, y2-1, x+2, y2-1, x+1, y2-2, x+1, y+2 }; const QCOORD icorners[] = { x+2, y+2, x2-2, y+2, x2-2,y2-2, x+2, y2-2 }; - p->drawLineSegments(QPointArray(8, segments)); - p->drawPoints(QPointArray(4, icorners)); + p->drawLineSegments(Q3PointArray(8, segments)); + p->drawPoints(Q3PointArray(4, icorners)); } else { const QCOORD corners[] = { x+1, y2-1, x+1, y+1, x2-1, y+1, x2-1, y2-1 }; - p->drawConvexPolygon(QPointArray(4, corners)); + p->drawConvexPolygon(Q3PointArray(4, corners)); } p->setPen(cg.highlightedText()); } if (mi->iconSet()) { p->save(); - QIconSet::Mode mode = - disabled ? QIconSet::Disabled : QIconSet::Normal; - QPixmap pixmap = mi->iconSet()->pixmap(QIconSet::Small, mode); + QIcon::Mode mode = + disabled ? QIcon::Disabled : QIcon::Normal; + QPixmap pixmap = mi->iconSet()->pixmap(QIcon::Small, mode); int pixw = pixmap.width(); int pixh = pixmap.height(); @@ -1279,7 +1282,7 @@ void dotNETstyle::drawControl(ControlElement element, int t = s.find('\t'); int m = itemVMargin; - int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine; + int text_flags = Qt::AlignVCenter | Qt::TextShowMnemonic | Qt::TextDontClip | Qt::TextSingleLine; if (active && !disabled) { p->setPen(cg.highlightedText()); @@ -1311,7 +1314,7 @@ void dotNETstyle::drawControl(ControlElement element, QRect rr = QRect(xpos, y+m, w-xm-tab+1, h-(2*m)); if (reverseLayout) { rr = visualRect(rr, r); - text_flags |= AlignRight; + text_flags |= Qt::AlignRight; } if (useTextShadows) { @@ -1325,11 +1328,11 @@ void dotNETstyle::drawControl(ControlElement element, } else if (mi->pixmap()) { QPixmap *pixmap = mi->pixmap(); if (pixmap->depth() == 1) { - p->setBackgroundMode(OpaqueMode); + p->setBackgroundMode(Qt::OpaqueMode); } p->drawPixmap(xpos, y, *pixmap); if (pixmap->depth() == 1) { - p->setBackgroundMode(TransparentMode); + p->setBackgroundMode(Qt::TransparentMode); } } } @@ -1396,12 +1399,12 @@ void dotNETstyle::drawControlMask(ControlElement element, int x1, y1, x2, y2; r.coords (&x1, &y1, &x2, &y2); QCOORD corners[] = { x1, y1, x2, y1, x1, y2, x2, y2 }; - p->fillRect (r, color1); - p->setPen (color0); - p->drawPoints (QPointArray (4, corners)); + p->fillRect (r, Qt::color1); + p->setPen (Qt::color0); + p->drawPoints (Q3PointArray (4, corners)); } else { // Just fill the entire thing - p->fillRect (r, color1); + p->fillRect (r, Qt::color1); } break; } @@ -1424,12 +1427,12 @@ void dotNETstyle::drawComplexControlMask(ComplexControl c, int x1, y1, x2, y2; r.coords (&x1, &y1, &x2, &y2); QCOORD corners[] = { x1, y1, x2, y1, x1, y2, x2, y2 }; - p->fillRect (r, color1); - p->setPen (color0); - p->drawPoints (QPointArray (4, corners)); + p->fillRect (r, Qt::color1); + p->setPen (Qt::color0); + p->drawPoints (Q3PointArray (4, corners)); } else { // Just fill the entire thing - p->fillRect (r, color1); + p->fillRect (r, Qt::color1); } break; } @@ -1492,7 +1495,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control, if (reverseLayout) { hr = visualRect(hr, r); } p->drawRect(hr); - p->setBrush(NoBrush); + p->setBrush(Qt::NoBrush); QRect rr = (pseudo3D ? QRect(x + 1, y + 1, w - 2, h - 2) : QRect(x + 1, y + 1, w - 1, h - 1)); if (reverseLayout) { rr = visualRect( rr, r ); } @@ -1505,13 +1508,13 @@ void dotNETstyle::drawComplexControl(ComplexControl control, if (pseudo3D && !((active & Style_Sunken) || (cb->listBox() && cb->listBox()->isVisible()))) { p->save(); - p->setBrush(NoBrush); + p->setBrush(Qt::NoBrush); QColor test = ((flags & Style_HasFocus) ? cg.highlight() : cg.midlight()); p->setPen(test.dark()); p->drawRect(hr); hr.moveBy(1,1); hr.setSize(QSize(hr.width() -2, hr.height() -2)); - QPointArray ca(3); + Q3PointArray ca(3); ca.setPoint(0, hr.topRight()); ca.setPoint(1, hr.bottomRight()); ca.setPoint(2, hr.bottomLeft()); @@ -1603,7 +1606,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control, // SPINWIDGETS // ----------- case CC_SpinWidget: { - const QSpinWidget *sw = (const QSpinWidget *) widget; + const Q3SpinWidget *sw = (const Q3SpinWidget *) widget; SFlags flags; PrimitiveElement pe; @@ -1622,7 +1625,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control, } else flags |= Style_Raised; - if (sw->buttonSymbols() == QSpinWidget::PlusMinus) + if (sw->buttonSymbols() == Q3SpinWidget::PlusMinus) pe = PE_SpinWidgetPlus; else pe = PE_SpinWidgetUp; @@ -1633,7 +1636,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control, if (pseudo3D) { const QCOORD corners[] = { re.x(), re.bottom(), re.x(), re.y() + 1, re.x() + 1, re.y(), re.right() - 1, re.y(), re.right(), re.y() + 1, re.right(), re.bottom() }; p->setPen(flags & Style_Raised ? ucg.background().dark() : ucg.highlight()); - p->drawLineSegments(QPointArray(6, corners)); + p->drawLineSegments(Q3PointArray(6, corners)); p->setPen(flags & Style_Raised ? ucg.background().light() : ucg.highlight()); p->drawLine(re.x() + 1, re.y() + 1, re.x() + 1, re.bottom()); p->drawLine(re.x() + 1, re.y() + 1, re.right()-1, re.y() + 1); @@ -1654,7 +1657,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control, } else flags |= Style_Raised; - if (sw->buttonSymbols() == QSpinWidget::PlusMinus) + if (sw->buttonSymbols() == Q3SpinWidget::PlusMinus) pe = PE_SpinWidgetMinus; else pe = PE_SpinWidgetDown; @@ -1672,7 +1675,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control, re.right(), re.y() }; p->setPen(flags & Style_Raised ? dcg.background().dark() : dcg.highlight()); - p->drawLineSegments(QPointArray(6, corners)); + p->drawLineSegments(Q3PointArray(6, corners)); p->setPen(flags & Style_Raised ? dcg.background().light() : dcg.highlight()); p->drawLine(re.x() + 1, re.y(), re.x() + 1, re.bottom()); p->setPen(flags & Style_Raised ? dcg.background().dark(115) : dcg.highlight()); @@ -1893,7 +1896,7 @@ QSize dotNETstyle::sizeFromContents(ContentsType t, if (!widget || opt.isDefault()) break; - const QPopupMenu *popup = (const QPopupMenu *)widget; + const Q3PopupMenu *popup = (const Q3PopupMenu *)widget; QMenuItem *mi = opt.menuItem(); int maxpmw = opt.maxIconWidth(); int w = s.width(), h = s.height(); @@ -1915,7 +1918,7 @@ QSize dotNETstyle::sizeFromContents(ContentsType t, h = QMAX(h, widget->fontMetrics().height() + 10); if (mi->iconSet()) { - h = QMAX(h, mi->iconSet()->pixmap(QIconSet::Small, QIconSet::Normal).height() + 8); + h = QMAX(h, mi->iconSet()->pixmap(QIcon::Small, QIcon::Normal).height() + 8); } } @@ -1950,8 +1953,8 @@ QSize dotNETstyle::sizeFromContents(ContentsType t, //We use bold font sometimes, so that make take more space than Qt allocated. QFontMetrics origFM = button->fontMetrics(); QFontMetrics boldFM = QFontMetrics(QFont(button->font().family(), button->font().pointSize(), 75)); - int origTextWidth = origFM.size(ShowPrefix, button->text()).width(); - int boldTextWidth = boldFM.size(ShowPrefix, button->text()).width(); + int origTextWidth = origFM.size(Qt::TextShowMnemonic, button->text()).width(); + int boldTextWidth = boldFM.size(Qt::TextShowMnemonic, button->text()).width(); if (boldTextWidth > origTextWidth) //this might not happen in particular when text is empty w += boldTextWidth - origTextWidth; @@ -1993,15 +1996,15 @@ void dotNETstyle::paletteChanged() { QComboBox *combo = 0L; QMenuBar *menuBar = 0L; - QToolBar *toolBar = 0L; + Q3ToolBar *toolBar = 0L; QWidget *widget = 0L; - QValueListIterator it = m_widgets.begin(); + Q3ValueListIterator it = m_widgets.begin(); for ( ; it != m_widgets.end(); ++it ) { widget = *it; if ((combo = dynamic_cast( widget ))) updatePalette( combo ); - else if ((toolBar = dynamic_cast( widget ))) + else if ((toolBar = dynamic_cast( widget ))) updatePalette( toolBar ); else if ((menuBar = dynamic_cast( widget ))) updatePalette( menuBar ); @@ -2018,7 +2021,7 @@ void dotNETstyle::updatePalette( QComboBox *combo ) combo->setPalette(pal); } -void dotNETstyle::updatePalette( QToolBar *bar ) +void dotNETstyle::updatePalette( Q3ToolBar *bar ) { QPalette pal = QApplication::palette(); pal.setColor(QColorGroup::Button, diff --git a/styles/dotnet/dotnet.h b/styles/dotnet/dotnet.h index f5e04904..f2f8c8a1 100644 --- a/styles/dotnet/dotnet.h +++ b/styles/dotnet/dotnet.h @@ -24,6 +24,10 @@ #include #include +//Added by qt3to4: +#include +#include +#include #define u_arrow -4,1, 2,1, -3,0, 1,0, -2,-1, 0,-1, -1,-2 #define d_arrow -4,-2, 2,-2, -3,-1, 1,-1, -2,0, 0,0, -1,1 @@ -44,7 +48,7 @@ public: void polish( QWidget* widget ); void unPolish( QWidget* widget ); - void renderMenuBlendPixmap( KPixmap&, const QColorGroup&, const QPopupMenu * ) const; + void renderMenuBlendPixmap( KPixmap&, const QColorGroup&, const Q3PopupMenu * ) const; void drawKStylePrimitive( KStylePrimitive kpe, QPainter* p, @@ -122,7 +126,7 @@ protected: bool eventFilter(QObject *, QEvent *); void updatePalette( QComboBox * ); - void updatePalette( QToolBar * ); + void updatePalette( Q3ToolBar * ); void updatePalette( QMenuBar * ); protected slots: @@ -137,7 +141,7 @@ private: bool pseudo3D, useTextShadows, roundedCorners, reverseLayout, kickerMode; - QValueList m_widgets; + Q3ValueList m_widgets; }; #endif diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp index d8b0b626..bdef487f 100644 --- a/styles/phase/phasestyle.cpp +++ b/styles/phase/phasestyle.cpp @@ -27,19 +27,19 @@ #include #include -#include +#include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include #include @@ -47,9 +47,14 @@ #include #include #include -#include +#include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include "phasestyle.h" #include "bitmaps.h" @@ -70,7 +75,7 @@ static const int MAXGRADIENTSIZE = 64; static unsigned contrast = 110; -QMap > gradients; // gradients[color][size] +QMap > gradients; // gradients[color][size] ////////////////////////////////////////////////////////////////////////////// // Construction, Destruction, Initialization // @@ -144,10 +149,10 @@ void PhaseStyle::polish(QApplication* app) void PhaseStyle::polish(QWidget *widget) { if (::qt_cast(widget) || - ::qt_cast(widget)) { + ::qt_cast(widget)) { // anti-flicker optimization - widget->setBackgroundMode(NoBackground); - } else if (::qt_cast(widget) || + widget->setBackgroundMode(Qt::NoBackground); + } else if (::qt_cast(widget) || widget->inherits(QTOOLBAREXTENSION) || (!qstrcmp(widget->name(), KTOOLBARWIDGET))) { // needs special handling on paint events @@ -155,7 +160,7 @@ void PhaseStyle::polish(QWidget *widget) } else if (highlights_ && (::qt_cast(widget) || ::qt_cast(widget) || - ::qt_cast(widget) || + ::qt_cast(widget) || ::qt_cast(widget) || ::qt_cast(widget) || ::qt_cast(widget) || @@ -202,16 +207,16 @@ void PhaseStyle::polish(QPalette &pal) void PhaseStyle::unPolish(QWidget *widget) { if (::qt_cast(widget) || - ::qt_cast(widget)) { + ::qt_cast(widget)) { widget->setBackgroundMode(PaletteBackground); - } else if (::qt_cast(widget) || + } else if (::qt_cast(widget) || widget->inherits(QTOOLBAREXTENSION) || (!qstrcmp(widget->name(), KTOOLBARWIDGET))) { widget->removeEventFilter(this); } else if (highlights_ && // highlighting (::qt_cast(widget) || ::qt_cast(widget) || - ::qt_cast(widget) || + ::qt_cast(widget) || ::qt_cast(widget) || ::qt_cast(widget) || ::qt_cast(widget) || @@ -417,13 +422,13 @@ void PhaseStyle::drawPhaseTab(QPainter *painter, } switch (QTabBar::Shape(bar->shape())) { - case QTabBar::RoundedAbove: - case QTabBar::TriangularAbove: { + case QTabBar::RoundedNorth: + case QTabBar:: TriangularNorth: { // is there a corner widget? tabwidget = dynamic_cast(bar->parent()); if (edge && tabwidget && tabwidget->cornerWidget(reverse_ ? - Qt::TopRight : Qt::TopLeft)) { + Qt::TopRightCorner : Qt::TopLeftCorner)) { edge = false; } @@ -496,13 +501,13 @@ void PhaseStyle::drawPhaseTab(QPainter *painter, break; } - case QTabBar::RoundedBelow: - case QTabBar::TriangularBelow: { + case QTabBar:: RoundedSouth: + case QTabBar:: TriangularSouth: { // is there a corner widget? tabwidget = dynamic_cast(bar->parent()); if (edge && tabwidget && tabwidget->cornerWidget(reverse_ ? - Qt::BottomRight : Qt::BottomLeft)) { + Qt::BottomRightCorner : Qt::BottomLeftCorner)) { edge = false; } @@ -581,7 +586,7 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, bool horiz = flags & Style_Horizontal; bool mouseover = highlights_ && (flags & Style_MouseOver); int x, y, w, h, x2, y2, n, cx, cy; - QPointArray parray; + Q3PointArray parray; QWidget* widget; rect.rect(&x, &y, &w, &h); @@ -616,7 +621,7 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, case PE_HeaderSection: { // covers kicker taskbar buttons and menu titles - QHeader* header = dynamic_cast(painter->device()); + Q3Header* header = dynamic_cast(painter->device()); widget = dynamic_cast(painter->device()); if (header) { @@ -883,7 +888,7 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, if (widget && widget->parent() && widget->parent()->inherits("QToolBar")) { - QToolBar *toolbar = dynamic_cast(widget->parent()); + Q3ToolBar *toolbar = dynamic_cast(widget->parent()); if (toolbar) { // toolbar not floating or in a QMainWindow flat = flatToolbar(toolbar); @@ -1137,8 +1142,8 @@ void PhaseStyle::drawControl(ControlElement element, bool active, enabled, depress; int x, y, w, h, x2, y2, dx; QMenuItem *mi; - QIconSet::Mode mode; - QIconSet::State state; + QIcon::Mode mode; + QIcon::State state; QPixmap pixmap; rect.rect(&x, &y, &w, &h); @@ -1198,21 +1203,21 @@ void PhaseStyle::drawControl(ControlElement element, if (button->iconSet() && !button->iconSet()->isNull()) { // draw icon if (button->isEnabled()) { if (button->hasFocus()) { - mode = QIconSet::Active; + mode = QIcon::Active; } else { - mode = QIconSet::Normal; + mode = QIcon::Normal; } } else { - mode = QIconSet::Disabled; + mode = QIcon::Disabled; } if (button->isToggleButton() && button->isOn()) { - state = QIconSet::On; + state = QIcon::On; } else { - state = QIconSet::Off; + state = QIcon::Off; } - pixmap = button->iconSet()->pixmap(QIconSet::Small, mode, state); + pixmap = button->iconSet()->pixmap(QIcon::Small, mode, state); if (button->text().isEmpty() && !button->pixmap()) { painter->drawPixmap(x+w/2 - pixmap.width()/2, y+h/2 - pixmap.height()/2, pixmap); @@ -1251,7 +1256,7 @@ void PhaseStyle::drawControl(ControlElement element, case CE_CheckBoxLabel: case CE_RadioButtonLabel: { - const QButton *b = dynamic_cast(widget); + const Q3Button *b = dynamic_cast(widget); if (!b) return; int alignment = reverse_ ? AlignRight : AlignLeft; @@ -1269,7 +1274,7 @@ void PhaseStyle::drawControl(ControlElement element, } case CE_DockWindowEmptyArea: { - const QToolBar *tb = dynamic_cast(widget); + const Q3ToolBar *tb = dynamic_cast(widget); if (tb) { // toolbar not floating or in a QMainWindow if (flatToolbar(tb)) { @@ -1320,7 +1325,7 @@ void PhaseStyle::drawControl(ControlElement element, } case CE_PopupMenuItem: { - const QPopupMenu *popup = dynamic_cast(widget); + const Q3PopupMenu *popup = dynamic_cast(widget); if (!popup) { KStyle::drawControl(element, painter, widget, rect, group, flags, option); @@ -1369,11 +1374,11 @@ void PhaseStyle::drawControl(ControlElement element, // draw icon if (mi->iconSet() && !mi->isChecked()) { if (active) - mode = enabled ? QIconSet::Active : QIconSet::Disabled; + mode = enabled ? QIcon::Active : QIcon::Disabled; else - mode = enabled ? QIconSet::Normal : QIconSet::Disabled; + mode = enabled ? QIcon::Normal : QIcon::Disabled; - pixmap = mi->iconSet()->pixmap(QIconSet::Small, mode); + pixmap = mi->iconSet()->pixmap(QIcon::Small, mode); QRect pmrect(0, 0, pixmap.width(), pixmap.height()); vrect = visualRect(QRect(x, y, checkwidth, h), rect); pmrect.moveCenter(vrect.center()); @@ -1504,7 +1509,7 @@ void PhaseStyle::drawControl(ControlElement element, } case CE_ProgressBarContents: { - const QProgressBar* pbar = dynamic_cast(widget); + const Q3ProgressBar* pbar = dynamic_cast(widget); if (!pbar) { KStyle::drawControl(element, painter, widget, rect, group, flags, option); @@ -1544,7 +1549,7 @@ void PhaseStyle::drawControl(ControlElement element, const int rx = x2 - 20; const int cx = rx - h + 1; - QPointArray parray(6); + Q3PointArray parray(6); parray.putPoints(0, 6, x-1,y, cx,y, rx-2,y2-2, x2+1,y2-2, x2+1,y2+2, x-1,y2+2); @@ -1553,7 +1558,7 @@ void PhaseStyle::drawControl(ControlElement element, painter->setPen(group.dark()); painter->setBrush(box->currentItem()->paletteBackgroundColor()); painter->drawConvexPolygon(parray, 0, 6); - painter->setBrush(NoBrush); + painter->setBrush(Qt::NoBrush); } else { painter->setClipRegion(parray, QPainter::CoordPainter); drawPhaseGradient(painter, rect, @@ -1766,7 +1771,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, } case CC_SpinWidget: { - const QSpinWidget *spin = dynamic_cast(widget); + const Q3SpinWidget *spin = dynamic_cast(widget); if (!spin) { KStyle::drawComplexControl(control, painter, widget, rect, group, flags, controls, active, option); @@ -1798,7 +1803,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, subrect = spin->upRect(); sunken = (active == SC_SpinWidgetUp); - if (spin->buttonSymbols() == QSpinWidget::PlusMinus) + if (spin->buttonSymbols() == Q3SpinWidget::PlusMinus) element = PE_SpinWidgetPlus; else element = PE_SpinWidgetUp; @@ -1813,7 +1818,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, subrect = spin->downRect(); sunken = (active == SC_SpinWidgetDown); - if (spin->buttonSymbols() == QSpinWidget::PlusMinus) + if (spin->buttonSymbols() == Q3SpinWidget::PlusMinus) element = PE_SpinWidgetMinus; else element = PE_SpinWidgetDown; @@ -1833,7 +1838,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, return; } - QToolBar *toolbar; + Q3ToolBar *toolbar; bool horiz = true; bool normal = !(down || on || raised); // normal button state @@ -1842,7 +1847,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, // check for QToolBar parent if (btn->parent() && btn->parent()->inherits("QToolBar")) { - toolbar = dynamic_cast(btn->parent()); + toolbar = dynamic_cast(btn->parent()); if (toolbar) { horiz = (toolbar->orientation() == Qt::Horizontal); if (normal) { // draw background @@ -1869,7 +1874,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, btn->parent()->inherits(QTOOLBAREXTENSION)) { QWidget *extension; if ((extension = dynamic_cast(btn->parent()))) { - toolbar = dynamic_cast(extension->parent()); + toolbar = dynamic_cast(extension->parent()); if (toolbar) { horiz = (toolbar->orientation() == Qt::Horizontal); if (normal) { // draw background @@ -2130,7 +2135,7 @@ QSize PhaseStyle::sizeFromContents(ContentsType contents, case CT_PopupMenuItem: { if (!widget || option.isDefault()) return contentsize; - const QPopupMenu *popup = dynamic_cast(widget); + const Q3PopupMenu *popup = dynamic_cast(widget); if (!popup) { return KStyle::sizeFromContents(contents, widget, contentsize, option); @@ -2157,7 +2162,7 @@ QSize PhaseStyle::sizeFromContents(ContentsType contents, } if (item->iconSet()) h = QMAX(h, item->iconSet()-> - pixmap(QIconSet::Small, QIconSet::Normal).height() + pixmap(QIcon::Small, QIcon::Normal).height() + ITEMFRAME*2); } @@ -2168,7 +2173,7 @@ QSize PhaseStyle::sizeFromContents(ContentsType contents, if (option.maxIconWidth() || popup->isCheckable()) { w += QMAX(option.maxIconWidth(), - QIconSet::iconSize(QIconSet::Small).width()) + QIcon::iconSize(QIcon::Small).width()) + ITEMHMARGIN*2; } w += RIGHTBORDER; @@ -2190,12 +2195,12 @@ QSize PhaseStyle::sizeFromContents(ContentsType contents, // ------------- // Is the toolbar "flat" -bool PhaseStyle::flatToolbar(const QToolBar *toolbar) const +bool PhaseStyle::flatToolbar(const Q3ToolBar *toolbar) const { if (!toolbar) return true; // not on a toolbar if (!toolbar->isMovingEnabled()) return true; // immobile toolbars are flat if (!toolbar->area()) return true; // not docked - if (toolbar->place() == QDockWindow::OutsideDock) return true; // ditto + if (toolbar->place() == Q3DockWindow::OutsideDock) return true; // ditto if (!toolbar->mainWindow()) return true; // not in a main window return false; } @@ -2213,8 +2218,8 @@ bool PhaseStyle::eventFilter(QObject *object, QEvent *event) bool horiz; int x, y, w, h; - QFrame *frame; - QToolBar *toolbar; + Q3Frame *frame; + Q3ToolBar *toolbar; QWidget *widget; // painting events @@ -2229,7 +2234,7 @@ bool PhaseStyle::eventFilter(QObject *object, QEvent *event) int px = widget->x(), py = widget->y(); // find the toolbar while (parent && parent->parent() - && !dynamic_cast(parent)) { + && !dynamic_cast(parent)) { px += parent->x(); py += parent->y(); parent = dynamic_cast(parent->parent()); @@ -2238,7 +2243,7 @@ bool PhaseStyle::eventFilter(QObject *object, QEvent *event) widget->rect().rect(&x, &y, &w, &h); QRect prect = parent->rect(); - toolbar = dynamic_cast(parent); + toolbar = dynamic_cast(parent); horiz = (toolbar) ? (toolbar->orientation() == Qt::Horizontal) : (prect.height() < prect.width()); QPainter painter(widget); @@ -2262,7 +2267,7 @@ bool PhaseStyle::eventFilter(QObject *object, QEvent *event) // QToolBarExtensionWidget else if ((object->parent()) && - (toolbar = dynamic_cast(object->parent()))) { + (toolbar = dynamic_cast(object->parent()))) { if (0 == (widget = dynamic_cast(object))) return false; horiz = (toolbar->orientation() == Qt::Horizontal); QPainter painter(widget); @@ -2293,18 +2298,18 @@ bool PhaseStyle::eventFilter(QObject *object, QEvent *event) } // QFrame lines (do this guy last) - else if (0 != (frame = dynamic_cast(object))) { - QFrame::Shape shape = frame->frameShape(); + else if (0 != (frame = dynamic_cast(object))) { + Q3Frame::Shape shape = frame->frameShape(); switch (shape) { - case QFrame::HLine: - case QFrame::VLine: { + case Q3Frame::HLine: + case Q3Frame::VLine: { // NOTE: assuming lines have no content QPainter painter(frame); frame->rect().rect(&x, &y, &w, &h); painter.setPen(frame->colorGroup().dark()); - if (shape == QFrame::HLine) { + if (shape == Q3Frame::HLine) { painter.drawLine(0, h/2, w, h/2); - } else if (shape == QFrame::VLine) { + } else if (shape == Q3Frame::VLine) { painter.drawLine(w/2, 0, w/2, h); } return true; @@ -2317,7 +2322,7 @@ bool PhaseStyle::eventFilter(QObject *object, QEvent *event) } else if (highlights_) { // "mouseover" events if (::qt_cast(object) || ::qt_cast(object) || - ::qt_cast(object) || + ::qt_cast(object) || ::qt_cast(object) || ::qt_cast(object) || ::qt_cast(object) || diff --git a/styles/phase/phasestyle.h b/styles/phase/phasestyle.h index e5f7ce40..1c55eb14 100644 --- a/styles/phase/phasestyle.h +++ b/styles/phase/phasestyle.h @@ -29,6 +29,8 @@ #include #include +//Added by qt3to4: +#include class KPixmap; @@ -141,7 +143,7 @@ private: int pw=-1, int ph=-1, bool reverse=false) const; - bool flatToolbar(const QToolBar *toolbar) const; + bool flatToolbar(const Q3ToolBar *toolbar) const; bool eventFilter(QObject *object, QEvent *event); -- 2.11.4.GIT