diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-14 05:14:51 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-14 05:14:51 +0000 |
| commit | 1d077caf68127ab1a5518df84cc5592a1b47a965 (patch) | |
| tree | 9729a338937930e9014ccbd70296f3313d6dc2cc | |
| parent | 771e57c60b52ff27c4d92cddc8e6bfc0b8dafd1a (diff) | |
| download | tdeartwork-1d077caf.tar.gz tdeartwork-1d077caf.zip | |
TQt4 port kdeartwork
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeartwork@1246991 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
136 files changed, 1725 insertions, 1638 deletions
diff --git a/kscreensaver/kdesavers/Euphoria.cpp b/kscreensaver/kdesavers/Euphoria.cpp index 8fc5811d..199d339d 100644 --- a/kscreensaver/kdesavers/Euphoria.cpp +++ b/kscreensaver/kdesavers/Euphoria.cpp @@ -638,15 +638,15 @@ void EuphoriaWidget::initializeGL() #ifdef UNIT_TEST void EuphoriaWidget::keyPressEvent( TQKeyEvent* e ) { - if( e->key() == Qt::Key_0 ) { setDefaults( 0 ); updateParameters(); } - if( e->key() == Qt::Key_1 ) { setDefaults( 1 ); updateParameters(); } - if( e->key() == Qt::Key_2 ) { setDefaults( 2 ); updateParameters(); } - if( e->key() == Qt::Key_3 ) { setDefaults( 3 ); updateParameters(); } - if( e->key() == Qt::Key_4 ) { setDefaults( 4 ); updateParameters(); } - if( e->key() == Qt::Key_5 ) { setDefaults( 5 ); updateParameters(); } - if( e->key() == Qt::Key_6 ) { setDefaults( 6 ); updateParameters(); } - if( e->key() == Qt::Key_7 ) { setDefaults( 7 ); updateParameters(); } - if( e->key() == Qt::Key_8 ) { setDefaults( 8 ); updateParameters(); } + if( e->key() == TQt::Key_0 ) { setDefaults( 0 ); updateParameters(); } + if( e->key() == TQt::Key_1 ) { setDefaults( 1 ); updateParameters(); } + if( e->key() == TQt::Key_2 ) { setDefaults( 2 ); updateParameters(); } + if( e->key() == TQt::Key_3 ) { setDefaults( 3 ); updateParameters(); } + if( e->key() == TQt::Key_4 ) { setDefaults( 4 ); updateParameters(); } + if( e->key() == TQt::Key_5 ) { setDefaults( 5 ); updateParameters(); } + if( e->key() == TQt::Key_6 ) { setDefaults( 6 ); updateParameters(); } + if( e->key() == TQt::Key_7 ) { setDefaults( 7 ); updateParameters(); } + if( e->key() == TQt::Key_8 ) { setDefaults( 8 ); updateParameters(); } } #endif @@ -1024,7 +1024,7 @@ KEuphoriaSetup::KEuphoriaSetup( TQWidget* parent, const char* name ) modeW->setCurrentItem( _saver->mode() ); // set before we connect connect( modeW, TQT_SIGNAL(activated(int)), _saver, TQT_SLOT(setMode(int)) ); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); } @@ -1038,7 +1038,7 @@ void KEuphoriaSetup::slotHelp() { KMessageBox::about(this, i18n("<h3>Euphoria 1.0</h3>\n<p>Copyright (c) 2002 Terence M. Welsh<br>\n<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n\n<p>Ported to KDE by Karl Robillard</p>"), - TQString::null, KMessageBox::AllowLink); + TQString(), KMessageBox::AllowLink); } @@ -1062,7 +1062,7 @@ void KEuphoriaSetup::slotOk() #ifdef UNIT_TEST -// moc Euphoria.h -o Euphoria.moc +// tqmoc Euphoria.h -o Euphoria.tqmoc // g++ -g -DUNIT_TEST Euphoria.cpp -I/usr/lib/qt3/include -lqt -L/usr/lib/qt3/lib -lGLU -lGL #include <tqapplication.h> diff --git a/kscreensaver/kdesavers/Euphoria.h b/kscreensaver/kdesavers/Euphoria.h index b0ec94c5..ba50c9d3 100644 --- a/kscreensaver/kdesavers/Euphoria.h +++ b/kscreensaver/kdesavers/Euphoria.h @@ -17,9 +17,10 @@ class wisp; class TQTimer; -class EuphoriaWidget : public QGLWidget +class EuphoriaWidget : public TQGLWidget { Q_OBJECT + TQ_OBJECT public: @@ -111,6 +112,7 @@ private: class KEuphoriaScreenSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: @@ -137,6 +139,7 @@ class TQComboBox; class KEuphoriaSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KEuphoriaSetup( TQWidget* parent = 0, const char* name = 0 ); diff --git a/kscreensaver/kdesavers/Flux.cpp b/kscreensaver/kdesavers/Flux.cpp index c38b6627..d04a6d3d 100644 --- a/kscreensaver/kdesavers/Flux.cpp +++ b/kscreensaver/kdesavers/Flux.cpp @@ -546,12 +546,12 @@ void FluxWidget::initializeGL() #ifdef UNIT_TEST void FluxWidget::keyPressEvent( TQKeyEvent* e ) { - if( e->key() == Qt::Key_0 ) { setDefaults( 0 ); updateParameters(); } - if( e->key() == Qt::Key_1 ) { setDefaults( 1 ); updateParameters(); } - if( e->key() == Qt::Key_2 ) { setDefaults( 2 ); updateParameters(); } - if( e->key() == Qt::Key_3 ) { setDefaults( 3 ); updateParameters(); } - if( e->key() == Qt::Key_4 ) { setDefaults( 4 ); updateParameters(); } - if( e->key() == Qt::Key_5 ) { setDefaults( 5 ); updateParameters(); } + if( e->key() == TQt::Key_0 ) { setDefaults( 0 ); updateParameters(); } + if( e->key() == TQt::Key_1 ) { setDefaults( 1 ); updateParameters(); } + if( e->key() == TQt::Key_2 ) { setDefaults( 2 ); updateParameters(); } + if( e->key() == TQt::Key_3 ) { setDefaults( 3 ); updateParameters(); } + if( e->key() == TQt::Key_4 ) { setDefaults( 4 ); updateParameters(); } + if( e->key() == TQt::Key_5 ) { setDefaults( 5 ); updateParameters(); } } #endif @@ -919,7 +919,7 @@ void KFluxSetup::slotHelp() { KMessageBox::about(this, i18n("<h3>Flux 1.0</h3>\n<p>Copyright (c) 2002 Terence M. Welsh<br>\n<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n\n<p>Ported to KDE by Karl Robillard</p>"), - TQString::null, KMessageBox::AllowLink); + TQString(), KMessageBox::AllowLink); } @@ -945,7 +945,7 @@ void KFluxSetup::slotOk() #ifdef UNIT_TEST -// moc Flux.h -o Flux.moc +// tqmoc Flux.h -o Flux.tqmoc // g++ -g -DUNIT_TEST Flux.cpp -I/usr/lib/qt3/include -lqt -L/usr/lib/qt3/lib -lGLU -lGL #include <tqapplication.h> diff --git a/kscreensaver/kdesavers/Flux.h b/kscreensaver/kdesavers/Flux.h index 5f0cd64e..eb921fb0 100644 --- a/kscreensaver/kdesavers/Flux.h +++ b/kscreensaver/kdesavers/Flux.h @@ -20,9 +20,10 @@ class flux; class particle; class TQTimer; -class FluxWidget : public QGLWidget +class FluxWidget : public TQGLWidget { Q_OBJECT + TQ_OBJECT public: @@ -99,6 +100,7 @@ private: class KFluxScreenSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: @@ -125,6 +127,7 @@ class TQComboBox; class KFluxSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: diff --git a/kscreensaver/kdesavers/SolarWinds.cpp b/kscreensaver/kdesavers/SolarWinds.cpp index ea3e916a..ee3229f2 100644 --- a/kscreensaver/kdesavers/SolarWinds.cpp +++ b/kscreensaver/kdesavers/SolarWinds.cpp @@ -399,12 +399,12 @@ void SWindsWidget::initializeGL() #ifdef UNIT_TEST void SWindsWidget::keyPressEvent( TQKeyEvent* e ) { - if( e->key() == Qt::Key_0 ) { setDefaults( 0 ); updateParameters(); } - if( e->key() == Qt::Key_1 ) { setDefaults( 1 ); updateParameters(); } - if( e->key() == Qt::Key_2 ) { setDefaults( 2 ); updateParameters(); } - if( e->key() == Qt::Key_3 ) { setDefaults( 3 ); updateParameters(); } - if( e->key() == Qt::Key_4 ) { setDefaults( 4 ); updateParameters(); } - if( e->key() == Qt::Key_5 ) { setDefaults( 5 ); updateParameters(); } + if( e->key() == TQt::Key_0 ) { setDefaults( 0 ); updateParameters(); } + if( e->key() == TQt::Key_1 ) { setDefaults( 1 ); updateParameters(); } + if( e->key() == TQt::Key_2 ) { setDefaults( 2 ); updateParameters(); } + if( e->key() == TQt::Key_3 ) { setDefaults( 3 ); updateParameters(); } + if( e->key() == TQt::Key_4 ) { setDefaults( 4 ); updateParameters(); } + if( e->key() == TQt::Key_5 ) { setDefaults( 5 ); updateParameters(); } } #endif @@ -731,7 +731,7 @@ void KSWindsSetup::slotHelp() { KMessageBox::about(this, i18n("<h3>Solar Winds 1.0</h3>\n<p>Copyright (c) 2002 Terence M. Welsh<br>\n<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n\n<p>Ported to KDE by Karl Robillard</p>"), - TQString::null, KMessageBox::AllowLink); + TQString(), KMessageBox::AllowLink); } @@ -757,7 +757,7 @@ void KSWindsSetup::slotOk() #ifdef UNIT_TEST -// moc SolarWinds.h -o SolarWinds.moc +// tqmoc SolarWinds.h -o SolarWinds.tqmoc // g++ -g -DUNIT_TEST SolarWinds.cpp -I/usr/lib/qt3/include -lqt -L/usr/lib/qt3/lib -lGLU -lGL #include <tqapplication.h> diff --git a/kscreensaver/kdesavers/SolarWinds.h b/kscreensaver/kdesavers/SolarWinds.h index e98252e1..70da2bd4 100644 --- a/kscreensaver/kdesavers/SolarWinds.h +++ b/kscreensaver/kdesavers/SolarWinds.h @@ -19,9 +19,10 @@ class wind; class TQTimer; -class SWindsWidget : public QGLWidget +class SWindsWidget : public TQGLWidget { Q_OBJECT + TQ_OBJECT public: @@ -90,6 +91,7 @@ private: class KSWindsScreenSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: @@ -116,6 +118,7 @@ class TQComboBox; class KSWindsSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: diff --git a/kscreensaver/kdesavers/banner.cpp b/kscreensaver/kdesavers/banner.cpp index f33a7ca0..e49ca556 100644 --- a/kscreensaver/kdesavers/banner.cpp +++ b/kscreensaver/kdesavers/banner.cpp @@ -4,7 +4,7 @@ // // Copyright (c) Martin R. Jones 1996 // -// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> +// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> // clock function and color cycling added 2000/01/09 by Alexander Neundorf <alexander.neundorf@rz.tu-ilmenau.de> // 2001/03/04 Converted to use libkscreensaver by Martin R. Jones // 2002/04/07 Added random vertical position of text, @@ -74,13 +74,13 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name ) TQVBoxLayout *tl11 = new TQVBoxLayout( 0, 0, spacingHint() ); tl1->addLayout(tl11); - TQGroupBox *group = new TQGroupBox( 0, Vertical, i18n("Font"), main ); - TQGridLayout *gl = new TQGridLayout(group->layout(), 6, 2, spacingHint() ); + TQGroupBox *group = new TQGroupBox( 0,Qt::Vertical, i18n("Font"), main ); + TQGridLayout *gl = new TQGridLayout(group->tqlayout(), 6, 2, spacingHint() ); label = new TQLabel( i18n("Family:"), group ); gl->addWidget(label, 1, 0); - KFontCombo* comboFonts = new KFontCombo( TQFontDatabase().families(), group ); + KFontCombo* comboFonts = new KFontCombo( TQFontDatabase().tqfamilies(), group ); comboFonts->setCurrentFont( fontFamily ); gl->addWidget(comboFonts, 1, 1); connect( comboFonts, TQT_SIGNAL( activated( const TQString& ) ), @@ -116,7 +116,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name ) TQT_SLOT( slotColor(const TQColor &) ) ); TQCheckBox *cyclingColorCb=new TQCheckBox(i18n("Cycling color"),group); - cyclingColorCb->setMinimumSize(cyclingColorCb->sizeHint()); + cyclingColorCb->setMinimumSize(cyclingColorCb->tqsizeHint()); gl->addMultiCellWidget(cyclingColorCb,5,5,0,1); connect(cyclingColorCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotCyclingColor(bool))); cyclingColorCb->setChecked(cyclingColor); @@ -134,7 +134,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name ) tl11->addStretch(1); tl11->addWidget(label); - TQSlider *sb = new TQSlider(0, 100, 10, speed, TQSlider::Horizontal, main ); + TQSlider *sb = new TQSlider(0, 100, 10, speed, Qt::Horizontal, main ); sb->setMinimumWidth( 180); sb->setFixedHeight(20); sb->setTickmarks(TQSlider::Below); @@ -155,8 +155,8 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name ) TQT_SLOT( slotMessage( const TQString & ) ) ); TQCheckBox *timeCb=new TQCheckBox( i18n("Show current time"), main); - timeCb->setFixedSize(timeCb->sizeHint()); - tl->addWidget(timeCb,0,Qt::AlignLeft); + timeCb->setFixedSize(timeCb->tqsizeHint()); + tl->addWidget(timeCb,0,TQt::AlignLeft); connect(timeCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotTimeToggled(bool))); timeCb->setChecked(showTime); @@ -191,7 +191,7 @@ void KBannerSetup::fillFontSizes() comboSizes->blockSignals( true ); comboSizes->clear(); int i = 0; - sizes = TQFontDatabase().pointSizes( fontFamily ); + sizes = TQFontDatabase().tqpointSizes( fontFamily ); sizes << 96 << 128 << 156 << 0; int current = 0; while ( sizes[i] ) diff --git a/kscreensaver/kdesavers/banner.h b/kscreensaver/kdesavers/banner.h index 57309787..73dac562 100644 --- a/kscreensaver/kdesavers/banner.h +++ b/kscreensaver/kdesavers/banner.h @@ -23,6 +23,7 @@ class KRandomSequence; class KBannerSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KBannerSaver( WId id ); virtual ~KBannerSaver(); @@ -44,30 +45,31 @@ protected slots: protected: TQFont font; - QTimer timer; - QString fontFamily; + TQTimer timer; + TQString fontFamily; int fontSize; bool bold; bool italic; - QColor fontColor; + TQColor fontColor; bool cyclingColor; int currentHue; bool needUpdate; bool needBlank; - QString message; + TQString message; bool showTime; int xpos, ypos, step, fsize; KRandomSequence *krnd; int speed; int colorContext; - QPixmap pixmap; - QSize pixmapSize; + TQPixmap pixmap; + TQSize pixmapSize; }; class KBannerSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KBannerSetup( TQWidget *parent = NULL, const char *name = NULL ); diff --git a/kscreensaver/kdesavers/blob.cpp b/kscreensaver/kdesavers/blob.cpp index c8860781..4877866e 100644 --- a/kscreensaver/kdesavers/blob.cpp +++ b/kscreensaver/kdesavers/blob.cpp @@ -369,7 +369,7 @@ void KBlobSaver::box ( int x, int y ) y = 0; // get the box region from the display to upgrade - TQImage img = TQPixmap::grabWindow(winId(), x, y, dim, dim).convertToImage(); + TQImage img = TQPixmap(TQPixmap::grabWindow(winId(), x, y, dim, dim)).convertToImage(); // depending on the depth of the display, use either lookup table for // next rgb val ( 8-bit ) or ramp the color directly for other displays @@ -392,7 +392,7 @@ void KBlobSaver::box ( int x, int y ) { for (int i = 0; i < img.width(); i++) { - QRgb p = img.pixel( i, j ); + TQRgb p = img.pixel( i, j ); p += (colorInc<<18); img.setPixel( i, j, p ); } diff --git a/kscreensaver/kdesavers/blob.h b/kscreensaver/kdesavers/blob.h index 2ef4bcf6..123a4855 100644 --- a/kscreensaver/kdesavers/blob.h +++ b/kscreensaver/kdesavers/blob.h @@ -28,6 +28,7 @@ enum blob_alg { class KBlobSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KBlobSaver( WId id ); @@ -53,7 +54,7 @@ public: }; private: - QTimer timer; + TQTimer timer; uint colors[RAMP]; uint lookup[256]; int colorContext, colorInc; @@ -93,6 +94,7 @@ class KIntNumInput; class KBlobSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT int showtime; int alg; diff --git a/kscreensaver/kdesavers/firesaver.ChangeLog b/kscreensaver/kdesavers/firesaver.ChangeLog index 98749856..2d3792bd 100644 --- a/kscreensaver/kdesavers/firesaver.ChangeLog +++ b/kscreensaver/kdesavers/firesaver.ChangeLog @@ -95,7 +95,7 @@ 2004-01-28 Enrico Ros <eros.kde@email.it> * firesaverparticle.cpp: keep a particle independent from the - 'shape' of the firework it belongs to. Added depth (level) of + 'tqshape' of the firework it belongs to. Added depth (level) of explosion (normal particles reach level 1, splitters reach 2). * name syntax: converted filenames to match the style of the ones diff --git a/kscreensaver/kdesavers/firesaver.cpp b/kscreensaver/kdesavers/firesaver.cpp index c8b605fc..3695acb8 100644 --- a/kscreensaver/kdesavers/firesaver.cpp +++ b/kscreensaver/kdesavers/firesaver.cpp @@ -479,7 +479,7 @@ void KFireSaver :: paintGL () glBegin( GL_QUADS ); flashedScreen = true; } - // generating children and removing parent + // generating tqchildren and removing parent int elementIndex = particleList.at(); explodeFirework(particle); particleList.remove(elementIndex); @@ -907,8 +907,8 @@ void KFireSaver :: burnLogo(TQImage * image) { for (int x=0 ; x<imageW ; x+=step) { - QRgb pixel = image->pixel(x,y); - if ( qAlpha(pixel) < 250 ) + TQRgb pixel = image->pixel(x,y); + if ( tqAlpha(pixel) < 250 ) continue; //if ( DRAND > 0.9 ) // continue; @@ -924,9 +924,9 @@ void KFireSaver :: burnLogo(TQImage * image) particle->xspeed = xI * speed + speedXOffs; particle->zspeed = yI * speed + speedYOffs; - particle->colour[0] = qRed(pixel) / 255.0f; - particle->colour[1] = qGreen(pixel) / 255.0f; - particle->colour[2] = qBlue(pixel) / 255.0f; + particle->colour[0] = tqRed(pixel) / 255.0f; + particle->colour[1] = tqGreen(pixel) / 255.0f; + particle->colour[2] = tqBlue(pixel) / 255.0f; particleList.append(particle); } @@ -1019,7 +1019,7 @@ void KFireSaver :: readConfig () parameters.particleSize = 5; if ( parameters.enableBottomFire = config.readBoolEntry( "enable-BottomFire", true ) ) { - TQColor blue = Qt::darkBlue; + TQColor blue = TQt::darkBlue; parameters.bottomFireColor = config.readColorEntry( "BottomFireColor", &blue ); } parameters.enableSound = config.readBoolEntry( "enable-Sounds", false ); diff --git a/kscreensaver/kdesavers/firesaver.h b/kscreensaver/kdesavers/firesaver.h index dfc713b0..8a34c5e9 100644 --- a/kscreensaver/kdesavers/firesaver.h +++ b/kscreensaver/kdesavers/firesaver.h @@ -43,7 +43,7 @@ class Particle; class Writer; -class KFireSaver : public QGLWidget +class KFireSaver : public TQGLWidget { public: KFireSaver( TQWidget *parent=0, const char *name=0 ); @@ -99,7 +99,7 @@ class KFireSaver : public QGLWidget KArtsDispatcher artsDispatcher; KArtsServer artsServer; TQPtrList<KPlayObject> playObjectList; - QString sound_explosion, + TQString sound_explosion, sound_debris; //other stuff @@ -133,7 +133,7 @@ class KFireSaver : public QGLWidget flashOpacity, //effects fadeAmount, megaFlares; - QColor + TQColor bottomFireColor; int colorsCount, colorsT[8], diff --git a/kscreensaver/kdesavers/firesaversetup.ui b/kscreensaver/kdesavers/firesaversetup.ui index 37614afa..5fbadc0c 100644 --- a/kscreensaver/kdesavers/firesaversetup.ui +++ b/kscreensaver/kdesavers/firesaversetup.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KFireSaverSetup</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KFireSaverSetup</cstring> </property> @@ -30,7 +30,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>useButton</cstring> </property> @@ -38,7 +38,7 @@ <string>&Load</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>KDE (default)</string> @@ -76,7 +76,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>presetLabel</cstring> </property> @@ -94,21 +94,21 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>201</width> <height>31</height> </size> </property> </spacer> - <widget class="QTabWidget" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQTabWidget" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>tabWidget</cstring> </property> <property name="tabShape"> <enum>Rounded</enum> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>220</height> @@ -146,16 +146,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>210</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout118</cstring> + <cstring>tqlayout118</cstring> </property> <grid> <property name="name"> @@ -171,24 +171,24 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>43</width> <height>180</height> </size> </property> </spacer> - <widget class="QFrame" row="1" column="1"> + <widget class="TQFrame" row="1" column="1"> <property name="name"> <cstring>previewFrame</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>240</width> <height>180</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>240</width> <height>180</height> @@ -210,7 +210,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>previewLabel</cstring> </property> @@ -220,7 +220,7 @@ <property name="text"> <string>P R E V I E W</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -236,14 +236,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>180</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>detachBox</cstring> </property> @@ -251,7 +251,7 @@ <string>&Show in separate window</string> </property> </widget> - <widget class="QPushButton" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQPushButton" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>applyButton</cstring> </property> @@ -263,7 +263,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -274,7 +274,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layS1</cstring> </property> @@ -282,7 +282,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>showLabel1</cstring> </property> @@ -298,7 +298,7 @@ <string>Show type:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Simple Show</string> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>260</width> <height>21</height> @@ -342,7 +342,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layS2</cstring> </property> @@ -350,7 +350,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>showLabel2</cstring> </property> @@ -358,7 +358,7 @@ <string>Number of fireworks:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>showLabel3</cstring> </property> @@ -366,7 +366,7 @@ <string>few</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>fireworksSlider</cstring> </property> @@ -394,7 +394,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>showLabel4</cstring> </property> @@ -412,7 +412,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>125</width> <height>21</height> @@ -421,7 +421,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layS2_2</cstring> </property> @@ -429,7 +429,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>particlesLabel1</cstring> </property> @@ -437,7 +437,7 @@ <string>Size of particles:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>particlesLabel2</cstring> </property> @@ -445,7 +445,7 @@ <string>small</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>particlesSlider</cstring> </property> @@ -470,7 +470,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>particlesLabel3</cstring> </property> @@ -488,7 +488,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>125</width> <height>21</height> @@ -497,7 +497,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>bottomfireBox</cstring> </property> @@ -508,7 +508,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layS3</cstring> </property> @@ -526,14 +526,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>bottomfireLabel1</cstring> </property> @@ -562,7 +562,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>309</width> <height>21</height> @@ -571,7 +571,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>soundsBox</cstring> </property> @@ -579,7 +579,7 @@ <string>Enable sounds</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>overheadBox</cstring> </property> @@ -587,7 +587,7 @@ <string>Limit overload (recommended)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>frameskipBox</cstring> </property> @@ -605,7 +605,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> @@ -614,7 +614,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -635,14 +635,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>0</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> <cstring>layF2</cstring> </property> @@ -650,7 +650,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>whiteBox</cstring> </property> @@ -658,7 +658,7 @@ <string>Blinding white</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>purpleBox</cstring> </property> @@ -666,7 +666,7 @@ <string>Velvet purple</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>seagreenBox</cstring> </property> @@ -674,7 +674,7 @@ <string>Deep-sea green</string> </property> </widget> - <widget class="QCheckBox" row="1" column="2"> + <widget class="TQCheckBox" row="1" column="2"> <property name="name"> <cstring>redBox</cstring> </property> @@ -682,7 +682,7 @@ <string>Deep red</string> </property> </widget> - <widget class="QCheckBox" row="3" column="2"> + <widget class="TQCheckBox" row="3" column="2"> <property name="name"> <cstring>combosBox</cstring> </property> @@ -696,7 +696,7 @@ <string>This allow a random creation of fireworks that explodes in 2 colors</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>blueBox</cstring> </property> @@ -714,14 +714,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>80</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>orangeBox</cstring> </property> @@ -729,7 +729,7 @@ <string>Hot orange</string> </property> </widget> - <widget class="QCheckBox" row="2" column="2"> + <widget class="TQCheckBox" row="2" column="2"> <property name="name"> <cstring>greenBox</cstring> </property> @@ -739,7 +739,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>colorsLabel1</cstring> </property> @@ -747,7 +747,7 @@ <string>Colors</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>fireworksLabel1</cstring> </property> @@ -755,7 +755,7 @@ <string>Fireworks</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>layF1</cstring> </property> @@ -763,7 +763,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>fire3Box</cstring> </property> @@ -774,7 +774,7 @@ <string>try me</string> </property> </widget> - <widget class="QCheckBox" row="1" column="2"> + <widget class="TQCheckBox" row="1" column="2"> <property name="name"> <cstring>fire6Box</cstring> </property> @@ -785,7 +785,7 @@ <string>try me</string> </property> </widget> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>fire5Box</cstring> </property> @@ -796,7 +796,7 @@ <string>try me</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>fire1Box</cstring> </property> @@ -807,7 +807,7 @@ <string>try me</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>fire2Box</cstring> </property> @@ -828,14 +828,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>80</height> </size> </property> </spacer> - <widget class="QCheckBox" row="3" column="2"> + <widget class="TQCheckBox" row="3" column="2"> <property name="name"> <cstring>fire8Box</cstring> </property> @@ -856,7 +856,7 @@ <string>try me</string> </property> </widget> - <widget class="QCheckBox" row="2" column="2"> + <widget class="TQCheckBox" row="2" column="2"> <property name="name"> <cstring>fire7Box</cstring> </property> @@ -867,7 +867,7 @@ <string>try me</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>fire4Box</cstring> </property> @@ -882,7 +882,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -903,14 +903,14 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>logosBox</cstring> </property> @@ -927,7 +927,7 @@ <string>Enable images explosion.</string> </property> </widget> - <widget class="QFrame" row="1" column="0"> + <widget class="TQFrame" row="1" column="0"> <property name="name"> <cstring>logosFrame</cstring> </property> @@ -954,14 +954,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>70</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>layP1</cstring> </property> @@ -969,7 +969,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>logosIconsBox</cstring> </property> @@ -983,7 +983,7 @@ <string>Enables random KDE Icons explosions.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>logosTuxBox</cstring> </property> @@ -1000,7 +1000,7 @@ <string>Enables random Tux explosions.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>logosDetailBox</cstring> </property> @@ -1014,7 +1014,7 @@ <string>When enabled speeds up logo explosion but reduces quality.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>logosKonquiBox</cstring> </property> @@ -1030,7 +1030,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>layP2</cstring> </property> @@ -1038,7 +1038,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>frequencyLabel</cstring> </property> @@ -1046,7 +1046,7 @@ <string>Frequency:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>neverLabel</cstring> </property> @@ -1054,7 +1054,7 @@ <string>sometimes</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>logosSlider</cstring> </property> @@ -1079,7 +1079,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>oftenLabel</cstring> </property> @@ -1097,7 +1097,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>91</width> <height>21</height> @@ -1108,7 +1108,7 @@ </widget> </grid> </widget> - <widget class="QFrame" row="3" column="0"> + <widget class="TQFrame" row="3" column="0"> <property name="name"> <cstring>starsFrame</cstring> </property> @@ -1135,14 +1135,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>50</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>layP3</cstring> </property> @@ -1150,7 +1150,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>starsFlickerBox</cstring> </property> @@ -1164,7 +1164,7 @@ <string>This option produces a sort of vibration in the lightness of the star.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>starsGradientBox</cstring> </property> @@ -1180,7 +1180,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>layP4</cstring> </property> @@ -1188,7 +1188,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4_5</cstring> </property> @@ -1196,7 +1196,7 @@ <string>Number:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3_2_6</cstring> </property> @@ -1204,7 +1204,7 @@ <string>less</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>starsSlider</cstring> </property> @@ -1229,7 +1229,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3_2_2_5</cstring> </property> @@ -1247,7 +1247,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>149</width> <height>21</height> @@ -1258,7 +1258,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>starsBox</cstring> </property> @@ -1275,7 +1275,7 @@ <string>Enable stars in the sky.</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>writingsBox</cstring> </property> @@ -1294,7 +1294,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1305,7 +1305,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>flashBox</cstring> </property> @@ -1316,7 +1316,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> <cstring>layE2</cstring> </property> @@ -1334,14 +1334,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>fadeLabel1</cstring> </property> @@ -1349,7 +1349,7 @@ <string>Intensity:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>fadeLabel2</cstring> </property> @@ -1357,7 +1357,7 @@ <string>small</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>fadeSlider</cstring> </property> @@ -1382,7 +1382,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>fadeLabel3</cstring> </property> @@ -1400,7 +1400,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>21</height> @@ -1409,7 +1409,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox" row="5" column="0"> + <widget class="TQCheckBox" row="5" column="0"> <property name="name"> <cstring>flaresBox</cstring> </property> @@ -1420,7 +1420,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget" row="6" column="0"> + <widget class="TQLayoutWidget" row="6" column="0"> <property name="name"> <cstring>layE3</cstring> </property> @@ -1438,14 +1438,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>flaresLabel1</cstring> </property> @@ -1453,7 +1453,7 @@ <string>Dimension:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>flaresLabel2</cstring> </property> @@ -1461,7 +1461,7 @@ <string>small</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>flaresSlider</cstring> </property> @@ -1486,7 +1486,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>flaresLabel3</cstring> </property> @@ -1504,7 +1504,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>117</width> <height>21</height> @@ -1513,7 +1513,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox" row="7" column="0"> + <widget class="TQCheckBox" row="7" column="0"> <property name="name"> <cstring>trailBox</cstring> </property> @@ -1527,7 +1527,7 @@ <string>not yet ported</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>layE1</cstring> </property> @@ -1545,14 +1545,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>flashLabel1</cstring> </property> @@ -1560,7 +1560,7 @@ <string>Flash opacity:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>flashLabel2</cstring> </property> @@ -1568,7 +1568,7 @@ <string>min</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>flashSlider</cstring> </property> @@ -1593,7 +1593,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>flashLabel3</cstring> </property> @@ -1611,7 +1611,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>21</height> @@ -1620,7 +1620,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>fadeBox</cstring> </property> @@ -1631,7 +1631,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>lightBox</cstring> </property> @@ -1655,7 +1655,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> @@ -1837,13 +1837,13 @@ <variables> <variable access="private">KFireSaver * fireSaverWidget;</variable> </variables> -<slots> +<Q_SLOTS> <slot>applyButton_clicked()</slot> <slot>updatePreview()</slot> <slot>writeConfig()</slot> <slot>readConfig()</slot> <slot>useButton_clicked()</slot> -</slots> +</Q_SLOTS> <functions> <function access="private" specifier="non virtual">init()</function> <function access="private">destroy()</function> diff --git a/kscreensaver/kdesavers/firesaversetup.ui.h b/kscreensaver/kdesavers/firesaversetup.ui.h index 09480126..5602cc6d 100644 --- a/kscreensaver/kdesavers/firesaversetup.ui.h +++ b/kscreensaver/kdesavers/firesaversetup.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -137,7 +137,7 @@ void KFireSaverSetup::readConfig() fireworksSlider->setValue(config.readNumEntry( "FireworksFrequency", 7 )); particlesSlider->setValue(config.readNumEntry( "ParticlesSize", 0 )); bottomfireBox->setChecked(config.readBoolEntry( "enable-BottomFire", true )); - TQColor blue = Qt::darkBlue; + TQColor blue = TQt::darkBlue; bottomfireColorButton->setColor(config.readColorEntry( "BottomFireColor", &blue )); soundsBox->setChecked(config.readBoolEntry( "enable-Sounds", false )); overheadBox->setChecked(config.readBoolEntry( "enable-NoOverhead", true )); @@ -205,7 +205,7 @@ void KFireSaverSetup::useButton_clicked() showCombo->setCurrentItem( 1 ); fireworksSlider->setValue( 7 ); bottomfireBox->setChecked( true ); - bottomfireColorButton->setColor( Qt::darkBlue ); + bottomfireColorButton->setColor( TQt::darkBlue ); frameskipBox->setChecked( true ); fire1Box->setChecked( true ); fire2Box->setChecked( false ); @@ -243,7 +243,7 @@ void KFireSaverSetup::useButton_clicked() case 1: // Elegant white fireworksSlider->setValue( 7 ); bottomfireBox->setChecked( true ); - bottomfireColorButton->setColor( Qt::blue ); + bottomfireColorButton->setColor( TQt::blue ); frameskipBox->setChecked( true ); fire1Box->setChecked( true ); fire2Box->setChecked( false ); @@ -320,7 +320,7 @@ void KFireSaverSetup::useButton_clicked() case 3: //Enhanced reality fireworksSlider->setValue( 8 ); bottomfireBox->setChecked( true ); - bottomfireColorButton->setColor( Qt::magenta ); + bottomfireColorButton->setColor( TQt::magenta ); frameskipBox->setChecked( true ); fire1Box->setChecked( true ); fire2Box->setChecked( true ); @@ -358,7 +358,7 @@ void KFireSaverSetup::useButton_clicked() case 4: //Hypnotic illusions fireworksSlider->setValue( 9 ); bottomfireBox->setChecked( true ); - bottomfireColorButton->setColor( Qt::red ); + bottomfireColorButton->setColor( TQt::red ); frameskipBox->setChecked( true ); fire1Box->setChecked( true ); fire2Box->setChecked( true ); diff --git a/kscreensaver/kdesavers/firesaverwriter.cpp b/kscreensaver/kdesavers/firesaverwriter.cpp index 4f98ae60..82b592d3 100644 --- a/kscreensaver/kdesavers/firesaverwriter.cpp +++ b/kscreensaver/kdesavers/firesaverwriter.cpp @@ -95,9 +95,9 @@ Writer::Writer( TQString descFileName ) return; TQString welcomeString = i18n("Welcome to KDE %1.%2.%3") - .arg(KDE_VERSION_MAJOR) - .arg(KDE_VERSION_MINOR) - .arg(KDE_VERSION_RELEASE); + .tqarg(KDE_VERSION_MAJOR) + .tqarg(KDE_VERSION_MINOR) + .tqarg(KDE_VERSION_RELEASE); spawnWords(welcomeString, Fun1); } diff --git a/kscreensaver/kdesavers/fountain.cpp b/kscreensaver/kdesavers/fountain.cpp index 23d90104..2c208b4c 100644 --- a/kscreensaver/kdesavers/fountain.cpp +++ b/kscreensaver/kdesavers/fountain.cpp @@ -19,7 +19,7 @@ #include <kglobal.h> #include "fountain.h" #include "fountain.moc" -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX #include <OpenGL/gl.h> #include <OpenGL/glu.h> #else @@ -218,8 +218,8 @@ Fountain::~Fountain() /** load the particle file */ bool Fountain::loadParticle() { - /* Status indicator */ - bool Status = TRUE; + /* tqStatus indicator */ + bool tqStatus = TRUE; TQImage buf; kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl; @@ -232,13 +232,13 @@ bool Fountain::loadParticle() else { TQImage dummy( 32, 32, 32 ); - dummy.fill( Qt::white.rgb() ); + dummy.fill( TQt::white.rgb() ); buf = dummy; tex = convertToGLFormat( buf ); } /* Set the status to true */ - //Status = TRUE; + //tqStatus = TRUE; glGenTextures(1, &texture[0]); /* create three textures */ glBindTexture(GL_TEXTURE_2D, texture[0]); /* use linear filtering */ @@ -250,7 +250,7 @@ bool Fountain::loadParticle() - return Status; + return tqStatus; } /** setup the GL enviroment */ void Fountain::initializeGL () @@ -303,8 +303,8 @@ void Fountain::initializeGL () particle[loop].xi=float((KApplication::random()%50)-26.0f)*10.0f; // Random Speed On X Axis particle[loop].yi=float((KApplication::random()%50)-25.0f)*10.0f; // Random Speed On Y Axis particle[loop].zi=float((KApplication::random()%50)-25.0f)*10.0f; // Random Speed On Z Axis - particle[loop].xg=0.0f; // Set Horizontal Pull To Zero - particle[loop].yg=-0.8f; // Set Vertical Pull Downward + particle[loop].xg=0.0f; // SetQt::Horizontal Pull To Zero + particle[loop].yg=-0.8f; // SetQt::Vertical Pull Downward particle[loop].zg=0.0f; // Set Pull On Z Axis To Zero particle[loop].size=size; // Set particle size. } @@ -424,8 +424,8 @@ void Fountain::paintGL () particle[loop].xi=float((KApplication::random()%50)-26.0f)*10.0f; // Random Speed On X Axis particle[loop].yi=float((KApplication::random()%50)-25.0f)*10.0f; // Random Speed On Y Axis particle[loop].zi=float((KApplication::random()%50)-25.0f)*10.0f; // Random Speed On Z Axis - particle[loop].xg=0.0f; // Set Horizontal Pull To Zero - particle[loop].yg=-0.8f; // Set Vertical Pull Downward + particle[loop].xg=0.0f; // SetQt::Horizontal Pull To Zero + particle[loop].yg=-0.8f; // SetQt::Vertical Pull Downward particle[loop].zg=0.0f; // Set Pull On Z Axis To Zero particle[loop].size=size; // Set particle size. } diff --git a/kscreensaver/kdesavers/fountain.h b/kscreensaver/kdesavers/fountain.h index 1a31f99e..5835e973 100644 --- a/kscreensaver/kdesavers/fountain.h +++ b/kscreensaver/kdesavers/fountain.h @@ -16,7 +16,7 @@ #include <tqdialog.h> #include <tqgl.h> -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX #include <OpenGL/gl.h> #include <OpenGL/glu.h> #else @@ -34,9 +34,10 @@ #define MAX_PARTICLES 1000 -class Fountain : public QGLWidget +class Fountain : public TQGLWidget { Q_OBJECT + TQ_OBJECT class particles // Create A Structure For Particle { public: @@ -103,6 +104,7 @@ private: class KFountainSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KFountainSaver( WId drawable ); virtual ~KFountainSaver(); @@ -120,6 +122,7 @@ private: class KFountainSetup : public SetupUi { Q_OBJECT + TQ_OBJECT public: KFountainSetup( TQWidget *parent = NULL, const char *name = NULL ); diff --git a/kscreensaver/kdesavers/fountaincfg.ui b/kscreensaver/kdesavers/fountaincfg.ui index 94759b2f..f77750aa 100644 --- a/kscreensaver/kdesavers/fountaincfg.ui +++ b/kscreensaver/kdesavers/fountaincfg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>SetupUi</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SetupUi</cstring> </property> @@ -12,7 +12,7 @@ <height>209</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>400</width> <height>209</height> @@ -37,7 +37,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -51,7 +51,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>CheckBox1</cstring> </property> @@ -59,7 +59,7 @@ <string>Use textures</string> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>PushButton3</cstring> </property> @@ -67,7 +67,7 @@ <string>&About</string> </property> </widget> - <widget class="QSpinBox" row="1" column="0"> + <widget class="TQSpinBox" row="1" column="0"> <property name="name"> <cstring>SpinBox1</cstring> </property> @@ -84,7 +84,7 @@ <number>75</number> </property> </widget> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>PushButton2</cstring> </property> @@ -92,7 +92,7 @@ <string>&Cancel</string> </property> </widget> - <widget class="QPushButton" row="4" column="0"> + <widget class="TQPushButton" row="4" column="0"> <property name="name"> <cstring>PushButton1</cstring> </property> @@ -103,7 +103,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -120,7 +120,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -134,7 +134,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton1</cstring> </property> @@ -145,7 +145,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton1_2</cstring> </property> @@ -157,12 +157,12 @@ </widget> </grid> </widget> - <widget class="QWidget" row="0" column="1" rowspan="4" colspan="2"> + <widget class="TQWidget" row="0" column="1" rowspan="4" colspan="2"> <property name="name"> <cstring>preview</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kscreensaver/kdesavers/gravity.cpp b/kscreensaver/kdesavers/gravity.cpp index c8415e49..93ae1660 100644 --- a/kscreensaver/kdesavers/gravity.cpp +++ b/kscreensaver/kdesavers/gravity.cpp @@ -18,7 +18,7 @@ #include <kcolorbutton.h> #include "gravity.h" #include "gravity.moc" -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX #include <OpenGL/glu.h> #include <OpenGL/gl.h> #else @@ -61,7 +61,7 @@ KGravitySetup::KGravitySetup( TQWidget *parent, const char *name ) preview->setFixedSize( 220, 170 ); preview->setBackgroundColor( black ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 preview->show(); // otherwise saver does not get correct size #endif saver = new KGravitySaver( preview->winId() ); @@ -143,7 +143,7 @@ KGravitySaver::KGravitySaver( WId id ) : KScreenSaver( id ) erase(); gravity = new Gravity(); embed(gravity); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 gravity->show(); #endif connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(blank()) ); @@ -206,8 +206,8 @@ Gravity::~Gravity() /** load the particle file */ bool Gravity::loadParticle() { - /* Status indicator */ - bool Status = TRUE; + /* tqStatus indicator */ + bool tqStatus = TRUE; TQImage buf; kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl; @@ -220,13 +220,13 @@ bool Gravity::loadParticle() else { TQImage dummy( 32, 32, 32 ); - dummy.fill( Qt::white.rgb() ); + dummy.fill( TQt::white.rgb() ); buf = dummy; tex = convertToGLFormat( buf ); } /* Set the status to true */ - //Status = TRUE; + //tqStatus = TRUE; glGenTextures(1, &texture[0]); /* create three textures */ glBindTexture(GL_TEXTURE_2D, texture[0]); /* use linear filtering */ @@ -238,7 +238,7 @@ bool Gravity::loadParticle() - return Status; + return tqStatus; } /** setup the GL enviroment */ void Gravity::initializeGL () diff --git a/kscreensaver/kdesavers/gravity.h b/kscreensaver/kdesavers/gravity.h index 53d60a25..654d3e32 100644 --- a/kscreensaver/kdesavers/gravity.h +++ b/kscreensaver/kdesavers/gravity.h @@ -16,7 +16,7 @@ #include <tqdialog.h> #include <tqgl.h> -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX #include <OpenGL/glu.h> #include <OpenGL/gl.h> #else @@ -34,9 +34,10 @@ #define MAX_PARTICLES 100 -class Gravity : public QGLWidget +class Gravity : public TQGLWidget { Q_OBJECT + TQ_OBJECT class particles // Create A Structure For Particle { public: @@ -101,6 +102,7 @@ private: class KGravitySaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KGravitySaver( WId drawable ); virtual ~KGravitySaver(); @@ -118,6 +120,7 @@ private: class KGravitySetup : public SetupUi { Q_OBJECT + TQ_OBJECT public: KGravitySetup( TQWidget *parent = NULL, const char *name = NULL ); ~KGravitySetup(); diff --git a/kscreensaver/kdesavers/gravitycfg.ui b/kscreensaver/kdesavers/gravitycfg.ui index acdd2c80..062b6e83 100644 --- a/kscreensaver/kdesavers/gravitycfg.ui +++ b/kscreensaver/kdesavers/gravitycfg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>SetupUi</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SetupUi</cstring> </property> @@ -12,7 +12,7 @@ <height>209</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>400</width> <height>209</height> @@ -37,7 +37,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -51,7 +51,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>CheckBox1</cstring> </property> @@ -59,7 +59,7 @@ <string>Use textures</string> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>PushButton3</cstring> </property> @@ -67,7 +67,7 @@ <string>&About</string> </property> </widget> - <widget class="QSpinBox" row="1" column="0"> + <widget class="TQSpinBox" row="1" column="0"> <property name="name"> <cstring>SpinBox1</cstring> </property> @@ -84,7 +84,7 @@ <number>75</number> </property> </widget> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>PushButton2</cstring> </property> @@ -92,7 +92,7 @@ <string>&Cancel</string> </property> </widget> - <widget class="QPushButton" row="4" column="0"> + <widget class="TQPushButton" row="4" column="0"> <property name="name"> <cstring>PushButton1</cstring> </property> @@ -103,7 +103,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -120,7 +120,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -134,7 +134,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton1</cstring> </property> @@ -145,7 +145,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton1_2</cstring> </property> @@ -157,12 +157,12 @@ </widget> </grid> </widget> - <widget class="QWidget" row="0" column="1" rowspan="4" colspan="2"> + <widget class="TQWidget" row="0" column="1" rowspan="4" colspan="2"> <property name="name"> <cstring>preview</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kscreensaver/kdesavers/kclock.cpp b/kscreensaver/kdesavers/kclock.cpp index 5079aa57..5ecea27c 100644 --- a/kscreensaver/kdesavers/kclock.cpp +++ b/kscreensaver/kdesavers/kclock.cpp @@ -84,8 +84,8 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name) top->addLayout( hbox ); TQGroupBox *colgroup = new TQGroupBox(i18n("Colors"), main); - colgroup->setColumnLayout( 0, Horizontal ); - TQGridLayout *grid = new TQGridLayout( colgroup->layout(), + colgroup->setColumnLayout( 0,Qt::Horizontal ); + TQGridLayout *grid = new TQGridLayout( colgroup->tqlayout(), 5, 2, spacingHint() ); TQLabel *label = new TQLabel(i18n("&Hour-hand:"), colgroup); @@ -143,7 +143,7 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name) label = new TQLabel( i18n( "Si&ze:" ), main ); top->addWidget( label ); - TQSlider *qs = new TQSlider(0, MAX_CLOCK_SIZE, 1, m_size, Horizontal, main); + TQSlider *qs = new TQSlider(0, MAX_CLOCK_SIZE, 1, m_size,Qt::Horizontal, main); label->setBuddy( qs ); qs->setTickInterval(1); qs->setTickmarks(TQSlider::Below); @@ -153,11 +153,11 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name) bool rtl = kapp->reverseLayout(); TQHBox *qsscale = new TQHBox(main); label = new TQLabel(i18n("Small"), qsscale); - label->setAlignment(rtl ? AlignRight : AlignLeft); + label->tqsetAlignment(rtl ? AlignRight : AlignLeft); label = new TQLabel(i18n("Medium"), qsscale); - label->setAlignment(AlignHCenter); + label->tqsetAlignment(AlignHCenter); label = new TQLabel(i18n("Big"), qsscale); - label->setAlignment(rtl ? AlignLeft : AlignRight); + label->tqsetAlignment(rtl ? AlignLeft : AlignRight); top->addWidget(qsscale); TQCheckBox *keepCentered = new TQCheckBox(i18n("&Keep clock centered"), main); @@ -183,15 +183,15 @@ void KClockSetup::readSettings() m_size = MAX_CLOCK_SIZE; config->setGroup("Colors"); - TQColor c = Qt::black; + TQColor c = TQt::black; m_bgndColor = config->readColorEntry("Background", &c); - c = Qt::white; + c = TQt::white; m_scaleColor = config->readColorEntry("Scale", &c); m_hourColor = config->readColorEntry("HourHand", &c); m_minColor = config->readColorEntry("MinuteHand", &c); - c = Qt::red; + c = TQt::red; m_secColor = config->readColorEntry("SecondHand", &c); if (m_saver) { @@ -229,7 +229,7 @@ void KClockSetup::slotHelp() "Version 1.0<br>" "<nobr>Melchior FRANZ (c) 2003</nobr>") + "<br><a href=\"mailto:mfranz@kde.org\">mfranz@kde.org</a>" - "</qt>", TQString::null, KMessageBox::AllowLink); + "</qt>", TQString(), KMessageBox::AllowLink); } @@ -296,7 +296,7 @@ KClockPainter::KClockPainter(int width, int height) : m_width(width), m_height(height) { - m_buf = new Q_UINT8[m_width * m_height * 3]; + m_buf = new TQ_UINT8[m_width * m_height * 3]; // build Cartesian coordinate system ranging from -1000 to +1000; // points with positive x and y are in the top right quarter m_matrix[0] = m_width / 2000.0; @@ -324,9 +324,9 @@ void KClockPainter::drawToImage(TQImage *q, int xoffs = 0, int yoffs = 0) { unsigned char *src = (unsigned char *)image(); for (int y = 0; y < m_height; y++) { - QRgb *dest = reinterpret_cast<QRgb *>(q->scanLine(y + yoffs)) + xoffs; + TQRgb *dest = reinterpret_cast<TQRgb *>(q->scanLine(y + yoffs)) + xoffs; for (int x = 0; x < m_width; x++, src += 3) - *dest++ = qRgba(src[0], src[1], src[2], 255); + *dest++ = tqRgba(src[0], src[1], src[2], 255); } } @@ -441,7 +441,7 @@ KClockSaver::~KClockSaver() void KClockSaver::start(int size) { - m_diameter = int(QMIN(width(), height()) * (size + 4) / 14.0); + m_diameter = int(TQMIN(width(), height()) * (size + 4) / 14.0); m_x = (width() - m_diameter) / 2; m_y = (height() - m_diameter) / 2; @@ -449,7 +449,7 @@ void KClockSaver::start(int size) m_scale = new KClockPainter(m_diameter, m_diameter); m_clock = new KClockPainter(m_diameter, m_diameter); - m_clock->setShadowColor(qRgb((m_bgndColor.red() + m_scaleColor.red()) / 2, + m_clock->setShadowColor(tqRgb((m_bgndColor.red() + m_scaleColor.red()) / 2, (m_bgndColor.green() + m_scaleColor.green()) / 2, (m_bgndColor.blue() + m_scaleColor.blue()) / 2)); drawScale(); @@ -497,15 +497,15 @@ void KClockSaver::readSettings() m_size = MAX_CLOCK_SIZE; config->setGroup("Colors"); - TQColor c = Qt::black; + TQColor c = TQt::black; m_bgndColor = config->readColorEntry("Background", &c); - c = Qt::white; + c = TQt::white; m_scaleColor = config->readColorEntry("Scale", &c); m_hourColor = config->readColorEntry("HourHand", &c); m_minColor = config->readColorEntry("MinuteHand", &c); - c = Qt::red; + c = TQt::red; m_secColor = config->readColorEntry("SecondHand", &c); } @@ -557,7 +557,7 @@ void KClockSaver::slotTimeout() if (width() < 256) { // intended for the control module preview: always fill the whole area TQImage *img = new TQImage(width(), height(), 32); - img->fill(qRgb(m_bgndColor.red(), m_bgndColor.green(), m_bgndColor.blue())); + img->fill(tqRgb(m_bgndColor.red(), m_bgndColor.green(), m_bgndColor.blue())); m_clock->drawToImage(img, m_x, m_y); p.drawImage(0, 0, *img); delete img; diff --git a/kscreensaver/kdesavers/kclock.h b/kscreensaver/kdesavers/kclock.h index 2afc42a6..662d24b8 100644 --- a/kscreensaver/kdesavers/kclock.h +++ b/kscreensaver/kdesavers/kclock.h @@ -19,10 +19,10 @@ class KClockPainter { int m_width; int m_height; - Q_UINT8 *m_buf; + TQ_UINT8 *m_buf; double m_matrix[6]; - Q_UINT32 m_color; - Q_UINT32 m_shadow; + TQ_UINT32 m_color; + TQ_UINT32 m_shadow; public: KClockPainter(int width, int height); @@ -45,6 +45,7 @@ class KClockPainter class KClockSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KClockSaver(WId id); virtual ~KClockSaver(); @@ -94,6 +95,7 @@ class KClockSaver : public KScreenSaver class KClockSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KClockSetup(TQWidget *parent = 0, const char *name = 0); ~KClockSetup(); diff --git a/kscreensaver/kdesavers/kvm.cpp b/kscreensaver/kdesavers/kvm.cpp index e0d54265..6e064e29 100644 --- a/kscreensaver/kdesavers/kvm.cpp +++ b/kscreensaver/kdesavers/kvm.cpp @@ -21,7 +21,7 @@ * implied warranty. * */ -// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> +// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> #ifdef HAVE_CONFIG_H #include <config.h> @@ -166,8 +166,8 @@ draw_pool (m_state *state) if( state->modified[index] == 1 ) pos_x += 2; TQPainter p(state->w); - p.setPen( Qt::green ); - p.setBrush( Qt::black ); + p.setPen( TQt::green ); + p.setBrush( TQt::black ); p.drawPixmap( state->grid_margin_x + x*state->char_width, state->grid_margin_y + y*state->char_height, state->images, pos_x*state->char_width, @@ -289,7 +289,7 @@ kVmSetup::kVmSetup( TQWidget *parent, const char *name ) TQLabel *label = new TQLabel( i18n("Virtual machine speed:"), main ); tl1->addWidget(label); - TQSlider *slider = new TQSlider( TQSlider::Horizontal, main ); + TQSlider *slider = new TQSlider( Qt::Horizontal, main ); slider->setMinimumSize( 120, 20 ); slider->setRange( 0, 100 ); slider->setSteps( 10, 20 ); @@ -303,7 +303,7 @@ kVmSetup::kVmSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Display update speed:"), main ); tl1->addWidget(label); - slider = new TQSlider( TQSlider::Horizontal, main ); + slider = new TQSlider( Qt::Horizontal, main ); slider->setMinimumSize( 120, 20 ); slider->setRange( 0, MAX_REFRESH_TIMEOUT ); slider->setSteps( MAX_REFRESH_TIMEOUT/10, MAX_REFRESH_TIMEOUT/5 ); diff --git a/kscreensaver/kdesavers/kvm.h b/kscreensaver/kdesavers/kvm.h index 0f705e21..7b618c9d 100644 --- a/kscreensaver/kdesavers/kvm.h +++ b/kscreensaver/kdesavers/kvm.h @@ -44,6 +44,7 @@ typedef struct { class kVmSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: kVmSaver( WId id ); virtual ~kVmSaver(); @@ -74,6 +75,7 @@ protected: class kVmSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: kVmSetup( TQWidget *parent = NULL, const char *name = NULL ); ~kVmSetup(); diff --git a/kscreensaver/kdesavers/lines.cpp b/kscreensaver/kdesavers/lines.cpp index 86919eca..9ea6551b 100644 --- a/kscreensaver/kdesavers/lines.cpp +++ b/kscreensaver/kdesavers/lines.cpp @@ -5,7 +5,7 @@ // based on kpolygon from Martin R. Jones 1996 // mailto:dirk.staneker@student.uni-tuebingen.de // -// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> +// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> // 2001/03/04 Converted to libkscreensaver by Martin R. Jones #include <config.h> @@ -128,7 +128,7 @@ kLinesSetup::kLinesSetup(TQWidget *parent, const char *name) TQLabel *label=new TQLabel(i18n("Length:"), main); tl1->addWidget(label); - TQSlider *sb= new TQSlider(1, MAXLENGTH+1, 16, length, TQSlider::Horizontal, + TQSlider *sb= new TQSlider(1, MAXLENGTH+1, 16, length, Qt::Horizontal, main); sb->setMinimumSize(120, 20); sb->setTickmarks(TQSlider::Below); @@ -139,7 +139,7 @@ kLinesSetup::kLinesSetup(TQWidget *parent, const char *name) label=new TQLabel(i18n("Speed:"), main); tl1->addWidget(label); - sb = new TQSlider(0, 100, 10, speed, TQSlider::Horizontal, main); + sb = new TQSlider(0, 100, 10, speed, Qt::Horizontal, main); sb->setMinimumSize(120, 20); sb->setTickmarks(TQSlider::Below); sb->setTickInterval(10); diff --git a/kscreensaver/kdesavers/lines.h b/kscreensaver/kdesavers/lines.h index c5e7f42a..fe9331bd 100644 --- a/kscreensaver/kdesavers/lines.h +++ b/kscreensaver/kdesavers/lines.h @@ -38,6 +38,7 @@ class Lines{ class kLinesSaver:public KScreenSaver{ Q_OBJECT + TQ_OBJECT public: kLinesSaver( WId id ); virtual ~kLinesSaver(); @@ -68,6 +69,7 @@ class kLinesSaver:public KScreenSaver{ class kLinesSetup : public KDialogBase{ Q_OBJECT + TQ_OBJECT public: kLinesSetup(TQWidget *parent=NULL, const char *name=NULL); ~kLinesSetup(); diff --git a/kscreensaver/kdesavers/lorenz.cpp b/kscreensaver/kdesavers/lorenz.cpp index 86bd0d80..e98410fb 100644 --- a/kscreensaver/kdesavers/lorenz.cpp +++ b/kscreensaver/kdesavers/lorenz.cpp @@ -82,7 +82,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) TQLabel *label = new TQLabel( i18n("Speed:"), main ); tl1->addWidget(label); - sps = new TQSlider(MINSPEED, MAXSPEED, 10, speed, TQSlider::Horizontal, main); + sps = new TQSlider(MINSPEED, MAXSPEED, 10, speed, Qt::Horizontal, main); sps->setMinimumSize( 120, 20 ); sps->setTickmarks(TQSlider::Below); sps->setTickInterval(150); @@ -92,7 +92,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Epoch:"), main ); tl1->addWidget(label); - eps = new TQSlider(MINEPOCH, MAXEPOCH, 100, epoch, TQSlider::Horizontal, main); + eps = new TQSlider(MINEPOCH, MAXEPOCH, 100, epoch, Qt::Horizontal, main); eps->setMinimumSize( 120, 20 ); eps->setTickmarks(TQSlider::Below); eps->setTickInterval(3000); @@ -102,7 +102,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Color rate:"), main ); tl1->addWidget(label); - crs = new TQSlider(MINCOLOR, MAXCOLOR, 5, crate, TQSlider::Horizontal, main); + crs = new TQSlider(MINCOLOR, MAXCOLOR, 5, crate, Qt::Horizontal, main); crs->setMinimumSize( 120, 20 ); crs->setTickmarks(TQSlider::Below); crs->setTickInterval(10); @@ -112,7 +112,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Rotation Z:"), main ); tl1->addWidget(label); - zrs = new TQSlider(MINZROT, MAXZROT, 18, zrot, TQSlider::Horizontal, main); + zrs = new TQSlider(MINZROT, MAXZROT, 18, zrot, Qt::Horizontal, main); zrs->setMinimumSize( 120, 20 ); zrs->setTickmarks(TQSlider::Below); zrs->setTickInterval(36); @@ -122,7 +122,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Rotation Y:"), main ); tl1->addWidget(label); - yrs = new TQSlider(MINYROT, MAXYROT, 18, yrot, TQSlider::Horizontal, main); + yrs = new TQSlider(MINYROT, MAXYROT, 18, yrot, Qt::Horizontal, main); yrs->setMinimumSize( 120, 20 ); yrs->setTickmarks(TQSlider::Below); yrs->setTickInterval(36); @@ -132,7 +132,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Rotation X:"), main ); tl1->addWidget(label); - xrs = new TQSlider(MINXROT, MAXXROT, 18, xrot, TQSlider::Horizontal, main); + xrs = new TQSlider(MINXROT, MAXXROT, 18, xrot, Qt::Horizontal, main); xrs->setMinimumSize( 120, 20 ); xrs->setTickmarks(TQSlider::Below); xrs->setTickInterval(36); diff --git a/kscreensaver/kdesavers/lorenz.h b/kscreensaver/kdesavers/lorenz.h index 4993273e..5a69634e 100644 --- a/kscreensaver/kdesavers/lorenz.h +++ b/kscreensaver/kdesavers/lorenz.h @@ -22,6 +22,7 @@ class Matrix3D; class KLorenzSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KLorenzSaver( WId id ); virtual ~KLorenzSaver(); @@ -56,6 +57,7 @@ class TQSlider; class KLorenzSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KLorenzSetup(TQWidget *parent = 0, const char *name = 0 ); ~KLorenzSetup(); diff --git a/kscreensaver/kdesavers/pendulum.cpp b/kscreensaver/kdesavers/pendulum.cpp index 18f03be8..4694ccd3 100644 --- a/kscreensaver/kdesavers/pendulum.cpp +++ b/kscreensaver/kdesavers/pendulum.cpp @@ -29,7 +29,7 @@ // std. C++ headers #include <cstdlib> -// Qt headers +// TQt headers #include <tqlineedit.h> #include <tqspinbox.h> #include <tqvalidator.h> @@ -44,7 +44,7 @@ #include "sspreviewarea.h" -// pendulum.moc includes pendulum.h +// pendulum.tqmoc includes pendulum.h #include "pendulum.moc" #define KPENDULUM_VERSION "1.1" @@ -654,7 +654,7 @@ void KPendulumSaver::doTimeStep() glArea->setEyePhi(eyePhi); // set new perspective } - glArea->updateGL(); // repaint scenery + glArea->updateGL(); // tqrepaint scenery timer->start(deltaT, TRUE); // restart timer } @@ -704,28 +704,28 @@ KPendulumSetup::KPendulumSetup(TQWidget* parent, const char* name) TQToolTip::add( mEdit, i18n("Ratio of 2nd mass to sum of both masses.\nValid values from %1 to %2.") - .arg(KPendulumSaver::massRatioLimitLower, 0, 'f', 2) - .arg(KPendulumSaver::massRatioLimitUpper, 0, 'f', 2)); + .tqarg(KPendulumSaver::massRatioLimitLower, 0, 'f', 2) + .tqarg(KPendulumSaver::massRatioLimitUpper, 0, 'f', 2)); TQToolTip::add( lEdit, i18n("Ratio of 2nd pendulum part length to the sum of both part lengths.\nValid values from %1 to %2.") - .arg(KPendulumSaver::lengthRatioLimitLower, 0, 'f', 2) - .arg(KPendulumSaver::lengthRatioLimitUpper, 0, 'f', 2)); + .tqarg(KPendulumSaver::lengthRatioLimitLower, 0, 'f', 2) + .tqarg(KPendulumSaver::lengthRatioLimitUpper, 0, 'f', 2)); TQToolTip::add( gEdit, i18n("Gravitational constant in arbitrary units.\nValid values from %1 to %2.") - .arg(KPendulumSaver::gLimitLower, 0, 'f', 2) - .arg(KPendulumSaver::gLimitUpper, 0, 'f', 2)); + .tqarg(KPendulumSaver::gLimitLower, 0, 'f', 2) + .tqarg(KPendulumSaver::gLimitUpper, 0, 'f', 2)); TQToolTip::add( eEdit, i18n("Energy in units of the maximum potential energy of the given configuration.\nValid values from %1 to %2.") - .arg(KPendulumSaver::ELimitLower, 0, 'f', 2) - .arg(KPendulumSaver::ELimitUpper, 0, 'f', 2)); + .tqarg(KPendulumSaver::ELimitLower, 0, 'f', 2) + .tqarg(KPendulumSaver::ELimitUpper, 0, 'f', 2)); TQToolTip::add( persSpinBox, i18n("Time in seconds after which a random perspective change occurs.\nValid values from %1 to %2.") - .arg(KPendulumSaver::persChangeIntervalLimitLower) - .arg(KPendulumSaver::persChangeIntervalLimitUpper)); + .tqarg(KPendulumSaver::persChangeIntervalLimitLower) + .tqarg(KPendulumSaver::persChangeIntervalLimitUpper)); // init preview area preview->setBackgroundColor(black); @@ -851,7 +851,7 @@ void KPendulumSetup::persChangeEnteredSlot(int t) void KPendulumSetup::barColorButtonClickedSlot(void) { - TQColor color = QColorDialog::getColor( + TQColor color = TQColorDialog::getColor( saver->barColor(), this, "bar color dialog"); if (color.isValid()) { @@ -861,7 +861,7 @@ void KPendulumSetup::barColorButtonClickedSlot(void) } void KPendulumSetup::m1ColorButtonClickedSlot(void) { - TQColor color = QColorDialog::getColor( + TQColor color = TQColorDialog::getColor( saver->m1Color(), this, "mass 1 color dialog"); if (color.isValid()) { @@ -871,7 +871,7 @@ void KPendulumSetup::m1ColorButtonClickedSlot(void) } void KPendulumSetup::m2ColorButtonClickedSlot(void) { - TQColor color = QColorDialog::getColor( + TQColor color = TQColorDialog::getColor( saver->m2Color(), this, "mass 2 color dialog"); if (color.isValid()) { diff --git a/kscreensaver/kdesavers/pendulum.h b/kscreensaver/kdesavers/pendulum.h index 3c26a1ef..af933de9 100644 --- a/kscreensaver/kdesavers/pendulum.h +++ b/kscreensaver/kdesavers/pendulum.h @@ -15,7 +15,7 @@ // STL headers #include <valarray> -// Qt headers +// TQt headers #include <tqwidget.h> #include <tqtimer.h> #include <tqgl.h> @@ -79,14 +79,15 @@ class PendulumOdeSolver : public RkOdeSolver<double> /** @brief GL widget class for the KPendulum screen saver * * Class implements TQGLWidget to display the KPendulum screen saver. */ -class PendulumGLWidget : public QGLWidget +class PendulumGLWidget : public TQGLWidget { Q_OBJECT + TQ_OBJECT public: /** @brief Constructor of KPendulum's GL widget - * @param parent parent widget, passed to QGLWidget's constructor - * @param name name of widget, passed to QGLWidget's constructor */ + * @param parent parent widget, passed to TQGLWidget's constructor + * @param name name of widget, passed to TQGLWidget's constructor */ PendulumGLWidget(TQWidget* parent=0, const char* name=0); /** @brief Destructor of KPendulum's GL widget */ ~PendulumGLWidget(void); @@ -184,6 +185,7 @@ class PendulumGLWidget : public QGLWidget class KPendulumSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: /** @brief Constructor of the KPendulum screen saver object @@ -332,6 +334,7 @@ class KPendulumSaver : public KScreenSaver class KPendulumSetup : public KPendulumSetupUi { Q_OBJECT + TQ_OBJECT public: /** @brief Constructor for the KPendulum screen saver setup dialog diff --git a/kscreensaver/kdesavers/pendulumcfg.ui b/kscreensaver/kdesavers/pendulumcfg.ui index 51454a00..0b28fc61 100644 --- a/kscreensaver/kdesavers/pendulumcfg.ui +++ b/kscreensaver/kdesavers/pendulumcfg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KPendulumSetupUi</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KPendulumSetupUi</cstring> </property> @@ -20,13 +20,13 @@ <verstretch>2</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>1200</width> <height>900</height> @@ -48,31 +48,31 @@ <property name="resizeMode"> <enum>Minimum</enum> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -90,7 +90,7 @@ m<sub>1</sub>+m<sub>2</sub> </p></string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>mEdit</cstring> </property> @@ -102,7 +102,7 @@ m<sub>1</sub>+m<sub>2</sub> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -114,15 +114,15 @@ m<sub>1</sub>+m<sub>2</sub> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -134,7 +134,7 @@ l<sub>1</sub>+l<sub>2</sub> </p></string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>lEdit</cstring> </property> @@ -146,7 +146,7 @@ l<sub>1</sub>+l<sub>2</sub> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -158,26 +158,26 @@ l<sub>1</sub>+l<sub>2</sub> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> <string>g</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>gEdit</cstring> </property> @@ -189,7 +189,7 @@ l<sub>1</sub>+l<sub>2</sub> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -201,26 +201,26 @@ l<sub>1</sub>+l<sub>2</sub> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13_2</cstring> + <cstring>tqlayout13_2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> <property name="text"> <string>E</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>eEdit</cstring> </property> @@ -232,7 +232,7 @@ l<sub>1</sub>+l<sub>2</sub> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -244,15 +244,15 @@ l<sub>1</sub>+l<sub>2</sub> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -264,7 +264,7 @@ Change [s]</string> <string>specify the time in seconds after which a random perspective change occurs</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>persSpinBox</cstring> </property> @@ -276,13 +276,13 @@ Change [s]</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>60</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -291,19 +291,19 @@ Change [s]</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>barColorButton</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>40</width> <height>32767</height> @@ -313,11 +313,11 @@ Change [s]</string> <string>Bars</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m1ColorButton</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>40</width> <height>32767</height> @@ -327,11 +327,11 @@ Change [s]</string> <string>M1</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m2ColorButton</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>40</width> <height>32767</height> @@ -353,7 +353,7 @@ Change [s]</string> <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -374,7 +374,7 @@ Change [s]</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>150</height> @@ -383,9 +383,9 @@ Change [s]</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> @@ -401,14 +401,14 @@ Change [s]</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>66</width> <height>31</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>OkButton</cstring> </property> @@ -419,7 +419,7 @@ Change [s]</string> <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>CancelButton</cstring> </property> @@ -427,7 +427,7 @@ Change [s]</string> <string>&Cancel</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>AboutButton</cstring> </property> @@ -445,7 +445,7 @@ Change [s]</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>65</width> <height>31</height> @@ -547,7 +547,7 @@ Change [s]</string> <slot>m2ColorButtonClickedSlot()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>okButtonClickedSlot()</slot> <slot>aboutButtonClickedSlot()</slot> <slot>mEditLostFocusSlot(void)</slot> @@ -558,7 +558,7 @@ Change [s]</string> <slot>barColorButtonClickedSlot(void)</slot> <slot>m1ColorButtonClickedSlot(void)</slot> <slot>m2ColorButtonClickedSlot(void)</slot> -</slots> +</Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>sspreviewarea.h</includehint> diff --git a/kscreensaver/kdesavers/polygon.cpp b/kscreensaver/kdesavers/polygon.cpp index 41274711..c4e8057c 100644 --- a/kscreensaver/kdesavers/polygon.cpp +++ b/kscreensaver/kdesavers/polygon.cpp @@ -4,7 +4,7 @@ // // Copyright (c) Martin R. Jones 1996 // -// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> +// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> // 2001/03/04 Converted to libkscreensaver by Martin R. Jones #include <config.h> @@ -66,7 +66,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name ) TQLabel *label = new TQLabel( i18n("Length:"), main ); tl1->addWidget(label); - TQSlider *sb = new TQSlider(1, MAXLENGTH, 10, length, TQSlider::Horizontal, + TQSlider *sb = new TQSlider(1, MAXLENGTH, 10, length, Qt::Horizontal, main ); sb->setMinimumSize( 90, 20 ); sb->setTickmarks(TQSlider::Below); @@ -77,7 +77,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Vertices:"), main ); tl1->addWidget(label); - sb = new TQSlider(3, MAXVERTICES, 2, vertices, TQSlider::Horizontal, main); + sb = new TQSlider(3, MAXVERTICES, 2, vertices, Qt::Horizontal, main); sb->setMinimumSize( 90, 20 ); sb->setTickmarks(TQSlider::Below); sb->setTickInterval(2); @@ -87,7 +87,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Speed:"), main ); tl1->addWidget(label); - sb = new TQSlider(0, 100, 10, speed, TQSlider::Horizontal, main); + sb = new TQSlider(0, 100, 10, speed, Qt::Horizontal, main); sb->setMinimumSize( 90, 20 ); sb->setTickmarks(TQSlider::Below); sb->setTickInterval(10); @@ -102,7 +102,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name ) saver = new kPolygonSaver( preview->winId() ); tl->addWidget(preview); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); } kPolygonSetup::~kPolygonSetup() diff --git a/kscreensaver/kdesavers/polygon.h b/kscreensaver/kdesavers/polygon.h index fed640c1..563d3b39 100644 --- a/kscreensaver/kdesavers/polygon.h +++ b/kscreensaver/kdesavers/polygon.h @@ -18,6 +18,7 @@ class kPolygonSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: kPolygonSaver( WId id ); virtual ~kPolygonSaver(); @@ -37,12 +38,12 @@ protected slots: void slotTimeout(); protected: - QTimer timer; + TQTimer timer; unsigned numLines; int numVertices; int colorContext; int speed; - QColor colors[64]; + TQColor colors[64]; int currentColor; TQPtrList<TQPointArray> polygons; TQMemArray<TQPoint> directions; @@ -52,6 +53,7 @@ protected: class kPolygonSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: kPolygonSetup( TQWidget *parent = 0, const char *name = 0 ); ~kPolygonSetup(); diff --git a/kscreensaver/kdesavers/rotation.cpp b/kscreensaver/kdesavers/rotation.cpp index 4868c9dc..7eb757d0 100644 --- a/kscreensaver/kdesavers/rotation.cpp +++ b/kscreensaver/kdesavers/rotation.cpp @@ -31,7 +31,7 @@ #include <cstdlib> // STL #include <deque> -// Qt headers +// TQt headers #include <tqcheckbox.h> #include <tqlineedit.h> #include <tqvalidator.h> @@ -44,7 +44,7 @@ #include "sspreviewarea.h" -// rotation.moc includes rotation.h +// rotation.tqmoc includes rotation.h #include "rotation.moc" /** Version number of this screen saver */ @@ -716,18 +716,18 @@ KRotationSetup::KRotationSetup(TQWidget* parent, const char* name) TQToolTip::add( lengthEdit, i18n("Length of traces in seconds of visibility.\nValid values from %1 to %2.") - .arg(KRotationSaver::traceLengthSecondsLimitLower, 0, 'f', 2) - .arg(KRotationSaver::traceLengthSecondsLimitUpper, 0, 'f', 2)); + .tqarg(KRotationSaver::traceLengthSecondsLimitLower, 0, 'f', 2) + .tqarg(KRotationSaver::traceLengthSecondsLimitUpper, 0, 'f', 2)); TQToolTip::add( LzEdit, i18n("Angular momentum in z direction in arbitrary units.\nValid values from %1 to %2.") - .arg(KRotationSaver::LzLimitLower, 0, 'f', 2) - .arg(KRotationSaver::LzLimitUpper, 0, 'f', 2)); + .tqarg(KRotationSaver::LzLimitLower, 0, 'f', 2) + .tqarg(KRotationSaver::LzLimitUpper, 0, 'f', 2)); TQToolTip::add( thetaEdit, i18n("Gravitational constant in arbitrary units.\nValid values from %1 to %2.") - .arg(KRotationSaver::initEulerThetaLimitLower, 0, 'f', 2) - .arg(KRotationSaver::initEulerThetaLimitUpper, 0, 'f', 2)); + .tqarg(KRotationSaver::initEulerThetaLimitLower, 0, 'f', 2) + .tqarg(KRotationSaver::initEulerThetaLimitUpper, 0, 'f', 2)); // init preview area preview->setBackgroundColor(black); diff --git a/kscreensaver/kdesavers/rotation.h b/kscreensaver/kdesavers/rotation.h index 0144275d..1086ca3e 100644 --- a/kscreensaver/kdesavers/rotation.h +++ b/kscreensaver/kdesavers/rotation.h @@ -12,7 +12,7 @@ #include <math.h> // STL headers #include <valarray> -// Qt headers +// TQt headers #include <tqwidget.h> #include <tqtimer.h> #include <tqgl.h> @@ -79,14 +79,15 @@ class EulerOdeSolver : public RkOdeSolver<double> /** @brief GL widget class for the KRotation screen saver * * Class implements TQGLWidget to display the KRotation screen saver. */ -class RotationGLWidget : public QGLWidget +class RotationGLWidget : public TQGLWidget { Q_OBJECT + TQ_OBJECT public: /** @brief Constructor of KRotation's GL widget - * @param parent parent widget, passed to QGLWidget's constructor - * @param name name of widget, passed to QGLWidget's constructor + * @param parent parent widget, passed to TQGLWidget's constructor + * @param name name of widget, passed to TQGLWidget's constructor * @param omega current rotation vector * @param e1 x trace data * @param e2 y trace data @@ -172,6 +173,7 @@ class RotationGLWidget : public QGLWidget class KRotationSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: /** @brief Constructor of the KRotation screen saver object @@ -299,6 +301,7 @@ class KRotationSaver : public KScreenSaver class KRotationSetup : public KRotationSetupUi { Q_OBJECT + TQ_OBJECT public: KRotationSetup(TQWidget* parent = NULL, const char* name = NULL); diff --git a/kscreensaver/kdesavers/rotationcfg.ui b/kscreensaver/kdesavers/rotationcfg.ui index d7e95d3b..8aa3cb53 100644 --- a/kscreensaver/kdesavers/rotationcfg.ui +++ b/kscreensaver/kdesavers/rotationcfg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KRotationSetupUi</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KRotationSetupUi</cstring> </property> @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>1200</width> <height>900</height> @@ -48,23 +48,23 @@ <property name="resizeMode"> <enum>Minimum</enum> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -83,15 +83,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>xTrace</cstring> </property> @@ -102,7 +102,7 @@ <string>x</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>randTraces</cstring> </property> @@ -110,7 +110,7 @@ <string>Random</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>yTrace</cstring> </property> @@ -118,7 +118,7 @@ <string>y</string> </property> </widget> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>zTrace</cstring> </property> @@ -128,7 +128,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -136,7 +136,7 @@ <string>Length:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lengthEdit</cstring> </property> @@ -148,7 +148,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>40</width> <height>32767</height> @@ -166,15 +166,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>LzEdit</cstring> </property> @@ -186,7 +186,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -196,7 +196,7 @@ <number>5</number> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -212,7 +212,7 @@ <string>Theta:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -228,7 +228,7 @@ <string>Lz:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>thetaEdit</cstring> </property> @@ -240,7 +240,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -262,7 +262,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>51</height> @@ -275,7 +275,7 @@ <property name="name"> <cstring>preview</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>150</height> @@ -284,9 +284,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -302,22 +302,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>31</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>OkButton</cstring> </property> @@ -328,7 +328,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>CancelButton</cstring> </property> @@ -336,7 +336,7 @@ <string>&Cancel</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>AboutButton</cstring> </property> @@ -356,7 +356,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>31</height> @@ -470,7 +470,7 @@ <slot>thetaEnteredSlot(const QString&)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>okButtonClickedSlot()</slot> <slot>aboutButtonClickedSlot()</slot> <slot>randomTracesToggled(bool)</slot> @@ -480,7 +480,7 @@ <slot>lengthEnteredSlot(const QString&)</slot> <slot>LzEnteredSlot(const QString&)</slot> <slot>thetaEnteredSlot(const QString&)</slot> -</slots> +</Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>sspreviewarea.h</includehint> diff --git a/kscreensaver/kdesavers/science.cpp b/kscreensaver/kdesavers/science.cpp index 57443e78..f0f61ffe 100644 --- a/kscreensaver/kdesavers/science.cpp +++ b/kscreensaver/kdesavers/science.cpp @@ -31,7 +31,7 @@ #include "science.h" #include "science.moc" -#if defined Q_WS_X11 && !defined K_WS_QTONLY +#if defined Q_WS_X11 && !defined K_WS_TQTONLY #include <X11/Xlib.h> #include <X11/Xutil.h> #endif @@ -897,7 +897,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Size:"), main ); ltc->addWidget( label ); - slideSize = new TQSlider(9, 50, 5, size[mode], TQSlider::Horizontal, + slideSize = new TQSlider(9, 50, 5, size[mode], Qt::Horizontal, main ); slideSize->setMinimumSize( 90, 20 ); slideSize->setTickmarks(TQSlider::Below); @@ -916,7 +916,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) ltc->addWidget( label ); slideIntensity = new TQSlider(0, 10, 1, intensity[mode], - TQSlider::Horizontal, main ); + Qt::Horizontal, main ); slideIntensity->setMinimumSize( 90, 20 ); slideIntensity->setTickmarks(TQSlider::Below); slideIntensity->setTickInterval(1); @@ -933,7 +933,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) ltc->addWidget( label ); slideSpeed = new TQSlider(0, SCI_MAX_SPEED, 10, speed[mode], - TQSlider::Horizontal, main ); + Qt::Horizontal, main ); slideSpeed->setMinimumSize( 90, 20 ); slideSpeed->setTickmarks(TQSlider::Below); slideSpeed->setTickInterval(10); @@ -949,7 +949,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) ltc->addLayout( ltcm ); slideMoveX = new TQSlider(0, SCI_MAX_MOVE, 5, moveX[mode], - TQSlider::Horizontal, main ); + Qt::Horizontal, main ); slideMoveX->setMinimumSize( 40, 20 ); slideMoveX->setTickmarks(TQSlider::Below); slideMoveX->setTickInterval(5); @@ -958,7 +958,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) ltcm->addWidget( slideMoveX ); slideMoveY = new TQSlider(0, SCI_MAX_MOVE, 5, moveY[mode], - TQSlider::Horizontal, main ); + Qt::Horizontal, main ); slideMoveY->setMinimumSize( 40, 20 ); slideMoveY->setTickmarks(TQSlider::Below); slideMoveY->setTickInterval(5); diff --git a/kscreensaver/kdesavers/science.h b/kscreensaver/kdesavers/science.h index eb92d339..48635bff 100644 --- a/kscreensaver/kdesavers/science.h +++ b/kscreensaver/kdesavers/science.h @@ -22,9 +22,10 @@ typedef signed int T32bit; class KScienceSaver; -class KPreviewWidget : public QWidget +class KPreviewWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: KPreviewWidget( TQWidget *parent ); void paintEvent( TQPaintEvent *event ); @@ -38,6 +39,7 @@ struct KScienceData; class KScienceSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KScienceSaver( WId id, bool setup=false, bool gP=false); virtual ~KScienceSaver(); @@ -106,6 +108,7 @@ protected: class KScienceSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KScienceSetup(TQWidget *parent=0, const char *name=0); ~KScienceSetup(); diff --git a/kscreensaver/kdesavers/slideshow.cpp b/kscreensaver/kdesavers/slideshow.cpp index de88fe3d..42c702ee 100644 --- a/kscreensaver/kdesavers/slideshow.cpp +++ b/kscreensaver/kdesavers/slideshow.cpp @@ -95,7 +95,7 @@ kSlideShowSaver::kSlideShowSaver( WId id ): KScreenSaver(id) connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); TQDesktopWidget *d = TQApplication::desktop(); - if( geometry() == d->geometry() && d->numScreens() > 1) + if( tqgeometry() == d->tqgeometry() && d->numScreens() > 1) { for(int i = 0; i < d->numScreens(); ++i) { @@ -285,7 +285,7 @@ int kSlideShowSaver::effectSpiralIn(bool aInit) my0 += miy; } - bitBlt(this, mx, my, &mNextScreen, mx, my, mix, miy, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), mx, my, TQT_TQPAINTDEVICE(&mNextScreen), mx, my, mix, miy, CopyROP, true); mx += mdx; my += mdy; @@ -321,8 +321,8 @@ int kSlideShowSaver::effectMeltdown(bool aInit) if (y >= mh) continue; done = false; if ((KApplication::random()&15) < 6) continue; - bitBlt(this, x, y+mdy, this, x, y, mdx, mh-y-mdy, CopyROP, true); - bitBlt(this, x, y, &mNextScreen, x, y, mdx, mdy, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x, y+mdy, TQT_TQPAINTDEVICE(this), x, y, mdx, mh-y-mdy, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x, y, TQT_TQPAINTDEVICE(&mNextScreen), x, y, mdx, mdy, CopyROP, true); mIntArray[i] += mdy; } @@ -407,7 +407,7 @@ int kSlideShowSaver::effectSweep(bool aInit) } for (w=2,i=4,x=mx; i>0; i--, w<<=1, x-=mdx) { - bitBlt(this, x, 0, &mNextScreen, x, 0, w, mh, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x, 0, TQT_TQPAINTDEVICE(&mNextScreen), x, 0, w, mh, CopyROP, true); } mx += mdx; } @@ -421,7 +421,7 @@ int kSlideShowSaver::effectSweep(bool aInit) } for (h=2,i=4,y=my; i>0; i--, h<<=1, y-=mdy) { - bitBlt(this, 0, y, &mNextScreen, 0, y, mw, h, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), 0, y, TQT_TQPAINTDEVICE(&mNextScreen), 0, y, mw, h, CopyROP, true); } my += mdy; } @@ -477,7 +477,7 @@ int kSlideShowSaver::effectRandom(bool /*aInit*/) { x = (KApplication::random() % w) << fact; y = (KApplication::random() % h) << fact; - bitBlt(this, x, y, &mNextScreen, x, y, sz, sz, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x, y, TQT_TQPAINTDEVICE(&mNextScreen), x, y, sz, sz, CopyROP, true); } showNextScreen(); @@ -509,7 +509,7 @@ int kSlideShowSaver::effectGrowing(bool aInit) return -1; } - bitBlt(this, mx, my, &mNextScreen, mx, my, + bitBlt(TQT_TQPAINTDEVICE(this), mx, my, TQT_TQPAINTDEVICE(&mNextScreen), mx, my, mw - (mx<<1), mh - (my<<1), CopyROP, true); return 20; @@ -548,9 +548,9 @@ int kSlideShowSaver::effectChessboard(bool aInit) for (y=0; y<mw; y+=(mdy<<1)) { - bitBlt(this, mix, y+miy, &mNextScreen, mix, y+miy, + bitBlt(TQT_TQPAINTDEVICE(this), mix, y+miy, TQT_TQPAINTDEVICE(&mNextScreen), mix, y+miy, mdx, mdy, CopyROP, true); - bitBlt(this, mx, y+my, &mNextScreen, mx, y+my, + bitBlt(TQT_TQPAINTDEVICE(this), mx, y+my, TQT_TQPAINTDEVICE(&mNextScreen), mx, y+my, mdx, mdy, CopyROP, true); } @@ -591,18 +591,18 @@ int kSlideShowSaver::effectIncomingEdges(bool aInit) if (mSubType) { // moving image edges - bitBlt(this, 0, 0, &mNextScreen, mix-mx, miy-my, mx, my, CopyROP, true); - bitBlt(this, x1, 0, &mNextScreen, mix, miy-my, mx, my, CopyROP, true); - bitBlt(this, 0, y1, &mNextScreen, mix-mx, miy, mx, my, CopyROP, true); - bitBlt(this, x1, y1, &mNextScreen, mix, miy, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&mNextScreen), mix-mx, miy-my, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x1, 0, TQT_TQPAINTDEVICE(&mNextScreen), mix, miy-my, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), 0, y1, TQT_TQPAINTDEVICE(&mNextScreen), mix-mx, miy, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x1, y1, TQT_TQPAINTDEVICE(&mNextScreen), mix, miy, mx, my, CopyROP, true); } else { // fixed image edges - bitBlt(this, 0, 0, &mNextScreen, 0, 0, mx, my, CopyROP, true); - bitBlt(this, x1, 0, &mNextScreen, x1, 0, mx, my, CopyROP, true); - bitBlt(this, 0, y1, &mNextScreen, 0, y1, mx, my, CopyROP, true); - bitBlt(this, x1, y1, &mNextScreen, x1, y1, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&mNextScreen), 0, 0, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x1, 0, TQT_TQPAINTDEVICE(&mNextScreen), x1, 0, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), 0, y1, TQT_TQPAINTDEVICE(&mNextScreen), 0, y1, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x1, y1, TQT_TQPAINTDEVICE(&mNextScreen), x1, y1, mx, my, CopyROP, true); } return 20; } @@ -625,7 +625,7 @@ int kSlideShowSaver::effectHorizLines(bool aInit) for (y=iyPos[mi]; y<mh; y+=8) { - bitBlt(this, 0, y, &mNextScreen, 0, y, mw, 1, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), 0, y, TQT_TQPAINTDEVICE(&mNextScreen), 0, y, mw, 1, CopyROP, true); } mi++; @@ -651,7 +651,7 @@ int kSlideShowSaver::effectVertLines(bool aInit) for (x=ixPos[mi]; x<mw; x+=8) { - bitBlt(this, x, 0, &mNextScreen, x, 0, 1, mh, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x, 0, TQT_TQPAINTDEVICE(&mNextScreen), x, 0, 1, mh, CopyROP, true); } mi++; @@ -661,7 +661,7 @@ int kSlideShowSaver::effectVertLines(bool aInit) //----------------------------------------------------------------------------- -void kSlideShowSaver::startPainter(Qt::PenStyle aPen) +void kSlideShowSaver::startPainter(TQt::PenStyle aPen) { TQBrush brush; brush.setPixmap(mNextScreen); @@ -716,7 +716,7 @@ void kSlideShowSaver::slotTimeout() //---------------------------------------------------------------------------- void kSlideShowSaver::showNextScreen() { - bitBlt(this, 0, 0, &mNextScreen, 0, 0, + bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&mNextScreen), 0, 0, mNextScreen.width(), mNextScreen.height(), CopyROP, true); } @@ -798,7 +798,7 @@ void kSlideShowSaver::createNextScreen() y = ((wh - ih) >> 1) + geoptr->mYorg; } - // bitBlt(&mNextScreen, x, y, &mImage, 0, 0, iw, ih, CopyROP, false); + // bitBlt(TQT_TQPAINTDEVICE(&mNextScreen), x, y, TQT_TQPAINTDEVICE(&mImage), 0, 0, iw, ih, CopyROP, false); p.drawImage(x, y, mImage); } } @@ -884,8 +884,8 @@ void kSlideShowSaver::traverseDirectory(const TQString &dirName) } dir.setFilter(TQDir::Dirs | TQDir::Files); - const QFileInfoList *fileinfolist = dir.entryInfoList(); - QFileInfoListIterator it(*fileinfolist); + const TQFileInfoList *fileinfolist = dir.entryInfoList(); + TQFileInfoListIterator it(*fileinfolist); TQFileInfo *fi; while ((fi = it.current())) { diff --git a/kscreensaver/kdesavers/slideshow.h b/kscreensaver/kdesavers/slideshow.h index c52dbda9..96655392 100644 --- a/kscreensaver/kdesavers/slideshow.h +++ b/kscreensaver/kdesavers/slideshow.h @@ -25,6 +25,7 @@ class SlideShowCfg; class kSlideShowSaver: public KScreenSaver { Q_OBJECT + TQ_OBJECT public: kSlideShowSaver( WId id ); virtual ~kSlideShowSaver(); @@ -82,7 +83,7 @@ protected: protected: /** Init mPainter with next-screen's pixmap and call mPainter.begin(&mWidget) */ - void startPainter(Qt::PenStyle penStyle=NoPen); + void startPainter(TQt::PenStyle penStyle=NoPen); protected: struct mScreenGeo { @@ -128,6 +129,7 @@ protected: class kSlideShowSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: kSlideShowSetup(TQWidget *parent=NULL, const char *name=NULL); ~kSlideShowSetup(); diff --git a/kscreensaver/kdesavers/slideshowcfg.ui b/kscreensaver/kdesavers/slideshowcfg.ui index 544ea60b..89856efe 100644 --- a/kscreensaver/kdesavers/slideshowcfg.ui +++ b/kscreensaver/kdesavers/slideshowcfg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SlideShowCfg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>mCbxSubdirectory</cstring> </property> @@ -27,7 +27,7 @@ <string>&Include images from sub-folders</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>mCbxRandom</cstring> </property> @@ -40,7 +40,7 @@ <cstring>mDirChooser</cstring> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>mCbxZoom</cstring> </property> @@ -58,14 +58,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>161</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -76,7 +76,7 @@ <cstring>mDirChooser</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>mCbxShowName</cstring> </property> @@ -94,14 +94,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>19</height> </size> </property> </spacer> - <widget class="QSpinBox" row="4" column="1" rowspan="1" colspan="2"> + <widget class="TQSpinBox" row="4" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>mDelay</cstring> </property> @@ -118,7 +118,7 @@ <number>1</number> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -129,7 +129,7 @@ <cstring>mDelay</cstring> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>mCbxRandomPosition</cstring> </property> @@ -137,7 +137,7 @@ <string>Random &position</string> </property> </widget> - <widget class="QFrame" row="0" column="3" rowspan="6" colspan="2"> + <widget class="TQFrame" row="0" column="3" rowspan="6" colspan="2"> <property name="name"> <cstring>mPreview</cstring> </property> diff --git a/kscreensaver/kdesavers/sspreviewarea.h b/kscreensaver/kdesavers/sspreviewarea.h index e0c9fc51..54450bcb 100644 --- a/kscreensaver/kdesavers/sspreviewarea.h +++ b/kscreensaver/kdesavers/sspreviewarea.h @@ -25,13 +25,14 @@ * function calls the reimplemented TQGLWidget::resizeGL() method of the GL * widgets (PendulumGLWidget::resizeGL(), RotationGLWidget::resizeGL()) which * really resizes the GL scenery. */ -class SsPreviewArea : public QWidget +class SsPreviewArea : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** @brief Constructor for SsPreviewArea - * @param parent Pointer tp parent widget, forwarded to the QWidget + * @param parent Pointer tp parent widget, forwarded to the TQWidget * constructor * @param name Pointer to widget name, forwarded to the TQWidget constructor * diff --git a/kscreensaver/kdesavers/wave.cpp b/kscreensaver/kdesavers/wave.cpp index e65d04ac..7d94057f 100644 --- a/kscreensaver/kdesavers/wave.cpp +++ b/kscreensaver/kdesavers/wave.cpp @@ -16,7 +16,7 @@ #include <kglobal.h> #include "wave.h" #include "wave.moc" -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX #include <OpenGL/glu.h> #include <OpenGL/gl.h> #else @@ -288,8 +288,8 @@ void Wave::paintGL () bool Wave::LoadGLTextures() { - /* Status indicator */ - bool Status = TRUE; + /* tqStatus indicator */ + bool tqStatus = TRUE; TQImage buf; // = TQPixmap::grabWindow ( 0 ).convertToImage(); kdDebug() << "Loading: " << locate("data", "kscreensaver/image.png") << endl; @@ -302,12 +302,12 @@ bool Wave::LoadGLTextures() else { TQImage dummy( 64, 64, 64 ); - dummy.fill( Qt::white.rgb() ); + dummy.fill( TQt::white.rgb() ); buf = dummy; tex = convertToGLFormat( buf ); } /* Set the status to true */ - //Status = TRUE; + //tqStatus = TRUE; glGenTextures(1, &texture[0]); /* create three textures */ glBindTexture(GL_TEXTURE_2D, texture[0]); /* use linear filtering */ @@ -320,5 +320,5 @@ bool Wave::LoadGLTextures() kdDebug() << "Texture Loaded: " << tex.width() << "," << tex.height() << endl; - return Status; + return tqStatus; } diff --git a/kscreensaver/kdesavers/wave.h b/kscreensaver/kdesavers/wave.h index 4d0f614f..d7c65671 100644 --- a/kscreensaver/kdesavers/wave.h +++ b/kscreensaver/kdesavers/wave.h @@ -16,7 +16,7 @@ #include <tqdialog.h> #include <tqgl.h> -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX #include <OpenGL/glu.h> #include <OpenGL/gl.h> #else @@ -29,9 +29,10 @@ #include "wavecfg.h" -class Wave : public QGLWidget +class Wave : public TQGLWidget { Q_OBJECT + TQ_OBJECT public: Wave( TQWidget * parent=0, const char * name=0 ); @@ -62,6 +63,7 @@ private: class KWaveSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KWaveSaver( WId drawable ); virtual ~KWaveSaver(); @@ -77,6 +79,7 @@ private: class KWaveSetup : public SetupUi { Q_OBJECT + TQ_OBJECT public: KWaveSetup( TQWidget *parent = NULL, const char *name = NULL ); ~KWaveSetup( ); diff --git a/kscreensaver/kdesavers/wavecfg.ui b/kscreensaver/kdesavers/wavecfg.ui index 7fcab67a..fddbdae1 100644 --- a/kscreensaver/kdesavers/wavecfg.ui +++ b/kscreensaver/kdesavers/wavecfg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>SetupUi</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SetupUi</cstring> </property> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>400</width> <height>209</height> @@ -35,7 +35,7 @@ <property name="caption"> <string>Bitmap Flag Setup</string> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -57,7 +57,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>CheckBox1</cstring> </property> @@ -65,7 +65,7 @@ <string>Use textures</string> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>PushButton3</cstring> </property> @@ -73,7 +73,7 @@ <string>&About</string> </property> </widget> - <widget class="QSpinBox" row="1" column="0"> + <widget class="TQSpinBox" row="1" column="0"> <property name="name"> <cstring>SpinBox1</cstring> </property> @@ -87,7 +87,7 @@ <number>10</number> </property> </widget> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>PushButton2</cstring> </property> @@ -95,7 +95,7 @@ <string>&Cancel</string> </property> </widget> - <widget class="QPushButton" row="4" column="0"> + <widget class="TQPushButton" row="4" column="0"> <property name="name"> <cstring>PushButton1</cstring> </property> @@ -106,14 +106,14 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>GroupBox1</cstring> </property> <property name="title"> <string>Shapes</string> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -135,7 +135,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton1</cstring> </property> @@ -146,7 +146,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton1_2</cstring> </property> @@ -157,12 +157,12 @@ </vbox> </widget> </widget> - <widget class="QWidget" row="0" column="1" rowspan="4" colspan="2"> + <widget class="TQWidget" row="0" column="1" rowspan="4" colspan="2"> <property name="name"> <cstring>preview</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kscreensaver/kpartsaver/configwidget.ui b/kscreensaver/kpartsaver/configwidget.ui index ddcf2247..816784b6 100644 --- a/kscreensaver/kpartsaver/configwidget.ui +++ b/kscreensaver/kpartsaver/configwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>ConfigWidget</class> <author>Stefan Schimanski <1Stein@gmx.de></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ConfigWidget</cstring> </property> @@ -26,7 +26,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -43,12 +43,12 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QListBox" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQListBox" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>m_files</cstring> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -62,7 +62,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>m_down</cstring> </property> @@ -73,7 +73,7 @@ <string>&Down</string> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>m_up</cstring> </property> @@ -84,7 +84,7 @@ <string>&Up</string> </property> </widget> - <widget class="QPushButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_add</cstring> </property> @@ -92,7 +92,7 @@ <string>&Add...</string> </property> </widget> - <widget class="QPushButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_remove</cstring> </property> @@ -118,7 +118,7 @@ </spacer> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -135,7 +135,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_single</cstring> </property> @@ -153,14 +153,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> </size> </property> </spacer> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_multiple</cstring> </property> @@ -168,7 +168,7 @@ <string>Switch to another medium after a delay</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -182,7 +182,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_delayLabel</cstring> </property> @@ -193,7 +193,7 @@ <string>Delay:</string> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>m_delay</cstring> </property> @@ -201,7 +201,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_random</cstring> </property> @@ -212,7 +212,7 @@ <string>Choose next medium randomly</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>m_secondsLabel</cstring> </property> @@ -238,7 +238,7 @@ </spacer> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -263,7 +263,7 @@ <enum>Expanding</enum> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_ok</cstring> </property> @@ -277,7 +277,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_cancel</cstring> </property> diff --git a/kscreensaver/kpartsaver/kpartsaver.cpp b/kscreensaver/kpartsaver/kpartsaver.cpp index e1699e73..84050b3e 100644 --- a/kscreensaver/kpartsaver/kpartsaver.cpp +++ b/kscreensaver/kpartsaver/kpartsaver.cpp @@ -123,7 +123,7 @@ KPartSaver::KPartSaver( WId id ) // create background widget m_back = new TQLabel( i18n("The screen saver is not configured yet."), this ); - m_back->setAlignment( AlignCenter ); + m_back->tqsetAlignment( AlignCenter ); embed( m_back ); m_back->show(); @@ -187,7 +187,7 @@ bool KPartSaver::openURL( KURL url ) } // create kpart - m_part = (KParts::ReadOnlyPart *)factory->create( this, "kpart", "KParts::ReadOnlyPart" ); + m_part = (KParts::ReadOnlyPart *)factory->create( TQT_TQOBJECT(this), "kpart", "KParts::ReadOnlyPart" ); if( !m_part ) { kdDebug() << "Part for " << url.url() << " can't be constructed" << endl; return false; @@ -257,7 +257,7 @@ void KPartSaver::next( bool random ) // create background widget m_back = new TQLabel( i18n("All of your files are unsupported"), this ); - m_back->setAlignment( AlignCenter ); + m_back->tqsetAlignment( AlignCenter ); embed( m_back ); m_back->show(); @@ -337,7 +337,7 @@ void SaverConfig::apply() void SaverConfig::add() { - KURL::List files = KFileDialog::getOpenURLs( TQString::null, TQString::null, + KURL::List files = KFileDialog::getOpenURLs( TQString(), TQString(), this, i18n("Select Media Files") ); for( unsigned int n=0; n<files.count(); n++ ) m_files->insertItem( files[n].prettyURL(), -1 ); diff --git a/kscreensaver/kpartsaver/kpartsaver.h b/kscreensaver/kpartsaver/kpartsaver.h index 40e9c342..e23dedff 100644 --- a/kscreensaver/kpartsaver/kpartsaver.h +++ b/kscreensaver/kpartsaver/kpartsaver.h @@ -50,6 +50,7 @@ class SaverConfig : public ConfigWidget { Q_OBJECT + TQ_OBJECT public: SaverConfig( TQWidget* parent = 0, const char* name = 0 ); @@ -67,6 +68,7 @@ Q_OBJECT class KPartSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KPartSaver( WId id=0 ); diff --git a/kscreensaver/kxsconfig/XScreenSaver_ad.h b/kscreensaver/kxsconfig/XScreenSaver_ad.h index 42452482..568338f7 100644 --- a/kscreensaver/kxsconfig/XScreenSaver_ad.h +++ b/kscreensaver/kxsconfig/XScreenSaver_ad.h @@ -366,10 +366,10 @@ "*up.labelString: /\\\\ ", "*frameLabel.labelString: ", "*cmdLabel.labelString: Command Line:", -"*cmdLabel.alignment: ALIGNMENT_BEGINNING", +"*cmdLabel.tqalignment: ALIGNMENT_BEGINNING", "*enabled.labelString: Enabled", "*visLabel.labelString: Visual:", -"*visLabel.alignment: ALIGNMENT_END", +"*visLabel.tqalignment: ALIGNMENT_END", "*visLabel.leftOffset: 20", "*demo.labelString: Demo", "*man.labelString: Documentation...", diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/kscreensaver/kxsconfig/kxsconfig.cpp index ca3093de..6020bcdb 100644 --- a/kscreensaver/kxsconfig/kxsconfig.cpp +++ b/kscreensaver/kxsconfig/kxsconfig.cpp @@ -92,11 +92,11 @@ KXSConfigDialog::KXSConfigDialog(const TQString &filename, const TQString &name) bool KXSConfigDialog::create() { TQVBoxLayout *topLayout = new TQVBoxLayout(plainPage(), spacingHint()); - TQHBoxLayout *layout = new TQHBoxLayout(topLayout, spacingHint()); + TQHBoxLayout *tqlayout = new TQHBoxLayout(topLayout, spacingHint()); TQVBox *controlLayout = new TQVBox(plainPage()); controlLayout->setSpacing(spacingHint()); - layout->addWidget(controlLayout); - ((TQBoxLayout*)controlLayout->layout())->addStrut(120); + tqlayout->addWidget(controlLayout); + ((TQBoxLayout*)controlLayout->tqlayout())->addStrut(120); KConfig config(mConfigFile); @@ -118,14 +118,14 @@ bool KXSConfigDialog::create() descr.replace('\n',' '); descr = descr.simplifyWhiteSpace(); TQLabel *l = new TQLabel( i18n( descr.utf8() ), plainPage() ); - l->setAlignment ( WordBreak ); + l->tqsetAlignment ( WordBreak ); topLayout->addWidget( l ); } } else { // fall back to KDE's old config files. int idx = 0; while (true) { - TQString group = TQString("Arg%1").arg(idx); + TQString group = TQString("Arg%1").tqarg(idx); if (config.hasGroup(group)) { config.setGroup(group); TQString type = config.readEntry("Type"); @@ -175,9 +175,9 @@ bool KXSConfigDialog::create() mPreview = new TQWidget(plainPage()); mPreview->setFixedSize(250, 200); // mPreview->setBackgroundMode(TQWidget::NoBackground); - mPreview->setBackgroundColor(Qt::black); + mPreview->setBackgroundColor(TQt::black); - layout->add(mPreview); + tqlayout->add(mPreview); show(); // So that hacks can XSelectInput ButtonPressMask @@ -229,7 +229,7 @@ void KXSConfigDialog::slotPreviewExited(KProcess *) while ( !saver[i].isSpace() ) word += saver[i++]; //work around a KStandarDirs::findExe() "feature" where it looks in $KDEDIR/bin first no matter what and sometimes finds the wrong executable TQFileInfo checkExe; - TQString saverdir = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(word); + TQString saverdir = TQString("%1/%2").tqarg(XSCREENSAVER_HACKS_DIR).tqarg(word); TQString path; checkExe.setFile(saverdir); if (checkExe.exists() && checkExe.isExecutable() && checkExe.isFile()) @@ -354,7 +354,7 @@ int main(int argc, char *argv[]) int dummyargc = 1; progname = dummyargs[0]; - // Teach Xt to use the Display that Qt has already opened. + // Teach Xt to use the Display that TQt has already opened. XtToolkitInitialize (); XtAppContext xtApp = XtCreateApplicationContext (); Display *dpy = qt_xdisplay(); @@ -378,7 +378,7 @@ int main(int argc, char *argv[]) app.exec(); } else { KMessageBox::sorry(0, - i18n("No configuration available for %1").arg(name), + i18n("No configuration available for %1").tqarg(name), name ); } diff --git a/kscreensaver/kxsconfig/kxsconfig.h b/kscreensaver/kxsconfig/kxsconfig.h index cb74eacb..5bda2ed6 100644 --- a/kscreensaver/kxsconfig/kxsconfig.h +++ b/kscreensaver/kxsconfig/kxsconfig.h @@ -31,6 +31,7 @@ class TQLabel; class KXSConfigDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KXSConfigDialog(const TQString &file, const TQString &name); ~KXSConfigDialog(); diff --git a/kscreensaver/kxsconfig/kxscontrol.h b/kscreensaver/kxsconfig/kxscontrol.h index ad75103c..0af889a6 100644 --- a/kscreensaver/kxsconfig/kxscontrol.h +++ b/kscreensaver/kxsconfig/kxscontrol.h @@ -37,6 +37,7 @@ class TQLineEdit; class KXSRangeControl : public TQWidget, public KXSRangeItem { Q_OBJECT + TQ_OBJECT public: KXSRangeControl(TQWidget *parent, const TQString &name, KConfig &config); KXSRangeControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); @@ -58,6 +59,7 @@ protected: class KXSDoubleRangeControl : public TQWidget, public KXSDoubleRangeItem { Q_OBJECT + TQ_OBJECT public: KXSDoubleRangeControl(TQWidget *parent, const TQString &name, KConfig &config); KXSDoubleRangeControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); @@ -79,6 +81,7 @@ protected: class KXSCheckBoxControl : public TQCheckBox, public KXSBoolItem { Q_OBJECT + TQ_OBJECT public: KXSCheckBoxControl(TQWidget *parent, const TQString &name, KConfig &config); KXSCheckBoxControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); @@ -96,6 +99,7 @@ protected slots: class KXSDropListControl : public TQWidget, public KXSSelectItem { Q_OBJECT + TQ_OBJECT public: KXSDropListControl(TQWidget *parent, const TQString &name, KConfig &config); KXSDropListControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); @@ -118,6 +122,7 @@ protected: class KXSLineEditControl : public TQWidget, public KXSStringItem { Q_OBJECT + TQ_OBJECT public: KXSLineEditControl(TQWidget *parent, const TQString &name, KConfig &config); KXSLineEditControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); @@ -138,6 +143,7 @@ protected: class KXSFileControl : public TQWidget, public KXSStringItem { Q_OBJECT + TQ_OBJECT public: KXSFileControl(TQWidget *parent, const TQString &name, KConfig &config); KXSFileControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); diff --git a/kscreensaver/kxsconfig/kxsitem.cpp b/kscreensaver/kxsconfig/kxsitem.cpp index 7d9ab034..022657c0 100644 --- a/kscreensaver/kxsconfig/kxsitem.cpp +++ b/kscreensaver/kxsconfig/kxsitem.cpp @@ -65,7 +65,7 @@ KXSRangeItem::KXSRangeItem(const TQString &name, const TQXmlAttributes &attr ) TQString KXSRangeItem::command() { - return mSwitch.arg(mInvert?mMaximum-(mValue-mMinimum):mValue); + return mSwitch.tqarg(mInvert?mMaximum-(mValue-mMinimum):mValue); } void KXSRangeItem::read(KConfig &config) @@ -109,7 +109,7 @@ KXSDoubleRangeItem::KXSDoubleRangeItem(const TQString &name, const TQXmlAttribut TQString KXSDoubleRangeItem::command() { - return mSwitch.arg(mInvert?mMaximum-(mValue-mMinimum):mValue); + return mSwitch.tqarg(mInvert?mMaximum-(mValue-mMinimum):mValue); } void KXSDoubleRangeItem::read(KConfig &config) @@ -232,7 +232,7 @@ KXSStringItem::KXSStringItem(const TQString &name, const TQXmlAttributes &attr ) TQString KXSStringItem::command() { if (!mValue.isEmpty()) - return mSwitch.arg(mValue); + return mSwitch.tqarg(mValue); return ""; } diff --git a/kscreensaver/kxsconfig/kxsrun.cpp b/kscreensaver/kxsconfig/kxsrun.cpp index 0f212c10..540d8f6c 100644 --- a/kscreensaver/kxsconfig/kxsrun.cpp +++ b/kscreensaver/kxsconfig/kxsrun.cpp @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) int idx = 0; while (true) { - TQString group = TQString("Arg%1").arg(idx); + TQString group = TQString("Arg%1").tqarg(idx); if (config.hasGroup(group)) { config.setGroup(group); TQString type = config.readEntry("Type"); @@ -135,7 +135,7 @@ int main(int argc, char *argv[]) // find the xscreensaver executable //work around a KStandarDirs::findExe() "feature" where it looks in $KDEDIR/bin first no matter what and sometimes finds the wrong executable TQFileInfo checkExe; - TQString saverdir = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(filename); + TQString saverdir = TQString("%1/%2").tqarg(XSCREENSAVER_HACKS_DIR).tqarg(filename); kdDebug() << "saverdir is" << saverdir << endl; TQString exeFile; checkExe.setFile(saverdir); diff --git a/kscreensaver/kxsconfig/kxsxml.cpp b/kscreensaver/kxsconfig/kxsxml.cpp index e35294dd..6ea0c7b7 100644 --- a/kscreensaver/kxsconfig/kxsxml.cpp +++ b/kscreensaver/kxsconfig/kxsxml.cpp @@ -36,7 +36,7 @@ bool KXSXml::parse( const TQString &filename ) { TQFile file( filename ); handler = new KXSXmlHandler( parent ); - TQXmlInputSource source( &file ); + TQXmlInputSource source( TQT_TQIODEVICE(&file) ); TQXmlSimpleReader reader; reader.setContentHandler( handler ); if ( !reader.parse( &source, FALSE ) ) diff --git a/kscreensaver/kxsconfig/kxsxml.h b/kscreensaver/kxsconfig/kxsxml.h index c7278c20..4f02a33c 100644 --- a/kscreensaver/kxsconfig/kxsxml.h +++ b/kscreensaver/kxsconfig/kxsxml.h @@ -42,7 +42,7 @@ private: KXSXmlHandler *handler; }; -class KXSXmlHandler : public QXmlDefaultHandler +class KXSXmlHandler : public TQXmlDefaultHandler { public: KXSXmlHandler( TQWidget *p ); diff --git a/kscreensaver/xsavers/demowin.h b/kscreensaver/xsavers/demowin.h index d31fc353..9c67d8bb 100644 --- a/kscreensaver/xsavers/demowin.h +++ b/kscreensaver/xsavers/demowin.h @@ -21,9 +21,10 @@ //---------------------------------------------------------------------------- -class DemoWindow : public QWidget +class DemoWindow : public TQWidget { Q_OBJECT + TQ_OBJECT public: DemoWindow() : TQWidget() { diff --git a/kscreensaver/xsavers/helpers.cpp b/kscreensaver/xsavers/helpers.cpp index ef700545..242d2f75 100644 --- a/kscreensaver/xsavers/helpers.cpp +++ b/kscreensaver/xsavers/helpers.cpp @@ -3,27 +3,27 @@ #include <kapplication.h> void min_width(TQWidget *w) { - w->setMinimumWidth(w->sizeHint().width()); + w->setMinimumWidth(w->tqsizeHint().width()); } void fixed_width(TQWidget *w) { - w->setFixedWidth(w->sizeHint().width()); + w->setFixedWidth(w->tqsizeHint().width()); } void min_height(TQWidget *w) { - w->setMinimumHeight(w->sizeHint().height()); + w->setMinimumHeight(w->tqsizeHint().height()); } void fixed_height(TQWidget *w) { - w->setFixedHeight(w->sizeHint().height()); + w->setFixedHeight(w->tqsizeHint().height()); } void min_size(TQWidget *w) { - w->setMinimumSize(w->sizeHint()); + w->setMinimumSize(w->tqsizeHint()); } void fixed_size(TQWidget *w) { - w->setFixedSize(w->sizeHint()); + w->setFixedSize(w->tqsizeHint()); } KConfig *klock_config() diff --git a/kscreensaver/xsavers/main.cpp b/kscreensaver/xsavers/main.cpp index 78e5351d..3cfa4b86 100644 --- a/kscreensaver/xsavers/main.cpp +++ b/kscreensaver/xsavers/main.cpp @@ -87,7 +87,7 @@ int main(int argc, char *argv[]) { demoWidget = new DemoWindow(); demoWidget->setBackgroundMode(TQWidget::NoBackground); -// demoWidget->setBackgroundColor(Qt::black); +// demoWidget->setBackgroundColor(TQt::black); demoWidget->show(); saveWin = demoWidget->winId(); app.setMainWidget(demoWidget); diff --git a/kscreensaver/xsavers/mode.h b/kscreensaver/xsavers/mode.h index c2bc7f1d..10213f0a 100644 --- a/kscreensaver/xsavers/mode.h +++ b/kscreensaver/xsavers/mode.h @@ -38,7 +38,7 @@ typedef struct LockStruct_s { ModeHook *init_hook; /* func to init a mode */ ModeHook *callback_hook; /* func to run (tick) a mode */ ModeHook *release_hook; /* func to shutdown a mode */ - ModeHook *refresh_hook; /* tells mode to repaint */ + ModeHook *refresh_hook; /* tells mode to tqrepaint */ ModeHook *change_hook; /* user wants mode to change */ ModeHook *unused_hook; /* for future expansion */ ModeSpecOpt *msopt; /* this mode's def resources */ @@ -313,10 +313,10 @@ extern ModeHook release_galaxy; extern ModeHook refresh_galaxy; extern ModeSpecOpt galaxy_opts; -extern ModeHook init_geometry; -extern ModeHook draw_geometry; -extern ModeHook release_geometry; -extern ModeHook refresh_geometry; +extern ModeHook init_tqgeometry; +extern ModeHook draw_tqgeometry; +extern ModeHook release_tqgeometry; +extern ModeHook refresh_tqgeometry; extern ModeSpecOpt geometry_opts; extern ModeHook init_grav; @@ -504,11 +504,11 @@ extern ModeHook release_rotor; extern ModeHook refresh_rotor; extern ModeSpecOpt rotor_opts; -extern ModeHook init_shape; -extern ModeHook draw_shape; -extern ModeHook release_shape; -extern ModeHook refresh_shape; -extern ModeSpecOpt shape_opts; +extern ModeHook init_tqshape; +extern ModeHook draw_tqshape; +extern ModeHook release_tqshape; +extern ModeHook refresh_tqshape; +extern ModeSpecOpt tqshape_opts; extern ModeHook init_slip; extern ModeHook draw_slip; diff --git a/kscreensaver/xsavers/saver.h b/kscreensaver/xsavers/saver.h index 318728fc..b531ed4b 100644 --- a/kscreensaver/xsavers/saver.h +++ b/kscreensaver/xsavers/saver.h @@ -10,9 +10,10 @@ extern void stopScreenSaver(); extern int setupScreenSaver(); //----------------------------------------------------------------------------- -class kScreenSaver : public QObject +class kScreenSaver : public TQObject { Q_OBJECT + TQ_OBJECT public: kScreenSaver( Drawable drawable ); virtual ~kScreenSaver(); diff --git a/kscreensaver/xsavers/space.cpp b/kscreensaver/xsavers/space.cpp index 77070ad2..99c7d10d 100644 --- a/kscreensaver/xsavers/space.cpp +++ b/kscreensaver/xsavers/space.cpp @@ -47,7 +47,7 @@ */ #define LONG64 -//#define QT_CLEAN_NAMESPACE +//#define TQT_CLEAN_NAMESPACE #include <tqslider.h> #include <tqlayout.h> @@ -275,7 +275,7 @@ static void Init(void) glDisable(GL_DITHER); } -void reshape(int width, int height) +void retqshape(int width, int height) { windW = (GLint)width; @@ -444,7 +444,7 @@ initSpace(Window window) glClearIndex(BlackPixel(display, screen)); } - reshape(xwa.width, xwa.height); + retqshape(xwa.width, xwa.height); Init(); } @@ -593,7 +593,7 @@ kSpaceSetup::kSpaceSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Speed:"), page ); vb->addWidget( label ); - slider = new TQSlider(MINSPEED, MAXSPEED, 10, speed, TQSlider::Horizontal, + slider = new TQSlider(MINSPEED, MAXSPEED, 10, speed, Qt::Horizontal, page ); vb->addWidget( slider ); slider->setTickmarks(TQSlider::Below); @@ -603,7 +603,7 @@ kSpaceSetup::kSpaceSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Warp interval:"), page ); vb->addWidget( label ); - slider = new TQSlider(MINWARP, MAXWARP, 3, warpinterval, Horizontal, page ); + slider = new TQSlider(MINWARP, MAXWARP, 3, warpinterval,Qt::Horizontal, page ); vb->addWidget( slider ); slider->setTickmarks(TQSlider::Below); slider->setTickInterval(3); @@ -725,8 +725,8 @@ void main(int argc, char **argv) Init(); - tkExposeFunc(Reshape); - tkReshapeFunc(Reshape); + tkExposeFunc(Retqshape); + tkRetqshapeFunc(Retqshape); tkKeyDownFunc(Key); tkIdleFunc(Idle); tkExec(); diff --git a/kscreensaver/xsavers/space.h b/kscreensaver/xsavers/space.h index f20db852..84ad22fc 100644 --- a/kscreensaver/xsavers/space.h +++ b/kscreensaver/xsavers/space.h @@ -11,6 +11,7 @@ class kSpaceSaver : public kScreenSaver { Q_OBJECT + TQ_OBJECT public: kSpaceSaver( Drawable drawable ); virtual ~kSpaceSaver(); @@ -38,6 +39,7 @@ protected: class kSpaceSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: kSpaceSetup( TQWidget *parent = NULL, const char *name = NULL ); diff --git a/kscreensaver/xsavers/swarm.cpp b/kscreensaver/xsavers/swarm.cpp index efc04c28..5b2c8fae 100644 --- a/kscreensaver/xsavers/swarm.cpp +++ b/kscreensaver/xsavers/swarm.cpp @@ -12,7 +12,7 @@ Contact me in case of problems, not the original author! Last revised: 10-Jul-97 */ -// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> +// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> #define MAXSPEED 100 #define MINSPEED 0 @@ -330,7 +330,7 @@ kSwarmSetup::kSwarmSetup( TQWidget *parent, const char *name ) left->addWidget(label); TQSlider *slider = new TQSlider(MINSPEED, MAXSPEED, 10, speed, - Horizontal, main ); + Qt::Horizontal, main ); slider->setMinimumSize( 120, 20 ); slider->setTickmarks(TQSlider::Below); slider->setTickInterval(10); @@ -342,7 +342,7 @@ kSwarmSetup::kSwarmSetup( TQWidget *parent, const char *name ) min_size(label); left->addWidget(label); - slider = new TQSlider(MINBATCH, MAXBATCH, 20, maxLevels, Horizontal, main ); + slider = new TQSlider(MINBATCH, MAXBATCH, 20, maxLevels,Qt::Horizontal, main ); slider->setMinimumSize( 120, 20 ); slider->setTickmarks(TQSlider::Below); slider->setTickInterval(20); diff --git a/kscreensaver/xsavers/swarm.h b/kscreensaver/xsavers/swarm.h index 0e34049c..90dac900 100644 --- a/kscreensaver/xsavers/swarm.h +++ b/kscreensaver/xsavers/swarm.h @@ -15,6 +15,7 @@ class kSwarmSaver : public kScreenSaver { Q_OBJECT + TQ_OBJECT public: kSwarmSaver( Drawable drawable ); virtual ~kSwarmSaver(); @@ -40,6 +41,7 @@ protected: class kSwarmSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: kSwarmSetup( TQWidget *parent = NULL, const char *name = NULL ); diff --git a/kscreensaver/xsavers/xlock.h b/kscreensaver/xsavers/xlock.h index ab58fe9c..ff309c63 100644 --- a/kscreensaver/xsavers/xlock.h +++ b/kscreensaver/xsavers/xlock.h @@ -15,7 +15,7 @@ * Changes of David Bagley <bagleyd@source.asset.com> * 12-May-95: Added defines for SunOS's Adjunct password file * Dale A. Harris <rodmur@ecst.csuchico.edu> - * 18-Nov-94: Modified for QNX 4.2 w/ Metrolink X server from Brian Campbell + * 18-Nov-94: Modified for TQNX 4.2 w/ Metrolink X server from Brian Campbell * <brianc@qnx.com>. * 11-Jul-94: added Bool flag: inwindow, which tells xlock to run in a * window from Greg Bowering <greg@cs.adelaide.edu.au> @@ -62,7 +62,7 @@ void initXLock( GC gc ); #define ICONW 64 #define ICONH 64 -#if defined VMS || defined __QNX__ +#if defined VMS || defined __TQNX__ #ifdef VMS /*#define VMS_PLAY*/ #include <unixlib.h> @@ -139,7 +139,7 @@ extern char *text_pass; extern char *text_info; extern char *text_valid; extern char *text_invalid; -extern char *geometry; +extern char *tqgeometry; extern float saturation; extern int nicelevel; extern int delay; diff --git a/kscreensaver/xsavers/xlockmore.h b/kscreensaver/xsavers/xlockmore.h index 496b48f2..277783ae 100644 --- a/kscreensaver/xsavers/xlockmore.h +++ b/kscreensaver/xsavers/xlockmore.h @@ -15,7 +15,7 @@ * Changes of David Bagley <bagleyd@bigfoot.com> * 12-May-95: Added defines for SunOS's Adjunct password file * Dale A. Harris <rodmur@ecst.csuchico.edu> - * 18-Nov-94: Modified for QNX 4.2 w/ Metrolink X server from Brian Campbell + * 18-Nov-94: Modified for TQNX 4.2 w/ Metrolink X server from Brian Campbell * <brianc@qnx.com>. * 11-Jul-94: added Bool flag: inwindow, which tells xlock to run in a * window from Greg Bowering <greg@cs.adelaide.edu.au> diff --git a/kwin-styles/cde/Makefile.am b/kwin-styles/cde/Makefile.am index 46d74191..f5ecdfed 100644 --- a/kwin-styles/cde/Makefile.am +++ b/kwin-styles/cde/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS = . config kde_module_LTLIBRARIES = kwin3_cde.la kwin3_cde_la_SOURCES = cdeclient.cpp -kwin3_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin3_cde_la_LIBADD = -lkdecorations METASOURCES = AUTO diff --git a/kwin-styles/cde/cdeclient.cpp b/kwin-styles/cde/cdeclient.cpp index 722f3a6f..d21f4770 100644 --- a/kwin-styles/cde/cdeclient.cpp +++ b/kwin-styles/cde/cdeclient.cpp @@ -7,7 +7,7 @@ * Copyright (c) 2000-2001, 2002 * Chris Lee <lee@azsites.com> * Lennart Kudling <kudling@kde.org> - * Fredrik Höglund <fredrik@kde.org> + * Fredrik H�glund <fredrik@kde.org> * * Copyright (c) 2003,2004 * Luciano Montanaro <mikelima@cirulla.net> @@ -41,7 +41,7 @@ static int s_frameWidth = 5; static int s_buttonSize = 19; static bool titlebarButtonMode = true; static bool coloredFrame = true; -static Qt::AlignmentFlags textAlignment = Qt::AlignHCenter; +static TQt::AlignmentFlags textAlignment = TQt::AlignHCenter; // Precomputed border sizes for accessibility // The sizes are applied for tiny -> normal -> large -> very large -> huge -> @@ -57,54 +57,54 @@ static int s_w2 = 5; // These are the line segments for the X on the close button static const int NUM_CLOSEL_COORDS = 2 * 14; -static const QCOORD closeLLinesTemplate[NUM_CLOSEL_COORDS] = +static const TQCOORD closeLLinesTemplate[NUM_CLOSEL_COORDS] = { 14,3, 12,3, 12,3, 9,6, 5,3, 3,3, 3,3, 3,5, 3,5, 6,8, 6,9, 3,12, 3,12, 3,14 }; static const int NUM_CLOSED_COORDS = 2 * 18; -static const QCOORD closeDLinesTemplate[NUM_CLOSED_COORDS] = +static const TQCOORD closeDLinesTemplate[NUM_CLOSED_COORDS] = { 5,3, 8,6, 14,4, 14,5, 14,5, 11,8, 11,9, 14,12, 14,12, 14,14, 14,14, 12,14, 12,14, 9,11, 8,11, 5,14, 5,14, 4,14 }; -static QCOORD closeLLines[NUM_CLOSEL_COORDS]; +static TQCOORD closeLLines[NUM_CLOSEL_COORDS]; -static QCOORD closeDLines[NUM_CLOSED_COORDS]; +static TQCOORD closeDLines[NUM_CLOSED_COORDS]; // These are the line segments for the ? on the help button static const int NUM_HELPL_COORDS = 2 * 16; -static const QCOORD helpLLinesTemplate[NUM_HELPL_COORDS] = +static const TQCOORD helpLLinesTemplate[NUM_HELPL_COORDS] = { 4,6, 4,5, 4,5, 6,3, 6,3, 9,3, 10,3, 11,4, 9,7, 7,9, 7,9, 7,10, 7,14, 7,13, 8,12, 9,12 }; static const int NUM_HELPD_COORDS = 2 * 14; -static const QCOORD helpDLinesTemplate[NUM_HELPD_COORDS] = +static const TQCOORD helpDLinesTemplate[NUM_HELPD_COORDS] = { 5,7, 8,6, 12,5, 12,8, 12,8, 10,10, 10,10, 10,11, 10,11, 8,11, 10,14, 10,13, 9,15, 8,15 }; -static QCOORD helpLLines[NUM_HELPL_COORDS]; +static TQCOORD helpLLines[NUM_HELPL_COORDS]; -static QCOORD helpDLines[NUM_HELPD_COORDS]; +static TQCOORD helpDLines[NUM_HELPD_COORDS]; // This question mark is taller than the one above and // is positioned one pixel higher on the button /* -static const QCOORD helpLLines[] = +static const TQCOORD helpLLines[] = { 4,5, 4,4, 4,4, 6,2, 6,2, 9,2, 10,2, 11,3, 9,6, 7,8, 7,9, 7,10, 7,13, 8,12, 8,12, 9,12 }; -static const QCOORD helpDLines[] = +static const TQCOORD helpDLines[] = { 5,6, 8,5, 12,4, 12,7, 12,7, 10,9, 10,10, 10,11, 10,11, 8,11, 10,13, 9,14, 9,14, 8,14 }; */ // Same as the one above but with a larger dot under // the question mark /* -static const QCOORD helpLLines[] = +static const TQCOORD helpLLines[] = { 4,5, 4,4, 4,4, 6,2, 6,2, 9,2, 10,2, 11,3, 9,6, 7,8, 7,9, 7,10, 7,14, 7,13, 8,12, 9,12 }; -static const QCOORD helpDLines[] = +static const TQCOORD helpDLines[] = { 5,6, 8,5, 12,4, 12,7, 12,7, 10,9, 10,10, 10,11, 10,11, 8,11, 10,13, 10,14, 9,15, 8,15 }; */ @@ -114,9 +114,9 @@ static inline const KDecorationOptions* options() return KDecoration::options(); } -static void fixColorGroup(TQColorGroup & colorGroup) +static void fixColorGroup(TQColorGroup & tqcolorGroup) { - TQColor light = colorGroup.light(); + TQColor light = tqcolorGroup.light(); int hue, saturation, value; @@ -125,17 +125,17 @@ static void fixColorGroup(TQColorGroup & colorGroup) if (value < 128) { light.setHsv(hue, saturation, 128); - colorGroup.setColor(TQColorGroup::Light, light); + tqcolorGroup.setColor(TQColorGroup::Light, light); } - TQColor dark = colorGroup.dark(); + TQColor dark = tqcolorGroup.dark(); dark.hsv(&hue, &saturation, &value); if (value < 84) { dark.setHsv(hue, saturation, 84); - colorGroup.setColor(TQColorGroup::Dark, dark); + tqcolorGroup.setColor(TQColorGroup::Dark, dark); } } @@ -158,11 +158,11 @@ static void readConfig(CdeClientFactory *f) TQString value = conf.readEntry( "TextAlignment", "AlignHCenter" ); if ( value == "AlignLeft" ) - textAlignment = Qt::AlignLeft; + textAlignment = TQt::AlignLeft; else if ( value == "AlignHCenter" ) - textAlignment = Qt::AlignHCenter; + textAlignment = TQt::AlignHCenter; else if ( value == "AlignRight" ) - textAlignment = Qt::AlignRight; + textAlignment = TQt::AlignRight; // find preferred border size @@ -325,7 +325,7 @@ void CdeClient::addClientButtons( const TQString& s ) case 'M': if ( ! button[BtnMenu] ) { - button[BtnMenu] = new CdeButton( this, "menu", BtnMenu, i18n("Menu"), LeftButton|RightButton ); + button[BtnMenu] = new CdeButton( this, "menu", BtnMenu, i18n("Menu"), Qt::LeftButton|Qt::RightButton ); connect( button[BtnMenu], TQT_SIGNAL(pressed()), TQT_SLOT(menuButtonPressed()) ); connect( button[BtnMenu], TQT_SIGNAL(released()), TQT_SLOT(menuButtonReleased()) ); titleLayout->addWidget( button[BtnMenu] ); @@ -358,7 +358,7 @@ void CdeClient::addClientButtons( const TQString& s ) case 'A': if ( (! button[BtnMax] ) && isMaximizable() ) { - button[BtnMax] = new CdeButton(this, "maximize", BtnMax, i18n("Maximize"), LeftButton|MidButton|RightButton); + button[BtnMax] = new CdeButton(this, "maximize", BtnMax, i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton); connect(button[BtnMax], TQT_SIGNAL(clicked()), TQT_SLOT(maximizeButtonClicked())); titleLayout->addWidget( button[BtnMax] ); @@ -381,7 +381,7 @@ void CdeClient::addClientButtons( const TQString& s ) void CdeClient::captionChange() { - widget()->repaint(titlebar->geometry(), false); + widget()->tqrepaint(titlebar->tqgeometry(), false); } void CdeClient::activeChange() @@ -389,7 +389,7 @@ void CdeClient::activeChange() for ( int i=0; i < BtnCount; i++ ) if ( button[i] ) button[i]->reset(); - widget()->repaint(false); + widget()->tqrepaint(false); } void CdeClient::maximizeChange() @@ -398,7 +398,7 @@ void CdeClient::maximizeChange() bool m = maximizeMode() == MaximizeFull; TQToolTip::remove(button[BtnMax]); TQToolTip::add(button[BtnMax], m ? i18n("Restore") : i18n("Maximize")); - button[BtnMax]->repaint(); + button[BtnMax]->tqrepaint(); } } @@ -412,7 +412,7 @@ void CdeClient::shadeChange() void CdeClient::showEvent(TQShowEvent *) { - widget()->repaint(); + widget()->tqrepaint(); } void CdeClient::desktopChange() @@ -420,7 +420,7 @@ void CdeClient::desktopChange() // Nothing to do yet } -TQSize CdeClient::minimumSize() const +TQSize CdeClient::tqminimumSize() const { return TQSize(2 * (s_buttonSize + s_frameWidth), 2 * s_frameWidth + s_buttonSize); @@ -477,10 +477,10 @@ void CdeClient::resizeEvent( TQResizeEvent* e) int dy = 0; if ( e->oldSize().width() != width() ) - dx = 32 + QABS( e->oldSize().width() - width() ); + dx = 32 + TQABS( e->oldSize().width() - width() ); if ( e->oldSize().height() != height() ) - dy = 8 + QABS( e->oldSize().height() - height() ); + dy = 8 + TQABS( e->oldSize().height() - height() ); if ( dy ) widget()->update( 0, height() - dy + 1, width(), dy ); @@ -489,12 +489,12 @@ void CdeClient::resizeEvent( TQResizeEvent* e) { widget()->update( width() - dx + 1, 0, dx, height() ); widget()->update( TQRect( TQPoint(4,4), - titlebar->geometry().bottomLeft() - TQPoint(1,0) ) ); - widget()->update(TQRect(titlebar->geometry().topRight(), - TQPoint(width() - 4, titlebar->geometry().bottom()))); + titlebar->tqgeometry().bottomLeft() - TQPoint(1,0) ) ); + widget()->update(TQRect(titlebar->tqgeometry().topRight(), + TQPoint(width() - 4, titlebar->tqgeometry().bottom()))); // Titlebar needs no paint event - TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), false ) ); + TQApplication::postEvent( this, new TQPaintEvent( titlebar->tqgeometry(), false ) ); } } } @@ -503,27 +503,27 @@ void CdeClient::paintEvent( TQPaintEvent* ) { TQPainter p(widget()); - TQColorGroup colorGroup; + TQColorGroup tqcolorGroup; if ( coloredFrame ) - colorGroup = options()->colorGroup( KDecoration::ColorTitleBar, isActive() ); + tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorTitleBar, isActive() ); else - colorGroup = options()->colorGroup( KDecoration::ColorFrame, isActive() ); + tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorFrame, isActive() ); - fixColorGroup( colorGroup ); + fixColorGroup( tqcolorGroup ); - TQRect trect = titlebar->geometry(); + TQRect trect = titlebar->tqgeometry(); TQRect mrect = widget()->rect(); if ( s_frameWidth > 0 ) { // draw black frame: - p.setPen( Qt::black ); + p.setPen( TQt::black ); p.drawRect( mrect ); } - p.setPen( Qt::NoPen ); - p.setBrush( colorGroup.background() ); + p.setPen( TQt::NoPen ); + p.setBrush( tqcolorGroup.background() ); if ( s_frameWidth > 1 ) @@ -546,24 +546,24 @@ void CdeClient::paintEvent( TQPaintEvent* ) // draw left and right frames: qDrawShadePanel( &p, 1, longSide + 1, s_frameWidth, mrect.height() - 2 * (longSide + 1), - colorGroup ); + tqcolorGroup ); qDrawShadePanel( &p, mrect.width() - s_frameWidth - 1, longSide + 1, s_frameWidth, mrect.height() - 2 * (longSide + 1), - colorGroup ); + tqcolorGroup ); } // draw top and bottom frames: qDrawShadePanel( &p, longSide + 1, 1, mrect.width() - 2 * (longSide + 1), s_frameWidth, - colorGroup ); + tqcolorGroup ); qDrawShadePanel( &p, longSide + 1, mrect.height() - s_frameWidth - 1, mrect.width() - 2 * (longSide + 1), s_frameWidth, - colorGroup ); + tqcolorGroup ); // draw light corner parts: - p.setPen( colorGroup.light() ); + p.setPen( tqcolorGroup.light() ); // tl corner: p.drawLine( 1, 1, longSide - 1, 1 ); @@ -601,7 +601,7 @@ void CdeClient::paintEvent( TQPaintEvent* ) s_frameWidth + 1, mrect.height() - s_frameWidth - 1 ); // draw dark corner parts: - p.setPen( colorGroup.dark() ); + p.setPen( tqcolorGroup.dark() ); // tl corner: if ( !shaded ) @@ -636,18 +636,18 @@ void CdeClient::paintEvent( TQPaintEvent* ) } - p.setPen( Qt::NoPen ); + p.setPen( TQt::NoPen ); if ( !coloredFrame ) { - colorGroup = options()->colorGroup( KDecoration::ColorTitleBar, isActive() ); - fixColorGroup( colorGroup ); - p.setBrush( colorGroup.background() ); + tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorTitleBar, isActive() ); + fixColorGroup( tqcolorGroup ); + p.setBrush( tqcolorGroup.background() ); } // draw titlebar: p.drawRect( trect ); - qDrawShadePanel( &p, trect, colorGroup, titlebarPressed ); + qDrawShadePanel( &p, trect, tqcolorGroup, titlebarPressed ); // draw caption: if ( titlebarPressed ) // move the caption right and down if the titlebar is pressed @@ -672,7 +672,7 @@ void CdeClient::paintEvent( TQPaintEvent* ) // Draw a line behind the wrapped window to prevent having // unpainted areas when we're shaded. - p.setPen( colorGroup.dark() ); + p.setPen( tqcolorGroup.dark() ); p.drawLine(s_frameWidth + 1, mrect.height() - s_frameWidth - 2, mrect.width() - s_frameWidth - 2, mrect.height() - s_frameWidth - 2); @@ -712,24 +712,24 @@ KDecoration::Position CdeClient::mousePosition( const TQPoint& p ) const void CdeClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if ( e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) titlebarDblClickOperation(); } void CdeClient::wheelEvent( TQWheelEvent * e ) { - if (isSetShade() || titleLayout->geometry().contains( e->pos() ) ) + if (isSetShade() || titleLayout->tqgeometry().contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } void CdeClient::mousePressEvent( TQMouseEvent * e ) { - if ( e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) { if ( titlebarButtonMode ) { titlebarPressed = true; - widget()->repaint(titlebar->geometry(), false); + widget()->tqrepaint(titlebar->tqgeometry(), false); } } } @@ -742,35 +742,35 @@ void CdeClient::borders(int &left, int &right, int &top, int &bottom) const void CdeClient::mouseReleaseEvent( TQMouseEvent * e ) { - if ( e->button() == LeftButton && titlebarPressed ) + if ( e->button() == Qt::LeftButton && titlebarPressed ) { titlebarPressed = false; - widget()->repaint(titlebar->geometry(), false); + widget()->tqrepaint(titlebar->tqgeometry(), false); } } bool CdeClient::eventFilter(TQObject *o, TQEvent *e) { - if (o != widget()) + if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch (e->type()) { case TQEvent::Resize: - resizeEvent(static_cast< TQResizeEvent* >(e)); + resizeEvent(TQT_TQRESIZEEVENT(e)); return true; case TQEvent::Paint: - paintEvent(static_cast< TQPaintEvent* >(e)); + paintEvent(TQT_TQPAINTEVENT(e)); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast< TQMouseEvent* >(e)); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(static_cast< TQMouseEvent* >(e)); + processMousePressEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::Show: - showEvent(static_cast< TQShowEvent* >(e)); + showEvent(TQT_TQSHOWEVENT(e)); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; default: break; @@ -782,7 +782,7 @@ bool CdeClient::eventFilter(TQObject *o, TQEvent *e) CdeButton::CdeButton(CdeClient* parent, const char* name, int btnType, const TQString& tip, int realize_btns) - : TQButton(parent->widget(), name), m_btnType(btnType), last_button(NoButton) + : TQButton(parent->widget(), name), m_btnType(btnType), last_button(Qt::NoButton) { setBackgroundMode( TQWidget::NoBackground ); setFixedSize( s_buttonSize, s_buttonSize ); @@ -797,7 +797,7 @@ CdeButton::CdeButton(CdeClient* parent, void CdeButton::reset() { - repaint( false ); + tqrepaint( false ); } void CdeButton::drawButton( TQPainter* p ) @@ -805,36 +805,36 @@ void CdeButton::drawButton( TQPainter* p ) p->setBrush( options()->color( KDecoration::ColorTitleBar, m_parent->isActive() ) ); p->drawRect( 0, 0, s_buttonSize, s_buttonSize ); - TQColorGroup colorGroup = - options()->colorGroup( KDecoration::ColorTitleBar, m_parent->isActive() ); + TQColorGroup tqcolorGroup = + options()->tqcolorGroup( KDecoration::ColorTitleBar, m_parent->isActive() ); - fixColorGroup(colorGroup); + fixColorGroup(tqcolorGroup); qDrawShadePanel( p, 0, 0, s_buttonSize, s_buttonSize, - colorGroup, isDown() ); + tqcolorGroup, isDown() ); switch ( m_btnType ) { case (BtnMenu): - qDrawShadePanel( p, s_o1, s_o2, s_w1, s_w2, colorGroup ); + qDrawShadePanel( p, s_o1, s_o2, s_w1, s_w2, tqcolorGroup ); break; case (BtnHelp): - p->setPen( colorGroup.light() ); + p->setPen( tqcolorGroup.light() ); p->drawLineSegments( TQPointArray(16, helpLLines) ); - p->setPen( colorGroup.dark() ); + p->setPen( tqcolorGroup.dark() ); p->drawLineSegments( TQPointArray(14, helpDLines) ); break; case (BtnIconify): - qDrawShadePanel( p, s_o2, s_o2, s_w2, s_w2, colorGroup ); + qDrawShadePanel( p, s_o2, s_o2, s_w2, s_w2, tqcolorGroup ); break; case (BtnMax): - qDrawShadePanel( p, s_o1, s_o1, s_w1, s_w1, colorGroup, + qDrawShadePanel( p, s_o1, s_o1, s_w1, s_w1, tqcolorGroup, m_parent->maximizeMode() == KDecoration::MaximizeFull ); break; case (BtnClose): - p->setPen( colorGroup.dark() ); + p->setPen( tqcolorGroup.dark() ); p->drawLineSegments( TQPointArray(18, closeDLines) ); - p->setPen( colorGroup.light() ); + p->setPen( tqcolorGroup.light() ); p->drawLineSegments( TQPointArray(15, closeLLines) ); break; } @@ -844,7 +844,7 @@ void CdeButton::mousePressEvent(TQMouseEvent *e) { last_button = e->button(); TQMouseEvent me(e->type(), e->pos(), - e->globalPos(), (e->button()&m_realize_buttons)?LeftButton:NoButton, e->state()); + e->globalPos(), (e->button()&m_realize_buttons)?Qt::LeftButton:Qt::NoButton, e->state()); TQButton::mousePressEvent(&me); } @@ -852,7 +852,7 @@ void CdeButton::mouseReleaseEvent(TQMouseEvent * e) { last_button = e->button(); TQMouseEvent me(e->type(), e->pos(), - e->globalPos(), (e->button()&m_realize_buttons)?LeftButton:NoButton, e->state()); + e->globalPos(), (e->button()&m_realize_buttons)?Qt::LeftButton:Qt::NoButton, e->state()); TQButton::mouseReleaseEvent(&me); } diff --git a/kwin-styles/cde/cdeclient.h b/kwin-styles/cde/cdeclient.h index 265c6c64..e3a0e9ad 100644 --- a/kwin-styles/cde/cdeclient.h +++ b/kwin-styles/cde/cdeclient.h @@ -5,7 +5,7 @@ * Copyright (c) 2000-2001, 2002 * Chris Lee <lee@azsites.com> * Lennart Kudling <kudling@kde.org> - * Fredrik Höglund <fredrik@kde.org> + * Fredrik H�glund <fredrik@kde.org> * * Copyright (c) 2003 * Luciano Montanaro <mikelima@cirulla.net> @@ -35,11 +35,11 @@ class CdeClient; enum Buttons { BtnMenu=0, BtnHelp, BtnIconify, BtnMax, BtnClose, BtnCount }; -class CdeButton : public QButton +class CdeButton : public TQButton { public: CdeButton( CdeClient* parent=0, const char* name=0, int btnType=0, - const TQString& tip=NULL, int realize_btns = LeftButton ); + const TQString& tip=NULL, int realize_btns = Qt::LeftButton ); void reset(); ButtonState lastButton() { return last_button; } @@ -58,6 +58,7 @@ private: class CdeClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: CdeClient(KDecorationBridge *b, KDecorationFactory *f); ~CdeClient() {}; @@ -77,7 +78,7 @@ protected: void activeChange(); void shadeChange(); void iconChange(); - TQSize minimumSize() const; + TQSize tqminimumSize() const; void resize(const TQSize &size); void borders(int &left, int &right, int &top, int &bottom) const; void mousePressEvent( TQMouseEvent* ); diff --git a/kwin-styles/cde/config/Makefile.am b/kwin-styles/cde/config/Makefile.am index c12933e4..a1aa27ce 100644 --- a/kwin-styles/cde/config/Makefile.am +++ b/kwin-styles/cde/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_cde_config.la kwin_cde_config_la_SOURCES = config.cpp -kwin_cde_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin_cde_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin_cde_config_la_LIBADD = $(LIB_KDEUI) METASOURCES = AUTO diff --git a/kwin-styles/cde/config/config.cpp b/kwin-styles/cde/config/config.cpp index e9e49df0..cf58377d 100644 --- a/kwin-styles/cde/config/config.cpp +++ b/kwin-styles/cde/config/config.cpp @@ -30,7 +30,7 @@ CdeConfig::CdeConfig( KConfig* conf, TQWidget* parent ) bgAlign = new TQButtonGroup( 3, Qt::Horizontal, i18n("Text &Alignment"), groupBox ); bgAlign->setExclusive( true ); - TQWhatsThis::add( bgAlign, i18n("Use these buttons to set the alignment of the titlebar caption text.") ); + TQWhatsThis::add( bgAlign, i18n("Use these buttons to set the tqalignment of the titlebar caption text.") ); new TQRadioButton( i18n("Left"), bgAlign, "AlignLeft" ); TQRadioButton *radio2 = new TQRadioButton( i18n("Centered"), bgAlign, "AlignHCenter" ); radio2->setChecked( true ); diff --git a/kwin-styles/cde/config/config.h b/kwin-styles/cde/config/config.h index 366cec54..fc7fa136 100644 --- a/kwin-styles/cde/config/config.h +++ b/kwin-styles/cde/config/config.h @@ -15,9 +15,10 @@ class TQVBox; class TQLabel; class TQRadioButton; -class CdeConfig: public QObject +class CdeConfig: public TQObject { Q_OBJECT + TQ_OBJECT public: CdeConfig( KConfig* conf, TQWidget* parent ); diff --git a/kwin-styles/glow/Makefile.am b/kwin-styles/glow/Makefile.am index 92d5a63a..e63c4ef8 100644 --- a/kwin-styles/glow/Makefile.am +++ b/kwin-styles/glow/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS = . config themes kde_module_LTLIBRARIES = kwin3_glow.la kwin3_glow_la_SOURCES = glowclient.cpp glowbutton.cpp -kwin3_glow_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_glow_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin3_glow_la_LIBADD = $(LIB_KDECORE) -lkdecorations METASOURCES = AUTO diff --git a/kwin-styles/glow/config/Makefile.am b/kwin-styles/glow/config/Makefile.am index e677ff91..c1721d1e 100644 --- a/kwin-styles/glow/config/Makefile.am +++ b/kwin-styles/glow/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_glow_config.la kwin_glow_config_la_SOURCES = glowconfigdialog.cpp -kwin_glow_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin_glow_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin_glow_config_la_LIBADD = $(LIB_KDEUI) METASOURCES = AUTO diff --git a/kwin-styles/glow/config/glowconfigdialog.cpp b/kwin-styles/glow/config/glowconfigdialog.cpp index ab0cd40d..5d3b4487 100644 --- a/kwin-styles/glow/config/glowconfigdialog.cpp +++ b/kwin-styles/glow/config/glowconfigdialog.cpp @@ -59,7 +59,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent ) _main_group_box = new TQWidget(parent); TQVBoxLayout *main_group_boxLayout = new TQVBoxLayout(_main_group_box); - main_group_boxLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft); + main_group_boxLayout->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft); main_group_boxLayout->setSpacing(6); //------------------------------------------------------------------------- @@ -79,12 +79,12 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent ) _button_glow_color_group_box = new TQGroupBox( 0, Qt::Horizontal, i18n("Button Glow Colors"), _main_group_box); TQHBoxLayout *colorHBoxLayout = - new TQHBoxLayout(_button_glow_color_group_box->layout()); + new TQHBoxLayout(_button_glow_color_group_box->tqlayout()); // create buttons TQSize buttonSize(BITMAP_SIZE, BITMAP_SIZE); TQPixmap pm(buttonSize); - pm.fill(Qt::black); + pm.fill(TQt::black); _stickyButton = new TQPushButton(_button_glow_color_group_box); pm.setMask(TQBitmap(buttonSize, stickyoff_bits, true)); @@ -119,7 +119,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent ) // create signal mapper _titleButtonMapper = new TQSignalMapper(this); for( uint i=0; i<_titleButtonList.size(); i++ ) { - _titleButtonMapper->setMapping(_titleButtonList[i], i); + _titleButtonMapper->setMapping(TQT_TQOBJECT(_titleButtonList[i]), i); connect(_titleButtonList[i], TQT_SIGNAL(clicked()),_titleButtonMapper, TQT_SLOT(map())); } connect(_titleButtonMapper, TQT_SIGNAL(mapped(int)),this, TQT_SLOT(slotTitleButtonClicked(int))); @@ -139,7 +139,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent ) _titlebarGradientTypeComboBox = new TQComboBox(_main_group_box); KConfig *c = KGlobal::config(); - KConfigGroupSaver cgs( c, TQString::fromLatin1("WM") ); + KConfigGroupSaver cgs( c, TQString::tqfromLatin1("WM") ); TQColor activeBackground = c->readColorEntry("activeBackground"); TQColor activeBlend = c->readColorEntry("activeBlend"); @@ -159,7 +159,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent ) this, TQT_SLOT(slotTitlebarGradientTypeChanged(int))); titlebarGradientTypeLayout->addWidget( new TQLabel(i18n("Titlebar gradient:"), _main_group_box)); - titlebarGradientTypeLayout->addWidget(_titlebarGradientTypeComboBox, 0, Qt::AlignLeft); + titlebarGradientTypeLayout->addWidget(_titlebarGradientTypeComboBox, 0, TQt::AlignLeft); titlebarGradientTypeLayout->addStretch(10); main_group_boxLayout->addLayout(titlebarGradientTypeLayout); @@ -194,7 +194,7 @@ void GlowConfigDialog::load( KConfig* /* conf */ ) _glowConfig->setGroup("General"); - _buttonConfigMap = new QColor[NUMBER_OF_BUTTONS]; + _buttonConfigMap = new TQColor[NUMBER_OF_BUTTONS]; color = _glowConfig->readColorEntry("stickyButtonGlowColor", &defaultStickyButtonColor); _buttonConfigMap[stickyButton] = color; @@ -286,7 +286,7 @@ void GlowConfigDialog::slotLoadThemeList () TQDir::Dirs | TQDir::Readable); if (dir.exists()) { - QFileInfoListIterator it2(*dir.entryInfoList()); + TQFileInfoListIterator it2(*dir.entryInfoList()); TQFileInfo * finfo; while ((finfo=it2.current())) diff --git a/kwin-styles/glow/config/glowconfigdialog.h b/kwin-styles/glow/config/glowconfigdialog.h index e8a1be31..81747a4c 100644 --- a/kwin-styles/glow/config/glowconfigdialog.h +++ b/kwin-styles/glow/config/glowconfigdialog.h @@ -29,9 +29,10 @@ class TQComboBox; class KConfig; class KColorButton; -class GlowConfigDialog : public QObject +class GlowConfigDialog : public TQObject { Q_OBJECT + TQ_OBJECT public: GlowConfigDialog( KConfig* conf, TQWidget* parent ); diff --git a/kwin-styles/glow/glowbutton.cpp b/kwin-styles/glow/glowbutton.cpp index 25bae19c..87079c2e 100644 --- a/kwin-styles/glow/glowbutton.cpp +++ b/kwin-styles/glow/glowbutton.cpp @@ -87,12 +87,12 @@ GlowButton::GlowButton(TQWidget *parent, const char *name, _steps = 0; m_updateTime = 50; - m_pixmapName = TQString::null; + m_pixmapName = TQString(); m_timer = new TQTimer(this); connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); m_pos = 0; - m_timerStatus = Stop; + m_timertqStatus = Stop; setTipText (tip); setCursor(arrowCursor); @@ -116,7 +116,7 @@ TQString GlowButton::getPixmapName() const return m_pixmapName; } -Qt::ButtonState GlowButton::lastButton() const +TQt::ButtonState GlowButton::lastButton() const { return _last_button; } @@ -132,7 +132,7 @@ void GlowButton::setPixmapName(const TQString& pixmapName) // set steps _steps = pixmap->height()/pixmap->width() - 1; - repaint(false); + tqrepaint(false); } void GlowButton::paintEvent( TQPaintEvent *e ) @@ -160,7 +160,7 @@ void GlowButton::enterEvent( TQEvent *e ) { if( m_pos<0 ) m_pos=-m_pos; - m_timerStatus = Run; + m_timertqStatus = Run; if( ! m_timer->isActive() ) m_timer->start(m_updateTime); TQButton::enterEvent(e); @@ -168,7 +168,7 @@ void GlowButton::enterEvent( TQEvent *e ) void GlowButton::leaveEvent( TQEvent *e ) { - m_timerStatus = Stop; + m_timertqStatus = Stop; if( ! m_timer->isActive() ) m_timer->start(m_updateTime); TQButton::leaveEvent(e); @@ -180,11 +180,11 @@ void GlowButton::mousePressEvent( TQMouseEvent *e ) if( m_timer->isActive() ) m_timer->stop(); m_pos = _steps; - repaint(false); + tqrepaint(false); // without pretending LeftButton, clicking on the button with MidButton // or RightButton would cause unwanted titlebar action TQMouseEvent me (e->type(), e->pos(), e->globalPos(), - (e->button()&m_realizeButtons)?LeftButton:NoButton, e->state()); + (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state()); TQButton::mousePressEvent(&me); } @@ -195,22 +195,22 @@ void GlowButton::mouseReleaseEvent( TQMouseEvent *e ) if( ! m_timer->isActive() ) { m_timer->start(m_updateTime); } - if( ! geometry().contains(p) ) { - m_timerStatus = Stop; + if( ! tqgeometry().contains(p) ) { + m_timertqStatus = Stop; } TQMouseEvent me (e->type(), e->pos(), e->globalPos(), - (e->button()&m_realizeButtons)?LeftButton:NoButton, e->state()); + (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state()); TQButton::mouseReleaseEvent(&me); } void GlowButton::slotTimeout() { - repaint(false); + tqrepaint(false); if( m_pos>=_steps-1 ) { m_pos = -m_pos; } - if( m_timerStatus==Stop ) { + if( m_timertqStatus==Stop ) { if( m_pos==0 ) { m_timer->stop(); return; @@ -268,29 +268,29 @@ TQPixmap * GlowButtonFactory::createGlowButtonPixmap( uint * src2_line = (uint*) fg_image.scanLine (y); uint * dst_line = (uint*) image.scanLine (i*h+y); for (int x=0; x<w; ++x) { - int r = qRed (*(src1_line+x)); - int g = qGreen (*(src1_line+x)); - int b = qBlue (*(src1_line+x)); - int a = QMAX (qAlpha(*(src1_line+x)),qGray(*(src2_line+x))); - *(dst_line+x) = qRgba (r, g, b, a); + int r = tqRed (*(src1_line+x)); + int g = tqGreen (*(src1_line+x)); + int b = tqBlue (*(src1_line+x)); + int a = TQMAX (tqAlpha(*(src1_line+x)),tqGray(*(src2_line+x))); + *(dst_line+x) = tqRgba (r, g, b, a); } } } TQPixmap * pixmap = new TQPixmap (image); TQPainter painter (pixmap); - bool dark = (qGray(color.rgb()) <= 127); + bool dark = (tqGray(color.rgb()) <= 127); TQImage fg_img (w, h, 32); fg_img.setAlphaBuffer (true); for (int y=0; y<h; ++y) { uint * src_line = (uint*) fg_image.scanLine (y); uint * dst_line = (uint*) fg_img.scanLine (y); for (int x=0; x<w; ++x) { - int alpha = qGray (*(src_line+x)); + int alpha = tqGray (*(src_line+x)); if (dark) - *(dst_line+x) = qRgba (255, 255, 255, alpha); + *(dst_line+x) = tqRgba (255, 255, 255, alpha); else - *(dst_line+x) = qRgba (0, 0, 0, alpha); + *(dst_line+x) = tqRgba (0, 0, 0, alpha); } } @@ -306,8 +306,8 @@ TQPixmap * GlowButtonFactory::createGlowButtonPixmap( uint * dst_line = (uint*) glow_img.scanLine(y); for (int x=0; x<w; ++x) { int alpha = - (int) (qGray (*(src_line+x)) * ((double) i/_steps)); - *(dst_line+x) = qRgba (r, g, b, alpha); + (int) (tqGray (*(src_line+x)) * ((double) i/_steps)); + *(dst_line+x) = tqRgba (r, g, b, alpha); } } painter.drawImage (0, i*h, glow_img); @@ -317,8 +317,8 @@ TQPixmap * GlowButtonFactory::createGlowButtonPixmap( uint * src_line = (uint*) glow_image.scanLine (y); uint * dst_line = (uint*) glow_img.scanLine (y); for (int x=0; x<w; ++x) { - int alpha = qGray (*(src_line+x)); - *(dst_line+x) = qRgba (r, g, b, alpha); + int alpha = tqGray (*(src_line+x)); + *(dst_line+x) = tqRgba (r, g, b, alpha); } } painter.drawImage (0, _steps*h, glow_img); diff --git a/kwin-styles/glow/glowbutton.h b/kwin-styles/glow/glowbutton.h index f263f0ac..d2e83beb 100644 --- a/kwin-styles/glow/glowbutton.h +++ b/kwin-styles/glow/glowbutton.h @@ -44,9 +44,10 @@ private: //----------------------------------------------------------------------------- -class GlowButton : public QButton +class GlowButton : public TQButton { Q_OBJECT + TQ_OBJECT public: GlowButton(TQWidget *parent, const char* name, const TQString& tip, const int realizeBtns); @@ -58,7 +59,7 @@ public: ButtonState lastButton() const; /** Sets the name of the pixmap in the pixmap cache. - * If no background pixmap is wanted use TQString::null as name. */ + * If no background pixmap is wanted use TQString() as name. */ void setPixmapName(const TQString& pixmapName); protected: @@ -72,7 +73,7 @@ protected slots: void slotTimeout(); private: - enum TimerStatus { Run, Stop }; + enum TimertqStatus { Run, Stop }; int m_updateTime; int _steps; @@ -80,7 +81,7 @@ private: TQTimer *m_timer; int m_pos; - TimerStatus m_timerStatus; + TimertqStatus m_timertqStatus; int m_realizeButtons; ButtonState _last_button; diff --git a/kwin-styles/glow/glowclient.cpp b/kwin-styles/glow/glowclient.cpp index 53d52b79..51c6e0d8 100644 --- a/kwin-styles/glow/glowclient.cpp +++ b/kwin-styles/glow/glowclient.cpp @@ -284,7 +284,7 @@ const TQString GlowClientGlobals::getPixmapTypeName(PixmapType type) case(Close): return "Close"; default: - return TQString::null; + return TQString(); } } @@ -404,20 +404,20 @@ GlowClient::~GlowClient() void GlowClient::resizeEvent( TQResizeEvent * ) { doShape(); - widget()->repaint(false); + widget()->tqrepaint(false); } void GlowClient::paintEvent( TQPaintEvent * ) { GlowClientConfig *conf = GlowClientGlobals::instance()->config(); TQRect r_this = widget()->rect(); - TQRect r_title = _title_spacer->geometry(); - TQColorGroup titleCg = options()->colorGroup(ColorTitleBar, isActive()); - TQColorGroup titleBlendCg=options()->colorGroup(ColorTitleBlend, isActive()); - TQColorGroup cg = widget()->colorGroup(); + TQRect r_title = _title_spacer->tqgeometry(); + TQColorGroup titleCg = options()->tqcolorGroup(ColorTitleBar, isActive()); + TQColorGroup titleBlendCg=options()->tqcolorGroup(ColorTitleBlend, isActive()); + TQColorGroup cg = widget()->tqcolorGroup(); TQColor titleColor = options()->color(ColorTitleBar, isActive()); TQColor titleBlendColor = options()->color(ColorTitleBlend, isActive()); - TQColor bgColor = widget()->colorGroup().background(); + TQColor bgColor = widget()->tqcolorGroup().background(); TQPainter p; TQPointArray pArray, pArray2, pArray3, pArray4; @@ -443,7 +443,7 @@ void GlowClient::paintEvent( TQPaintEvent * ) p.setPen(options()->color(ColorFont, isActive())); p.drawText(r_title.x(), 0, r_title.width(), r_title.height(), - Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, caption()); + TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, caption()); // draw split color beneath buttons top right pArray4 = TQPointArray(4); @@ -452,7 +452,7 @@ void GlowClient::paintEvent( TQPaintEvent * ) tBSize.height()/2-1); pArray4.setPoint(2, r_title.x()+r_title.width()-1, tBSize.height()); pArray4.setPoint(3, tBSize.width()-1, tBSize.height()); - p.setPen(Qt::NoPen); + p.setPen(TQt::NoPen); p.setBrush(bgColor); p.drawPolygon(pArray4); @@ -479,7 +479,7 @@ void GlowClient::paintEvent( TQPaintEvent * ) pArray3.setPoint(1, 0, 0); pArray3.setPoint(2, tBSize.width()-1, 0); pArray3.setPoint(3, tBSize.width()-1, tBSize.height()-1); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawPolyline(pArray3); p.end(); @@ -489,10 +489,10 @@ void GlowClient::paintEvent( TQPaintEvent * ) bitBlt(widget(), 0, 0, title_buffer); for (unsigned int i=0; i<m_buttonList.size(); ++i) - m_buttonList[i]->repaint(false); + m_buttonList[i]->tqrepaint(false); p.begin(widget()); - p.setPen(Qt::black); + p.setPen(TQt::black); //----- // draw borders p.drawLine(0,tBSize.height(),0,r_this.height()-1); @@ -503,7 +503,7 @@ void GlowClient::paintEvent( TQPaintEvent * ) // fill content widget p.fillRect(1, tBSize.height(), r_this.width()-2, r_this.height()-tBSize.height()-1, - options()->colorGroup(ColorFrame, isActive()).background()); + options()->tqcolorGroup(ColorFrame, isActive()).background()); p.end(); // paint resize handle if necessary @@ -511,7 +511,7 @@ void GlowClient::paintEvent( TQPaintEvent * ) && width()>=2 && height() >= RESIZE_HANDLE_HEIGHT) { p.begin(widget()); - p.setPen (Qt::black); + p.setPen (TQt::black); p.drawLine (1, height() - RESIZE_HANDLE_HEIGHT, width()-2, height() - RESIZE_HANDLE_HEIGHT); p.end(); @@ -521,12 +521,12 @@ void GlowClient::paintEvent( TQPaintEvent * ) void GlowClient::showEvent( TQShowEvent * ) { doShape(); - widget()->repaint(false); + widget()->tqrepaint(false); } void GlowClient::mouseDoubleClickEvent( TQMouseEvent *e ) { - if(e->button() == LeftButton && _title_spacer->geometry().contains(e->pos())) + if(e->button() == Qt::LeftButton && _title_spacer->tqgeometry().contains(e->pos())) titlebarDblClickOperation(); } @@ -539,7 +539,7 @@ void GlowClient::wheelEvent( TQWheelEvent *e ) void GlowClient::activeChange() { updateButtonPixmaps(); - widget()->repaint(false); + widget()->tqrepaint(false); } void GlowClient::iconChange() @@ -553,12 +553,12 @@ void GlowClient::shadeChange() void GlowClient::captionChange() { - widget()->update(_title_spacer->geometry()); + widget()->update(_title_spacer->tqgeometry()); } -TQSize GlowClient::minimumSize() const +TQSize GlowClient::tqminimumSize() const { - return widget()->minimumSize(); + return widget()->tqminimumSize(); } void GlowClient::resize( const TQSize& s ) @@ -649,7 +649,7 @@ void GlowClient::createButtons() TQSize size = globals->theme()->buttonSize; m_stickyButton = factory->createGlowButton(widget(), - "StickyButton", isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops"), LeftButton|RightButton); + "StickyButton", isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops"), Qt::LeftButton|Qt::RightButton); m_stickyButton->setFixedSize(size); connect(m_stickyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleOnAllDesktops())); m_buttonList.insert(m_buttonList.end(), m_stickyButton); @@ -667,7 +667,7 @@ void GlowClient::createButtons() m_buttonList.insert(m_buttonList.end(), m_minimizeButton); m_maximizeButton=factory->createGlowButton(widget(), - "MaximizeButton", i18n("Maximize"), LeftButton|MidButton|RightButton); + "MaximizeButton", i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton); m_maximizeButton->setFixedSize(size); connect(m_maximizeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMaximize())); m_buttonList.insert(m_buttonList.end(), m_maximizeButton); @@ -746,7 +746,7 @@ void GlowClient::updateButtonPositions() m_leftButtonList.clear(); m_rightButtonList.clear(); - // reset left and right button layout + // reset left and right button tqlayout if(m_leftButtonLayout) delete m_leftButtonLayout; m_leftButtonLayout = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0); @@ -857,27 +857,27 @@ void GlowClient::slotMaximize() bool GlowClient::eventFilter( TQObject* o, TQEvent* e ) { - if( o != widget()) + if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch( e->type()) { case TQEvent::Resize: - resizeEvent( static_cast< TQResizeEvent* >( e )); + resizeEvent( TQT_TQRESIZEEVENT( e )); return true; case TQEvent::Paint: - paintEvent( static_cast< TQPaintEvent* >( e )); + paintEvent( TQT_TQPAINTEVENT( e )); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent( static_cast< TQMouseEvent* >( e )); + mouseDoubleClickEvent( TQT_TQMOUSEEVENT( e )); return true; case TQEvent::MouseButtonPress: - processMousePressEvent( static_cast< TQMouseEvent* >( e )); + processMousePressEvent( TQT_TQMOUSEEVENT( e )); return true; case TQEvent::Show: - showEvent( static_cast< TQShowEvent* >( e )); + showEvent( TQT_TQSHOWEVENT( e )); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; default: break; diff --git a/kwin-styles/glow/glowclient.h b/kwin-styles/glow/glowclient.h index 41305bc6..9129dce0 100644 --- a/kwin-styles/glow/glowclient.h +++ b/kwin-styles/glow/glowclient.h @@ -144,6 +144,7 @@ private: class GlowClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: GlowClient( KDecorationBridge* b, KDecorationFactory* f ); ~GlowClient(); @@ -151,7 +152,7 @@ public: virtual void init(); virtual void borders( int&, int&, int&, int& ) const; virtual void resize( const TQSize& ); - virtual TQSize minimumSize() const; + virtual TQSize tqminimumSize() const; protected: virtual void resizeEvent( TQResizeEvent * ); diff --git a/kwin-styles/glow/resources.h b/kwin-styles/glow/resources.h index fa575aed..a304b822 100644 --- a/kwin-styles/glow/resources.h +++ b/kwin-styles/glow/resources.h @@ -1,11 +1,11 @@ #ifndef RESOURCES_H #define RESOURCES_H -#define DEFAULT_CLOSE_BUTTON_COLOR Qt::red -#define DEFAULT_MAXIMIZE_BUTTON_COLOR Qt::yellow -#define DEFAULT_ICONIFY_BUTTON_COLOR Qt::green -#define DEFAULT_HELP_BUTTON_COLOR Qt::white -#define DEFAULT_STICKY_BUTTON_COLOR Qt::white +#define DEFAULT_CLOSE_BUTTON_COLOR TQt::red +#define DEFAULT_MAXIMIZE_BUTTON_COLOR TQt::yellow +#define DEFAULT_ICONIFY_BUTTON_COLOR TQt::green +#define DEFAULT_HELP_BUTTON_COLOR TQt::white +#define DEFAULT_STICKY_BUTTON_COLOR TQt::white #endif diff --git a/kwin-styles/icewm/Makefile.am b/kwin-styles/icewm/Makefile.am index 1bdcda43..f5e240f1 100644 --- a/kwin-styles/icewm/Makefile.am +++ b/kwin-styles/icewm/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = . config icewm-themes kde_module_LTLIBRARIES = kwin3_icewm.la kwin3_icewm_la_SOURCES = icewm.cpp -kwin3_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin3_icewm_la_LIBADD = $(LIB_KDEUI) -lkdecorations METASOURCES = AUTO diff --git a/kwin-styles/icewm/config/Makefile.am b/kwin-styles/icewm/config/Makefile.am index 7c2b82e5..9189f18f 100644 --- a/kwin-styles/icewm/config/Makefile.am +++ b/kwin-styles/icewm/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_icewm_config.la kwin_icewm_config_la_SOURCES = config.cpp -kwin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin_icewm_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) METASOURCES = AUTO diff --git a/kwin-styles/icewm/config/config.cpp b/kwin-styles/icewm/config/config.cpp index 980e949a..8b679d54 100644 --- a/kwin-styles/icewm/config/config.cpp +++ b/kwin-styles/icewm/config/config.cpp @@ -172,7 +172,7 @@ void IceWMConfig::findIceWMThemes() TQDir d(*it, TQString("*"), TQDir::Unsorted, TQDir::Dirs | TQDir::Readable ); if (d.exists()) { - QFileInfoListIterator it2( *d.entryInfoList() ); + TQFileInfoListIterator it2( *d.entryInfoList() ); TQFileInfo* finfo; // Step through all directories within the kwin/icewm-themes directory diff --git a/kwin-styles/icewm/config/config.h b/kwin-styles/icewm/config/config.h index 9bcb76bf..c9c5b2d0 100644 --- a/kwin-styles/icewm/config/config.h +++ b/kwin-styles/icewm/config/config.h @@ -37,9 +37,10 @@ class TQVBox; -class IceWMConfig: public QObject +class IceWMConfig: public TQObject { Q_OBJECT + TQ_OBJECT public: IceWMConfig( KConfig* conf, TQWidget* parent ); diff --git a/kwin-styles/icewm/icewm.cpp b/kwin-styles/icewm/icewm.cpp index 9b60219d..47386962 100644 --- a/kwin-styles/icewm/icewm.cpp +++ b/kwin-styles/icewm/icewm.cpp @@ -218,7 +218,7 @@ void ThemeHandler::convertButtons( TQString& s ) } -// Reverses all characters in a QString +// Reverses all characters in a TQString TQString ThemeHandler::reverseString( TQString s ) { if (s.length() <= 1) @@ -385,8 +385,8 @@ void ThemeHandler::initTheme() setPixmap( frameTR, "frame", "TR.xpm" ); // Sides - setPixmap( frameL, "frame", "L.xpm", true, Vertical ); - setPixmap( frameR, "frame", "R.xpm", true, Vertical ); + setPixmap( frameL, "frame", "L.xpm", true,Qt::Vertical ); + setPixmap( frameR, "frame", "R.xpm", true,Qt::Vertical ); // Bottom setPixmap( frameBL, "frame", "BL.xpm" ); @@ -500,7 +500,7 @@ void ThemeHandler::freePixmapGroup( TQPixmap* p[] ) } -// Converts icewm colors #C0C0C0 or rgb:C0/C0/C0 to QColors +// Converts icewm colors #C0C0C0 or rgb:C0/C0/C0 to TQColors TQColor ThemeHandler::decodeColor( TQString& s ) { // Make rgb:C0/C0/C0, or #C0/C0/C0 -> C0C0C0 @@ -517,7 +517,7 @@ TQColor ThemeHandler::decodeColor( TQString& s ) if (s.length() != 6) return TQColor( 0xC0, 0xC0, 0xC0 ); - // Qt makes this conversion very easy + // TQt makes this conversion very easy return TQColor( TQString("#") + s ); } @@ -772,7 +772,7 @@ IceWMButton::IceWMButton(IceWMClient *parent, const char *name, TQPixmap* (*p)[2 setBackgroundMode( TQWidget::NoBackground ); client = parent; usePixmap( p ); - setFixedSize( sizeHint() ); + setFixedSize( tqsizeHint() ); setToggleButton( isToggle ); } @@ -785,7 +785,7 @@ void IceWMButton::setTipText(const TQString &tip) { } -TQSize IceWMButton::sizeHint() const +TQSize IceWMButton::tqsizeHint() const { // Check for invalid data if ( validPixmaps( (TQPixmap**) (*pix) ) ) // Cast to avoid dumb warning @@ -802,7 +802,7 @@ void IceWMButton::usePixmap( TQPixmap* (*p)[2] ) if (validPixmaps( *p )) { pix = p; setFixedSize( (*pix)[Active]->width(), titleBarHeight ); - repaint( false ); + tqrepaint( false ); } else pix = NULL; } @@ -840,7 +840,7 @@ void IceWMButton::mousePressEvent( TQMouseEvent* e ) { last_button = e->button(); TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), - (e->button()&m_realizeButtons)?LeftButton:NoButton, e->state() ); + (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); TQButton::mousePressEvent( &me ); } @@ -849,7 +849,7 @@ void IceWMButton::mouseReleaseEvent( TQMouseEvent* e ) { last_button = e->button(); TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), - (e->button()&m_realizeButtons)?LeftButton:NoButton, e->state() ); + (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); TQButton::mouseReleaseEvent( &me ); } @@ -892,7 +892,7 @@ void IceWMClient::init() // No flicker thanks widget()->setBackgroundMode( NoBackground ); - // Pack the windowWrapper() window within a grid layout + // Pack the windowWrapper() window within a grid tqlayout grid = new TQGridLayout(widget(), 0, 0, 0); grid->setResizeMode(TQLayout::FreeResize); grid->addRowSpacing(0, borderSizeY); // Top grab bar @@ -956,7 +956,7 @@ void IceWMClient::init() } -// Adds the buttons to the hbox layout as per the buttons specified +// Adds the buttons to the hbox tqlayout as per the buttons specified // in the button string 's' void IceWMClient::addClientButtons( const TQString& s ) { @@ -973,7 +973,7 @@ void IceWMClient::addClientButtons( const TQString& s ) if (showMenuButtonIcon) { renderMenuIcons(); button[BtnSysMenu] = new IceWMButton(this, "menu", - &menuButtonWithIconPix, false, i18n("Menu"), LeftButton|RightButton); + &menuButtonWithIconPix, false, i18n("Menu"), Qt::LeftButton|Qt::RightButton); } else button[BtnSysMenu] = new IceWMButton(this, "menu", @@ -1002,7 +1002,7 @@ void IceWMClient::addClientButtons( const TQString& s ) if ( validPixmaps(maximizePix) && !button[BtnMaximize] && isMaximizable() ) { button[BtnMaximize] = new IceWMButton(this, "maximize", - &maximizePix, false, i18n("Maximize"), LeftButton|MidButton|RightButton); + &maximizePix, false, i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton); hb->addWidget( button[BtnMaximize] ); connect( button[BtnMaximize], TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMaximize())); @@ -1057,7 +1057,7 @@ void IceWMClient::addClientButtons( const TQString& s ) } -// Adds a pixmap to the titlebar layout via the use of a nice QSpacerItem +// Adds a pixmap to the titlebar tqlayout via the use of a nice TQSpacerItem TQSpacerItem* IceWMClient::addPixmapSpacer( TQPixmap* p[], TQSizePolicy::SizeType s, int hsize ) { TQSpacerItem* sp; @@ -1157,9 +1157,9 @@ void IceWMClient::resize( const TQSize& s ) } -TQSize IceWMClient::minimumSize() const +TQSize IceWMClient::tqminimumSize() const { - return widget()->minimumSize(); + return widget()->tqminimumSize(); } @@ -1175,10 +1175,10 @@ void IceWMClient::resizeEvent( TQResizeEvent* e ) int dy = 0; if ( e->oldSize().width() != widget()->width() ) - dx = 32 + QABS( e->oldSize().width() - width() ); + dx = 32 + TQABS( e->oldSize().width() - width() ); if ( e->oldSize().height() != height() ) - dy = 8 + QABS( e->oldSize().height() - height() ); + dy = 8 + TQABS( e->oldSize().height() - height() ); if ( dy ) widget()->update( 0, height() - dy + 1, width(), dy ); @@ -1186,9 +1186,9 @@ void IceWMClient::resizeEvent( TQResizeEvent* e ) if ( dx ) { widget()->update( width() - dx + 1, 0, dx, height() ); - widget()->update( TQRect( TQPoint(4,4), titlebar->geometry().bottomLeft() - TQPoint(1,0) ) ); - widget()->update( TQRect( titlebar->geometry().topRight(), TQPoint( width() - 4, titlebar->geometry().bottom() ) ) ); - widget()->repaint(titlebar->geometry(), false); + widget()->update( TQRect( TQPoint(4,4), titlebar->tqgeometry().bottomLeft() - TQPoint(1,0) ) ); + widget()->update( TQRect( titlebar->tqgeometry().topRight(), TQPoint( width() - 4, titlebar->tqgeometry().bottom() ) ) ); + widget()->tqrepaint(titlebar->tqgeometry(), false); } } } @@ -1297,7 +1297,7 @@ void IceWMClient::paintEvent( TQPaintEvent* ) p.drawLine(1, h-2, w-2, h-2); p.drawLine(w-2, 1, w-2, h-2); - p.setPen( Qt::black ); + p.setPen( TQt::black ); p.drawLine(w-1, 0, w-1, h-1); p.drawLine(0, h-1, w-1, h-1); } @@ -1306,7 +1306,7 @@ void IceWMClient::paintEvent( TQPaintEvent* ) // Fill frame border if required if (borderSizeX > 2) { - // Fill Vertical sizes + // FillQt::Vertical sizes p.fillRect( x+2, y+2, borderSizeX-2, h-4, c1); p.fillRect( w-borderSizeX, y+2, borderSizeX-2, h-4, c1); } @@ -1377,46 +1377,46 @@ void IceWMClient::paintEvent( TQPaintEvent* ) TQPainter p2( titleBuffer, this ); titleBuffer->fill( act ? *colorActiveTitleBar : *colorInActiveTitleBar ); - r = titleSpacerJ->geometry(); + r = titleSpacerJ->tqgeometry(); if (!r.isEmpty() && titleJ[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleJ[ act ]); - r = titleSpacerL->geometry(); + r = titleSpacerL->tqgeometry(); if (!r.isEmpty() && titleL[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleL[ act ]); - r = titleSpacerS->geometry(); + r = titleSpacerS->tqgeometry(); if (!r.isEmpty() && titleS[ act ]) p2.drawTiledPixmap( r.x()-borderSizeX, 0, r.width(), titleBarHeight, *titleS[ act ]); - r = titleSpacerP->geometry(); + r = titleSpacerP->tqgeometry(); if (!r.isEmpty() && titleP[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleP[ act ]); - r = titlebar->geometry(); + r = titlebar->tqgeometry(); if (!r.isEmpty() && titleT[ act ] ) p2.drawTiledPixmap( r.x()-borderSizeX, 0, r.width(), titleBarHeight, *titleT[ act ]); - r = titleSpacerM->geometry(); + r = titleSpacerM->tqgeometry(); if (!r.isEmpty() && titleM[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleM[ act ], 0, 0, r.width(), r.height()); - r = titleSpacerB->geometry(); + r = titleSpacerB->tqgeometry(); if (!r.isEmpty() && titleB[ act ]) p2.drawTiledPixmap( r.x()-borderSizeX, 0, r.width(), titleBarHeight, *titleB[ act ]); - r = titleSpacerR->geometry(); + r = titleSpacerR->tqgeometry(); if (!r.isEmpty() && titleR[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleR[ act ], 0, 0, r.width(), r.height()); - r = titleSpacerQ->geometry(); + r = titleSpacerQ->tqgeometry(); if (!r.isEmpty() && titleQ[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleQ[ act ], 0, 0, r.width(), r.height()); p2.setFont( options()->font(true) ); // Pre-compute as much as possible - r = titlebar->geometry(); + r = titlebar->tqgeometry(); rx = r.x() - borderSizeX; rw = width()-(2*borderSizeX)-r.x(); @@ -1432,7 +1432,7 @@ void IceWMClient::paintEvent( TQPaintEvent* ) p2.drawText(rx, 0, rw, titleBarHeight, AlignLeft|AlignVCenter, caption()); p2.end(); - bitBlt( widget(), borderSizeX, hb->geometry().y(), titleBuffer ); + bitBlt( widget(), borderSizeX, hb->tqgeometry().y(), titleBuffer ); delete titleBuffer; } @@ -1453,7 +1453,7 @@ void IceWMClient::showEvent(TQShowEvent *ev) void IceWMClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if( e->button() != LeftButton ) + if( e->button() != Qt::LeftButton ) return; TQRect r; @@ -1486,7 +1486,7 @@ void IceWMClient::iconChange() renderMenuIcons(); button[BtnSysMenu]->usePixmap( &menuButtonWithIconPix ); if (button[BtnSysMenu]->isVisible()) - button[BtnSysMenu]->repaint(false); + button[BtnSysMenu]->tqrepaint(false); } } } @@ -1497,13 +1497,13 @@ void IceWMClient::desktopChange() if (button[BtnDepth]) { button[BtnDepth]->turnOn( isOnAllDesktops() ); - button[BtnDepth]->repaint(false); + button[BtnDepth]->tqrepaint(false); button[BtnDepth]->setTipText(isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops")); } } -// Please don't modify the following unless you want layout problems +// Please don't modify the following unless you want tqlayout problems void IceWMClient::captionChange() { TQRect r( 0, borderSizeY, geometry().width(), titleBarHeight); @@ -1512,7 +1512,7 @@ void IceWMClient::captionChange() TQSizePolicy::Preferred, TQSizePolicy::Fixed ); titlebar->invalidate(); grid->activate(); - widget()->repaint( r, false ); + widget()->tqrepaint( r, false ); } @@ -1541,12 +1541,12 @@ void IceWMClient::shadeChange() void IceWMClient::activeChange() { - widget()->repaint(false); + widget()->tqrepaint(false); // Reset the button pixmaps. for(int i= IceWMClient::BtnSysMenu; i < IceWMClient::BtnCount; i++) if(button[i]) - button[i]->repaint( false ); + button[i]->tqrepaint( false ); } @@ -1661,24 +1661,24 @@ void IceWMClient::menuButtonReleased() bool IceWMClient::eventFilter( TQObject* o, TQEvent* e ) { - if( o != widget()) + if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch( e->type()) { case TQEvent::Resize: - resizeEvent(static_cast< TQResizeEvent* >( e ) ); + resizeEvent(TQT_TQRESIZEEVENT( e ) ); return true; case TQEvent::Paint: - paintEvent(static_cast< TQPaintEvent* >( e ) ); + paintEvent(TQT_TQPAINTEVENT( e ) ); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast< TQMouseEvent* >( e ) ); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(static_cast< TQMouseEvent* >( e ) ); + processMousePressEvent(TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; default: break; diff --git a/kwin-styles/icewm/icewm.h b/kwin-styles/icewm/icewm.h index f5c319b6..f343912c 100644 --- a/kwin-styles/icewm/icewm.h +++ b/kwin-styles/icewm/icewm.h @@ -96,15 +96,15 @@ class ThemeHandler: public KDecorationFactory }; -class IceWMButton : public QButton +class IceWMButton : public TQButton { public: IceWMButton( IceWMClient *parent=0, const char *name=0, TQPixmap* (*p)[2]=0L, bool isToggle=false, - const TQString& tip=NULL, const int realizeBtns = LeftButton ); + const TQString& tip=NULL, const int realizeBtns = Qt::LeftButton ); void setTipText(const TQString &tip); void usePixmap( TQPixmap* (*p)[2] ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void turnOn( bool isOn ); ButtonState last_button; @@ -125,6 +125,7 @@ class IceWMButton : public QButton class IceWMClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: IceWMClient( KDecorationBridge* bridge, KDecorationFactory* factory ); ~IceWMClient(); @@ -149,7 +150,7 @@ class IceWMClient : public KDecoration void iconChange(); virtual void desktopChange( ); virtual void borders(int&, int&, int&, int&) const; - virtual TQSize minimumSize() const; + virtual TQSize tqminimumSize() const; protected slots: void slotMaximize(); diff --git a/kwin-styles/kde1/Makefile.am b/kwin-styles/kde1/Makefile.am index 9c25f718..c47be9c8 100644 --- a/kwin-styles/kde1/Makefile.am +++ b/kwin-styles/kde1/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin3_kde1.la kwin3_kde1_la_SOURCES = kde1client.cpp -kwin3_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin3_kde1_la_LIBADD = -lkdecorations METASOURCES = AUTO diff --git a/kwin-styles/kde1/kde1client.cpp b/kwin-styles/kde1/kde1client.cpp index 4da5e3a1..a5a5e892 100644 --- a/kwin-styles/kde1/kde1client.cpp +++ b/kwin-styles/kde1/kde1client.cpp @@ -19,7 +19,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org> #include "kde1client_bitmaps.h" -// Default button layout +// Default button tqlayout const char default_left[] = "MS"; const char default_right[] = "H_IAX"; @@ -55,8 +55,8 @@ void create_pixmaps() if ( pixmaps_created ) return; pixmaps_created = true; - TQColorGroup aGrp = options()->colorGroup(KDecorationOptions::ColorButtonBg, true); - TQColorGroup iGrp = options()->colorGroup(KDecorationOptions::ColorButtonBg, false); + TQColorGroup aGrp = options()->tqcolorGroup(KDecorationOptions::ColorButtonBg, true); + TQColorGroup iGrp = options()->tqcolorGroup(KDecorationOptions::ColorButtonBg, false); TQPainter aPainter, iPainter; close_pix = new TQPixmap(16, 16); @@ -282,7 +282,7 @@ void StdClient::init() button[n]->setBackgroundMode( PaletteBackground ); button[n]->setMouseTracking( FALSE ); button[n]->setAutoRaise( TRUE ); - button[n]->setFocusPolicy( TQWidget::NoFocus ); + button[n]->setFocusPolicy( TQ_NoFocus ); button[n]->setFixedSize( 20, 20 ); } @@ -398,7 +398,7 @@ void StdClient::activeChange() button[ButtonClose]->setIconSet(on ? *close_pix : *dis_close_pix); if (button[ButtonHelp]) button[ButtonHelp]->setIconSet(on ? *question_mark_pix : *dis_question_mark_pix); - widget()->repaint( titlebar->geometry(), false ); + widget()->tqrepaint( titlebar->tqgeometry(), false ); } @@ -413,7 +413,7 @@ StdClient::~StdClient() void StdClient::resizeEvent( TQResizeEvent* ) { TQRegion rr = widget()->rect(); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); // t.setTop( 0 ); // TQRegion r = rr.subtract( TQRect( t.x()+1, 0, t.width()-2, 1 ) ); // setMask( r ); @@ -429,7 +429,7 @@ void StdClient::resizeEvent( TQResizeEvent* ) */ void StdClient::captionChange() { - widget()->repaint( titlebar->geometry(), FALSE ); + widget()->tqrepaint( titlebar->tqgeometry(), FALSE ); } @@ -461,11 +461,11 @@ void StdClient::desktopChange() void StdClient::paintEvent( TQPaintEvent* ) { TQPainter p( widget() ); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); TQRegion r = widget()->rect(); r = r.subtract( t ); p.setClipRegion( r ); - qDrawWinPanel( &p, widget()->rect(), widget()->colorGroup() ); + qDrawWinPanel( &p, widget()->rect(), widget()->tqcolorGroup() ); // t.setTop( 1 ); // p.setClipRegion( t ); // t.setTop( 0 ); @@ -480,7 +480,7 @@ void StdClient::paintEvent( TQPaintEvent* ) // p.drawLine(t.left(), t.top()+1, t.right(), t.top()+1); if ( isActive() ) qDrawShadePanel( &p2, 0, 0, titleRect.width(), titleRect.height(), - widget()->colorGroup(), true, 1 ); + widget()->tqcolorGroup(), true, 1 ); titleRect.setLeft( 4 ); titleRect.setWidth( titleRect.width() - 2 ); p2.setPen(options()->color(KDecorationOptions::ColorFont, isActive())); @@ -494,14 +494,14 @@ void StdClient::paintEvent( TQPaintEvent* ) void StdClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if ( e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) titlebarDblClickOperation(); } void StdClient::wheelEvent( TQWheelEvent * e ) { - if (isSetShade() || TQRect( 0, 0, width(), titlebar->geometry().height() ).contains( e->pos() ) ) + if (isSetShade() || TQRect( 0, 0, width(), titlebar->tqgeometry().height() ).contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } @@ -513,7 +513,7 @@ void StdClient::iconChange() button[ButtonMenu]->setIconSet(isActive() ? *menu_pix : *dis_menu_pix); else button[ButtonMenu]->setIconSet( icon().pixmap( TQIconSet::Small, TQIconSet::Normal ) ); - button[ButtonMenu]->repaint( FALSE ); + button[ButtonMenu]->tqrepaint( FALSE ); } } @@ -543,28 +543,28 @@ void StdClient::maxButtonClicked( ButtonState button ) bool StdClient::eventFilter( TQObject* o, TQEvent* e ) { - if ( o != widget() ) + if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()) ) return false; switch ( e->type() ) { case TQEvent::Resize: - resizeEvent( static_cast< TQResizeEvent* >( e ) ); + resizeEvent( TQT_TQRESIZEEVENT( e ) ); return true; case TQEvent::Paint: - paintEvent( static_cast< TQPaintEvent* >( e ) ); + paintEvent( TQT_TQPAINTEVENT( e ) ); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent( static_cast< TQMouseEvent* >( e ) ); + mouseDoubleClickEvent( TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::MouseButtonPress: - processMousePressEvent( static_cast< TQMouseEvent* >( e ) ); + processMousePressEvent( TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; default: @@ -572,9 +572,9 @@ bool StdClient::eventFilter( TQObject* o, TQEvent* e ) } } -TQSize StdClient::minimumSize() const +TQSize StdClient::tqminimumSize() const { - return widget()->minimumSize().expandedTo( TQSize( 100, 50 )); + return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 )); } void StdClient::borders( int& left, int& right, int& top, int& bottom ) const @@ -636,7 +636,7 @@ StdToolClient::~StdToolClient() void StdToolClient::resizeEvent( TQResizeEvent* ) { // TQRegion r = rect(); -// TQRect t = titlebar->geometry(); +// TQRect t = titlebar->tqgeometry(); // t.setTop( 0 ); // r = r.subtract( TQRect(0, 0, width(), 1) ); // r = r.subtract (TQRect( 0, 0, 1, t.height() ) ); @@ -647,11 +647,11 @@ void StdToolClient::resizeEvent( TQResizeEvent* ) void StdToolClient::paintEvent( TQPaintEvent* ) { TQPainter p( widget() ); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); TQRect r = widget()->rect(); - qDrawWinPanel( &p, r, widget()->colorGroup() ); + qDrawWinPanel( &p, r, widget()->tqcolorGroup() ); r.setTop( t.bottom()+1 ); - qDrawWinPanel( &p, r, widget()->colorGroup() ); + qDrawWinPanel( &p, r, widget()->tqcolorGroup() ); p.fillRect( TQRect( TQPoint(t.topLeft() ), TQPoint( width() - t.left(), t.bottom() ) ), options()->color(KDecorationOptions::ColorTitleBar, isActive())); p.setPen( options()->color(KDecorationOptions::ColorTitleBar, isActive()).light() ); @@ -665,19 +665,19 @@ void StdToolClient::paintEvent( TQPaintEvent* ) void StdToolClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if ( e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) titlebarDblClickOperation(); } void StdToolClient::wheelEvent( TQWheelEvent * e ) { - if (isSetShade() || TQRect( 0, 0, width(), titlebar->geometry().height() ).contains( e->pos() ) ) + if (isSetShade() || TQRect( 0, 0, width(), titlebar->tqgeometry().height() ).contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } void StdToolClient::captionChange() { - widget()->repaint( titlebar->geometry(), FALSE ); + widget()->tqrepaint( titlebar->tqgeometry(), FALSE ); } void StdToolClient::reset( unsigned long ) @@ -692,28 +692,28 @@ void StdToolClient::reset( unsigned long ) bool StdToolClient::eventFilter( TQObject* o, TQEvent* e ) { - if ( o != widget() ) + if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()) ) return false; switch ( e->type() ) { case TQEvent::Resize: - resizeEvent( static_cast< TQResizeEvent* >( e ) ); + resizeEvent( TQT_TQRESIZEEVENT( e ) ); return true; case TQEvent::Paint: - paintEvent( static_cast< TQPaintEvent* >( e ) ); + paintEvent( TQT_TQPAINTEVENT( e ) ); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent( static_cast< TQMouseEvent* >( e ) ); + mouseDoubleClickEvent( TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::MouseButtonPress: - processMousePressEvent( static_cast< TQMouseEvent* >( e ) ); + processMousePressEvent( TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; default: @@ -721,9 +721,9 @@ bool StdToolClient::eventFilter( TQObject* o, TQEvent* e ) } } -TQSize StdToolClient::minimumSize() const +TQSize StdToolClient::tqminimumSize() const { - return widget()->minimumSize().expandedTo( TQSize( 100, 50 )); + return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 )); } void StdToolClient::borders( int& left, int& right, int& top, int& bottom ) const diff --git a/kwin-styles/kde1/kde1client.h b/kwin-styles/kde1/kde1client.h index 7dd13ab9..b97afc3e 100644 --- a/kwin-styles/kde1/kde1client.h +++ b/kwin-styles/kde1/kde1client.h @@ -28,11 +28,12 @@ enum ButtonType { class StdClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: StdClient( KDecorationBridge* b, KDecorationFactory* f ); ~StdClient(); void init(); - TQSize minimumSize() const; + TQSize tqminimumSize() const; void borders( int& left, int& right, int& top, int& bottom ) const; void reset( unsigned long mask ); void resize( const TQSize& s ); @@ -66,11 +67,12 @@ private: class StdToolClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: StdToolClient( KDecorationBridge* b, KDecorationFactory* f ); ~StdToolClient(); void init(); - TQSize minimumSize() const; + TQSize tqminimumSize() const; void borders( int& left, int& right, int& top, int& bottom ) const; void reset( unsigned long mask ); void resize( const TQSize& s ); @@ -100,9 +102,10 @@ private: Like TQToolButton, but provides a clicked(ButtonState) signals that has the last pressed mouse button as argument */ -class ThreeButtonButton: public QToolButton +class ThreeButtonButton: public TQToolButton { Q_OBJECT + TQ_OBJECT public: ThreeButtonButton ( TQWidget *parent = 0, const char* name = 0 ) : TQToolButton( parent, name ) @@ -119,13 +122,13 @@ protected: void mousePressEvent( TQMouseEvent* e ) { last_button = e->button(); - TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), LeftButton, e->state() ); + TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); TQToolButton::mousePressEvent( &me ); } void mouseReleaseEvent( TQMouseEvent* e ) { - TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), LeftButton, e->state() ); + TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); TQToolButton::mouseReleaseEvent( &me ); } diff --git a/kwin-styles/kstep/Makefile.am b/kwin-styles/kstep/Makefile.am index 89397fad..1294e533 100644 --- a/kwin-styles/kstep/Makefile.am +++ b/kwin-styles/kstep/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin3_kstep.la kwin3_kstep_la_SOURCES = nextclient.cpp -kwin3_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx #kwin_kstep_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) kwin3_kstep_la_LIBADD = $(LIB_KDEUI) -lkdecorations diff --git a/kwin-styles/kstep/nextclient.cpp b/kwin-styles/kstep/nextclient.cpp index d4e57e86..08867a62 100644 --- a/kwin-styles/kstep/nextclient.cpp +++ b/kwin-styles/kstep/nextclient.cpp @@ -255,13 +255,13 @@ static void create_pixmaps(NextClientFactory *f) KPixmapEffect::DiagonalGradient); KPixmapEffect::gradient(internal, c.dark(120), c.light(120), KPixmapEffect::DiagonalGradient); - bitBlt(iBtn, 3, 3, &internal, 0, 0, internalHeight, internalHeight, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(iBtn), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true); KPixmapEffect::gradient(*iBtnDown, c.dark(120), c.light(120), KPixmapEffect::DiagonalGradient); KPixmapEffect::gradient(internal, c.light(120), c.dark(120), KPixmapEffect::DiagonalGradient); - bitBlt(iBtnDown, 3, 3, &internal, 0, 0, internalHeight, internalHeight, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(iBtnDown), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true); // active buttons c = options()->color(KDecoration::ColorButtonBg, true); @@ -269,36 +269,36 @@ static void create_pixmaps(NextClientFactory *f) KPixmapEffect::DiagonalGradient); KPixmapEffect::gradient(internal, c.dark(120), c.light(120), KPixmapEffect::DiagonalGradient); - bitBlt(aBtn, 3, 3, &internal, 0, 0, internalHeight, internalHeight, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(aBtn), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true); KPixmapEffect::gradient(*aBtnDown, c.dark(120), c.light(120), KPixmapEffect::DiagonalGradient); KPixmapEffect::gradient(internal, c.light(120), c.dark(120), KPixmapEffect::DiagonalGradient); - bitBlt(aBtnDown, 3, 3, &internal, 0, 0, internalHeight, internalHeight, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(aBtnDown), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true); TQPainter p; p.begin(aBtn); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(0, 0, btnWidth, btnWidth); p.end(); p.begin(iBtn); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(0, 0, btnWidth, btnWidth); p.end(); p.begin(aBtnDown); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(0, 0, btnWidth, btnWidth); p.end(); p.begin(iBtnDown); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(0, 0, btnWidth, btnWidth); p.end(); - if(qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128) - btnForeground = new TQColor(Qt::black); + if(tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128) + btnForeground = new TQColor(TQt::black); else - btnForeground = new TQColor(Qt::white); + btnForeground = new TQColor(TQt::white); } static void delete_pixmaps() @@ -324,7 +324,7 @@ NextButton::NextButton(NextClient *parent, const char *name, const unsigned char *bitmap, int bw, int bh, const TQString& tip, const int realizeBtns) : TQButton(parent->widget(), name), - deco(NULL), client(parent), last_button(NoButton) + deco(NULL), client(parent), last_button(Qt::NoButton) { realizeButtons = realizeBtns; @@ -340,14 +340,14 @@ NextButton::NextButton(NextClient *parent, const char *name, void NextButton::reset() { - repaint(false); + tqrepaint(false); } void NextButton::setBitmap(const unsigned char *bitmap, int w, int h) { deco = new TQBitmap(w, h, bitmap, true); deco->setMask(*deco); - repaint(); + tqrepaint(); } void NextButton::drawButton(TQPainter *p) @@ -376,7 +376,7 @@ void NextButton::mousePressEvent( TQMouseEvent* e ) { last_button = e->button(); TQMouseEvent me( e->type(), e->pos(), e->globalPos(), - (e->button()&realizeButtons)?LeftButton:NoButton, e->state() ); + (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); TQButton::mousePressEvent( &me ); } @@ -384,7 +384,7 @@ void NextButton::mouseReleaseEvent( TQMouseEvent* e ) { last_button = e->button(); TQMouseEvent me( e->type(), e->pos(), e->globalPos(), - (e->button()&realizeButtons)?LeftButton:NoButton, e->state() ); + (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); TQButton::mouseReleaseEvent( &me ); } @@ -478,7 +478,7 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec) if (isMaximizable()) { button[MAXIMIZE_IDX] = new NextButton(this, "maximize", maximize_bits, 10, 10, - i18n("Maximize"), LeftButton|MidButton|RightButton); + i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton); titleLayout->addWidget( button[MAXIMIZE_IDX] ); connect( button[MAXIMIZE_IDX], TQT_SIGNAL(clicked()), this, TQT_SLOT(maximizeButtonClicked()) ); @@ -508,7 +508,7 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec) case 'M': button[MENU_IDX] = - new NextButton(this, "menu", NULL, 10, 10, i18n("Menu"), LeftButton|RightButton); + new NextButton(this, "menu", NULL, 10, 10, i18n("Menu"), Qt::LeftButton|Qt::RightButton); titleLayout->addWidget( button[MENU_IDX] ); // NOTE DIFFERENCE: capture pressed(), not clicked() connect( button[MENU_IDX], TQT_SIGNAL(pressed()), @@ -602,7 +602,7 @@ bool NextClient::mustDrawHandle() const void NextClient::iconChange() { if (button[MENU_IDX] && button[MENU_IDX]->isVisible()) - button[MENU_IDX]->repaint(false); + button[MENU_IDX]->tqrepaint(false); } void NextClient::menuButtonPressed() @@ -658,9 +658,9 @@ void NextClient::resizeEvent(TQResizeEvent *) // TODO ? update border area only? widget()->update(); #if 0 - widget()->update(titlebar->geometry()); + widget()->update(titlebar->tqgeometry()); TQPainter p(widget()); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); t.setTop( 0 ); TQRegion r = widget()->rect(); r = r.subtract( t ); @@ -672,7 +672,7 @@ void NextClient::resizeEvent(TQResizeEvent *) void NextClient::captionChange() { - widget()->repaint(titlebar->geometry(), false); + widget()->tqrepaint(titlebar->tqgeometry(), false); } @@ -682,16 +682,16 @@ void NextClient::paintEvent( TQPaintEvent* ) // Draw black frame TQRect fr = widget()->rect(); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(fr); // Draw title bar - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); t.setTop(1); p.drawTiledPixmap(t.x()+1, t.y()+1, t.width()-2, t.height()-2, isActive() ? *aTitlePix : *iTitlePix); qDrawShadePanel(&p, t.x(), t.y(), t.width(), t.height()-1, - options()->colorGroup(KDecoration::ColorTitleBar, isActive())); + options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive())); p.drawLine(t.x(), t.bottom(), t.right(), t.bottom()); #if 0 @@ -716,7 +716,7 @@ void NextClient::paintEvent( TQPaintEvent* ) int corner = 16 + 3*handleSize/2; qDrawShadePanel(&p, fr.x() + 1, fr.bottom() - handleSize, corner-1, handleSize, - options()->colorGroup(KDecoration::ColorHandle, isActive()), + options()->tqcolorGroup(KDecoration::ColorHandle, isActive()), false); p.drawTiledPixmap(fr.x() + 2, fr.bottom() - handleSize + 1, corner - 3, handleSize - 2, isActive() ? *aHandlePix : *iHandlePix); @@ -724,7 +724,7 @@ void NextClient::paintEvent( TQPaintEvent* ) qDrawShadePanel(&p, fr.x() + corner, fr.bottom() - handleSize, fr.width() - 2*corner, handleSize, - options()->colorGroup(KDecoration::ColorFrame, isActive()), + options()->tqcolorGroup(KDecoration::ColorFrame, isActive()), false); p.drawTiledPixmap(fr.x() + corner + 1, fr.bottom() - handleSize + 1, fr.width() - 2*corner - 2, handleSize - 2, @@ -732,7 +732,7 @@ void NextClient::paintEvent( TQPaintEvent* ) qDrawShadePanel(&p, fr.right() - corner + 1, fr.bottom() - handleSize, corner - 1, handleSize, - options()->colorGroup(KDecoration::ColorHandle, isActive()), + options()->tqcolorGroup(KDecoration::ColorHandle, isActive()), false); p.drawTiledPixmap(fr.right() - corner + 2, fr.bottom() - handleSize + 1, corner - 3, handleSize - 2, isActive() ? *aHandlePix : *iHandlePix); @@ -741,7 +741,7 @@ void NextClient::paintEvent( TQPaintEvent* ) void NextClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if (e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) ) + if (e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) titlebarDblClickOperation(); } @@ -753,7 +753,7 @@ void NextClient::wheelEvent( TQWheelEvent * e ) void NextClient::showEvent(TQShowEvent *) { - widget()->repaint(); + widget()->tqrepaint(); } void NextClient::desktopChange() @@ -782,7 +782,7 @@ void NextClient::maximizeChange() void NextClient::activeChange() { - widget()->repaint(false); + widget()->tqrepaint(false); slotReset(); } @@ -839,7 +839,7 @@ void NextClient::keepAboveChange(bool above) TQToolTip::remove(b); TQToolTip::add(b, above ? i18n("Do not keep above others") : i18n("Keep above others")); - b->repaint(false); + b->tqrepaint(false); } } @@ -850,11 +850,11 @@ void NextClient::keepBelowChange(bool below) TQToolTip::remove(b); TQToolTip::add(b, below ? i18n("Do not keep below others") : i18n("Keep below others")); - b->repaint(false); + b->tqrepaint(false); } } -TQSize NextClient::minimumSize() const +TQSize NextClient::tqminimumSize() const { return TQSize(titleHeight * 6 + 2, titleHeight + handleSize + 2); } @@ -870,31 +870,31 @@ void NextClient::reset(unsigned long) if (button[i]) button[i]->reset(); } - widget()->repaint(); + widget()->tqrepaint(); } bool NextClient::eventFilter(TQObject *o, TQEvent *e) { - if (o != widget()) + if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch (e->type()) { case TQEvent::Resize: - resizeEvent(static_cast< TQResizeEvent* >( e )); + resizeEvent(TQT_TQRESIZEEVENT( e )); return true; case TQEvent::Paint: - paintEvent(static_cast< TQPaintEvent* >( e )); + paintEvent(TQT_TQPAINTEVENT( e )); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast< TQMouseEvent* >( e )); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT( e )); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(static_cast< TQMouseEvent* >( e )); + processMousePressEvent(TQT_TQMOUSEEVENT( e )); return true; case TQEvent::Show: - showEvent(static_cast< TQShowEvent* >( e )); + showEvent(TQT_TQSHOWEVENT( e )); return true; default: break; @@ -905,15 +905,15 @@ bool NextClient::eventFilter(TQObject *o, TQEvent *e) bool NextClient::drawbound(const TQRect& geom, bool /* clear */) { TQPainter p(workspaceWidget()); - p.setPen(TQPen(Qt::white, 3)); - p.setRasterOp(Qt::XorROP); + p.setPen(TQPen(TQt::white, 3)); + p.setRasterOp(TQt::XorROP); p.drawRect(geom); int leftMargin = geom.left() + 2; p.fillRect(leftMargin, geom.top() + titleHeight - 1, - geom.width() - 4, 3, Qt::white); + geom.width() - 4, 3, TQt::white); if (mustDrawHandle()) { p.fillRect(leftMargin, geom.bottom() - handleSize - 1, - geom.width() - 4, 3, Qt::white); + geom.width() - 4, 3, TQt::white); } return true; } diff --git a/kwin-styles/kstep/nextclient.h b/kwin-styles/kstep/nextclient.h index 0a29d135..b24da66d 100644 --- a/kwin-styles/kstep/nextclient.h +++ b/kwin-styles/kstep/nextclient.h @@ -16,12 +16,12 @@ namespace KStep { class NextClient; -class NextButton : public QButton +class NextButton : public TQButton { public: NextButton(NextClient *parent=0, const char *name=0, const unsigned char *bitmap=NULL, int bw=0, int bh=0, - const TQString& tip=NULL, const int realizeBtns = LeftButton); + const TQString& tip=NULL, const int realizeBtns = Qt::LeftButton); void setBitmap(const unsigned char *bitmap, int bw, int bh); void reset(); ButtonState lastButton() { return last_button; } @@ -42,6 +42,7 @@ protected: class NextClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: NextClient(KDecorationBridge *b, KDecorationFactory *f); ~NextClient() {;} @@ -60,7 +61,7 @@ protected: void activeChange(); void shadeChange(); void iconChange(); - TQSize minimumSize() const; + TQSize tqminimumSize() const; void resize(const TQSize &size); void borders(int &left, int &right, int &top, int &bottom) const; void reset(unsigned long changed); diff --git a/kwin-styles/openlook/Makefile.am b/kwin-styles/openlook/Makefile.am index 25ed43d0..abf08664 100644 --- a/kwin-styles/openlook/Makefile.am +++ b/kwin-styles/openlook/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin3_openlook.la kwin3_openlook_la_SOURCES = OpenLook.cpp -kwin3_openlook_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_openlook_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin3_openlook_la_LIBADD = -lkdecorations noinst_HEADERS = OpenLook.h diff --git a/kwin-styles/openlook/OpenLook.cpp b/kwin-styles/openlook/OpenLook.cpp index d3f2b190..8e61f187 100644 --- a/kwin-styles/openlook/OpenLook.cpp +++ b/kwin-styles/openlook/OpenLook.cpp @@ -162,33 +162,33 @@ OpenLook::~OpenLook() bool OpenLook::eventFilter(TQObject *o, TQEvent *e) { - if (o != widget()) return false; + if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch (e->type()) { case TQEvent::Resize: - resizeEvent(static_cast< TQResizeEvent* >(e)); + resizeEvent(TQT_TQRESIZEEVENT(e)); return true; case TQEvent::Paint: - paintEvent(static_cast< TQPaintEvent* >(e)); + paintEvent(TQT_TQPAINTEVENT(e)); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast< TQMouseEvent* >(e)); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; case TQEvent::MouseButtonPress: - if (!isButtonPress(static_cast< TQMouseEvent* >(e))) { - processMousePressEvent(static_cast< TQMouseEvent* >(e)); + if (!isButtonPress(TQT_TQMOUSEEVENT(e))) { + processMousePressEvent(TQT_TQMOUSEEVENT(e)); } return true; case TQEvent::MouseButtonRelease: - if (isButtonRelease(static_cast< TQMouseEvent* >(e))) { + if (isButtonRelease(TQT_TQMOUSEEVENT(e))) { return true; } else { return false; } case TQEvent::Show: - showEvent(static_cast< TQShowEvent* >(e)); + showEvent(TQT_TQSHOWEVENT(e)); return true; default: break; @@ -215,7 +215,7 @@ OpenLook::shadeChange() { } -TQSize OpenLook::minimumSize() const +TQSize OpenLook::tqminimumSize() const { int left, right, top, bottom; borders(left, right, top, bottom); @@ -226,7 +226,7 @@ TQSize OpenLook::minimumSize() const OpenLook::resize(const TQSize& s) { widget()->resize(s); - widget()->repaint(); //there is some strange wrong repaint of the frame without + widget()->tqrepaint(); //there is some strange wrong tqrepaint of the frame without } void @@ -252,9 +252,9 @@ OpenLook::paintEvent(TQPaintEvent * pe) TQBrush titleBackground(options()->color(KDecoration::ColorTitleBar, true)); if (isActive()) - qDrawShadePanel(&p, tr, widget()->colorGroup(), true, 1, &titleBackground); + qDrawShadePanel(&p, tr, widget()->tqcolorGroup(), true, 1, &titleBackground); else - p.fillRect(tr, widget()->colorGroup().brush(TQColorGroup::Background)); + p.fillRect(tr, widget()->tqcolorGroup().brush(TQColorGroup::Background)); p.setClipRegion(clipRegion); @@ -272,13 +272,13 @@ OpenLook::paintEvent(TQPaintEvent * pe) void OpenLook::showEvent(TQShowEvent *) { - widget()->repaint(); + widget()->tqrepaint(); } void OpenLook::mouseDoubleClickEvent(TQMouseEvent * e) { - if (e->button() == LeftButton && titleRect().contains(e->pos())) + if (e->button() == Qt::LeftButton && titleRect().contains(e->pos())) { titlebarDblClickOperation(); } @@ -302,7 +302,7 @@ OpenLook::resizeEvent(TQResizeEvent* e) void OpenLook::activeChange() { - widget()->repaint(); + widget()->tqrepaint(); } KDecoration::Position @@ -333,16 +333,16 @@ OpenLook::desktopChange() void OpenLook::maximizeChange() { - widget()->repaint(false); + widget()->tqrepaint(false); } void OpenLook::doLayout() { - TQVBoxLayout * layout = new TQVBoxLayout(widget(), openLookMargin); + TQVBoxLayout * tqlayout = new TQVBoxLayout(widget(), openLookMargin); titleSpacer_ = - new QSpacerItem + new TQSpacerItem ( 0, titleHeight, @@ -350,12 +350,12 @@ OpenLook::doLayout() TQSizePolicy::Fixed ); - layout->addItem(titleSpacer_); + tqlayout->addItem(titleSpacer_); - layout->addSpacing(2); + tqlayout->addSpacing(2); TQBoxLayout * midLayout = - new TQBoxLayout(layout, TQBoxLayout::LeftToRight, 0, 0); + new TQBoxLayout(tqlayout, TQBoxLayout::LeftToRight, 0, 0); if (isPreview()) { midLayout->addWidget(new TQLabel( @@ -377,11 +377,11 @@ OpenLook::animateMinimize(bool /*iconify*/) if (!icongeom.isValid()) return false; - TQRect wingeom(geometry()); + TQRect wingeom(tqgeometry()); TQPainter p(workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); #if 0 if (iconify) @@ -422,10 +422,10 @@ OpenLook::animateMinimize(bool /*iconify*/) return true; } - QRect + TQRect OpenLook::topLeftRect() const { - return QRect + return TQRect ( 0, 0, @@ -434,10 +434,10 @@ OpenLook::topLeftRect() const ); } - QRect + TQRect OpenLook::topRightRect() const { - return QRect + return TQRect ( width() - openLookCornerSize, 0, @@ -446,10 +446,10 @@ OpenLook::topRightRect() const ); } - QRect + TQRect OpenLook::bottomLeftRect() const { - return QRect + return TQRect ( 0, height() - openLookCornerSize, @@ -458,10 +458,10 @@ OpenLook::bottomLeftRect() const ); } - QRect + TQRect OpenLook::bottomRightRect() const { - return QRect + return TQRect ( width() - openLookCornerSize, height() - openLookCornerSize, @@ -482,7 +482,7 @@ OpenLook::paintTopLeftRect(TQPainter & p) const int x2(r.right()); int y2(r.bottom()); - p.setPen(widget()->colorGroup().light()); + p.setPen(widget()->tqcolorGroup().light()); p.drawLine(x1, y1, x2, y1); p.drawLine(x1, y1 + 1, x1, y2); @@ -490,7 +490,7 @@ OpenLook::paintTopLeftRect(TQPainter & p) const p.fillRect(x1 + 1, y1 + 1, r.width()-2, openLookMargin-2, handleColour); p.fillRect(x1 + 1, y1 + 1, openLookMargin-2, r.height()-2, handleColour); - p.setPen(widget()->colorGroup().dark()); + p.setPen(widget()->tqcolorGroup().dark()); p.drawLine(x2, y1 + 1, x2, y1 + openLookMargin-1); @@ -513,7 +513,7 @@ OpenLook::paintTopRightRect(TQPainter & p) const int x2(r.right()); int y2(r.bottom()); - p.setPen(widget()->colorGroup().light()); + p.setPen(widget()->tqcolorGroup().light()); p.drawLine(x1, y1, x2, y1); p.drawLine(x1, y1 + 1, x1, y1 + openLookMargin-1); @@ -522,7 +522,7 @@ OpenLook::paintTopRightRect(TQPainter & p) const p.fillRect(x1 + 1, y1 + 1, r.width()-2, openLookMargin-2, handleColour); p.fillRect(x2 - openLookMargin + 2, y1 + 1, openLookMargin-2, r.height()-2, handleColour); - p.setPen(widget()->colorGroup().dark()); + p.setPen(widget()->tqcolorGroup().dark()); p.drawLine(x1 + 1, y1 + openLookMargin-1, x2 - openLookMargin+1, y1 + openLookMargin-1); p.drawLine(x2, y1 + 1, x2, y2); @@ -541,7 +541,7 @@ OpenLook::paintBottomLeftRect(TQPainter & p) const int x2(r.right()); int y2(r.bottom()); - p.setPen(widget()->colorGroup().light()); + p.setPen(widget()->tqcolorGroup().light()); p.drawLine(x1, y1, x1 + openLookMargin-1, y1); p.drawLine(x1, y1 + 1, x1, y2); @@ -550,7 +550,7 @@ OpenLook::paintBottomLeftRect(TQPainter & p) const p.fillRect(x1 + 1, y2 - openLookMargin + 2, r.width()-2, openLookMargin-2, handleColour); p.fillRect(x1 + 1, y1 + 1, openLookMargin-2, r.height()-2, handleColour); - p.setPen(widget()->colorGroup().dark()); + p.setPen(widget()->tqcolorGroup().dark()); p.drawLine(x1 + openLookMargin-1, y1 + 1, x1 + openLookMargin-1, y2 - openLookMargin); p.drawLine(x1 + 1, y2, x2, y2); @@ -569,7 +569,7 @@ OpenLook::paintBottomRightRect(TQPainter & p) const int x2(r.right()); int y2(r.bottom()); - p.setPen(widget()->colorGroup().light()); + p.setPen(widget()->tqcolorGroup().light()); p.drawLine(x1, y2 - openLookMargin+1, x1, y2); p.drawLine(x1 + 1, y2 - openLookMargin+1, x2 - openLookMargin+1, y2 - openLookMargin+1); @@ -579,16 +579,16 @@ OpenLook::paintBottomRightRect(TQPainter & p) const p.fillRect(x1 + 1, y2 - openLookMargin + 2, r.width()-2, openLookMargin-2, handleColour); p.fillRect(x2 - openLookMargin + 2, y1 + 1, openLookMargin-2, r.height()-2, handleColour); - p.setPen(widget()->colorGroup().dark()); + p.setPen(widget()->tqcolorGroup().dark()); p.drawLine(x1 + 1, y2, x2, y2); p.drawLine(x2, y1 + 1, x2, y2 - 1); } - QRect + TQRect OpenLook::buttonRect() const { - return QRect + return TQRect ( openLookCornerSize + 3, titleRect().top(), @@ -609,16 +609,16 @@ OpenLook::paintButton(TQPainter & p) const r.width() - 2, r.height() - 2, buttonDown_ - ? widget()->colorGroup().dark() + ? widget()->tqcolorGroup().dark() : options()->color(KDecoration::ColorButtonBg, isActive()) ); - p.setPen(buttonDown_ ? widget()->colorGroup().dark() : widget()->colorGroup().light()); + p.setPen(buttonDown_ ? widget()->tqcolorGroup().dark() : widget()->tqcolorGroup().light()); p.drawLine(r.left() + 1, r.top(), r.right() - 1, r.top()); p.drawLine(r.left(), r.top() + 1, r.left(), r.bottom() - 1); - p.setPen(buttonDown_ ? widget()->colorGroup().light() : widget()->colorGroup().dark()); + p.setPen(buttonDown_ ? widget()->tqcolorGroup().light() : widget()->tqcolorGroup().dark()); p.drawLine(r.right(), r.top() + 1, r.right(), r.bottom() - 1); p.drawLine(r.left() + 1, r.bottom(), r.right() - 1, r.bottom()); @@ -638,7 +638,7 @@ OpenLook::paintArrow(TQPainter & p) const TQPointArray poly(3); - p.setBrush(widget()->colorGroup().mid()); + p.setBrush(widget()->tqcolorGroup().mid()); poly.setPoint(0, x, y); poly.setPoint(1, x + w - 1, y); @@ -646,13 +646,13 @@ OpenLook::paintArrow(TQPainter & p) const p.drawPolygon(poly); - p.setPen(widget()->colorGroup().dark()); + p.setPen(widget()->tqcolorGroup().dark()); p.drawLine(x, y, x + w - 1, y); p.drawLine(x, y, x + (w / 2), y + h - 1); - p.setPen(widget()->colorGroup().light()); + p.setPen(widget()->tqcolorGroup().light()); p.drawLine(x + (w / 2), y + h - 1, x + w - 1, y); } @@ -669,10 +669,10 @@ OpenLook::paintBorder(TQPainter & p) const uint r = widget()->rect().right(); uint b = widget()->rect().bottom(); - p.fillRect(x + cs, y, w - cs - cs, 2, widget()->colorGroup().shadow()); - p.fillRect(x + cs, b - 1, w - cs - cs, 2, widget()->colorGroup().shadow()); - p.fillRect(x, y + cs, 2, h - cs - cs, widget()->colorGroup().shadow()); - p.fillRect(r - 1, y + cs, 2, h - cs - cs, widget()->colorGroup().shadow()); + p.fillRect(x + cs, y, w - cs - cs, 2, widget()->tqcolorGroup().shadow()); + p.fillRect(x + cs, b - 1, w - cs - cs, 2, widget()->tqcolorGroup().shadow()); + p.fillRect(x, y + cs, 2, h - cs - cs, widget()->tqcolorGroup().shadow()); + p.fillRect(r - 1, y + cs, 2, h - cs - cs, widget()->tqcolorGroup().shadow()); TQColor frameColour(options()->color(KDecoration::ColorFrame, isActive())); @@ -687,14 +687,14 @@ OpenLook::paintBorder(TQPainter & p) const titleRect().bottom() + 1, width() - 2 * openLookMargin, 2, - widget()->colorGroup().background() + widget()->tqcolorGroup().background() ); } - QRect + TQRect OpenLook::titleRect() const { - return titleSpacer_->geometry(); + return titleSpacer_->tqgeometry(); } bool @@ -704,7 +704,7 @@ OpenLook::isButtonPress(TQMouseEvent * e) buttonDown_ = buttonRect().contains(mousePressPoint_); - widget()->repaint(buttonRect()); + widget()->tqrepaint(buttonRect()); return buttonDown_; } @@ -717,7 +717,7 @@ OpenLook::isButtonRelease(TQMouseEvent * e) return true; } buttonDown_ = false; - widget()->repaint(buttonRect()); + widget()->tqrepaint(buttonRect()); return false; } diff --git a/kwin-styles/openlook/OpenLook.h b/kwin-styles/openlook/OpenLook.h index 94dacebd..882c2d36 100644 --- a/kwin-styles/openlook/OpenLook.h +++ b/kwin-styles/openlook/OpenLook.h @@ -40,6 +40,7 @@ namespace OpenLook class OpenLook : public KDecoration { Q_OBJECT + TQ_OBJECT public: OpenLook(KDecorationBridge *b, KDecorationFactory *f); @@ -59,7 +60,7 @@ namespace OpenLook void iconChange(); void maximizeChange(); void borders(int &left, int &right, int &top, int &bottom) const; - TQSize minimumSize() const; + TQSize tqminimumSize() const; void resize( const TQSize& ); virtual void mouseDoubleClickEvent(TQMouseEvent *); virtual void wheelEvent(TQWheelEvent *e); diff --git a/kwin-styles/riscos/AboveButton.h b/kwin-styles/riscos/AboveButton.h index 9ea0e005..86fbb0a7 100644 --- a/kwin-styles/riscos/AboveButton.h +++ b/kwin-styles/riscos/AboveButton.h @@ -31,6 +31,7 @@ namespace RiscOS class AboveButton : public Button { Q_OBJECT + TQ_OBJECT public: diff --git a/kwin-styles/riscos/Button.cpp b/kwin-styles/riscos/Button.cpp index d126ced1..7bf4f477 100644 --- a/kwin-styles/riscos/Button.cpp +++ b/kwin-styles/riscos/Button.cpp @@ -31,13 +31,13 @@ Button::Button(TQWidget *parent, const TQString& tip, const ButtonState realizeButtons) : TQWidget(parent, "Button", 0), realizeButtons_(realizeButtons), - lastButton_(NoButton), + lastButton_(Qt::NoButton), alignment_(Left), down_ (false), active_ (false) { TQToolTip::add(this, tip); - setBackgroundColor(Qt::black); + setBackgroundColor(TQt::black); setFixedSize(Static::instance()->titleHeight() - 1, Static::instance()->titleHeight()); @@ -48,19 +48,19 @@ Button::~Button() // Empty. } -void Button::setAlignment(Alignment a) +void Button::tqsetAlignment(Alignment a) { alignment_ = a; - repaint(); + tqrepaint(); } void Button::setActive(bool b) { active_ = b; - repaint(); + tqrepaint(); } -Button::Alignment Button::alignment() const +Button::Alignment Button::tqalignment() const { return alignment_; } @@ -69,10 +69,10 @@ void Button::mousePressEvent(TQMouseEvent *e) { down_ = true; lastButton_ = e->button(); - repaint(); + tqrepaint(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button()&realizeButtons_) ? LeftButton : NoButton, + (e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton, e->state()); TQWidget::mousePressEvent(&me); } @@ -81,9 +81,9 @@ void Button::mouseReleaseEvent(TQMouseEvent *e) { down_ = false; lastButton_ = e->button(); - repaint(); + tqrepaint(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button()&realizeButtons_) ? LeftButton : NoButton, + (e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton, e->state()); TQWidget::mouseReleaseEvent(&me); } @@ -94,9 +94,9 @@ void Button::setPixmap(const TQPixmap &p) aPixmap_ = iPixmap_ = p; else { - QRgb light; - QRgb* data = NULL; - QRgb w = qRgb(255, 255, 255); + TQRgb light; + TQRgb* data = NULL; + TQRgb w = tqRgb(255, 255, 255); TQImage aTx(p.convertToImage()); TQImage iTx(aTx.copy()); @@ -104,10 +104,10 @@ void Button::setPixmap(const TQPixmap &p) const KDecorationOptions* options = KDecoration::options(); light = options->color(KDecoration::ColorButtonBg, true).light(150).rgb(); - if (light == qRgb(0, 0, 0)) - light = qRgb(228, 228, 228); + if (light == tqRgb(0, 0, 0)) + light = tqRgb(228, 228, 228); - data = (QRgb *)aTx.bits(); + data = (TQRgb *)aTx.bits(); for (int x = 0; x < 144; x++) if (data[x] == w) @@ -115,10 +115,10 @@ void Button::setPixmap(const TQPixmap &p) light = options->color(KDecoration::ColorButtonBg, false).light(150).rgb(); - if (light == qRgb(0, 0, 0)) - light = qRgb(228, 228, 228); + if (light == tqRgb(0, 0, 0)) + light = tqRgb(228, 228, 228); - data = (QRgb *)iTx.bits(); + data = (TQRgb *)iTx.bits(); for (int x = 0; x < 144; x++) if (data[x] == w) @@ -133,7 +133,7 @@ void Button::setPixmap(const TQPixmap &p) iPixmap_.setMask(*p.mask()); } } - repaint(); + tqrepaint(); } void Button::paintEvent(TQPaintEvent *) diff --git a/kwin-styles/riscos/Button.h b/kwin-styles/riscos/Button.h index fc29e205..0c7c66c5 100644 --- a/kwin-styles/riscos/Button.h +++ b/kwin-styles/riscos/Button.h @@ -31,9 +31,10 @@ namespace RiscOS { -class Button : public QWidget +class Button : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -42,12 +43,12 @@ class Button : public QWidget enum Alignment { Left, Right }; Button(TQWidget *parent, const TQString &tip, - const ButtonState realizeButton = LeftButton); + const ButtonState realizeButton = Qt::LeftButton); virtual ~Button(); - void setAlignment(Alignment); + void tqsetAlignment(Alignment); - Alignment alignment() const; + Alignment tqalignment() const; protected slots: diff --git a/kwin-styles/riscos/CloseButton.h b/kwin-styles/riscos/CloseButton.h index b9173c14..615ea2ed 100644 --- a/kwin-styles/riscos/CloseButton.h +++ b/kwin-styles/riscos/CloseButton.h @@ -31,6 +31,7 @@ namespace RiscOS class CloseButton : public Button { Q_OBJECT + TQ_OBJECT public: diff --git a/kwin-styles/riscos/HelpButton.h b/kwin-styles/riscos/HelpButton.h index f825a05b..d57b91ce 100644 --- a/kwin-styles/riscos/HelpButton.h +++ b/kwin-styles/riscos/HelpButton.h @@ -31,6 +31,7 @@ namespace RiscOS class HelpButton : public Button { Q_OBJECT + TQ_OBJECT public: diff --git a/kwin-styles/riscos/IconifyButton.h b/kwin-styles/riscos/IconifyButton.h index 8f757cb4..54e44aba 100644 --- a/kwin-styles/riscos/IconifyButton.h +++ b/kwin-styles/riscos/IconifyButton.h @@ -31,6 +31,7 @@ namespace RiscOS class IconifyButton : public Button { Q_OBJECT + TQ_OBJECT public: diff --git a/kwin-styles/riscos/LowerButton.h b/kwin-styles/riscos/LowerButton.h index f3fc4df1..8616d688 100644 --- a/kwin-styles/riscos/LowerButton.h +++ b/kwin-styles/riscos/LowerButton.h @@ -31,6 +31,7 @@ namespace RiscOS class LowerButton : public Button { Q_OBJECT + TQ_OBJECT public: diff --git a/kwin-styles/riscos/Makefile.am b/kwin-styles/riscos/Makefile.am index 2a7d9764..3f81820d 100644 --- a/kwin-styles/riscos/Makefile.am +++ b/kwin-styles/riscos/Makefile.am @@ -31,7 +31,7 @@ kwin3_riscos_la_SOURCES = AboveButton.cpp \ Static.cpp \ StickyButton.cpp -kwin3_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin3_riscos_la_LIBADD = $(LIB_KDEUI) -lkdecorations kwin3_riscos_la_METASOURCES = AUTO diff --git a/kwin-styles/riscos/Manager.cpp b/kwin-styles/riscos/Manager.cpp index c4b77f0a..837bec9c 100644 --- a/kwin-styles/riscos/Manager.cpp +++ b/kwin-styles/riscos/Manager.cpp @@ -82,23 +82,23 @@ void Manager::init() bool Manager::eventFilter(TQObject *o, TQEvent *e) { - if (o != widget()) return false; + if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch (e->type()) { case TQEvent::Resize: - resizeEvent(static_cast<TQResizeEvent*>(e)); + resizeEvent(TQT_TQRESIZEEVENT(e)); return true; case TQEvent::Paint: - paintEvent(static_cast<TQPaintEvent*>(e)); + paintEvent(TQT_TQPAINTEVENT(e)); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast<TQMouseEvent*>(e)); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(static_cast<TQMouseEvent*>(e)); + processMousePressEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; case TQEvent::MouseButtonRelease: return false; @@ -134,22 +134,22 @@ void Manager::resize(const TQSize &s) widget()->resize(s); } -TQSize Manager::minimumSize() const +TQSize Manager::tqminimumSize() const { - return widget()->minimumSize(); + return widget()->tqminimumSize(); } void Manager::activeChange() { updateTitleBuffer(); - widget()->repaint(); + widget()->tqrepaint(); emit(activeChanged(isActive())); } void Manager::captionChange() { updateTitleBuffer(); - widget()->repaint(); + widget()->tqrepaint(); } void Manager::iconChange() @@ -182,7 +182,7 @@ void Manager::paintEvent(TQPaintEvent *e) if (intersectsLeft || intersectsRight) { - p.setPen(Qt::black); + p.setPen(TQt::black); if (intersectsLeft) p.drawLine(0, r.top(), 0, r.bottom()); @@ -197,7 +197,7 @@ void Manager::paintEvent(TQPaintEvent *e) // Title bar. - TQRect tr = titleSpacer_->geometry(); + TQRect tr = titleSpacer_->tqgeometry(); bitBlt(widget(), tr.topLeft(), &titleBuf_); // Resize bar. @@ -224,7 +224,7 @@ void Manager::resizeEvent(TQResizeEvent*) { updateButtonVisibility(); updateTitleBuffer(); - widget()->repaint(); + widget()->tqrepaint(); } void Manager::updateButtonVisibility() @@ -282,7 +282,7 @@ void Manager::updateButtonVisibility() break; } - layout()->activate(); + tqlayout()->activate(); #endif } @@ -292,7 +292,7 @@ void Manager::updateTitleBuffer() Static * s = Static::instance(); - TQRect tr = titleSpacer_->geometry(); + TQRect tr = titleSpacer_->tqgeometry(); if (tr.width() == 0 || tr.height() == 0) titleBuf_.resize(8, 8); @@ -352,13 +352,13 @@ KDecoration::Position Manager::mousePosition(const TQPoint& p) const void Manager::mouseDoubleClickEvent(TQMouseEvent *e) { - if (e->button() == LeftButton && titleSpacer_->geometry().contains(e->pos())) + if (e->button() == Qt::LeftButton && titleSpacer_->tqgeometry().contains(e->pos())) titlebarDblClickOperation(); } void Manager::wheelEvent(TQWheelEvent *e) { - if (isSetShade() || titleLayout_->geometry().contains(e->pos()) ) + if (isSetShade() || titleLayout_->tqgeometry().contains(e->pos()) ) titlebarMouseWheelOperation( e->delta()); } @@ -428,7 +428,7 @@ bool Manager::animateMinimize(bool iconify) // Go away quick. helperShowHide(false); - qApp->syncX(); + tqApp->syncX(); TQRect r = iconGeometry(); @@ -463,7 +463,7 @@ bool Manager::animateMinimize(bool iconify) double delta = finalAngle / steps; TQPainter p(workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); for (double angle = 0; ; angle += delta) { @@ -517,7 +517,7 @@ bool Manager::animateMinimize(bool iconify) // Go away quick. helperShowHide(false); - qApp->syncX(); + tqApp->syncX(); int stepCount = 12; @@ -527,7 +527,7 @@ bool Manager::animateMinimize(bool iconify) int dy = r.height() / (stepCount * 2); TQPainter p(workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); for (int step = 0; step < stepCount; step++) { @@ -559,7 +559,7 @@ bool Manager::animateMinimize(bool iconify) TQPainter p(workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); #if 0 if (iconify) p.setClipRegion(TQRegion(workspaceWidget()->rect()) - wingeom); @@ -573,7 +573,7 @@ bool Manager::animateMinimize(bool iconify) p.flush(); - qApp->syncX(); + tqApp->syncX(); usleep(30000); @@ -678,7 +678,7 @@ void Manager::createTitle() for (TQPtrListIterator<Button> it(leftButtonList_); it.current(); ++it) { - it.current()->setAlignment(Button::Left); + it.current()->tqsetAlignment(Button::Left); titleLayout_->addWidget(it.current()); } @@ -689,7 +689,7 @@ void Manager::createTitle() for (TQPtrListIterator<Button> it(rightButtonList_); it.current(); ++it) { - it.current()->setAlignment(Button::Right); + it.current()->tqsetAlignment(Button::Right); titleLayout_->addWidget(it.current()); } } diff --git a/kwin-styles/riscos/Manager.h b/kwin-styles/riscos/Manager.h index be440454..5668a7fc 100644 --- a/kwin-styles/riscos/Manager.h +++ b/kwin-styles/riscos/Manager.h @@ -45,6 +45,7 @@ class Button; class Manager : public KDecoration { Q_OBJECT + TQ_OBJECT public: @@ -55,7 +56,7 @@ class Manager : public KDecoration void reset(unsigned long changed); void borders(int&, int&, int&, int&) const; void resize(const TQSize&); - TQSize minimumSize() const; + TQSize tqminimumSize() const; void activeChange(); void captionChange(); void iconChange(); @@ -107,6 +108,7 @@ class Manager : public KDecoration class Factory : public TQObject, public KDecorationFactory { Q_OBJECT + TQ_OBJECT public: Factory(); diff --git a/kwin-styles/riscos/MaximiseButton.cpp b/kwin-styles/riscos/MaximiseButton.cpp index ebfb6628..dcc1b52a 100644 --- a/kwin-styles/riscos/MaximiseButton.cpp +++ b/kwin-styles/riscos/MaximiseButton.cpp @@ -67,7 +67,7 @@ static const char * const unmaximise_xpm[] = { MaximiseButton::MaximiseButton(TQWidget * parent) : Button(parent, i18n("Maximize"), - (ButtonState)(LeftButton|MidButton|RightButton)), + (ButtonState)(Qt::LeftButton|Qt::MidButton|Qt::RightButton)), on_(false) { setPixmap(TQPixmap((const char **)maximise_xpm)); @@ -78,7 +78,7 @@ void MaximiseButton::setOn(bool on) on_ = on; setPixmap(on_ ? TQPixmap((const char **)unmaximise_xpm) : TQPixmap((const char **)maximise_xpm)); - repaint(); + tqrepaint(); TQToolTip::remove(this); TQToolTip::add(this, on_ ? i18n("Restore") : i18n("Maximize")); } diff --git a/kwin-styles/riscos/MaximiseButton.h b/kwin-styles/riscos/MaximiseButton.h index ff715ba1..770c9370 100644 --- a/kwin-styles/riscos/MaximiseButton.h +++ b/kwin-styles/riscos/MaximiseButton.h @@ -31,6 +31,7 @@ namespace RiscOS class MaximiseButton : public Button { Q_OBJECT + TQ_OBJECT public: diff --git a/kwin-styles/riscos/Palette.h b/kwin-styles/riscos/Palette.h index 260175b9..3fb71ab0 100644 --- a/kwin-styles/riscos/Palette.h +++ b/kwin-styles/riscos/Palette.h @@ -47,19 +47,19 @@ class Palette data_[7] = 0xFF000000; } - QRgb& operator [] (int idx) + TQRgb& operator [] (int idx) { return data_[idx]; } - QRgb operator [] (int idx) const + TQRgb operator [] (int idx) const { return data_[idx]; } private: - TQMemArray<QRgb> data_; + TQMemArray<TQRgb> data_; }; } // End namespace diff --git a/kwin-styles/riscos/Static.cpp b/kwin-styles/riscos/Static.cpp index 5c6e427d..7aac6f5a 100644 --- a/kwin-styles/riscos/Static.cpp +++ b/kwin-styles/riscos/Static.cpp @@ -245,16 +245,16 @@ void Static::updatePixmaps() void Static::_createTexture(TQPixmap &px, int t, bool active) { const TQImage texture(TQPixmap((const char **)texture_xpm).convertToImage()); - const QRgb w(qRgb(255, 255, 255)); - const QRgb b(qRgb(0, 0, 0)); + const TQRgb w(tqRgb(255, 255, 255)); + const TQRgb b(tqRgb(0, 0, 0)); TQColor c(KDecoration::options()->color(KDecoration::ColorType(t), active)); - QRgb mid (c.rgb()); - QRgb light (c.light(110).rgb()); - QRgb dark (c.dark(110).rgb()); + TQRgb mid (c.rgb()); + TQRgb light (c.light(110).rgb()); + TQRgb dark (c.dark(110).rgb()); - QRgb* data(reinterpret_cast<QRgb *>(texture.bits())); + TQRgb* data(reinterpret_cast<TQRgb *>(const_cast<TQImage&>(texture).bits())); for (int x = 0; x < 64*12; x++) if (data[x] == w) @@ -318,24 +318,24 @@ void Static::_resizeAllPixmaps() void Static::_blankAllPixmaps() { - aResize_ .fill(Qt::black); - iResize_ .fill(Qt::black); - aTitleTextLeft_ .fill(Qt::black); - aTitleTextRight_.fill(Qt::black); - iTitleTextLeft_ .fill(Qt::black); - iTitleTextRight_.fill(Qt::black); - aTitleTextMid_ .fill(Qt::black); - iTitleTextMid_ .fill(Qt::black); - aResizeMidLeft_ .fill(Qt::black); - aResizeMidRight_.fill(Qt::black); - iResizeMidLeft_ .fill(Qt::black); - iResizeMidRight_.fill(Qt::black); - aResizeMid_ .fill(Qt::black); - iResizeMid_ .fill(Qt::black); - aButtonUp_ .fill(Qt::black); - iButtonUp_ .fill(Qt::black); - aButtonDown_ .fill(Qt::black); - iButtonDown_ .fill(Qt::black); + aResize_ .fill(TQt::black); + iResize_ .fill(TQt::black); + aTitleTextLeft_ .fill(TQt::black); + aTitleTextRight_.fill(TQt::black); + iTitleTextLeft_ .fill(TQt::black); + iTitleTextRight_.fill(TQt::black); + aTitleTextMid_ .fill(TQt::black); + iTitleTextMid_ .fill(TQt::black); + aResizeMidLeft_ .fill(TQt::black); + aResizeMidRight_.fill(TQt::black); + iResizeMidLeft_ .fill(TQt::black); + iResizeMidRight_.fill(TQt::black); + aResizeMid_ .fill(TQt::black); + iResizeMid_ .fill(TQt::black); + aButtonUp_ .fill(TQt::black); + iButtonUp_ .fill(TQt::black); + aButtonDown_ .fill(TQt::black); + iButtonDown_ .fill(TQt::black); } void Static::_initPalettes() @@ -362,7 +362,7 @@ void Static::_initTextures() void Static::_drawTitleTextAreaSides() { TQPixmap temp(4, titleHeight_); - temp.fill(Qt::black); + temp.fill(TQt::black); transx = transy = 0.0; @@ -372,29 +372,29 @@ void Static::_drawTitleTextAreaSides() _drawBorder(temp, 4, titleHeight_ - 2); painter_.begin(&aTitleTextLeft_); - painter_.drawPixmap(1, 1, temp, 0, 1); + painter_.tqdrawPixmap(1, 1, temp, 0, 1); painter_.end(); painter_.begin(&aTitleTextRight_); - painter_.drawPixmap(0, 1, temp, 2, 1); + painter_.tqdrawPixmap(0, 1, temp, 2, 1); painter_.end(); palette_ = iTitlePal_; _drawBorder(temp, 4, titleHeight_ - 2); painter_.begin(&iTitleTextLeft_); - painter_.drawPixmap(1, 1, temp, 0, 1); + painter_.tqdrawPixmap(1, 1, temp, 0, 1); painter_.end(); painter_.begin(&iTitleTextRight_); - painter_.drawPixmap(0, 1, temp, 2, 1); + painter_.tqdrawPixmap(0, 1, temp, 2, 1); painter_.end(); } void Static::_drawResizeCentralAreaSides() { TQPixmap temp(4, resizeHeight_); - temp.fill(Qt::black); + temp.fill(TQt::black); transy = 1.0; @@ -403,29 +403,29 @@ void Static::_drawResizeCentralAreaSides() _drawBorder(temp, 4, resizeHeight_ - 3); painter_.begin(&aResizeMidLeft_); - painter_.drawPixmap(0, 1, temp, 0, 1); + painter_.tqdrawPixmap(0, 1, temp, 0, 1); painter_.end(); painter_.begin(&aResizeMidRight_); - painter_.drawPixmap(0, 1, temp, 2, 1); + painter_.tqdrawPixmap(0, 1, temp, 2, 1); painter_.end(); palette_ = iResizePal_; _drawBorder(temp, 4, resizeHeight_ - 3); painter_.begin(&iResizeMidLeft_); - painter_.drawPixmap(0, 1, temp, 0, 1); + painter_.tqdrawPixmap(0, 1, temp, 0, 1); painter_.end(); painter_.begin(&iResizeMidRight_); - painter_.drawPixmap(0, 1, temp, 2, 1); + painter_.tqdrawPixmap(0, 1, temp, 2, 1); painter_.end(); } void Static::_drawTitleTextAreaBackground() { TQPixmap temp(70, titleHeight_); - temp.fill(Qt::black); + temp.fill(TQt::black); transx = transy = 0.0; @@ -433,7 +433,7 @@ void Static::_drawTitleTextAreaBackground() _drawBorder(temp, 70, titleHeight_ - 3); painter_.begin(&aTitleTextMid_); - painter_.drawPixmap(0, 1, temp, 2, 0); + painter_.tqdrawPixmap(0, 1, temp, 2, 0); if (hicolour_) painter_.drawTiledPixmap(0, 4, 64, titleHeight_ - 8, aTexture_); painter_.end(); @@ -442,7 +442,7 @@ void Static::_drawTitleTextAreaBackground() _drawBorder(temp, 70, titleHeight_ - 3); painter_.begin(&iTitleTextMid_); - painter_.drawPixmap(0, 1, temp, 2, 0); + painter_.tqdrawPixmap(0, 1, temp, 2, 0); if (hicolour_) painter_.drawTiledPixmap(0, 4, 64, titleHeight_ - 8, iTexture_); painter_.end(); @@ -451,7 +451,7 @@ void Static::_drawTitleTextAreaBackground() void Static::_drawResizeCentralAreaBackground() { TQPixmap temp(70, titleHeight_); - temp.fill(Qt::black); + temp.fill(TQt::black); transy = 1.0; @@ -459,7 +459,7 @@ void Static::_drawResizeCentralAreaBackground() _drawBorder(temp, 70, resizeHeight_ - 3); painter_.begin(&aResizeMid_); - painter_.drawPixmap(0, 0, temp, 2, 0); + painter_.tqdrawPixmap(0, 0, temp, 2, 0); if (hicolour_) painter_.drawTiledPixmap(0, 4, 64, resizeHeight_ - 8, aTexture_); painter_.end(); @@ -468,7 +468,7 @@ void Static::_drawResizeCentralAreaBackground() _drawBorder(temp, 70, 7); painter_.begin(&iResizeMid_); - painter_.drawPixmap(0, 0, temp, 2, 0); + painter_.tqdrawPixmap(0, 0, temp, 2, 0); if (hicolour_) painter_.drawTiledPixmap(0, 4, 64, resizeHeight_ - 8, iTexture_); painter_.end(); diff --git a/kwin-styles/riscos/Static.h b/kwin-styles/riscos/Static.h index e7b49d59..0a5b4cdb 100644 --- a/kwin-styles/riscos/Static.h +++ b/kwin-styles/riscos/Static.h @@ -99,7 +99,7 @@ class Static aButPal_, iButPal_; - QPixmap + TQPixmap aButtonUp_, iButtonUp_, aButtonDown_, iButtonDown_, aResize_, iResize_, diff --git a/kwin-styles/riscos/StickyButton.cpp b/kwin-styles/riscos/StickyButton.cpp index b40db535..2229f915 100644 --- a/kwin-styles/riscos/StickyButton.cpp +++ b/kwin-styles/riscos/StickyButton.cpp @@ -77,7 +77,7 @@ void StickyButton::setOn(bool on) on_ = on; setPixmap(on_ ? TQPixmap((const char **)unsticky_xpm) : TQPixmap((const char **)sticky_xpm)); - repaint(); + tqrepaint(); TQToolTip::remove(this); TQToolTip::add(this, on_ ? i18n("Not on all desktops") : i18n("On all desktops")); diff --git a/kwin-styles/riscos/StickyButton.h b/kwin-styles/riscos/StickyButton.h index 4c500b8b..26c0428e 100644 --- a/kwin-styles/riscos/StickyButton.h +++ b/kwin-styles/riscos/StickyButton.h @@ -31,6 +31,7 @@ namespace RiscOS class StickyButton : public Button { Q_OBJECT + TQ_OBJECT public: diff --git a/kwin-styles/smooth-blend/client/Makefile.am b/kwin-styles/smooth-blend/client/Makefile.am index bd64ee62..d9ace4d7 100644 --- a/kwin-styles/smooth-blend/client/Makefile.am +++ b/kwin-styles/smooth-blend/client/Makefile.am @@ -14,7 +14,7 @@ noinst_HEADERS = smoothblend.h buttons.h kde_module_LTLIBRARIES = kwin3_smoothblend.la kwin3_smoothblend_la_SOURCES = smoothblend.cc kwin3_smoothblend_la_LIBADD = -lkdecorations -kwin3_smoothblend_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkdecore -module +kwin3_smoothblend_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkdecore -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin3_smoothblend_la_METASOURCES = AUTO DISTCLEANFILES = $(kwin3_smoothblend_la_METASOURCES) diff --git a/kwin-styles/smooth-blend/client/buttons.h b/kwin-styles/smooth-blend/client/buttons.h index ac0eaa8e..3d777144 100644 --- a/kwin-styles/smooth-blend/client/buttons.h +++ b/kwin-styles/smooth-blend/client/buttons.h @@ -1704,7 +1704,7 @@ static struct EmbedImage { const unsigned char *data; ulong compressed; int numColors; - const QRgb *colorTable; + const TQRgb *colorTable; bool alpha; const char *name; } embed_image_vec[] = { @@ -1731,13 +1731,13 @@ static TQImage uic_findImage( const TQString& name ) for ( int i=0; embed_image_vec[i].data; i++ ) { if ( TQString::fromUtf8(embed_image_vec[i].name) == name ) { TQByteArray baunzip; - baunzip = qUncompress( embed_image_vec[i].data, + baunzip = tqUncompress( embed_image_vec[i].data, embed_image_vec[i].compressed ); TQImage img((uchar*)baunzip.data(), embed_image_vec[i].width, embed_image_vec[i].height, embed_image_vec[i].depth, - (QRgb*)embed_image_vec[i].colorTable, + (TQRgb*)embed_image_vec[i].colorTable, embed_image_vec[i].numColors, TQImage::BigEndian ); @@ -1750,7 +1750,7 @@ static TQImage uic_findImage( const TQString& name ) return TQImage(); } -class MimeSourceFactory_smoothblend : public QMimeSourceFactory +class MimeSourceFactory_smoothblend : public TQMimeSourceFactory { public: MimeSourceFactory_smoothblend() {} diff --git a/kwin-styles/smooth-blend/client/config/Makefile.am b/kwin-styles/smooth-blend/client/config/Makefile.am index 618dbca1..f50eb0fa 100644 --- a/kwin-styles/smooth-blend/client/config/Makefile.am +++ b/kwin-styles/smooth-blend/client/config/Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = smoothblendconfig.h kde_module_LTLIBRARIES = kwin_smoothblend_config.la kwin_smoothblend_config_la_SOURCES = configdialog.ui smoothblendconfig.cc -kwin_smoothblend_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin_smoothblend_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin_smoothblend_config_la_LIBADD = $(LIB_KDEUI) kwin_smoothblend_config_la_METASOURCES = AUTO diff --git a/kwin-styles/smooth-blend/client/config/configdialog.ui b/kwin-styles/smooth-blend/client/config/configdialog.ui index f84973dc..09af45f6 100644 --- a/kwin-styles/smooth-blend/client/config/configdialog.ui +++ b/kwin-styles/smooth-blend/client/config/configdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConfigDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConfigDialog</cstring> </property> @@ -30,7 +30,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>buttongroup</cstring> </property> @@ -41,7 +41,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox" row="0" column="2" rowspan="1" colspan="2"> + <widget class="TQSpinBox" row="0" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonsize</cstring> </property> @@ -72,7 +72,7 @@ <number>16</number> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>animatebuttons</cstring> </property> @@ -92,7 +92,7 @@ <string>Check this option if you want to use button animations when hovering with the mouse.</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -100,7 +100,7 @@ <string>Button size:</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>menuClose</cstring> </property> @@ -124,14 +124,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> </size> </property> </spacer> - <widget class="QComboBox" row="2" column="3"> + <widget class="TQComboBox" row="2" column="3"> <item> <property name="text"> <string>Intensify</string> @@ -154,7 +154,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>180</width> <height>140</height> @@ -181,7 +181,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>titlegroup</cstring> </property> @@ -192,15 +192,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> <property name="text"> - <string>Text alignment:</string> + <string>Text tqalignment:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -208,7 +208,7 @@ <string>Frame width:</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="1" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -216,7 +216,7 @@ <string>Title height:</string> </property> </widget> - <widget class="QSpinBox" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQSpinBox" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>titlesize</cstring> </property> @@ -230,7 +230,7 @@ <number>16</number> </property> </widget> - <widget class="QSpinBox" row="3" column="1" rowspan="1" colspan="2"> + <widget class="TQSpinBox" row="3" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>framesize</cstring> </property> @@ -250,7 +250,7 @@ <number>4</number> </property> </widget> - <widget class="QButtonGroup" row="0" column="1" rowspan="2" colspan="2"> + <widget class="TQButtonGroup" row="0" column="1" rowspan="2" colspan="2"> <property name="name"> <cstring>titlealign</cstring> </property> @@ -274,14 +274,14 @@ <property name="title"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> <string></string> </property> <property name="whatsThis" stdset="0"> - <string>Use these buttons to set the alignment of the window title</string> + <string>Use these buttons to set the tqalignment of the window title</string> </property> <hbox> <property name="name"> @@ -290,15 +290,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>AlignLeft</cstring> </property> @@ -309,7 +309,7 @@ <string></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>AlignHCenter</cstring> </property> @@ -323,7 +323,7 @@ <string></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>AlignRight</cstring> </property> @@ -348,14 +348,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>231</width> <height>71</height> </size> </property> </spacer> - <widget class="QCheckBox" row="4" column="2" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>roundCorners</cstring> </property> @@ -369,7 +369,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>titleshadow</cstring> </property> diff --git a/kwin-styles/smooth-blend/client/config/smoothblendconfig.h b/kwin-styles/smooth-blend/client/config/smoothblendconfig.h index de861779..4f2add87 100644 --- a/kwin-styles/smooth-blend/client/config/smoothblendconfig.h +++ b/kwin-styles/smooth-blend/client/config/smoothblendconfig.h @@ -32,6 +32,7 @@ class ConfigDialog; class smoothblendConfig : public TQObject { Q_OBJECT + TQ_OBJECT public: smoothblendConfig(KConfig* config, TQWidget* parent); ~smoothblendConfig(); diff --git a/kwin-styles/smooth-blend/client/smoothblend.cc b/kwin-styles/smooth-blend/client/smoothblend.cc index 9146c6eb..6e416dce 100644 --- a/kwin-styles/smooth-blend/client/smoothblend.cc +++ b/kwin-styles/smooth-blend/client/smoothblend.cc @@ -36,7 +36,7 @@ using namespace smoothblend; smoothblendFactory* factory=NULL; bool smoothblendFactory::initialized_ = false; -Qt::AlignmentFlags smoothblendFactory::titlealign_ = Qt::AlignHCenter; +TQt::AlignmentFlags smoothblendFactory::titlealign_ = TQt::AlignHCenter; bool smoothblendFactory::cornerflags_ = true; int smoothblendFactory::titlesize_ = 30; int smoothblendFactory::buttonsize_ = 26; @@ -51,7 +51,7 @@ bool smoothblendFactory::menuClose = false; static const int TOPMARGIN = 4; // do not change static const int DECOHEIGHT = 4; // do not change static const int SIDETITLEMARGIN = 2; -// Default button layout +// Default button tqlayout const char default_left[] = "M"; const char default_right[] = "HIAX"; @@ -94,7 +94,7 @@ KDecoration* smoothblendFactory::createDecoration(KDecorationBridge* b) { // reset() // ------- // Reset the handler. Returns true if decorations need to be remade, false if -// only a repaint is necessary +// only a tqrepaint is necessary bool smoothblendFactory::reset(unsigned long changed) { // read in the configuration @@ -124,11 +124,11 @@ bool smoothblendFactory::readConfig() { // grab settings TQString value = config.readEntry("TitleAlignment", "AlignHCenter"); if (value == "AlignLeft") - titlealign_ = Qt::AlignLeft; + titlealign_ = TQt::AlignLeft; else if (value == "AlignHCenter") - titlealign_ = Qt::AlignHCenter; + titlealign_ = TQt::AlignHCenter; else if (value == "AlignRight") - titlealign_ = Qt::AlignRight; + titlealign_ = TQt::AlignRight; cornerflags_ = config.readBoolEntry("RoundCorners", true); titlesize_ = config.readNumEntry("TitleSize",30); @@ -161,7 +161,7 @@ smoothblendButton::smoothblendButton(smoothblendClient *parent, const char *name type_(type), size_(button_size), deco_(0), - lastmouse_(NoButton), + lastmouse_(Qt::NoButton), hover_(false) { setBackgroundMode(NoBackground); @@ -184,11 +184,11 @@ smoothblendButton::~smoothblendButton() { } ////////////////////////////////////////////////////////////////////////////// -// sizeHint() +// tqsizeHint() // ---------- // Return size hint -TQSize smoothblendButton::sizeHint() const { +TQSize smoothblendButton::tqsizeHint() const { return TQSize(::factory->buttonSize(), ::factory->buttonSize()); } @@ -232,7 +232,7 @@ void smoothblendButton::animate() { animTmr->start(TIMERINTERVAL, true); // single-shot } } - repaint(false); + tqrepaint(false); } ////////////////////////////////////////////////////////////////////////////// // enterEvent() @@ -275,9 +275,9 @@ void smoothblendButton::mousePressEvent(TQMouseEvent* e) { lastmouse_ = e->button(); // translate and pass on mouse event - int button = LeftButton; - if ((type_ != ButtonMax) && (e->button() != LeftButton)) { - button = NoButton; // middle & right buttons inappropriate + int button = Qt::LeftButton; + if ((type_ != ButtonMax) && (e->button() != Qt::LeftButton)) { + button = Qt::NoButton; // middle & right buttons inappropriate } TQMouseEvent me(e->type(), e->pos(), e->globalPos(), button, e->state()); @@ -293,9 +293,9 @@ void smoothblendButton::mouseReleaseEvent(TQMouseEvent* e) { lastmouse_ = e->button(); // translate and pass on mouse event - int button = LeftButton; - if ((type_ != ButtonMax) && (e->button() != LeftButton)) { - button = NoButton; // middle & right buttons inappropriate + int button = Qt::LeftButton; + if ((type_ != ButtonMax) && (e->button() != Qt::LeftButton)) { + button = Qt::NoButton; // middle & right buttons inappropriate } TQMouseEvent me(e->type(), e->pos(), e->globalPos(), button, e->state()); TQButton::mouseReleaseEvent(&me); @@ -407,7 +407,7 @@ void smoothblendButton::drawButton( TQPainter *painter ) { TQColor redColor(red); bool active = client_->isActive(); TQPixmap backgroundTile = client_->getTitleBarTile(active); - group = KDecoration::options()->colorGroup(KDecoration::ColorTitleBar, active); + group = KDecoration::options()->tqcolorGroup(KDecoration::ColorTitleBar, active); //draw the titlebar behind the buttons and app icons if ((client_->maximizeMode()==client_->MaximizeFull) && !KDecoration::options()->moveResizeMaximizedWindows()) @@ -434,7 +434,7 @@ void smoothblendButton::drawButton( TQPainter *painter ) { //that may produce pixilation of the image painter->drawImage( dx, dy, menuButtonImage.smoothScale(newWidth, newHeight) ); } else { - //highlight on a mouse over repaint + //highlight on a mouse over tqrepaint double factor = animProgress * 0.13; if(!isDown()) @@ -508,8 +508,8 @@ void smoothblendClient::create_pixmaps() { TQColorGroup group,widgetGroup; int FRAMESIZE = ::factory->frameSize(); // Get the color groups we need for the gradients - group = options()->colorGroup(KDecoration::ColorTitleBar, true); - widgetGroup = widget()->colorGroup(); + group = options()->tqcolorGroup(KDecoration::ColorTitleBar, true); + widgetGroup = widget()->tqcolorGroup(); // active top title bar tile tempPixmap.resize(1, TOPMARGIN); @@ -525,7 +525,7 @@ void smoothblendClient::create_pixmaps() { painter.end(); // inactive top title bar tile - group = options()->colorGroup(KDecoration::ColorTitleBar, false); + group = options()->tqcolorGroup(KDecoration::ColorTitleBar, false); tempPixmap = KPixmapEffect::unbalancedGradient(tempPixmap, group.background(), widgetGroup.background(), @@ -539,7 +539,7 @@ void smoothblendClient::create_pixmaps() { // active title bar tile tempPixmap.resize(1, s_titleHeight+FRAMESIZE); - group = options()->colorGroup(KDecoration::ColorTitleBar, true); + group = options()->tqcolorGroup(KDecoration::ColorTitleBar, true); tempPixmap = KPixmapEffect::unbalancedGradient(tempPixmap, group.background(), widgetGroup.background(), @@ -552,7 +552,7 @@ void smoothblendClient::create_pixmaps() { painter.end(); // inactive title bar tile - group = options()->colorGroup(KDecoration::ColorTitleBar, false); + group = options()->tqcolorGroup(KDecoration::ColorTitleBar, false); tempPixmap = KPixmapEffect::unbalancedGradient(tempPixmap, group.background(), widgetGroup.background(), @@ -600,7 +600,7 @@ void smoothblendClient::init() { } void smoothblendClient::_resetLayout() { - // basic layout: + // basic tqlayout: // _______________________________________________________________ // | topSpacer | // |_______________________________________________________________| @@ -697,9 +697,9 @@ void smoothblendClient::_resetLayout() ////////////////////////////////////////////////////////////////////////////// // addButtons() // ------------ -// Add buttons to title layout +// Add buttons to title tqlayout -void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int button_size) { +void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int button_size) { TQString tip; if (s.length() > 0) { for (unsigned n=0; n < s.length(); n++) { @@ -710,8 +710,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b new smoothblendButton(this, "splat.png", i18n("Menu"),ButtonMenu,button_size); connect(button[ButtonMenu], TQT_SIGNAL(pressed()), this, TQT_SLOT(menuButtonPressed())); connect(button[ButtonMenu], TQT_SIGNAL(released()), this, TQT_SLOT(menuButtonReleased())); - layout->addWidget(button[ButtonMenu]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonMenu]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -726,8 +726,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b new smoothblendButton(this, "circle.png", tip, ButtonSticky, button_size, true); connect(button[ButtonSticky], TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleOnAllDesktops())); - layout->addWidget(button[ButtonSticky]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonSticky]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -737,8 +737,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b new smoothblendButton(this, "help.png", i18n("Help"), ButtonHelp, button_size); connect(button[ButtonHelp], TQT_SIGNAL(clicked()), this, TQT_SLOT(showContextHelp())); - layout->addWidget(button[ButtonHelp]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonHelp]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -748,8 +748,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b new smoothblendButton(this, "minimize.png", i18n("Minimize"), ButtonMin, button_size); connect(button[ButtonMin], TQT_SIGNAL(clicked()), this, TQT_SLOT(minimize())); - layout->addWidget(button[ButtonMin]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonMin]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -764,8 +764,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b new smoothblendButton(this, "maximize.png", tip, ButtonMax, button_size, true); connect(button[ButtonMax], TQT_SIGNAL(clicked()), this, TQT_SLOT(maxButtonPressed())); - layout->addWidget(button[ButtonMax]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonMax]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -775,8 +775,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b new smoothblendButton(this, "close.png", i18n("Close"), ButtonClose, button_size); connect(button[ButtonClose], TQT_SIGNAL(clicked()), this, TQT_SLOT(closeWindow())); - layout->addWidget(button[ButtonClose]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonClose]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -787,8 +787,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b i18n("Keep Above Others"), ButtonAbove, button_size, true); connect(button[ButtonAbove], TQT_SIGNAL(clicked()), this, TQT_SLOT(aboveButtonPressed())); - layout->addWidget(button[ButtonAbove]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonAbove]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -799,8 +799,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b i18n("Keep Below Others"), ButtonBelow, button_size, true); connect(button[ButtonBelow], TQT_SIGNAL(clicked()), this, TQT_SLOT(belowButtonPressed())); - layout->addWidget(button[ButtonBelow]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonBelow]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -815,13 +815,13 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b new smoothblendButton(this, "shade.png", tip, ButtonShade, button_size, true); connect(button[ButtonShade], TQT_SIGNAL(clicked()), this, TQT_SLOT(shadeButtonPressed())); - layout->addWidget(button[ButtonShade]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonShade]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; case '_': // Spacer item - layout->addSpacing(::factory->frameSize()); + tqlayout->addSpacing(::factory->frameSize()); } } } @@ -836,7 +836,7 @@ void smoothblendClient::activeChange() { for (int n=0; n<ButtonTypeCount; n++) if (button[n]) button[n]->reset(); - widget()->repaint(false); + widget()->tqrepaint(false); } ////////////////////////////////////////////////////////////////////////////// @@ -845,7 +845,7 @@ void smoothblendClient::activeChange() { // The title has changed void smoothblendClient::captionChange() { - widget()->repaint(titlebar_->geometry(), false); + widget()->tqrepaint(titlebar_->tqgeometry(), false); } ////////////////////////////////////////////////////////////////////////////// @@ -858,7 +858,7 @@ void smoothblendClient::desktopChange() { if (button[ButtonSticky]) { TQToolTip::remove(button[ButtonSticky]); TQToolTip::add(button[ButtonSticky], d ? i18n("Un-Sticky") : i18n("Sticky")); - button[ButtonSticky]->repaint(false); + button[ButtonSticky]->tqrepaint(false); } } @@ -869,7 +869,7 @@ void smoothblendClient::desktopChange() { void smoothblendClient::iconChange() { if (button[ButtonMenu]) { - button[ButtonMenu]->repaint(false); + button[ButtonMenu]->tqrepaint(false); } } @@ -883,7 +883,7 @@ void smoothblendClient::maximizeChange() { if (button[ButtonMax]) { TQToolTip::remove(button[ButtonMax]); TQToolTip::add(button[ButtonMax], m ? i18n("Restore") : i18n("Maximize")); - button[ButtonMax]->repaint(false); + button[ButtonMax]->tqrepaint(false); } } @@ -897,7 +897,7 @@ void smoothblendClient::shadeChange() { if (button[ButtonShade]) { TQToolTip::remove(button[ButtonShade]); TQToolTip::add(button[ButtonShade], s ? i18n("Unshade") : i18n("Shade")); - button[ButtonShade]->repaint(false); + button[ButtonShade]->tqrepaint(false); } } @@ -909,7 +909,7 @@ void smoothblendClient::shadeChange() { void smoothblendClient::keepAboveChange(bool a) { if (button[ButtonAbove]) { button[ButtonAbove]->setOn(a); - button[ButtonAbove]->repaint(false); + button[ButtonAbove]->tqrepaint(false); } } @@ -921,7 +921,7 @@ void smoothblendClient::keepAboveChange(bool a) { void smoothblendClient::keepBelowChange(bool b) { if (button[ButtonBelow]) { button[ButtonBelow]->setOn(b); - button[ButtonBelow]->repaint(false); + button[ButtonBelow]->tqrepaint(false); } } @@ -937,7 +937,7 @@ void smoothblendClient::borders(int &left, int &right, int &top, int &bottom) co left = right = bottom = 0; top = ::factory->buttonSize(); - // update layout etc. + // update tqlayout etc. topSpacer_->changeSize(1, 0, TQSizePolicy::Expanding, TQSizePolicy::Fixed); decoSpacer_->changeSize(1, 0, TQSizePolicy::Expanding, TQSizePolicy::Fixed); leftSpacer_->changeSize(left, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding); @@ -949,7 +949,7 @@ void smoothblendClient::borders(int &left, int &right, int &top, int &bottom) co left = right = bottom = ::factory->frameSize(); top = ::factory->titleSize() + (FRAMESIZE*2); - // update layout etc. + // update tqlayout etc. topSpacer_->changeSize(1, FRAMESIZE, TQSizePolicy::Expanding, TQSizePolicy::Fixed); decoSpacer_->changeSize(1, FRAMESIZE, TQSizePolicy::Expanding, TQSizePolicy::Fixed); leftSpacer_->changeSize(left, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding); @@ -958,7 +958,7 @@ void smoothblendClient::borders(int &left, int &right, int &top, int &bottom) co rightTitleSpacer_->changeSize(right,s_titleHeight,TQSizePolicy::Fixed, TQSizePolicy::Fixed); bottomSpacer_->changeSize(1, bottom, TQSizePolicy::Expanding, TQSizePolicy::Fixed); } - widget()->layout()->activate(); + widget()->tqlayout()->activate(); } ////////////////////////////////////////////////////////////////////////////// @@ -971,12 +971,12 @@ void smoothblendClient::resize(const TQSize &size) { } ////////////////////////////////////////////////////////////////////////////// -// minimumSize() +// tqminimumSize() // ------------- // Return the minimum allowable size for this window -TQSize smoothblendClient::minimumSize() const { - return widget()->minimumSize(); +TQSize smoothblendClient::tqminimumSize() const { + return widget()->tqminimumSize(); } ////////////////////////////////////////////////////////////////////////////// @@ -1035,32 +1035,32 @@ KDecoration::Position smoothblendClient::mousePosition(const TQPoint &point) con // Event filter bool smoothblendClient::eventFilter(TQObject *obj, TQEvent *e) { - if (obj != widget()) + if (TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(widget())) return false; switch (e->type()) { case TQEvent::MouseButtonDblClick: { - mouseDoubleClickEvent(static_cast<TQMouseEvent *>(e)); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); return true; } case TQEvent::MouseButtonPress: { - processMousePressEvent(static_cast<TQMouseEvent *>(e)); + processMousePressEvent(TQT_TQMOUSEEVENT(e)); return true; } case TQEvent::Paint: { - paintEvent(static_cast<TQPaintEvent *>(e)); + paintEvent(TQT_TQPAINTEVENT(e)); return true; } case TQEvent::Resize: { - resizeEvent(static_cast<TQResizeEvent *>(e)); + resizeEvent(TQT_TQRESIZEEVENT(e)); return true; } case TQEvent::Show: { - showEvent(static_cast<TQShowEvent *>(e)); + showEvent(TQT_TQSHOWEVENT(e)); return true; } case TQEvent::Wheel: { - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent(TQT_TQWHEELEVENT( e )); return true; } default: { @@ -1077,7 +1077,7 @@ bool smoothblendClient::eventFilter(TQObject *obj, TQEvent *e) { // Doubleclick on title void smoothblendClient::mouseDoubleClickEvent(TQMouseEvent *e) { - if (titlebar_->geometry().contains(e->pos())) + if (titlebar_->tqgeometry().contains(e->pos())) titlebarDblClickOperation(); } @@ -1088,7 +1088,7 @@ void smoothblendClient::mouseDoubleClickEvent(TQMouseEvent *e) { void smoothblendClient::wheelEvent(TQWheelEvent *e) { - if (titleLayout_->geometry().contains(e->pos()) ) + if (titleLayout_->tqgeometry().contains(e->pos()) ) titlebarMouseWheelOperation( e->delta()); } @@ -1117,18 +1117,18 @@ void smoothblendClient::paintEvent(TQPaintEvent*) { TQPainter painter(widget()); bool active = isActive(); //get group information first - group = options()->colorGroup(KDecoration::ColorTitleBar, isActive()); - widgetGroup = widget()->colorGroup(); - - TQRect topRect( topSpacer_->geometry() ); - TQRect titleRect( titleLayout_->geometry() ); - TQRect textRect( titlebar_->geometry() ); - TQRect Rltitle( leftTitleSpacer_->geometry() ); - TQRect Rrtitle( rightTitleSpacer_->geometry() ); - TQRect Rdeco( decoSpacer_->geometry() ); - TQRect Rleft( leftSpacer_->geometry() ); - TQRect Rright( rightSpacer_->geometry() ); - TQRect Rbottom( bottomSpacer_->geometry() ); + group = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive()); + widgetGroup = widget()->tqcolorGroup(); + + TQRect topRect( topSpacer_->tqgeometry() ); + TQRect titleRect( titleLayout_->tqgeometry() ); + TQRect textRect( titlebar_->tqgeometry() ); + TQRect Rltitle( leftTitleSpacer_->tqgeometry() ); + TQRect Rrtitle( rightTitleSpacer_->tqgeometry() ); + TQRect Rdeco( decoSpacer_->tqgeometry() ); + TQRect Rleft( leftSpacer_->tqgeometry() ); + TQRect Rright( rightSpacer_->tqgeometry() ); + TQRect Rbottom( bottomSpacer_->tqgeometry() ); TQRect tempRect; @@ -1167,14 +1167,14 @@ void smoothblendClient::paintEvent(TQPaintEvent*) { painter.setFont(options()->font(isActive(), false)); painter.setPen(blackColor); painter.drawText(shadowRect, - ::factory->titleAlign() | AlignVCenter | Qt::SingleLine, + ::factory->titleAlign() | AlignVCenter | TQt::SingleLine, captionText); } // draw title text painter.setFont(options()->font(isActive(), false)); painter.setPen(options()->color(KDecoration::ColorFont, isActive())); painter.drawText(textRect, - ::factory->titleAlign() | AlignVCenter | Qt::SingleLine, + ::factory->titleAlign() | AlignVCenter | TQt::SingleLine, captionText); //left of buttons and title @@ -1183,7 +1183,7 @@ void smoothblendClient::paintEvent(TQPaintEvent*) { Rltitle.width(), Rltitle.height()+Rdeco.height(), active ? *aTitleBarTile:*iTitleBarTile); - // left mid layout + // left mid tqlayout painter.fillRect(Rleft,widgetGroup.background()); // right of buttons and title @@ -1192,7 +1192,7 @@ void smoothblendClient::paintEvent(TQPaintEvent*) { Rrtitle.width(), Rrtitle.height()+Rdeco.height(), active ? *aTitleBarTile:*iTitleBarTile); - // right mid layout + // right mid tqlayout painter.fillRect(Rright,widgetGroup.background()); // bottom @@ -1280,7 +1280,7 @@ void smoothblendClient::updateMask() { void smoothblendClient::resizeEvent(TQResizeEvent *) { if (widget()->isShown()) { TQRegion region = widget()->rect(); - region = region.subtract(titlebar_->geometry()); + region = region.subtract(titlebar_->tqgeometry()); widget()->erase(region); updateMask(); } @@ -1293,7 +1293,7 @@ void smoothblendClient::resizeEvent(TQResizeEvent *) { void smoothblendClient::showEvent(TQShowEvent *) { updateMask(); - widget()->repaint(); + widget()->tqrepaint(); } ////////////////////////////////////////////////////////////////////////////// diff --git a/kwin-styles/smooth-blend/client/smoothblend.h b/kwin-styles/smooth-blend/client/smoothblend.h index a72fe743..4abd32cb 100644 --- a/kwin-styles/smooth-blend/client/smoothblend.h +++ b/kwin-styles/smooth-blend/client/smoothblend.h @@ -65,7 +65,7 @@ public: virtual KDecoration *createDecoration(KDecorationBridge *b); virtual bool reset(unsigned long changed); static bool initialized(); - static Qt::AlignmentFlags titleAlign(); + static TQt::AlignmentFlags titleAlign(); static bool roundedCorners(); static int titleSize(); static int buttonSize(); @@ -82,7 +82,7 @@ private: private: static bool initialized_; - static Qt::AlignmentFlags titlealign_; + static TQt::AlignmentFlags titlealign_; static bool cornerflags_; static int titlesize_; static int buttonsize_; @@ -98,7 +98,7 @@ private: inline bool smoothblendFactory::initialized() { return initialized_; } -inline Qt::AlignmentFlags smoothblendFactory::titleAlign() { +inline TQt::AlignmentFlags smoothblendFactory::titleAlign() { return titlealign_; } inline bool smoothblendFactory::roundedCorners() { @@ -124,6 +124,7 @@ inline bool smoothblendFactory::titleShadow() { class smoothblendButton : public TQButton { Q_OBJECT + TQ_OBJECT public: smoothblendButton(smoothblendClient *parent=0, const char *name=0, const TQString &tip=NULL, @@ -134,7 +135,7 @@ public: ~smoothblendButton(); void setBitmap(const unsigned char *bitmap); - TQSize sizeHint() const; + TQSize tqsizeHint() const; ButtonState lastMousePress() const; void reset(); TQImage getButtonImage(ButtonType type); @@ -166,17 +167,18 @@ private: uint animProgress; }; -inline Qt::ButtonState smoothblendButton::lastMousePress() const { +inline TQt::ButtonState smoothblendButton::lastMousePress() const { return lastmouse_; } inline void smoothblendButton::reset() { - repaint(false); + tqrepaint(false); } // smoothblendClient ////////////////////////////////////////////////////////// class smoothblendClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: smoothblendClient(KDecorationBridge *b, KDecorationFactory *f); virtual ~smoothblendClient(); @@ -193,7 +195,7 @@ public: virtual void borders(int &l, int &r, int &t, int &b) const; virtual void resize(const TQSize &size); - virtual TQSize minimumSize() const; + virtual TQSize tqminimumSize() const; virtual Position mousePosition(const TQPoint &point) const; TQPixmap getTitleBarTile(bool active) const @@ -202,7 +204,7 @@ public: } private: - void addButtons(TQBoxLayout* layout, const TQString& buttons, int buttonSize = 18); + void addButtons(TQBoxLayout* tqlayout, const TQString& buttons, int buttonSize = 18); bool eventFilter(TQObject *obj, TQEvent *e); void mouseDoubleClickEvent(TQMouseEvent *e); void wheelEvent(TQWheelEvent *e); diff --git a/kwin-styles/system/Makefile.am b/kwin-styles/system/Makefile.am index 21a2119a..d94361f6 100644 --- a/kwin-styles/system/Makefile.am +++ b/kwin-styles/system/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin3_system.la kwin3_system_la_SOURCES = systemclient.cpp -kwin3_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx #kwin_system_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) kwin3_system_la_LIBADD = $(LIB_KDEUI) -lkdecorations diff --git a/kwin-styles/system/systemclient.cpp b/kwin-styles/system/systemclient.cpp index caab350a..a676a02a 100644 --- a/kwin-styles/system/systemclient.cpp +++ b/kwin-styles/system/systemclient.cpp @@ -13,7 +13,7 @@ #include <kapplication.h> #include <kdebug.h> -// Default button layout +// Default button tqlayout const char default_left[] = "X"; const char default_right[] = "HSIA"; @@ -78,7 +78,7 @@ static void create_pixmaps() aUpperGradient->resize(32, 18); iUpperGradient = new KPixmap; iUpperGradient->resize(32, 18); - TQColor bgColor = kapp->palette().active().background(); + TQColor bgColor = kapp->tqpalette().active().background(); KPixmapEffect::gradient(*aUpperGradient, KDecoration::options()->color(KDecorationOptions::ColorFrame, true).light(130), bgColor, @@ -117,19 +117,19 @@ static void create_pixmaps() hColor.light(150), hColor.dark(150), KPixmapEffect::DiagonalGradient); - bitBlt(&aPix, 1, 1, &aInternal, 0, 0, 8, 8, Qt::CopyROP, true); - bitBlt(&iPix, 1, 1, &iInternal, 0, 0, 8, 8, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(&aPix), 1, 1, TQT_TQPAINTDEVICE(&aInternal), 0, 0, 8, 8, TQt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(&iPix), 1, 1, TQT_TQPAINTDEVICE(&iInternal), 0, 0, 8, 8, TQt::CopyROP, true); // normal buttons btnPix = new KPixmap; btnPix->resize(14, 14); - bitBlt(btnPix, 2, 2, &aPix, 0, 0, 10, 10, Qt::CopyROP, true); - drawButtonFrame(btnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, true)); + bitBlt(TQT_TQPAINTDEVICE(btnPix), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true); + drawButtonFrame(btnPix, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, true)); iBtnPix = new KPixmap; iBtnPix->resize(14, 14); - bitBlt(iBtnPix, 2, 2, &iPix, 0, 0, 10, 10, Qt::CopyROP, true); - drawButtonFrame(iBtnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, false)); + bitBlt(TQT_TQPAINTDEVICE(iBtnPix), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true); + drawButtonFrame(iBtnPix, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, false)); // pressed buttons @@ -152,25 +152,25 @@ static void create_pixmaps() hColor.light(150), hColor.dark(150), KPixmapEffect::DiagonalGradient); - bitBlt(&aPix, 1, 1, &aInternal, 0, 0, 8, 8, Qt::CopyROP, true); - bitBlt(&iPix, 1, 1, &iInternal, 0, 0, 8, 8, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(&aPix), 1, 1, TQT_TQPAINTDEVICE(&aInternal), 0, 0, 8, 8, TQt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(&iPix), 1, 1, TQT_TQPAINTDEVICE(&iInternal), 0, 0, 8, 8, TQt::CopyROP, true); btnPixDown = new KPixmap; btnPixDown->resize(14, 14); - bitBlt(btnPixDown, 2, 2, &aPix, 0, 0, 10, 10, Qt::CopyROP, true); - drawButtonFrame(btnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, + bitBlt(TQT_TQPAINTDEVICE(btnPixDown), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true); + drawButtonFrame(btnPixDown, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, true)); iBtnPixDown = new KPixmap; iBtnPixDown->resize(14, 14); - bitBlt(iBtnPixDown, 2, 2, &iPix, 0, 0, 10, 10, Qt::CopyROP, true); - drawButtonFrame(iBtnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, + bitBlt(TQT_TQPAINTDEVICE(iBtnPixDown), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true); + drawButtonFrame(iBtnPixDown, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, false)); } - if(qGray(KDecoration::options()->color(KDecorationOptions::ColorButtonBg, true).rgb()) > 128) - btnForeground = new TQColor(Qt::black); + if(tqGray(KDecoration::options()->color(KDecorationOptions::ColorButtonBg, true).rgb()) > 128) + btnForeground = new TQColor(TQt::black); else - btnForeground = new TQColor(Qt::white); + btnForeground = new TQColor(TQt::white); } static void delete_pixmaps() @@ -211,21 +211,21 @@ void SystemButton::setTipText(const TQString &tip) } -TQSize SystemButton::sizeHint() const +TQSize SystemButton::tqsizeHint() const { return(TQSize(14, 14)); } void SystemButton::reset() { - repaint(false); + tqrepaint(false); } void SystemButton::setBitmap(const unsigned char *bitmap) { deco = TQBitmap(8, 8, bitmap, true); deco.setMask(deco); - repaint(); + tqrepaint(); } void SystemButton::drawButton(TQPainter *p) @@ -237,7 +237,7 @@ void SystemButton::drawButton(TQPainter *p) p->drawPixmap(0, 0, isDown() ? *iBtnPixDown : *iBtnPix); } else{ - TQColorGroup g = KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, + TQColorGroup g = KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, client->isActive()); int x2 = width()-1; int y2 = height()-1; @@ -251,7 +251,7 @@ void SystemButton::drawButton(TQPainter *p) p->setPen(g.dark()); p->drawRect(1, 1, width()-2, height()-2); // inner frame - g = KDecoration::options()->colorGroup(KDecorationOptions::ColorButtonBg, client->isActive()); + g = KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorButtonBg, client->isActive()); p->fillRect(3, 3, width()-6, height()-6, g.background()); p->setPen(isDown() ? g.mid() : g.light()); p->drawLine(2, 2, x2-2, 2); @@ -271,14 +271,14 @@ void SystemButton::drawButton(TQPainter *p) void SystemButton::mousePressEvent( TQMouseEvent* e ) { last_button = e->button(); - TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), LeftButton, e->state() ); + TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); TQButton::mousePressEvent( &me ); } void SystemButton::mouseReleaseEvent( TQMouseEvent* e ) { last_button = e->button(); - TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), LeftButton, e->state() ); + TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); TQButton::mouseReleaseEvent( &me ); } @@ -411,24 +411,24 @@ void SystemClient::addButtons(TQBoxLayout *hb, const TQString& s) bool SystemClient::eventFilter( TQObject* o, TQEvent* e ) { - if( o != widget()) + if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch( e->type()) { case TQEvent::Resize: - resizeEvent(static_cast< TQResizeEvent* >( e ) ); + resizeEvent(TQT_TQRESIZEEVENT( e ) ); return true; case TQEvent::Paint: - paintEvent(static_cast< TQPaintEvent* >( e ) ); + paintEvent(TQT_TQPAINTEVENT( e ) ); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast< TQMouseEvent* >( e ) ); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(static_cast< TQMouseEvent* >( e ) ); + processMousePressEvent(TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; default: break; @@ -440,7 +440,7 @@ void SystemClient::reset(unsigned long) { titleBuffer.resize(0, 0); recalcTitleBuffer(); - widget()->repaint(); + widget()->tqrepaint(); if (button[ButtonClose]) button[ButtonClose]->reset(); if (button[ButtonSticky]) @@ -466,7 +466,7 @@ void SystemClient::resizeEvent( TQResizeEvent* ) /* if ( isVisibleToTLW() && !testWFlags( WStaticContents )) { TQPainter p( this ); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); t.setTop( 0 ); TQRegion r = rect(); r = r.subtract( t ); @@ -481,9 +481,9 @@ void SystemClient::resize( const TQSize& s ) } -TQSize SystemClient::minimumSize() const +TQSize SystemClient::tqminimumSize() const { - return widget()->minimumSize(); + return widget()->tqminimumSize(); } @@ -499,10 +499,10 @@ void SystemClient::recalcTitleBuffer() p.drawTiledPixmap(0, 0, width(), 18, *aUpperGradient); else p.fillRect(0, 0, width(), 18, - options()->colorGroup(KDecorationOptions::ColorFrame, true). + options()->tqcolorGroup(KDecorationOptions::ColorFrame, true). brush(TQColorGroup::Button)); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); t.setTop( 2 ); t.setLeft( t.left() + 4 ); t.setRight( t.right() - 2 ); @@ -532,24 +532,24 @@ void SystemClient::recalcTitleBuffer() void SystemClient::captionChange() { recalcTitleBuffer(); - widget()->repaint(titlebar->geometry(), false); + widget()->tqrepaint(titlebar->tqgeometry(), false); } void SystemClient::drawRoundFrame(TQPainter &p, int x, int y, int w, int h) { kDrawRoundButton(&p, x, y, w, h, - options()->colorGroup(KDecorationOptions::ColorFrame, isActive()), false); + options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()), false); } void SystemClient::paintEvent( TQPaintEvent* ) { TQPainter p(widget()); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); - TQBrush fillBrush(widget()->colorGroup().brush(TQColorGroup::Background).pixmap() ? - widget()->colorGroup().brush(TQColorGroup::Background) : - options()->colorGroup(KDecorationOptions::ColorFrame, isActive()). + TQBrush fillBrush(TQBrush(widget()->tqcolorGroup().brush(TQColorGroup::Background)).pixmap() ? + widget()->tqcolorGroup().brush(TQColorGroup::Background) : + options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()). brush(TQColorGroup::Button)); p.fillRect(1, 18, width()-2, height()-19, fillBrush); @@ -570,17 +570,17 @@ void SystemClient::paintEvent( TQPaintEvent* ) p.drawText(t, AlignCenter, caption() ); } - p.setPen(options()->colorGroup(KDecorationOptions::ColorFrame, isActive()).light()); + p.setPen(options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()).light()); p.drawLine(width()-20, height()-7, width()-10, height()-7); p.drawLine(width()-20, height()-5, width()-10, height()-5); - p.setPen(options()->colorGroup(KDecorationOptions::ColorFrame, isActive()).dark()); + p.setPen(options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()).dark()); p.drawLine(width()-20, height()-6, width()-10, height()-6); p.drawLine(width()-20, height()-4, width()-10, height()-4); drawRoundFrame(p, 0, 0, width(), height()); } -#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) +#define TQCOORDARRLEN(x) sizeof(x)/(sizeof(TQCOORD)*2) void SystemClient::doShape() { @@ -597,7 +597,7 @@ void SystemClient::showEvent(TQShowEvent *) // Client::showEvent(ev); doShape(); widget()->show(); -// widget()->repaint(); +// widget()->tqrepaint(); } /*void SystemClient::windowWrapperShowEvent( TQShowEvent* ) @@ -607,13 +607,13 @@ void SystemClient::showEvent(TQShowEvent *) void SystemClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if ( e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) titlebarDblClickOperation(); } void SystemClient::wheelEvent( TQWheelEvent *e ) { - if (isSetShade() || TQRect( 0, 0, width(), titlebar->geometry().height() ).contains( e->pos() ) ) + if (isSetShade() || TQRect( 0, 0, width(), titlebar->tqgeometry().height() ).contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } @@ -633,7 +633,7 @@ void SystemClient::maximizeChange() void SystemClient::activeChange() { - widget()->repaint(false); + widget()->tqrepaint(false); if (button[ButtonClose]) button[ButtonClose]->reset(); if (button[ButtonSticky]) @@ -649,7 +649,7 @@ void SystemClient::activeChange() void SystemClient::iconChange() { // if (button[BtnMenu] && button[BtnMenu]->isVisible()) -// button[BtnMenu]->repaint(false); +// button[BtnMenu]->tqrepaint(false); } void SystemClient::desktopChange() diff --git a/kwin-styles/system/systemclient.h b/kwin-styles/system/systemclient.h index 09406f48..ecaf25ee 100644 --- a/kwin-styles/system/systemclient.h +++ b/kwin-styles/system/systemclient.h @@ -30,6 +30,7 @@ enum ButtonType { class SystemClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: SystemClient(KDecorationBridge* bridge, KDecorationFactory* factory); ~SystemClient(); @@ -44,7 +45,7 @@ class SystemClient : public KDecoration virtual void iconChange(); virtual void desktopChange(); virtual void activeChange(); - virtual TQSize minimumSize() const; + virtual TQSize tqminimumSize() const; virtual void borders(int&, int&, int&, int&) const; virtual void reset( unsigned long changed ); void drawRoundFrame(TQPainter &p, int x, int y, int w, int h); @@ -67,14 +68,14 @@ class SystemClient : public KDecoration TQString oldTitle; }; -class SystemButton : public QButton +class SystemButton : public TQButton { public: SystemButton(SystemClient *parent=0, const char *name=0, const unsigned char *bitmap=NULL, const TQString& tip=NULL); void setBitmap(const unsigned char *bitmap); void reset(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void setTipText(const TQString &tip); ButtonState last_button; protected: @@ -93,6 +94,7 @@ class SystemButton : public QButton class SystemDecoFactory : public TQObject, public KDecorationFactory { Q_OBJECT + TQ_OBJECT public: SystemDecoFactory(); virtual ~SystemDecoFactory(); diff --git a/styles/dotnet/Makefile.am b/styles/dotnet/Makefile.am index 4c80bfaf..513221e8 100644 --- a/styles/dotnet/Makefile.am +++ b/styles/dotnet/Makefile.am @@ -24,7 +24,7 @@ METASOURCES = AUTO INCLUDES = $(all_includes) noinst_HEADERS = dotnet.h kde_style_LTLIBRARIES = dotnet.la -dotnet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +dotnet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx dotnet_la_LIBADD = -lkdefx dotnet_la_SOURCES = dotnet.cpp diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp index 934e45a3..df40c1a5 100644 --- a/styles/dotnet/dotnet.cpp +++ b/styles/dotnet/dotnet.cpp @@ -53,7 +53,7 @@ /* This code registers the style with TQStyleFactory, which makes it possible * for any code that uses TQStyle to find out about it. */ // -- Style Plugin Interface ------------------------- -class dotNETstylePlugin : public QStylePlugin +class dotNETstylePlugin : public TQStylePlugin { public: dotNETstylePlugin() {} @@ -84,8 +84,8 @@ dotNETstyle::dotNETstyle() : KStyle( AllowMenuTransparency ), kickerMode(false) winstyle = TQStyleFactory::create("B3"); } - if (qApp->inherits("KApplication")) { - connect( qApp, TQT_SIGNAL( kdisplayPaletteChanged() ), TQT_SLOT( paletteChanged() )); + if (tqApp->inherits("KApplication")) { + connect( tqApp, TQT_SIGNAL( kdisplayPaletteChanged() ), TQT_SLOT( paletteChanged() )); } TQSettings settings; @@ -111,7 +111,7 @@ bool dotNETstyle::inheritsKHTML(const TQWidget* w) const void dotNETstyle::polish(TQWidget* widget) { - if (!qstrcmp(qApp->argv()[0], "kicker") || widget->inherits("Kicker")) + if (!qstrcmp(tqApp->argv()[0], "kicker") || widget->inherits("Kicker")) kickerMode = true; if (widget->isTopLevel()) @@ -190,12 +190,12 @@ void dotNETstyle::renderButton(TQPainter *p, if (pseudo3D) { if (roundedCorners) { - 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 }; + const TQCOORD 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(TQPointArray(8, iCorners)); if (corners) { - const QCOORD cPixels[] = { x, y, x + w - 1, y, x + w - 1, y + h - 1, x, y + h - 1 }; + const TQCOORD cPixels[] = { x, y, x + w - 1, y, x + w - 1, y + h - 1, x, y + h - 1 }; p->setPen(g.button()); p->drawPoints(TQPointArray(4, cPixels)); } @@ -205,13 +205,13 @@ void dotNETstyle::renderButton(TQPainter *p, p->drawRect(r); } - const QCOORD oCorners[] = { x + 1, y + h - 2, x + 1, y + 1, x + w - 2, y + 1, x + w - 2, y + h - 2 }; + const TQCOORD oCorners[] = { x + 1, y + h - 2, x + 1, y + 1, x + w - 2, y + 1, x + w - 2, y + h - 2 }; const TQPointArray outline(4, oCorners); p->setPen(g.button().dark(115)); p->setBrush(TQBrush::NoBrush); p->drawConvexPolygon(outline); p->setPen(g.button().light()); - p->drawPolyline(outline, 0, 3); + p->tqdrawPolyline(outline, 0, 3); } else { p->setPen(g.button().dark()); p->setBrush(g.button()); @@ -289,7 +289,7 @@ void dotNETstyle::renderSlider(TQPainter *p, } /* This function does the rendering for most of the panels in dotNET. - * The QCOORD stuff is used to provide the slightly-rounded corners. + * The TQCOORD stuff is used to provide the slightly-rounded corners. * Changing this function will have pretty widespread effects. Also a good * place to start if you're looking to make your own style. */ @@ -306,8 +306,8 @@ void dotNETstyle::renderPanel(TQPainter *p, p->save(); if (pseudo3D) { - 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 }; + const TQCOORD oCorners[] = { x, y2, x, y, x2, y, x2, y2 }; + const TQCOORD iCorners[] = { x+1, y2-1, x+1, y+1, x2-1, y+1, x2-1, y2-1 }; p->setPen(g.background().dark()); p->drawConvexPolygon(TQPointArray(4, oCorners)); @@ -331,17 +331,17 @@ void dotNETstyle::renderPanel(TQPainter *p, } } else { if (sunken) { - const QCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; + const TQCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; p->setPen(g.background().dark()); p->drawConvexPolygon(TQPointArray(4, corners)); p->setPen(g.background().light()); - p->drawPolyline(TQPointArray(4, corners), 0, 3); + p->tqdrawPolyline(TQPointArray(4, corners), 0, 3); } else { - const QCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 }; + const TQCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 }; p->setPen(g.background().dark()); p->drawPolygon(TQPointArray(4, corners)); p->setPen(g.background().light()); - p->drawPolyline(TQPointArray(4, corners), 0, 3); + p->tqdrawPolyline(TQPointArray(4, corners), 0, 3); } } @@ -349,17 +349,17 @@ void dotNETstyle::renderPanel(TQPainter *p, // Stolen wholesale from Keramik. I don't like it, but oh well. if (!thick) { if (sunken) { - const QCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; + const TQCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; p->setPen(g.background().dark()); p->drawConvexPolygon(TQPointArray(4, corners)); p->setPen(g.background().light()); - p->drawPolyline(TQPointArray(4, corners), 0, 3); + p->tqdrawPolyline(TQPointArray(4, corners), 0, 3); } else { - const QCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 }; + const TQCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 }; p->setPen(g.background().dark()); p->drawPolygon(TQPointArray(4, corners)); p->setPen(g.background().light()); - p->drawPolyline(TQPointArray(4, corners), 0, 3); + p->tqdrawPolyline(TQPointArray(4, corners), 0, 3); } } } @@ -383,7 +383,7 @@ void dotNETstyle::drawKStylePrimitive(KStylePrimitive kpe, const TQSlider* slider = (const TQSlider*)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) { @@ -416,7 +416,7 @@ void dotNETstyle::drawKStylePrimitive(KStylePrimitive kpe, // This function draws primitive elements as well as their masks. -void dotNETstyle::drawPrimitive(PrimitiveElement pe, +void dotNETstyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const TQRect &r, const TQColorGroup &cg, @@ -493,16 +493,16 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe, // SCROLLBAR BUTTONS // ----------------- case PE_ScrollBarSubLine: { - drawPrimitive(PE_ButtonBevel, p, r, cg, flags); + tqdrawPrimitive(PE_ButtonBevel, p, r, cg, flags); p->setPen(down ? cg.highlightedText() : cg.foreground()); - drawPrimitive((horiz ? PE_ArrowLeft : PE_ArrowUp), p, r, cg, flags); + tqdrawPrimitive((horiz ? PE_ArrowLeft : PE_ArrowUp), p, r, cg, flags); break; } case PE_ScrollBarAddLine: { - drawPrimitive(PE_ButtonBevel, p, r, cg, flags); + tqdrawPrimitive(PE_ButtonBevel, p, r, cg, flags); p->setPen(down ? cg.highlightedText() : cg.foreground()); - drawPrimitive((horiz ? PE_ArrowRight : PE_ArrowDown), p, r, cg, flags); + tqdrawPrimitive((horiz ? PE_ArrowRight : PE_ArrowDown), p, r, cg, flags); break; } @@ -517,7 +517,7 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe, p->drawLine(x + 1, y + 1, x + 1, h - 2); if (pseudo3D && roundedCorners) { - const QCOORD corners[] = { x, y, x, y2, x2, y, x2, y2 }; + const TQCOORD corners[] = { x, y, x, y2, x2, y, x2, y2 }; p->setPen(cg.background()); p->drawPoints(TQPointArray(4, corners)); } @@ -541,8 +541,8 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe, // RADIOBUTTONS // ------------ case PE_ExclusiveIndicator: { - const QCOORD outline[] = { 0, 7, 0, 5, 1, 4, 1, 3, 2, 2, 3, 1, 4, 1, 5, 0, 7, 0, 8, 1, 9, 1, 10, 2, 11, 3, 11, 4, 12, 5, 12, 7, 11, 8, 11, 9, 10, 10, 9, 11, 8, 11, 7, 12, 5, 12, 4, 11, 3, 11, 2, 10, 1, 9, 1, 8 }; - const QCOORD indark[] = { 1, 7, 1, 6, 1, 5, 2, 4, 2, 3, 3, 2, 4, 2, 5, 1, 6, 1, 7, 1 }; + const TQCOORD outline[] = { 0, 7, 0, 5, 1, 4, 1, 3, 2, 2, 3, 1, 4, 1, 5, 0, 7, 0, 8, 1, 9, 1, 10, 2, 11, 3, 11, 4, 12, 5, 12, 7, 11, 8, 11, 9, 10, 10, 9, 11, 8, 11, 7, 12, 5, 12, 4, 11, 3, 11, 2, 10, 1, 9, 1, 8 }; + const TQCOORD indark[] = { 1, 7, 1, 6, 1, 5, 2, 4, 2, 3, 3, 2, 4, 2, 5, 1, 6, 1, 7, 1 }; p->fillRect(r, cg.background()); p->setPen(cg.background().dark()); @@ -554,7 +554,7 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe, } case PE_ExclusiveIndicatorMask: { - const QCOORD outline[] = { 0, 7, 0, 5, 1, 4, 1, 3, 2, 2, 3, 1, 4, 1, 5, 0, 7, 0, 8, 1, 9, 1, 10, 2, 11, 3, 11, 4, 12, 5, 12, 7, 11, 8, 11, 9, 10, 10, 9, 11, 8, 11, 7, 12, 5, 12, 4, 11, 3, 11, 2, 10, 1, 9, 1, 8 }; + const TQCOORD outline[] = { 0, 7, 0, 5, 1, 4, 1, 3, 2, 2, 3, 1, 4, 1, 5, 0, 7, 0, 8, 1, 9, 1, 10, 2, 11, 3, 11, 4, 12, 5, 12, 7, 11, 8, 11, 9, 10, 10, 9, 11, 8, 11, 7, 12, 5, 12, 4, 11, 3, 11, 2, 10, 1, 9, 1, 8 }; p->fillRect(r, color0); p->setPen(color1); p->setBrush(color1); @@ -591,7 +591,7 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe, p->drawRect(r); if (pseudo3D && roundedCorners) { - const QCOORD corners[] = { x, y, x, y2, x2, y, x2, y2 }; + const TQCOORD corners[] = { x, y, x, y2, x2, y, x2, y2 }; p->setPen(cg.background()); p->drawPoints(TQPointArray(4, corners)); } @@ -669,11 +669,11 @@ 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 TQCOORD check[] = { x, y + 2, x, y + 4, x + 2, y + 6, x + 6, y + 2, x + 6, y, x + 2, y + 4 }; const TQPointArray a(6, check); p->setPen(flags & Style_Down ? cg.highlight() : p->pen()); - p->setBrush(flags & Style_Down ? cg.highlight() : p->pen().color()); + p->setBrush(flags & Style_Down ? cg.highlight() : TQColor(p->pen().color())); p->drawPolygon(a); break; @@ -719,27 +719,27 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe, p->save(); if (flags & Style_Down) { - p->translate(pixelMetric(PM_ButtonShiftHorizontal), - pixelMetric(PM_ButtonShiftVertical)); + p->translate(tqpixelMetric(PM_ButtonShiftHorizontal), + tqpixelMetric(PM_ButtonShiftVertical)); } if (flags & Style_Enabled) { a.translate((r.x() + r.width()/2), (r.y() + r.height()/2)); - if (p->pen() == TQPen::NoPen) { + if (p->pen() == Qt::NoPen) { p->setPen(cg.buttonText()); } p->drawLineSegments(a, 0, 3); p->drawPoint(a[6]); } else { a.translate((r.x() + r.width()/2)+1, (r.y() + r.height()/2)+1); - if (p->pen() == TQPen::NoPen) { + if (p->pen() == Qt::NoPen) { p->setPen(cg.highlightedText()); } p->drawLineSegments(a, 0, 3); p->drawPoint(a[6]); a.translate(-1,-1); - if (p->pen() == TQPen::NoPen) { + if (p->pen() == Qt::NoPen) { p->setPen(cg.mid()); } p->drawLineSegments(a, 0, 3); @@ -751,13 +751,13 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe, } default: { - return KStyle::drawPrimitive(pe, p, r, cg, flags, opt); + return KStyle::tqdrawPrimitive(pe, p, r, cg, flags, opt); } } } -void dotNETstyle::drawControl(ControlElement element, +void dotNETstyle::tqdrawControl(TQ_ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -769,10 +769,10 @@ void dotNETstyle::drawControl(ControlElement element, // CHECKBOXES // ---------- case CE_CheckBox: { - drawPrimitive(PE_Indicator, p, r, cg, flags); + tqdrawPrimitive(PE_Indicator, p, r, cg, flags); if (flags & Style_On || flags & Style_Down) { p->setPen(cg.foreground()); - drawPrimitive(PE_CheckMark, p, r, cg, flags); + tqdrawPrimitive(PE_CheckMark, p, r, cg, flags); } break; } @@ -818,16 +818,16 @@ void dotNETstyle::drawControl(ControlElement element, if (pseudo3D) { TQPointArray corners; if (TQApplication::reverseLayout()) { - const QCOORD c[] = { x, h, x, y, x + w, y, x + w, h }; + const TQCOORD c[] = { x, h, x, y, x + w, y, x + w, h }; corners = TQPointArray(4, c); } else { - const QCOORD c[] = { x, h, x, y, w, y, w, h }; + const TQCOORD c[] = { x, h, x, y, w, y, w, h }; corners = TQPointArray(4, c); } p->setPen(cg.highlight().dark(120)); p->drawConvexPolygon(corners); p->setPen(cg.highlight().light(120)); - p->drawPolyline(corners, 0, 3); + p->tqdrawPolyline(corners, 0, 3); if (roundedCorners) { p->setPen(cg.background().dark()); p->drawPoints(corners); @@ -840,10 +840,10 @@ void dotNETstyle::drawControl(ControlElement element, // RADIOBUTTONS // ------------ case CE_RadioButton: { - drawPrimitive(PE_ExclusiveIndicator, p, r, cg, flags); + tqdrawPrimitive(PE_ExclusiveIndicator, p, r, cg, flags); 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 }; + TQCOORD center[] = { 4, 5, 4, 7, 5, 8, 7, 8, 8, 7, 8, 5, 7, 4, 5, 4 }; TQPointArray c(8, center); p->setPen(flags & Style_Down ? cg.highlight() : cg.text()); p->setBrush(flags & Style_Down ? cg.highlight() : cg.text()); @@ -857,7 +857,7 @@ void dotNETstyle::drawControl(ControlElement element, case CE_TabBarTab: { const TQTabBar *tb = (const TQTabBar *) widget; bool cornerWidget = false; - TQTabBar::Shape tbs = tb->shape(); + TQTabBar::Shape tbs = tb->tqshape(); bool selected = flags & Style_Selected; int x, x2, y, y2, w, h; r.rect(&x, &y, &w, &h); @@ -865,7 +865,7 @@ void dotNETstyle::drawControl(ControlElement element, if (tb->parent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) { const TQTabWidget *tw = (const TQTabWidget *)tb->parent(); - TQWidget *cw = tw->cornerWidget(Qt::TopLeft); + TQWidget *cw = tw->cornerWidget(TQt::TopLeft); if (cw) { cornerWidget = true; } @@ -877,28 +877,28 @@ void dotNETstyle::drawControl(ControlElement element, if (pseudo3D) { p->setPen(cg.background().dark()); if (selected) { - const QCOORD oCorners[] = { x, y2, x, y, x2, y, x2, y2 }; - p->drawPolyline(TQPointArray(4, oCorners)); + const TQCOORD oCorners[] = { x, y2, x, y, x2, y, x2, y2 }; + p->tqdrawPolyline(TQPointArray(4, oCorners)); if (roundedCorners) { p->setPen(cg.background()); p->drawPoints(TQPointArray(4, oCorners), 1, 2); } - p->setPen(cg.background().dark(115)); + p->setPen(TQColor(cg.background().dark(115))); /* Right inner border */ p->drawLine(x + w - 2, y + 1, x + w - 2, y + h - 2); - p->setPen(cg.background().light()); + p->setPen(TQColor(cg.background().light())); /* Top inner border */ p->drawLine(x + 1, y + 1, x + w - 2, y + 1); /* Left inner border */ p->drawLine(x + 1, y + 1, x + 1, y + h - 1); } else { TQRect r2(x+1, y+3, w-2, h-5); - p->fillRect(r2, cg.mid().light(105)); + p->fillRect(r2, TQColor(cg.mid().light(105))); - const QCOORD oCorners[] = { x, y2, x, y + 2, x2, y + 2, x2, y2 }; - p->drawPolyline(TQPointArray(4, oCorners)); + const TQCOORD oCorners[] = { x, y2, x, y + 2, x2, y + 2, x2, y2 }; + p->tqdrawPolyline(TQPointArray(4, oCorners)); p->setPen(cg.background()); @@ -951,8 +951,8 @@ void dotNETstyle::drawControl(ControlElement element, if (pseudo3D) { p->setPen(cg.background().dark()); if (selected) { - const QCOORD oCorners[] = { x, y + 1, x, y2, x2, y2, x2, y + 1 }; - p->drawPolyline(TQPointArray(4, oCorners)); + const TQCOORD oCorners[] = { x, y + 1, x, y2, x2, y2, x2, y + 1 }; + p->tqdrawPolyline(TQPointArray(4, oCorners)); p->setPen(cg.background().dark(115)); p->drawLine(x + 1, y + h - 2, x + w - 2, y + h - 2); @@ -963,11 +963,11 @@ void dotNETstyle::drawControl(ControlElement element, p->drawLine(x + 1, y, x + 1, y + h - 2); } else { y2 -= 2; - const QCOORD oCorners[] = { x, y, x, y2, x2, y2, x2, y }; + const TQCOORD oCorners[] = { x, y, x, y2, x2, y2, x2, y }; TQRect r2(x + 1, y + 2, w - 2, h - 5); p->fillRect(r2, cg.mid().light(105)); - p->drawPolyline(TQPointArray(4, oCorners)); + p->tqdrawPolyline(TQPointArray(4, oCorners)); p->setPen(cg.mid().dark(115)); /* Inner right border */ @@ -1019,7 +1019,7 @@ void dotNETstyle::drawControl(ControlElement element, } default: - winstyle->drawControl(element, p, widget, r, cg, flags, opt); + winstyle->tqdrawControl(element, p, widget, r, cg, flags, opt); } break; @@ -1036,17 +1036,17 @@ void dotNETstyle::drawControl(ControlElement element, p->drawText(r.x()+1, r.y()+1, r.width(), r.height(), text_flags, opt.tab()->text()); } - p->setPen(flags & Style_Enabled ? cg.foreground() : cg.mid().dark()); + p->setPen(flags & Style_Enabled ? TQColor(cg.foreground()) : TQColor(cg.mid().dark())); if (!flags & Style_Selected) { - p->translate(pixelMetric(PM_ButtonShiftHorizontal), - pixelMetric(PM_ButtonShiftVertical)); + p->translate(tqpixelMetric(PM_ButtonShiftHorizontal), + tqpixelMetric(PM_ButtonShiftVertical)); } p->drawText(r, text_flags, opt.tab()->text()); if (flags & Style_HasFocus) - drawPrimitive(PE_FocusRect, p, r, cg); + tqdrawPrimitive(PE_FocusRect, p, r, cg); p->restore(); break; @@ -1057,14 +1057,14 @@ void dotNETstyle::drawControl(ControlElement element, TQRect br = r; bool btnDefault = button->isDefault(); - static int di = pixelMetric(PM_ButtonDefaultIndicator); + static int di = tqpixelMetric(PM_ButtonDefaultIndicator); br.addCoords(di, di, -di, -di); if (btnDefault) { - drawPrimitive(PE_ButtonDefault, p, r, cg, flags); + tqdrawPrimitive(PE_ButtonDefault, p, r, cg, flags); } - drawPrimitive(PE_ButtonBevel, p, br, cg, flags); + tqdrawPrimitive(PE_ButtonBevel, p, br, cg, flags); break; } @@ -1076,8 +1076,8 @@ void dotNETstyle::drawControl(ControlElement element, TQRect ur(r); if (flags & Style_Down) { - p->translate(pixelMetric(PM_ButtonShiftHorizontal), - pixelMetric(PM_ButtonShiftVertical)); + p->translate(tqpixelMetric(PM_ButtonShiftHorizontal), + tqpixelMetric(PM_ButtonShiftVertical)); } if (!pb->text().isEmpty() && (flags & Style_ButtonDefault)) { @@ -1120,13 +1120,13 @@ void dotNETstyle::drawControl(ControlElement element, } if (!pb->text().isEmpty()) { - p->setPen(enabled ? cg.foreground() : pb->palette().disabled().buttonText()); + p->setPen(enabled ? cg.foreground() : pb->tqpalette().disabled().buttonText()); p->drawText(ur, text_flags, pb->text()); } if ( flags & Style_HasFocus ) - drawPrimitive( PE_FocusRect, p, - visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), + tqdrawPrimitive( PE_FocusRect, p, + tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), cg, flags ); break; @@ -1149,7 +1149,7 @@ void dotNETstyle::drawControl(ControlElement element, p->setPen(down ? cg.highlight().light() : cg.highlight().dark()); p->drawRect(r); if (pseudo3D && roundedCorners && !down) { - const QCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 }; + const TQCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 }; p->setPen(cg.background()); p->drawPoints(TQPointArray(4, corners)); } @@ -1194,7 +1194,7 @@ void dotNETstyle::drawControl(ControlElement element, static const int rightBorder = 20; const int tab = opt.tabWidth(); - int checkcol = QMAX(opt.maxIconWidth(), 26); + int checkcol = TQMAX(opt.maxIconWidth(), 26); int x, x2, y, y2, w, h; r.rect(&x, &y, &w, &h); r.coords(&x, &y, &x2, &y2); @@ -1233,12 +1233,12 @@ void dotNETstyle::drawControl(ControlElement element, p->fillRect(x + 2, y + 2, w - 4, h - 4, cg.highlight()); p->setPen(cg.highlight().dark()); 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 }; + const TQCOORD 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 TQCOORD icorners[] = { x+2, y+2, x2-2, y+2, x2-2,y2-2, x+2, y2-2 }; p->drawLineSegments(TQPointArray(8, segments)); p->drawPoints(TQPointArray(4, icorners)); } else { - const QCOORD corners[] = { x+1, y2-1, x+1, y+1, x2-1, y+1, x2-1, y2-1 }; + const TQCOORD corners[] = { x+1, y2-1, x+1, y+1, x2-1, y+1, x2-1, y2-1 }; p->drawConvexPolygon(TQPointArray(4, corners)); } p->setPen(cg.highlightedText()); @@ -1257,7 +1257,7 @@ void dotNETstyle::drawControl(ControlElement element, pmr.moveCenter(cr.center()); if (TQApplication::reverseLayout()) - pmr = visualRect( pmr, r ); + pmr = tqvisualRect( pmr, r ); p->setPen(cg.highlightedText()); p->drawPixmap(pmr.topLeft(), pixmap); @@ -1295,7 +1295,7 @@ void dotNETstyle::drawControl(ControlElement element, TQRect rr = TQRect(xp, y+m, tab, h-(2*m)); if (TQApplication::reverseLayout()) - rr = visualRect(rr, r); + rr = tqvisualRect(rr, r); if (useTextShadows) { TQPen op = p->pen(); @@ -1310,7 +1310,7 @@ void dotNETstyle::drawControl(ControlElement element, TQRect rr = TQRect(xpos, y+m, w-xm-tab+1, h-(2*m)); if (TQApplication::reverseLayout()) { - rr = visualRect(rr, r); + rr = tqvisualRect(rr, r); text_flags |= AlignRight; } @@ -1325,17 +1325,17 @@ void dotNETstyle::drawControl(ControlElement element, } else if (mi->pixmap()) { TQPixmap *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); } } } if (mi->popup()) { - int dim = pixelMetric(PM_MenuButtonIndicator); + int dim = tqpixelMetric(PM_MenuButtonIndicator); xpos = x+w - arrowHMargin - 2*itemFrame - dim; @@ -1347,8 +1347,8 @@ void dotNETstyle::drawControl(ControlElement element, TQRect rr = TQRect(xpos, y + h/2 - dim/2, dim, dim); if (TQApplication::reverseLayout()) - rr = visualRect( rr, r ); - drawPrimitive((TQApplication::reverseLayout() ? PE_ArrowLeft : PE_ArrowRight), p, rr, cg, Style_Enabled); + rr = tqvisualRect( rr, r ); + tqdrawPrimitive((TQApplication::reverseLayout() ? PE_ArrowLeft : PE_ArrowRight), p, rr, cg, Style_Enabled); } if (checkable) { @@ -1364,9 +1364,9 @@ void dotNETstyle::drawControl(ControlElement element, TQRect rr = TQRect( xp + 6, y + 6, 16, h - 6 ); if (TQApplication::reverseLayout()) - rr = visualRect( rr, r ); + rr = tqvisualRect( rr, r ); - drawPrimitive(PE_CheckMark, p, rr, cg, cflags); + tqdrawPrimitive(PE_CheckMark, p, rr, cg, cflags); } } @@ -1380,11 +1380,11 @@ void dotNETstyle::drawControl(ControlElement element, p->fillRect(r, cg.button()); break; default: - winstyle->drawControl(element, p, widget, r, cg, flags, opt); + winstyle->tqdrawControl(element, p, widget, r, cg, flags, opt); } } -void dotNETstyle::drawControlMask(ControlElement element, +void dotNETstyle::tqdrawControlMask(TQ_ControlElement element, TQPainter *p, const TQWidget *w, const TQRect &r, @@ -1395,7 +1395,7 @@ void dotNETstyle::drawControlMask(ControlElement element, if (pseudo3D && roundedCorners) { int x1, y1, x2, y2; r.coords (&x1, &y1, &x2, &y2); - QCOORD corners[] = { x1, y1, x2, y1, x1, y2, x2, y2 }; + TQCOORD corners[] = { x1, y1, x2, y1, x1, y2, x2, y2 }; p->fillRect (r, color1); p->setPen (color0); p->drawPoints (TQPointArray (4, corners)); @@ -1407,12 +1407,12 @@ void dotNETstyle::drawControlMask(ControlElement element, } default: { - KStyle::drawControlMask (element, p, w, r, opt); + KStyle::tqdrawControlMask (element, p, w, r, opt); } } } -void dotNETstyle::drawComplexControlMask(ComplexControl c, +void dotNETstyle::tqdrawComplexControlMask(ComplexControl c, TQPainter *p, const TQWidget *w, const TQRect &r, @@ -1423,7 +1423,7 @@ void dotNETstyle::drawComplexControlMask(ComplexControl c, if (pseudo3D && roundedCorners) { int x1, y1, x2, y2; r.coords (&x1, &y1, &x2, &y2); - QCOORD corners[] = { x1, y1, x2, y1, x1, y2, x2, y2 }; + TQCOORD corners[] = { x1, y1, x2, y1, x1, y2, x2, y2 }; p->fillRect (r, color1); p->setPen (color0); p->drawPoints (TQPointArray (4, corners)); @@ -1434,12 +1434,12 @@ void dotNETstyle::drawComplexControlMask(ComplexControl c, break; } default: { - KStyle::drawComplexControlMask (c, p, w, r, o); + KStyle::tqdrawComplexControlMask (c, p, w, r, o); } } } -void dotNETstyle::drawComplexControl(ComplexControl control, +void dotNETstyle::tqdrawComplexControl(ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1489,13 +1489,13 @@ void dotNETstyle::drawComplexControl(ComplexControl control, } TQRect hr = (pseudo3D ? TQRect(w - handle_offset - 1, y, handle_width + 2, h) : TQRect(w - handle_offset - 1, y + 1, handle_width + 2, h - 1)); - if (TQApplication::reverseLayout()) { hr = visualRect(hr, r); } + if (TQApplication::reverseLayout()) { hr = tqvisualRect(hr, r); } p->drawRect(hr); p->setBrush(NoBrush); TQRect rr = (pseudo3D ? TQRect(x + 1, y + 1, w - 2, h - 2) : TQRect(x + 1, y + 1, w - 1, h - 1)); - if (TQApplication::reverseLayout()) { rr = visualRect( rr, r ); } + if (TQApplication::reverseLayout()) { rr = tqvisualRect( rr, r ); } if (flags & Style_HasFocus || cg.highlight() == cg.midlight() || (cb->listBox() && cb->listBox()->isVisible())) { @@ -1516,10 +1516,10 @@ void dotNETstyle::drawComplexControl(ComplexControl control, ca.setPoint(1, hr.bottomRight()); ca.setPoint(2, hr.bottomLeft()); p->setPen(test.dark(120)); - p->drawPolyline(ca); + p->tqdrawPolyline(ca); p->setPen(test.light(120)); ca.setPoint(1, hr.topLeft()); - p->drawPolyline(ca); + p->tqdrawPolyline(ca); p->restore(); } @@ -1544,7 +1544,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control, TQRect pmr(0, 0, 7, 4); pmr.moveCenter(cr.center()); if (TQApplication::reverseLayout()) { - pmr = visualRect( pmr, r ); + pmr = tqvisualRect( pmr, r ); } p->drawPixmap(pmr.topLeft(), downArrow); @@ -1574,7 +1574,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control, if (controls & SC_ToolButton) { // If we're pressed, on, or raised... if (bflags & (Style_Down | Style_On | Style_Raised)) { - drawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt); + tqdrawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt); } else if (tb->parentWidget() && tb->parentWidget()->backgroundPixmap() && !tb->parentWidget()->backgroundPixmap()->isNull()) { @@ -1586,15 +1586,15 @@ void dotNETstyle::drawComplexControl(ComplexControl control, // Draw a toolbutton menu indicator if required if (controls & SC_ToolButtonMenu) { if (mflags & (Style_Down | Style_On | Style_Raised)) { - drawPrimitive(PE_ButtonDropDown, p, menuarea, cg, mflags, opt); + tqdrawPrimitive(PE_ButtonDropDown, p, menuarea, cg, mflags, opt); } - drawPrimitive(PE_ArrowDown, p, menuarea, cg, mflags, opt); + tqdrawPrimitive(PE_ArrowDown, p, menuarea, cg, mflags, opt); } if (tb->hasFocus() && !tb->focusProxy()) { TQRect fr = tb->rect(); fr.addCoords(2, 2, -2, -2); - drawPrimitive(PE_FocusRect, p, fr, cg); + tqdrawPrimitive(PE_FocusRect, p, fr, cg); } break; @@ -1605,10 +1605,10 @@ void dotNETstyle::drawComplexControl(ComplexControl control, case CC_SpinWidget: { const TQSpinWidget *sw = (const TQSpinWidget *) widget; SFlags flags; - PrimitiveElement pe; + TQ_PrimitiveElement pe; TQRect swf = querySubControlMetrics(control, sw, SC_SpinWidgetFrame); - swf = visualRect( swf, sw ); + swf = tqvisualRect( swf, sw ); if (controls & SC_SpinWidgetFrame) { // Don't draw the WindowsStyle thick frame. @@ -1629,22 +1629,22 @@ void dotNETstyle::drawComplexControl(ComplexControl control, pe = PE_SpinWidgetUp; TQRect re = sw->upRect(); - TQColorGroup ucg = sw->isUpEnabled() ? cg : sw->palette().disabled(); + TQColorGroup ucg = sw->isUpEnabled() ? cg : sw->tqpalette().disabled(); p->fillRect(re.x() + 1, re.y() + 1, re.width() - 2, re.height() - 1, flags & Style_Raised ? ucg.background() : ucg.highlight()); 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()); + const TQCOORD 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 ? TQColor(ucg.background().dark()) : ucg.highlight()); p->drawLineSegments(TQPointArray(6, corners)); - p->setPen(flags & Style_Raised ? ucg.background().light() : ucg.highlight()); + p->setPen(flags & Style_Raised ? TQColor(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); - p->setPen(flags & Style_Raised ? ucg.background().dark(115) : ucg.highlight()); + p->setPen(flags & Style_Raised ? TQColor(ucg.background().dark(115)) : ucg.highlight()); p->drawLine(re.right()-1, re.y() + 2, re.right()-1, re.bottom()); } else { } re.setX(re.x() + 1); p->setPen(flags & Style_Raised ? ucg.foreground() : ucg.highlightedText()); - drawPrimitive(pe, p, re, ucg, flags); + tqdrawPrimitive(pe, p, re, ucg, flags); } if (controls & SC_SpinWidgetDown) { @@ -1661,10 +1661,10 @@ void dotNETstyle::drawComplexControl(ComplexControl control, pe = PE_SpinWidgetDown; TQRect re = sw->downRect(); - TQColorGroup dcg = sw->isDownEnabled() ? cg : sw->palette().disabled(); + TQColorGroup dcg = sw->isDownEnabled() ? cg : sw->tqpalette().disabled(); p->fillRect(re.x() + 1, re.y(), re.width() - 2, re.height() - 1, flags & Style_Raised ? dcg.background() : dcg.highlight()); if (pseudo3D) { - const QCOORD corners[] = { + const TQCOORD corners[] = { re.x(), re.top(), re.x(), re.bottom(), re.x() + 1, re.y() + re.height(), @@ -1672,25 +1672,25 @@ void dotNETstyle::drawComplexControl(ComplexControl control, re.right(), re.bottom(), re.right(), re.y() }; - p->setPen(flags & Style_Raised ? dcg.background().dark() : dcg.highlight()); + p->setPen(flags & Style_Raised ? TQColor(dcg.background().dark()) : dcg.highlight()); p->drawLineSegments(TQPointArray(6, corners)); - p->setPen(flags & Style_Raised ? dcg.background().light() : dcg.highlight()); + p->setPen(flags & Style_Raised ? TQColor(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()); + p->setPen(flags & Style_Raised ? TQColor(dcg.background().dark(115)) : dcg.highlight()); p->drawLine(re.x() + 2, re.bottom(), re.right()-1, re.bottom()); p->drawLine(re.right()-1, re.y(), re.right()-1, re.bottom()); } else { } p->setPen(flags & Style_Raised ? dcg.foreground() : dcg.highlightedText()); re.setX(re.x() + 1); - drawPrimitive(pe, p, re, dcg, flags); + tqdrawPrimitive(pe, p, re, dcg, flags); } break; } default: - KStyle::drawComplexControl(control, p, widget, + KStyle::tqdrawComplexControl(control, p, widget, r, cg, flags, controls, active, opt); break; @@ -1708,7 +1708,7 @@ TQRect dotNETstyle::subRect(SubRect r, const TQWidget *widget) const case SR_PushButtonFocusRect: { TQRect rect = widget->rect(); - int margin = pixelMetric(PM_ButtonDefaultIndicator, widget) + pixelMetric(PM_DefaultFrameWidth, widget) + 2; + int margin = tqpixelMetric(PM_ButtonDefaultIndicator, widget) + tqpixelMetric(PM_DefaultFrameWidth, widget) + 2; rect.addCoords(margin, margin, -margin, -margin); return rect; @@ -1749,10 +1749,10 @@ TQRect dotNETstyle::querySubControlMetrics(ComplexControl control, } case CC_SpinWidget: { - int fw = pixelMetric(PM_SpinBoxFrameWidth, widget); + int fw = tqpixelMetric(PM_SpinBoxFrameWidth, widget); TQSize bs; - bs.setHeight(QMAX(8, widget->height()/2)); - bs.setWidth(QMIN(bs.height() * 8 / 5, widget->width() / 4)); + bs.setHeight(TQMAX(8, widget->height()/2)); + bs.setWidth(TQMIN(bs.height() * 8 / 5, widget->width() / 4)); int y = fw; int x, lx, rx; @@ -1787,15 +1787,15 @@ TQRect dotNETstyle::querySubControlMetrics(ComplexControl control, return KStyle::querySubControlMetrics(control, widget, subcontrol, opt); } -int dotNETstyle::pixelMetric(PixelMetric m, const TQWidget *widget) const +int dotNETstyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const { switch(m) { // TABS // ---- case PM_TabBarTabVSpace: { const TQTabBar * tb = (const TQTabBar *) widget; - if (tb->shape() == TQTabBar::RoundedAbove || - tb->shape() == TQTabBar::RoundedBelow) + if (tb->tqshape() == TQTabBar::RoundedAbove || + tb->tqshape() == TQTabBar::RoundedBelow) return 12; else return 0; @@ -1803,8 +1803,8 @@ int dotNETstyle::pixelMetric(PixelMetric m, const TQWidget *widget) const case PM_TabBarTabOverlap: { const TQTabBar* tb = (const TQTabBar*)widget; - if (tb->shape() != TQTabBar::RoundedAbove && - tb->shape() != TQTabBar::RoundedBelow) + if (tb->tqshape() != TQTabBar::RoundedAbove && + tb->tqshape() != TQTabBar::RoundedBelow) return 3; // Leave standard size alone else return 1; // Change size for our tabs only @@ -1878,12 +1878,12 @@ int dotNETstyle::pixelMetric(PixelMetric m, const TQWidget *widget) const } default: - return KStyle::pixelMetric(m, widget); + return KStyle::tqpixelMetric(m, widget); } } -TQSize dotNETstyle::sizeFromContents(ContentsType t, +TQSize dotNETstyle::tqsizeFromContents(ContentsType t, const TQWidget *widget, const TQSize &s, const TQStyleOption &opt) const @@ -1901,8 +1901,8 @@ TQSize dotNETstyle::sizeFromContents(ContentsType t, bool checkable = popup->isCheckable(); if (mi->custom()) { - w = mi->custom()->sizeHint().width(); - h = mi->custom()->sizeHint().height(); + w = mi->custom()->tqsizeHint().width(); + h = mi->custom()->tqsizeHint().height(); } else if (mi->widget()) { // don't change the size in this case. } else if (mi->isSeparator()) { @@ -1910,13 +1910,13 @@ TQSize dotNETstyle::sizeFromContents(ContentsType t, h = 1; } else { if (mi->pixmap()) { - h = QMAX(h, mi->pixmap()->height() + 8); + h = TQMAX(h, mi->pixmap()->height() + 8); } - h = QMAX(h, widget->fontMetrics().height() + 10); + h = TQMAX(h, widget->fontMetrics().height() + 10); if (mi->iconSet()) { - h = QMAX(h, mi->iconSet()->pixmap(TQIconSet::Small, TQIconSet::Normal).height() + 8); + h = TQMAX(h, mi->iconSet()->pixmap(TQIconSet::Small, TQIconSet::Normal).height() + 8); } } @@ -1945,10 +1945,10 @@ TQSize dotNETstyle::sizeFromContents(ContentsType t, const TQPushButton* button = (const TQPushButton*) widget; int w = s.width(); int h = s.height(); - int bm = pixelMetric( PM_ButtonMargin, widget ); - int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2; + int bm = tqpixelMetric( PM_ButtonMargin, widget ); + int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2; - //We use bold font sometimes, so that make take more space than Qt allocated. + //We use bold font sometimes, so that make take more space than TQt allocated. TQFontMetrics origFM = button->fontMetrics(); TQFontMetrics boldFM = TQFontMetrics(TQFont(button->font().family(), button->font().pointSize(), 75)); int origTextWidth = origFM.size(ShowPrefix, button->text()).width(); @@ -1968,7 +1968,7 @@ TQSize dotNETstyle::sizeFromContents(ContentsType t, // Compensate for default indicator. Doing it for all widgets lets us // workaround changes in auto-default behavior in KDialogBase in 3.3 - int di = pixelMetric( PM_ButtonDefaultIndicator ); + int di = tqpixelMetric( PM_ButtonDefaultIndicator ); w += di * 2; h += di * 2; @@ -1979,15 +1979,15 @@ TQSize dotNETstyle::sizeFromContents(ContentsType t, case CT_ComboBox: { int arrow = 21; - return TQSize(s.width() + arrow, QMAX(s.height() + 4, 16)); + return TQSize(s.width() + arrow, TQMAX(s.height() + 4, 16)); } default: - return KStyle::sizeFromContents (t, widget, s, opt); + return KStyle::tqsizeFromContents (t, widget, s, opt); } - return KStyle::sizeFromContents (t, widget, s, opt); -// return winstyle->sizeFromContents(t, widget, s, opt); + return KStyle::tqsizeFromContents (t, widget, s, opt); +// return winstyle->tqsizeFromContents(t, widget, s, opt); } void dotNETstyle::paletteChanged() @@ -2011,7 +2011,7 @@ void dotNETstyle::paletteChanged() void dotNETstyle::updatePalette( TQComboBox *combo ) { - TQPalette pal = TQApplication::palette(); + TQPalette pal = TQApplication::tqpalette(); pal.setColor(TQColorGroup::Dark, pal.active().color(TQColorGroup::Base)); pal.setColor(TQColorGroup::Midlight, @@ -2021,7 +2021,7 @@ void dotNETstyle::updatePalette( TQComboBox *combo ) void dotNETstyle::updatePalette( TQToolBar *bar ) { - TQPalette pal = TQApplication::palette(); + TQPalette pal = TQApplication::tqpalette(); pal.setColor(TQColorGroup::Button, pal.active().color(TQColorGroup::Background)); bar->setPalette(pal); @@ -2029,7 +2029,7 @@ void dotNETstyle::updatePalette( TQToolBar *bar ) void dotNETstyle::updatePalette( TQMenuBar *bar ) { - TQPalette pal = TQApplication::palette(); + TQPalette pal = TQApplication::tqpalette(); pal.setColor(TQColorGroup::Button, pal.active().color(TQColorGroup::Background)); bar->setPalette(pal); @@ -2046,7 +2046,7 @@ bool dotNETstyle::eventFilter(TQObject *obj, TQEvent *ev) if (ev->type() == TQEvent::Enter) { TQWidget *btn = (TQWidget *)obj; if (btn->isEnabled()) { - TQPalette pal = btn->palette(); + TQPalette pal = btn->tqpalette(); pal.setColor(TQColorGroup::Dark, pal.active().color(TQColorGroup::Highlight).dark()); pal.setColor(TQColorGroup::Midlight, @@ -2055,7 +2055,7 @@ bool dotNETstyle::eventFilter(TQObject *obj, TQEvent *ev) } } else if (ev->type() == TQEvent::Leave) { TQWidget *btn = (TQWidget *)obj; - TQPalette pal = btn->palette(); + TQPalette pal = btn->tqpalette(); pal.setColor(TQColorGroup::Dark, pal.active().color(TQColorGroup::Base)); pal.setColor(TQColorGroup::Midlight, @@ -2064,7 +2064,7 @@ bool dotNETstyle::eventFilter(TQObject *obj, TQEvent *ev) } } else if (obj->inherits(TQBUTTON_OBJECT_NAME_STRING)) { TQWidget *btn = (TQWidget *)obj; - TQPalette pal = btn->palette(); + TQPalette pal = btn->tqpalette(); pal.setColor(TQColorGroup::Button, pal.active().color(TQColorGroup::Background)); btn->setPalette(pal); diff --git a/styles/dotnet/dotnet.h b/styles/dotnet/dotnet.h index 8225da28..f2dbcf8a 100644 --- a/styles/dotnet/dotnet.h +++ b/styles/dotnet/dotnet.h @@ -30,11 +30,12 @@ #define l_arrow 0,-3, 0,3,-1,-2,-1,2,-2,-1,-2,1,-3,0 #define r_arrow -2,-3,-2,3,-1,-2, -1,2,0,-1,0,1,1,0 -#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) +#define TQCOORDARRLEN(x) sizeof(x)/(sizeof(TQCOORD)*2) class dotNETstyle : public KStyle { Q_OBJECT + TQ_OBJECT public: dotNETstyle(); @@ -54,14 +55,14 @@ public: SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawPrimitive( PrimitiveElement pe, + void tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption &opt = TQStyleOption::Default ) const; - void drawControl( ControlElement element, + void tqdrawControl( TQ_ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -69,9 +70,9 @@ public: SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const; + void tqdrawControlMask( TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const; - void drawComplexControl( ComplexControl control, + void tqdrawComplexControl( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -81,7 +82,7 @@ public: SCFlags active = SC_None, const TQStyleOption& = TQStyleOption::Default ) const; - int pixelMetric( PixelMetric m, + int tqpixelMetric( PixelMetric m, const TQWidget *widget = 0 ) const; TQRect subRect( SubRect r, @@ -92,13 +93,13 @@ public: SubControl subcontrol, const TQStyleOption &opt = TQStyleOption::Default ) const; - void drawComplexControlMask(TQStyle::ComplexControl c, + void tqdrawComplexControlMask(TQStyle::ComplexControl c, TQPainter *p, const TQWidget *w, const TQRect &r, const TQStyleOption &o=TQStyleOption::Default) const; - TQSize sizeFromContents(TQStyle::ContentsType t, + TQSize tqsizeFromContents(TQStyle::ContentsType t, const TQWidget *w, const TQSize &s, const TQStyleOption &o) const; diff --git a/styles/phase/Makefile.am b/styles/phase/Makefile.am index 47d15577..ae98c9e0 100644 --- a/styles/phase/Makefile.am +++ b/styles/phase/Makefile.am @@ -15,7 +15,7 @@ noinst_HEADERS = phasestyle.h bitmaps.h kde_style_LTLIBRARIES = phasestyle.la phasestyle_la_SOURCES = phasestyle.cpp -phasestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +phasestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx phasestyle_la_LIBADD = -lkdefx -lkdecore phasestyle_la_METASOURCES = AUTO diff --git a/styles/phase/config/Makefile.am b/styles/phase/config/Makefile.am index 725d15a3..1c09e305 100644 --- a/styles/phase/config/Makefile.am +++ b/styles/phase/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) noinst_HEADERS = phasestyleconfig.h kde_module_LTLIBRARIES = kstyle_phase_config.la -kstyle_phase_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kstyle_phase_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kstyle_phase_config_la_LIBADD = $(LIB_KDEUI) kstyle_phase_config_la_SOURCES = phasestyleconfig.cpp styledialog.ui kstyle_phase_config_la_METASOURCES = AUTO diff --git a/styles/phase/config/phasestyleconfig.cpp b/styles/phase/config/phasestyleconfig.cpp index 4f7e200d..f6e34226 100644 --- a/styles/phase/config/phasestyleconfig.cpp +++ b/styles/phase/config/phasestyleconfig.cpp @@ -104,7 +104,7 @@ void PhaseStyleConfig::defaults() extern "C" { KDE_EXPORT TQObject* allocate_kstyle_config(TQWidget* parent) { - return(new PhaseStyleConfig(parent)); + return(TQT_TQOBJECT(new PhaseStyleConfig(parent))); } } diff --git a/styles/phase/config/phasestyleconfig.h b/styles/phase/config/phasestyleconfig.h index f77c5a3a..63b3ef10 100644 --- a/styles/phase/config/phasestyleconfig.h +++ b/styles/phase/config/phasestyleconfig.h @@ -34,6 +34,7 @@ class KConfig; class PhaseStyleConfig : public StyleDialog { Q_OBJECT + TQ_OBJECT public: PhaseStyleConfig(TQWidget* parent); ~PhaseStyleConfig(); diff --git a/styles/phase/config/styledialog.ui b/styles/phase/config/styledialog.ui index 2015003e..484de58a 100644 --- a/styles/phase/config/styledialog.ui +++ b/styles/phase/config/styledialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>StyleDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>StyleDialog</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>stylebox</cstring> </property> @@ -36,7 +36,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>gradients</cstring> </property> @@ -47,7 +47,7 @@ <string>This option will draw buttons and several other widgets using a gradient texture</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>highlights</cstring> </property> diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp index 49fc4e6e..dc9a75fb 100644 --- a/styles/phase/phasestyle.cpp +++ b/styles/phase/phasestyle.cpp @@ -1,7 +1,7 @@ ////////////////////////////////////////////////////////////////////////////// // phasestyle.cpp // ------------------- -// Qt/KDE widget style +// TQt/KDE widget style // ------------------- // Copyright (c) 2004 David Johnson // Please see the header file for copyright and license information. @@ -14,10 +14,10 @@ // overlap to share part of their border. // // Menu and toolbars are painted with the background color by default. This -// differs from the Qt default of giving them PaletteButton backgrounds. +// differs from the TQt default of giving them PaletteButton backgrounds. // Menubars have normal gradients, toolbars have reverse. // -// Some toolbars are not part of a QMainWindows, such as in a KDE file dialog. +// Some toolbars are not part of a TQMainWindows, such as in a KDE file dialog. // In these cases we treat the toolbar as "floating" and paint it flat. // ////////////////////////////////////////////////////////////////////////////// @@ -54,8 +54,8 @@ #include "phasestyle.h" #include "bitmaps.h" -static const char* QSPLITTERHANDLE = "QSplitterHandle"; -static const char* QTOOLBAREXTENSION = "QToolBarExtensionWidget"; +static const char* TQSPLITTERHANDLE = TQSPLITTERHANDLE_OBJECT_NAME_STRING; +static const char* TQTOOLBAREXTENSION = "TQToolBarExtensionWidget"; static const char* KTOOLBARWIDGET = "kde toolbar widget"; // some convenient constants @@ -89,7 +89,7 @@ PhaseStyle::PhaseStyle() if (gradients_) { // don't bother setting if already false gradients_ = settings.readBoolEntry("/phasestyle/Settings/gradients", true); - contrast = 100 + settings.readNumEntry("/Qt/KDE/contrast", 5); + contrast = 100 + settings.readNumEntry("/TQt/KDE/contrast", 5); } highlights_ = settings.readBoolEntry("/phasestyle/Settings/highlights", true); @@ -148,26 +148,26 @@ void PhaseStyle::polish(TQApplication* app) void PhaseStyle::polish(TQWidget *widget) { - if (::qt_cast<TQMenuBar*>(widget) || - ::qt_cast<TQPopupMenu*>(widget)) { + if (::tqqt_cast<TQMenuBar*>(widget) || + ::tqqt_cast<TQPopupMenu*>(widget)) { // anti-flicker optimization widget->setBackgroundMode(NoBackground); - } else if (::qt_cast<TQFrame*>(widget) || - widget->inherits(QTOOLBAREXTENSION) || + } else if (::tqqt_cast<TQFrame*>(widget) || + widget->inherits(TQTOOLBAREXTENSION) || (!qstrcmp(widget->name(), KTOOLBARWIDGET))) { // needs special handling on paint events widget->installEventFilter(this); } else if (highlights_ && - (::qt_cast<TQPushButton*>(widget) || - ::qt_cast<TQComboBox*>(widget) || - ::qt_cast<TQSpinWidget*>(widget) || - ::qt_cast<TQCheckBox*>(widget) || - ::qt_cast<TQRadioButton*>(widget) || - ::qt_cast<TQSlider*>(widget) || - widget->inherits(QSPLITTERHANDLE))) { + (::tqqt_cast<TQPushButton*>(widget) || + ::tqqt_cast<TQComboBox*>(widget) || + ::tqqt_cast<TQSpinWidget*>(widget) || + ::tqqt_cast<TQCheckBox*>(widget) || + ::tqqt_cast<TQRadioButton*>(widget) || + ::tqqt_cast<TQSlider*>(widget) || + widget->inherits(TQSPLITTERHANDLE))) { // mouseover highlighting widget->installEventFilter(this); - } else if (highlights_ && ::qt_cast<TQTabBar*>(widget)) { + } else if (highlights_ && ::tqqt_cast<TQTabBar*>(widget)) { // highlighting needing mouse tracking widget->setMouseTracking(true); widget->installEventFilter(this); @@ -206,23 +206,23 @@ void PhaseStyle::polish(TQPalette &pal) void PhaseStyle::unPolish(TQWidget *widget) { - if (::qt_cast<TQMenuBar*>(widget) || - ::qt_cast<TQPopupMenu*>(widget)) { + if (::tqqt_cast<TQMenuBar*>(widget) || + ::tqqt_cast<TQPopupMenu*>(widget)) { widget->setBackgroundMode(PaletteBackground); - } else if (::qt_cast<TQFrame*>(widget) || - widget->inherits(QTOOLBAREXTENSION) || + } else if (::tqqt_cast<TQFrame*>(widget) || + widget->inherits(TQTOOLBAREXTENSION) || (!qstrcmp(widget->name(), KTOOLBARWIDGET))) { widget->removeEventFilter(this); } else if (highlights_ && // highlighting - (::qt_cast<TQPushButton*>(widget) || - ::qt_cast<TQComboBox*>(widget) || - ::qt_cast<TQSpinWidget*>(widget) || - ::qt_cast<TQCheckBox*>(widget) || - ::qt_cast<TQRadioButton*>(widget) || - ::qt_cast<TQSlider*>(widget) || - widget->inherits(QSPLITTERHANDLE))) { + (::tqqt_cast<TQPushButton*>(widget) || + ::tqqt_cast<TQComboBox*>(widget) || + ::tqqt_cast<TQSpinWidget*>(widget) || + ::tqqt_cast<TQCheckBox*>(widget) || + ::tqqt_cast<TQRadioButton*>(widget) || + ::tqqt_cast<TQSlider*>(widget) || + widget->inherits(TQSPLITTERHANDLE))) { widget->removeEventFilter(this); - } else if (highlights_ && ::qt_cast<TQTabBar*>(widget)) { + } else if (highlights_ && ::tqqt_cast<TQTabBar*>(widget)) { widget->setMouseTracking(false); widget->removeEventFilter(this); } @@ -421,14 +421,14 @@ void PhaseStyle::drawPhaseTab(TQPainter *painter, edge = false; } - switch (TQTabBar::Shape(bar->shape())) { + switch (TQTabBar::Shape(bar->tqshape())) { case TQTabBar::RoundedAbove: case TQTabBar::TriangularAbove: { // is there a corner widget? - tabwidget = ::qt_cast<TQTabWidget*>(bar->parent()); + tabwidget = ::tqqt_cast<TQTabWidget*>(bar->parent()); if (edge && tabwidget && tabwidget->cornerWidget(reverse_ ? - Qt::TopRight : Qt::TopLeft)) { + TQt::TopRight : TQt::TopLeft)) { edge = false; } @@ -436,14 +436,14 @@ void PhaseStyle::drawPhaseTab(TQPainter *painter, y += 2; h -= 2; } if (selected) { - painter->setPen(Qt::NoPen); + painter->setPen(TQt::NoPen); painter->fillRect(x+1, y+1, w-1, h-1, group.brush(TQColorGroup::Background)); } else { drawPhaseGradient(painter, TQRect(x+1, y+1, w-1, h-2), (flags & Style_MouseOver) ? group.background() - : group.background().dark(contrast), + : TQColor(group.background().dark(contrast)), false, 0, 0, 0, h*2, false); } @@ -504,17 +504,17 @@ void PhaseStyle::drawPhaseTab(TQPainter *painter, case TQTabBar::RoundedBelow: case TQTabBar::TriangularBelow: { // is there a corner widget? - tabwidget = ::qt_cast<TQTabWidget*>(bar->parent()); + tabwidget = ::tqqt_cast<TQTabWidget*>(bar->parent()); if (edge && tabwidget && tabwidget->cornerWidget(reverse_ ? - Qt::BottomRight : Qt::BottomLeft)) { + TQt::BottomRight : TQt::BottomLeft)) { edge = false; } painter->setBrush((selected || (flags & Style_MouseOver)) ? group.background() - : group.background().dark(contrast)); - painter->setPen(Qt::NoPen); + : TQColor(group.background().dark(contrast))); + painter->setPen(TQt::NoPen); painter->fillRect(x+1, y+1, w-1, h-1, painter->brush()); // draw tab @@ -567,11 +567,11 @@ void PhaseStyle::drawPhaseTab(TQPainter *painter, } ////////////////////////////////////////////////////////////////////////////// -// drawPrimitive() +// tqdrawPrimitive() // --------------- // Draw the primitive element -void PhaseStyle::drawPrimitive(PrimitiveElement element, +void PhaseStyle::tqdrawPrimitive(TQ_PrimitiveElement element, TQPainter *painter, const TQRect &rect, const TQColorGroup &group, @@ -605,7 +605,7 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, case PE_ButtonCommand: drawPhaseButton(painter, x, y, w, h, group, mouseover ? - group.button().light(contrast) : + TQColor(group.button().light(contrast)) : group.button(), depress); break; @@ -625,7 +625,7 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, widget =dynamic_cast<TQWidget*>(painter->device()); if (header) { - horiz = (header->orientation() == Horizontal); + horiz = (header->orientation() ==Qt::Horizontal); } else { horiz = true; } @@ -663,9 +663,9 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, case PE_HeaderArrow: if (flags & Style_Up) - drawPrimitive(PE_ArrowUp, painter, rect, group, Style_Enabled); + tqdrawPrimitive(PE_ArrowUp, painter, rect, group, Style_Enabled); else - drawPrimitive(PE_ArrowDown, painter, rect, group, Style_Enabled); + tqdrawPrimitive(PE_ArrowDown, painter, rect, group, Style_Enabled); break; case PE_ScrollBarAddPage: @@ -688,7 +688,7 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, drawPhaseBevel(painter, x, y, w, h, group, group.button(), down, !horiz, true); - PrimitiveElement arrow = ((horiz) ? + TQ_PrimitiveElement arrow = ((horiz) ? ((element == PE_ScrollBarAddLine) ? PE_ArrowRight : PE_ArrowLeft) : ((element == PE_ScrollBarAddLine) ? @@ -703,7 +703,7 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, } } - drawPrimitive(arrow, painter, TQRect(x,y,h,w), group, flags); + tqdrawPrimitive(arrow, painter, TQRect(x,y,h,w), group, flags); break; } @@ -727,29 +727,29 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, case PE_Indicator: drawPhasePanel(painter, x+1, y+1, w-2, h-2, group, true, enabled ? - &group.brush(TQColorGroup::Base) : - &group.brush(TQColorGroup::Background)); + &group.tqbrush(TQColorGroup::Base) : + &group.tqbrush(TQColorGroup::Background)); if (on) { painter->setPen(mouseover - ? group.highlight().dark(contrast) + ? TQColor(group.highlight().dark(contrast)) : group.dark()); painter->drawRect(x+4, y+4, w-8, h-8); painter->fillRect(x+5, y+5, w-10, h-10, - group.brush(TQColorGroup::Highlight)); + group.tqbrush(TQColorGroup::Highlight)); } else if (mouseover) { - painter->setPen(group.highlight().dark(contrast)); + painter->setPen(TQColor(group.highlight().dark(contrast))); painter->drawRect(x+4, y+4, w-8, h-8); } break; case PE_IndicatorMask: - painter->fillRect(x+1, y+1, w-2, h-2, Qt::color1); - painter->setPen(Qt::color0); + painter->fillRect(x+1, y+1, w-2, h-2, TQt::color1); + painter->setPen(TQt::color0); break; case PE_ExclusiveIndicator: { - // note that this requires an even size from pixelMetric + // note that this requires an even size from tqpixelMetric cx = (x + x2) / 2; cy = (y + y2) / 2; @@ -761,31 +761,31 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, parray.putPoints(0, 8, x+1,cy+1, x+1,cy, cx,y+1, cx+1,y+1, x2-1,cy, x2-1,cy+1, cx+1,y2-1, cx,y2-1); - painter->drawConvexPolygon(parray, 0, 8); + painter->tqdrawConvexPolygon(parray, 0, 8); painter->setPen(group.mid()); parray.putPoints(0, 4, x,cy, cx,y, cx+1,y, x2,cy); - painter->drawPolyline(parray, 0, 4); + painter->tqdrawPolyline(parray, 0, 4); painter->setPen(group.midlight()); parray.putPoints(0, 4, x2,cy+1, cx+1,y2, cx,y2, x,cy+1); - painter->drawPolyline(parray, 0, 4); + painter->tqdrawPolyline(parray, 0, 4); if (on) { painter->setBrush(group.brush(TQColorGroup::Highlight)); painter->setPen(mouseover - ? group.highlight().dark(contrast) + ? TQColor(group.highlight().dark(contrast)) : group.dark()); parray.putPoints(0, 8, x+4,cy+1, x+4,cy, cx,y+4, cx+1,y+4, x2-4,cy, x2-4,cy+1, cx+1,y2-4, cx,y2-4); - painter->drawConvexPolygon(parray, 0, 8); + painter->tqdrawConvexPolygon(parray, 0, 8); } else if (mouseover) { - painter->setPen(group.highlight().dark(contrast)); + painter->setPen(TQColor(group.highlight().dark(contrast))); parray.putPoints(0, 9, x+4,cy+1, x+4,cy, cx,y+4, cx+1,y+4, x2-4,cy, x2-4,cy+1, cx+1,y2-4, cx,y2-4, x+4,cy+1); - painter->drawPolyline(parray, 0, 9); + painter->tqdrawPolyline(parray, 0, 9); } break; } @@ -793,25 +793,25 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, case PE_ExclusiveIndicatorMask: cx = (x + x2) / 2; cy = (y + y2) / 2; - painter->setBrush(Qt::color1); - painter->setPen(Qt::color1); + painter->setBrush(TQt::color1); + painter->setPen(TQt::color1); parray.putPoints(0, 8, x,cy+1, x,cy, cx,y, cx+1,y, x2,cy, x2,cy+1, cx+1,y2, cx,y2); - painter->drawConvexPolygon(parray, 0, 8); - painter->setPen(Qt::color0); + painter->tqdrawConvexPolygon(parray, 0, 8); + painter->setPen(TQt::color0); break; case PE_DockWindowResizeHandle: drawPhasePanel(painter, x, y, w, h, group, false, - &group.brush(TQColorGroup::Background)); + &group.tqbrush(TQColorGroup::Background)); break; case PE_Splitter: cx = x + w/2 - 2; cy = y + h/2 - 2; painter->fillRect(rect, (hover_ == painter->device()) - ? group.background().light(contrast) + ? TQColor(group.background().light(contrast)) : group.background()); if (!horiz && (w >=20)) { @@ -888,9 +888,9 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, if (widget && widget->parent() && widget->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) { - TQToolBar *toolbar = ::qt_cast<TQToolBar*>(widget->parent()); + TQToolBar *toolbar = ::tqqt_cast<TQToolBar*>(widget->parent()); if (toolbar) { - // toolbar not floating or in a QMainWindow + // toolbar not floating or in a TQMainWindow flat = flatToolbar(toolbar); } } @@ -922,7 +922,7 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, } case PE_SizeGrip: { - int sw = QMIN(h, w) - 1; + int sw = TQMIN(h, w) - 1; y = y2 - sw; if (reverse_) { @@ -999,7 +999,7 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, break; default: - KStyle::drawPrimitive(element, painter, rect, group, flags, option); + KStyle::tqdrawPrimitive(element, painter, rect, group, flags, option); } } @@ -1084,9 +1084,9 @@ void PhaseStyle::drawKStylePrimitive(KStylePrimitive element, break; case KPE_SliderGroove: { - const TQSlider* slider = ::qt_cast<const TQSlider*>(widget); + const TQSlider* slider = ::tqqt_cast<const TQSlider*>(widget); if (slider) { - if (slider->orientation() == Horizontal) { + if (slider->orientation() ==Qt::Horizontal) { y = cy - 3; h = 7; } else { @@ -1095,17 +1095,17 @@ void PhaseStyle::drawKStylePrimitive(KStylePrimitive element, } } drawPhasePanel(painter, x, y, w, h, group, true, - &group.brush(TQColorGroup::Mid)); + &group.tqbrush(TQColorGroup::Mid)); break; } case KPE_SliderHandle: { - const TQSlider* slider = ::qt_cast<const TQSlider*>(widget); + const TQSlider* slider = ::tqqt_cast<const TQSlider*>(widget); if (slider) { TQColor color = (widget==hover_) - ? group.button().light(contrast) + ? TQColor(group.button().light(contrast)) : group.button(); - if (slider->orientation() == Horizontal) { + if (slider->orientation() ==Qt::Horizontal) { drawPhaseBevel(painter, cx-5, y, 6, h, group, color, false, false, false); drawPhaseBevel(painter, cx, y, 6, h, group, color, @@ -1127,11 +1127,11 @@ void PhaseStyle::drawKStylePrimitive(KStylePrimitive element, } ////////////////////////////////////////////////////////////////////////////// -// drawControl() +// tqdrawControl() // ------------- // Draw the control -void PhaseStyle::drawControl(ControlElement element, +void PhaseStyle::tqdrawControl(TQ_ControlElement element, TQPainter *painter, const TQWidget *widget, const TQRect &rect, @@ -1153,25 +1153,25 @@ void PhaseStyle::drawControl(ControlElement element, switch (element) { case CE_PushButton: { depress = flags & (Style_Down | Style_On); - int bd = pixelMetric(PM_ButtonDefaultIndicator, widget) + 1; + int bd = tqpixelMetric(PM_ButtonDefaultIndicator, widget) + 1; if ((flags & Style_ButtonDefault) && !depress) { drawPhasePanel(painter, x, y, w, h, group, true, - &group.brush(TQColorGroup::Mid)); + &group.tqbrush(TQColorGroup::Mid)); drawPhaseBevel(painter, x+bd, y+bd, w-bd*2, h-bd*2, group, (widget==hover_) - ? group.button().light(contrast) + ? TQColor(group.button().light(contrast)) : group.button(), false, false, false); } else { drawPhaseButton(painter, x, y, w, h, group, (widget==hover_) - ? group.button().light(contrast) + ? TQColor(group.button().light(contrast)) : group.button(), depress); } if (flags & Style_HasFocus) { // draw focus - drawPrimitive(PE_FocusRect, painter, + tqdrawPrimitive(PE_FocusRect, painter, subRect(SR_PushButtonFocusRect, widget), group, flags); } @@ -1179,9 +1179,9 @@ void PhaseStyle::drawControl(ControlElement element, } case CE_PushButtonLabel: { - const TQPushButton* button = ::qt_cast<const TQPushButton*>(widget); + const TQPushButton* button = ::tqqt_cast<const TQPushButton*>(widget); if (!button) { - KStyle::drawControl(element, painter, widget, rect, group, + KStyle::tqdrawControl(element, painter, widget, rect, group, flags, option); return; } @@ -1193,8 +1193,8 @@ void PhaseStyle::drawControl(ControlElement element, } if (button->isMenuButton()) { // menu indicator - int dx = pixelMetric(PM_MenuButtonIndicator, widget); - drawPrimitive(PE_ArrowDown, painter, + int dx = tqpixelMetric(PM_MenuButtonIndicator, widget); + tqdrawPrimitive(PE_ArrowDown, painter, TQRect(x+w-dx-2, y+2, dx, h-4), group, flags, option); w -= dx; @@ -1232,41 +1232,41 @@ void PhaseStyle::drawControl(ControlElement element, for(int n=0; n<2; n++) { drawItem(painter, TQRect(x+n, y, w, h), AlignCenter | ShowPrefix, - button->colorGroup(), + button->tqcolorGroup(), button->isEnabled(), button->pixmap(), button->text(), -1, (button->isEnabled()) ? - &button->colorGroup().buttonText() : - &button->colorGroup().mid()); + &button->tqcolorGroup().buttonText() : + &button->tqcolorGroup().mid()); } } else { // normal button drawItem(painter, TQRect(x, y, w, h), AlignCenter | ShowPrefix, - button->colorGroup(), + button->tqcolorGroup(), button->isEnabled(), button->pixmap(), button->text(), -1, (button->isEnabled()) ? - &button->colorGroup().buttonText() : - &button->colorGroup().mid()); + &button->tqcolorGroup().buttonText() : + &button->tqcolorGroup().mid()); } break; } case CE_CheckBoxLabel: case CE_RadioButtonLabel: { - const TQButton *b = ::qt_cast<const TQButton*>(widget); + const TQButton *b = ::tqqt_cast<const TQButton*>(widget); if (!b) return; - int alignment = reverse_ ? AlignRight : AlignLeft; - drawItem(painter, rect, alignment | AlignVCenter | ShowPrefix, + int tqalignment = reverse_ ? AlignRight : AlignLeft; + drawItem(painter, rect, tqalignment | AlignVCenter | ShowPrefix, group, flags & Style_Enabled, b->pixmap(), b->text()); // only draw focus if content (forms on html won't) if ((flags & Style_HasFocus) && ((!b->text().isNull()) || b->pixmap())) { - drawPrimitive(PE_FocusRect, painter, - visualRect(subRect(SR_RadioButtonFocusRect, + tqdrawPrimitive(PE_FocusRect, painter, + tqvisualRect(subRect(SR_RadioButtonFocusRect, widget), widget), group, flags); } @@ -1274,9 +1274,9 @@ void PhaseStyle::drawControl(ControlElement element, } case CE_DockWindowEmptyArea: { - const TQToolBar *tb = ::qt_cast<const TQToolBar*>(widget); + const TQToolBar *tb = ::tqqt_cast<const TQToolBar*>(widget); if (tb) { - // toolbar not floating or in a QMainWindow + // toolbar not floating or in a TQMainWindow if (flatToolbar(tb)) { if (tb->backgroundMode() == PaletteButton) // force default button color to background color @@ -1294,9 +1294,9 @@ void PhaseStyle::drawControl(ControlElement element, break; case CE_MenuBarItem: { - const TQMenuBar *mbar = ::qt_cast<const TQMenuBar*>(widget); + const TQMenuBar *mbar = ::tqqt_cast<const TQMenuBar*>(widget); if (!mbar) { - KStyle::drawControl(element, painter, widget, rect, group, + KStyle::tqdrawControl(element, painter, widget, rect, group, flags, option); return; } @@ -1306,7 +1306,7 @@ void PhaseStyle::drawControl(ControlElement element, if ((flags & Style_Active) && (flags & Style_HasFocus)) { if (flags & Style_Down) { drawPhasePanel(painter, x, y, w, h, group, true, - &group.brush(TQColorGroup::Background)); + &group.tqbrush(TQColorGroup::Background)); } else { drawPhaseBevel(painter, x, y, w, h, group, group.background(), @@ -1325,9 +1325,9 @@ void PhaseStyle::drawControl(ControlElement element, } case CE_PopupMenuItem: { - const TQPopupMenu *popup = ::qt_cast<const TQPopupMenu*>(widget); + const TQPopupMenu *popup = ::tqqt_cast<const TQPopupMenu*>(widget); if (!popup) { - KStyle::drawControl(element, painter, widget, rect, group, + KStyle::tqdrawControl(element, painter, widget, rect, group, flags, option); return; } @@ -1341,12 +1341,12 @@ void PhaseStyle::drawControl(ControlElement element, int tabwidth = option.tabWidth(); int checkwidth = option.maxIconWidth(); bool checkable = popup->isCheckable(); - bool etchtext = styleHint(SH_EtchDisabledText); + bool etchtext = tqstyleHint(SH_EtchDisabledText); active = flags & Style_Active; enabled = mi->isEnabled(); TQRect vrect; - if (checkable) checkwidth = QMAX(checkwidth, 20); + if (checkable) checkwidth = TQMAX(checkwidth, 20); // draw background if (active && enabled) { @@ -1380,7 +1380,7 @@ void PhaseStyle::drawControl(ControlElement element, pixmap = mi->iconSet()->pixmap(TQIconSet::Small, mode); TQRect pmrect(0, 0, pixmap.width(), pixmap.height()); - vrect = visualRect(TQRect(x, y, checkwidth, h), rect); + vrect = tqvisualRect(TQRect(x, y, checkwidth, h), rect); pmrect.moveCenter(vrect.center()); painter->drawPixmap(pmrect.topLeft(), pixmap); } @@ -1388,7 +1388,7 @@ void PhaseStyle::drawControl(ControlElement element, // draw check if (mi->isChecked()) { int cx = reverse_ ? x+w - checkwidth : x; - drawPrimitive(PE_CheckMark, painter, + tqdrawPrimitive(PE_CheckMark, painter, TQRect(cx + ITEMFRAME, y + ITEMFRAME, checkwidth - ITEMFRAME*2, h - ITEMFRAME*2), group, Style_Default | @@ -1464,29 +1464,29 @@ void PhaseStyle::drawControl(ControlElement element, else if (mi->pixmap()) { // pixmap as label pixmap = *mi->pixmap(); if (pixmap.depth() == 1) - painter->setBackgroundMode(OpaqueMode); + painter->setBackgroundMode(Qt::OpaqueMode); dx = ((w - pixmap.width()) / 2) + ((w - pixmap.width()) % 2); painter->drawPixmap(x+dx, y+ITEMFRAME, pixmap); if (pixmap.depth() == 1) - painter->setBackgroundMode(TransparentMode); + painter->setBackgroundMode(Qt::TransparentMode); } } if (mi->popup()) { // draw submenu arrow - PrimitiveElement arrow = reverse_ ? PE_ArrowLeft : PE_ArrowRight; + TQ_PrimitiveElement arrow = reverse_ ? PE_ArrowLeft : PE_ArrowRight; int dim = (h-2*ITEMFRAME) / 2; - vrect = visualRect(TQRect(x + w - ARROWMARGIN - ITEMFRAME - dim, + vrect = tqvisualRect(TQRect(x + w - ARROWMARGIN - ITEMFRAME - dim, y + h / 2 - dim / 2, dim, dim), rect); - drawPrimitive(arrow, painter, vrect, group, + tqdrawPrimitive(arrow, painter, vrect, group, enabled ? Style_Enabled : Style_Default); } break; } case CE_TabBarTab: { - const TQTabBar* tab = ::qt_cast<const TQTabBar*>(widget); + const TQTabBar* tab = ::tqqt_cast<const TQTabBar*>(widget); if (tab) { if ((widget == hover_) && (option.tab() == hovertab_)) { flags |= Style_MouseOver; @@ -1495,7 +1495,7 @@ void PhaseStyle::drawControl(ControlElement element, drawPhaseTab(painter, x, y, w, h, group, tab, option, flags); } else { // not a tabbar - KStyle::drawControl(element, painter, widget, rect, group, + KStyle::tqdrawControl(element, painter, widget, rect, group, flags, option); return; } @@ -1504,14 +1504,14 @@ void PhaseStyle::drawControl(ControlElement element, case CE_ProgressBarGroove: { drawPhasePanel(painter, x, y, w, h, group, true, - &group.brush(TQColorGroup::Base)); + &group.tqbrush(TQColorGroup::Base)); break; } case CE_ProgressBarContents: { - const TQProgressBar* pbar = ::qt_cast<const TQProgressBar*>(widget); + const TQProgressBar* pbar = ::tqqt_cast<const TQProgressBar*>(widget); if (!pbar) { - KStyle::drawControl(element, painter, widget, rect, group, + KStyle::tqdrawControl(element, painter, widget, rect, group, flags, option); return; } @@ -1522,7 +1522,7 @@ void PhaseStyle::drawControl(ControlElement element, if (!pbar->totalSteps()) { // busy indicator - int bar = pixelMetric(PM_ProgressBarChunkWidth, widget) + 2; + int bar = tqpixelMetric(PM_ProgressBarChunkWidth, widget) + 2; int progress = pbar->progress() % ((w-bar) * 2); if (progress > (w-bar)) progress = 2 * (w-bar) - progress; painter->drawRect(x+progress+1, y+1, bar-2, h-2); @@ -1537,11 +1537,10 @@ void PhaseStyle::drawControl(ControlElement element, break; } -#if (QT_VERSION >= 0x030200) case CE_ToolBoxTab: { - const TQToolBox *box = ::qt_cast<const TQToolBox*>(widget); + const TQToolBox *box = ::tqqt_cast<const TQToolBox*>(widget); if (!box) { - KStyle::drawControl(element, painter, widget, rect, group, + KStyle::tqdrawControl(element, painter, widget, rect, group, flags, option); return; } @@ -1557,7 +1556,7 @@ void PhaseStyle::drawControl(ControlElement element, if (box->currentItem() && (flags & Style_Selected)) { painter->setPen(group.dark()); painter->setBrush(box->currentItem()->paletteBackgroundColor()); - painter->drawConvexPolygon(parray, 0, 6); + painter->tqdrawConvexPolygon(parray, 0, 6); painter->setBrush(NoBrush); } else { painter->setClipRegion(parray, TQPainter::CoordPainter); @@ -1565,29 +1564,28 @@ void PhaseStyle::drawControl(ControlElement element, group.background(), false, 0, 0, 0, h*2, false); painter->setClipping(false); - painter->drawPolyline(parray, 0, 4); + painter->tqdrawPolyline(parray, 0, 4); } parray.putPoints(0, 4, x,y+1, cx,y+1, rx-2,y2-1, x2,y2-1); painter->setPen(group.midlight()); - painter->drawPolyline(parray, 0, 4); + painter->tqdrawPolyline(parray, 0, 4); break; } -#endif default: - KStyle::drawControl(element, painter, widget, rect, group, + KStyle::tqdrawControl(element, painter, widget, rect, group, flags, option); } } ////////////////////////////////////////////////////////////////////////////// -// drawControlMask() +// tqdrawControlMask() // ----------------- // Draw a bitmask for the element -void PhaseStyle::drawControlMask(ControlElement element, +void PhaseStyle::tqdrawControlMask(TQ_ControlElement element, TQPainter *painter, const TQWidget *widget, const TQRect &rect, @@ -1595,21 +1593,21 @@ void PhaseStyle::drawControlMask(ControlElement element, { switch (element) { case CE_PushButton: - painter->fillRect(rect, Qt::color1); - painter->setPen(Qt::color0); + painter->fillRect(rect, TQt::color1); + painter->setPen(TQt::color0); break; default: - KStyle::drawControlMask(element, painter, widget, rect, option); + KStyle::tqdrawControlMask(element, painter, widget, rect, option); } } ////////////////////////////////////////////////////////////////////////////// -// drawComplexControl() +// tqdrawComplexControl() // -------------------- // Draw a complex control -void PhaseStyle::drawComplexControl(ComplexControl control, +void PhaseStyle::tqdrawComplexControl(TQ_ComplexControl control, TQPainter *painter, const TQWidget *widget, const TQRect &rect, @@ -1629,9 +1627,9 @@ void PhaseStyle::drawComplexControl(ComplexControl control, switch (control) { case CC_ComboBox: { - const TQComboBox * combo = ::qt_cast<const TQComboBox*>(widget); + const TQComboBox * combo = ::tqqt_cast<const TQComboBox*>(widget); if (!combo) { - KStyle::drawComplexControl(control, painter, widget, rect, group, + KStyle::tqdrawComplexControl(control, painter, widget, rect, group, flags, controls, active, option); return; } @@ -1639,24 +1637,24 @@ void PhaseStyle::drawComplexControl(ComplexControl control, sunken = (active == SC_ComboBoxArrow); drawPhaseButton(painter, x, y, w, h, group, (widget==hover_) - ? group.button().light(contrast) + ? TQColor(group.button().light(contrast)) : group.button(), sunken); if (controls & SC_ComboBoxArrow) { // draw arrow box - subrect = visualRect(querySubControlMetrics(CC_ComboBox, widget, + subrect = tqvisualRect(querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxArrow), widget); subrect.rect(&x, &y, &w, &h); - int slot = QMAX(h/4, 6) + (h % 2); + int slot = TQMAX(h/4, 6) + (h % 2); drawPhasePanel(painter, x+3, y+(h/2)-(slot/2), w-6, slot, group, true, - sunken ? &group.brush(TQColorGroup::Midlight) - : &group.brush(TQColorGroup::Mid)); + sunken ? &group.tqbrush(TQColorGroup::Midlight) + : &group.tqbrush(TQColorGroup::Mid)); } if (controls & SC_ComboBoxEditField) { // draw edit box if (combo->editable()) { // editable box - subrect = visualRect(querySubControlMetrics(CC_ComboBox, + subrect = tqvisualRect(querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxEditField), widget); x2 = subrect.right(); y2 = subrect.bottom(); painter->setPen(group.dark()); @@ -1666,9 +1664,9 @@ void PhaseStyle::drawComplexControl(ComplexControl control, painter->setPen(group.button()); painter->drawPoint(x2+2, y2); } else if (combo->hasFocus()) { // non editable box - subrect = visualRect(subRect(SR_ComboBoxFocusRect, + subrect = tqvisualRect(subRect(SR_ComboBoxFocusRect, combo), widget); - drawPrimitive(PE_FocusRect, painter, subrect, group, + tqdrawPrimitive(PE_FocusRect, painter, subrect, group, Style_FocusAtBorder, TQStyleOption(group.highlight())); } @@ -1680,9 +1678,9 @@ void PhaseStyle::drawComplexControl(ComplexControl control, case CC_ScrollBar: { // always a three button scrollbar - const TQScrollBar *sb = ::qt_cast<const TQScrollBar*>(widget); + const TQScrollBar *sb = ::tqqt_cast<const TQScrollBar*>(widget); if (!sb) { - KStyle::drawComplexControl(control, painter, widget, rect, group, + KStyle::tqdrawComplexControl(control, painter, widget, rect, group, flags, controls, active, option); return; } @@ -1699,7 +1697,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, srect = querySubControlMetrics(control, widget, SC_ScrollBarAddLine, option); if (srect.isValid()) - drawPrimitive(PE_ScrollBarAddLine, painter, srect, group, + tqdrawPrimitive(PE_ScrollBarAddLine, painter, srect, group, scrollflags | ((active == SC_ScrollBarAddLine) ? Style_Down : Style_Default)); } @@ -1710,7 +1708,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, srect = querySubControlMetrics(control, widget, SC_ScrollBarSubLine, option); if (srect.isValid()) - drawPrimitive(PE_ScrollBarSubLine, painter, srect, group, + tqdrawPrimitive(PE_ScrollBarSubLine, painter, srect, group, scrollflags | ((active == SC_ScrollBarSubLine) ? Style_Down : Style_Default)); // bottom/right subline @@ -1719,7 +1717,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, if (srect.isValid()) { if (horizontal) srect.moveBy(-srect.width()+1, 0); else srect.moveBy(0, -srect.height()+1); - drawPrimitive(PE_ScrollBarSubLine, painter, srect, group, + tqdrawPrimitive(PE_ScrollBarSubLine, painter, srect, group, scrollflags | ((active == SC_ScrollBarSubLine) ? Style_Down : Style_Default)); } @@ -1732,7 +1730,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, if (srect.isValid()) { if (horizontal) srect.addCoords(1, 0, 1, 0); else srect.addCoords(0, 1, 0, 1); - drawPrimitive(PE_ScrollBarAddPage, painter, srect, group, + tqdrawPrimitive(PE_ScrollBarAddPage, painter, srect, group, scrollflags | ((active == SC_ScrollBarAddPage) ? Style_Down : Style_Default)); } @@ -1743,7 +1741,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, srect = querySubControlMetrics(control, widget, SC_ScrollBarSubPage, option); if (srect.isValid()) { - drawPrimitive(PE_ScrollBarSubPage, painter, srect, group, + tqdrawPrimitive(PE_ScrollBarSubPage, painter, srect, group, scrollflags | ((active == SC_ScrollBarSubPage) ? Style_Down : Style_Default)); } @@ -1762,13 +1760,13 @@ void PhaseStyle::drawComplexControl(ComplexControl control, if (srect.isValid()) { if (horizontal) srect.addCoords(0, 0, 1, 0); else srect.addCoords(0, 0, 0, 1); - drawPrimitive(PE_ScrollBarSlider, painter, srect, group, + tqdrawPrimitive(PE_ScrollBarSlider, painter, srect, group, scrollflags | ((active == SC_ScrollBarSlider) ? Style_Down : Style_Default)); // focus if (sb->hasFocus()) { srect.addCoords(2, 2, -2, -2); - drawPrimitive(PE_FocusRect, painter, srect, group, + tqdrawPrimitive(PE_FocusRect, painter, srect, group, Style_Default); } } @@ -1777,14 +1775,14 @@ void PhaseStyle::drawComplexControl(ComplexControl control, } case CC_SpinWidget: { - const TQSpinWidget *spin = ::qt_cast<const TQSpinWidget*>(widget); + const TQSpinWidget *spin = ::tqqt_cast<const TQSpinWidget*>(widget); if (!spin) { - KStyle::drawComplexControl(control, painter, widget, rect, group, + KStyle::tqdrawComplexControl(control, painter, widget, rect, group, flags, controls, active, option); return; } - PrimitiveElement element; + TQ_PrimitiveElement element; // draw frame if (controls & SC_SpinWidgetFrame) { @@ -1800,7 +1798,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, drawPhaseBevel(painter, subrect.x(), subrect.y(), subrect.width(), subrect.height(), group, (widget==hover_) - ? group.button().light(contrast) + ? TQColor(group.button().light(contrast)) : group.button(), false, false, false); } @@ -1814,7 +1812,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, else element = PE_SpinWidgetUp; - drawPrimitive(element, painter, subrect, group, flags + tqdrawPrimitive(element, painter, subrect, group, flags | ((active == SC_SpinWidgetUp) ? Style_On | Style_Sunken : Style_Raised)); } @@ -1829,7 +1827,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, else element = PE_SpinWidgetDown; - drawPrimitive(element, painter, subrect, group, flags + tqdrawPrimitive(element, painter, subrect, group, flags | ((active == SC_SpinWidgetDown) ? Style_On | Style_Sunken : Style_Raised)); } @@ -1837,9 +1835,9 @@ void PhaseStyle::drawComplexControl(ComplexControl control, } case CC_ToolButton: { - const TQToolButton *btn = ::qt_cast<const TQToolButton*>(widget); + const TQToolButton *btn = ::tqqt_cast<const TQToolButton*>(widget); if (!btn) { - KStyle::drawComplexControl(control, painter, widget, rect, group, + KStyle::tqdrawComplexControl(control, painter, widget, rect, group, flags, controls, active, option); return; } @@ -1853,12 +1851,12 @@ void PhaseStyle::drawComplexControl(ComplexControl control, // check for TQToolBar parent if (btn->parent() && btn->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) { - toolbar = ::qt_cast<TQToolBar*>(btn->parent()); + toolbar = ::tqqt_cast<TQToolBar*>(btn->parent()); if (toolbar) { horiz = (toolbar->orientation() == Qt::Horizontal); if (normal) { // draw background if (flatToolbar(toolbar)) { - // toolbar not floating or in a QMainWindow + // toolbar not floating or in a TQMainWindow painter->fillRect(rect, group.background()); } else { drawPhaseGradient(painter, rect, group.background(), @@ -1875,12 +1873,12 @@ void PhaseStyle::drawComplexControl(ComplexControl control, } } } - // check for QToolBarExtensionWidget parent + // check for TQToolBarExtensionWidget parent else if (btn->parent() && - btn->parent()->inherits(QTOOLBAREXTENSION)) { + btn->parent()->inherits(TQTOOLBAREXTENSION)) { TQWidget *extension; - if ((extension = ::qt_cast<TQWidget*>(btn->parent()))) { - toolbar = ::qt_cast<TQToolBar*>(extension->parent()); + if ((extension = ::tqqt_cast<TQWidget*>(btn->parent()))) { + toolbar = ::tqqt_cast<TQToolBar*>(extension->parent()); if (toolbar) { horiz = (toolbar->orientation() == Qt::Horizontal); if (normal) { // draw background @@ -1907,7 +1905,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control, // now draw active buttons if (down || on) { drawPhasePanel(painter, x, y, w, h, group, true, - &group.brush(TQColorGroup::Button)); + &group.tqbrush(TQColorGroup::Button)); } else if (raised) { drawPhaseBevel(painter, x, y, w, h, group, group.button(), false, !horiz, true); @@ -1917,18 +1915,18 @@ void PhaseStyle::drawComplexControl(ComplexControl control, } default: - KStyle::drawComplexControl(control, painter, widget, rect, group, + KStyle::tqdrawComplexControl(control, painter, widget, rect, group, flags, controls, active, option); break; } } ////////////////////////////////////////////////////////////////////////////// -// drawComplexControlMask() +// tqdrawComplexControlMask() // ------------------------ // Draw a bitmask for the control -void PhaseStyle::drawComplexControlMask(ComplexControl control, +void PhaseStyle::tqdrawComplexControlMask(TQ_ComplexControl control, TQPainter *painter, const TQWidget *widget, const TQRect &rect, @@ -1937,25 +1935,25 @@ void PhaseStyle::drawComplexControlMask(ComplexControl control, switch (control) { case CC_ComboBox: case CC_ToolButton: { - painter->fillRect(rect, Qt::color1); - painter->setPen(Qt::color0); + painter->fillRect(rect, TQt::color1); + painter->setPen(TQt::color0); break; } default: - KStyle::drawComplexControlMask(control,painter,widget,rect,option); + KStyle::tqdrawComplexControlMask(control,painter,widget,rect,option); } } ////////////////////////////////////////////////////////////////////////////// -// pixelMetric() +// tqpixelMetric() // ------------- // Get the pixel metric for metric -int PhaseStyle::pixelMetric(PixelMetric metric, const TQWidget *widget) const +int PhaseStyle::tqpixelMetric(PixelMetric metric, const TQWidget *widget) const { // not using widget's font, so that all metrics are uniform - int em = QMAX(TQApplication::fontMetrics().strikeOutPos() * 3, 17); + int em = TQMAX(TQApplication::fontMetrics().strikeOutPos() * 3, 17); switch (metric) { case PM_DefaultFrameWidth: @@ -1974,8 +1972,8 @@ int PhaseStyle::pixelMetric(PixelMetric metric, const TQWidget *widget) const return 24; case PM_TabBarTabVSpace: - if (const TQTabBar *tb = ::qt_cast<const TQTabBar*>(widget)) { - if (tb->shape() == TQTabBar::RoundedAbove) { + if (const TQTabBar *tb = ::tqqt_cast<const TQTabBar*>(widget)) { + if (tb->tqshape() == TQTabBar::RoundedAbove) { return 10; } else { return 6; @@ -2002,7 +2000,7 @@ int PhaseStyle::pixelMetric(PixelMetric metric, const TQWidget *widget) const return em; default: - return KStyle::pixelMetric(metric, widget); + return KStyle::tqpixelMetric(metric, widget); } } @@ -2031,14 +2029,14 @@ TQRect PhaseStyle::subRect(SubRect rect, const TQWidget *widget) const // ------------------------ // Get metrics for subcontrols of complex controls -TQRect PhaseStyle::querySubControlMetrics(ComplexControl control, +TQRect PhaseStyle::querySubControlMetrics(TQ_ComplexControl control, const TQWidget *widget, SubControl subcontrol, const TQStyleOption &option) const { TQRect rect; - const int fw = pixelMetric(PM_DefaultFrameWidth, widget); + const int fw = tqpixelMetric(PM_DefaultFrameWidth, widget); int w = widget->width(), h = widget->height(); int xc; @@ -2071,7 +2069,7 @@ TQRect PhaseStyle::querySubControlMetrics(ComplexControl control, } case CC_ScrollBar: { - const TQScrollBar *sb = ::qt_cast<const TQScrollBar*>(widget); + const TQScrollBar *sb = ::tqqt_cast<const TQScrollBar*>(widget); if (!sb) break; bool horizontal = (sb->orientation() == Qt::Horizontal); @@ -2126,11 +2124,11 @@ TQRect PhaseStyle::querySubControlMetrics(ComplexControl control, } ////////////////////////////////////////////////////////////////////////////// -// sizeFromContents() +// tqsizeFromContents() // ------------------ // Returns the size of widget based on the contentsize -TQSize PhaseStyle::sizeFromContents(ContentsType contents, +TQSize PhaseStyle::tqsizeFromContents(ContentsType contents, const TQWidget* widget, const TQSize &contentsize, const TQStyleOption &option ) const @@ -2140,13 +2138,13 @@ TQSize PhaseStyle::sizeFromContents(ContentsType contents, switch (contents) { case CT_PushButton: { - const TQPushButton* button = ::qt_cast<const TQPushButton*>(widget); + const TQPushButton* button = ::tqqt_cast<const TQPushButton*>(widget); if (!button) { - return KStyle::sizeFromContents(contents, widget, contentsize, + return KStyle::tqsizeFromContents(contents, widget, contentsize, option); } - int margin = pixelMetric(PM_ButtonMargin, widget) - + pixelMetric(PM_DefaultFrameWidth, widget) + 4; + int margin = tqpixelMetric(PM_ButtonMargin, widget) + + tqpixelMetric(PM_DefaultFrameWidth, widget) + 4; w += margin + 6; // add room for bold font h += margin; @@ -2161,16 +2159,16 @@ TQSize PhaseStyle::sizeFromContents(ContentsType contents, case CT_PopupMenuItem: { if (!widget || option.isDefault()) return contentsize; - const TQPopupMenu *popup = ::qt_cast<const TQPopupMenu*>(widget); + const TQPopupMenu *popup = ::tqqt_cast<const TQPopupMenu*>(widget); if (!popup) { - return KStyle::sizeFromContents(contents, widget, contentsize, + return KStyle::tqsizeFromContents(contents, widget, contentsize, option); } TQMenuItem *item = option.menuItem(); if (item->custom()) { - w = item->custom()->sizeHint().width(); - h = item->custom()->sizeHint().height(); + w = item->custom()->tqsizeHint().width(); + h = item->custom()->tqsizeHint().height(); if (!item->custom()->fullSpan()) h += ITEMVMARGIN*2 + ITEMFRAME*2; } else if (item->widget()) { // a menu item that is a widget @@ -2180,14 +2178,14 @@ TQSize PhaseStyle::sizeFromContents(ContentsType contents, w = h = 3; } else { if (item->pixmap()) { - h = QMAX(h, item->pixmap()->height() + ITEMFRAME*2); + h = TQMAX(h, item->pixmap()->height() + ITEMFRAME*2); } else { - h = QMAX(h, MINICONSIZE + ITEMFRAME*2); - h = QMAX(h, popup->fontMetrics().height() + h = TQMAX(h, MINICONSIZE + ITEMFRAME*2); + h = TQMAX(h, popup->fontMetrics().height() + ITEMVMARGIN*2 + ITEMFRAME*2); } if (item->iconSet()) - h = QMAX(h, item->iconSet()-> + h = TQMAX(h, item->iconSet()-> pixmap(TQIconSet::Small, TQIconSet::Normal).height() + ITEMFRAME*2); } @@ -2198,7 +2196,7 @@ TQSize PhaseStyle::sizeFromContents(ContentsType contents, w += 2 * ARROWMARGIN; if (option.maxIconWidth() || popup->isCheckable()) { - w += QMAX(option.maxIconWidth(), + w += TQMAX(option.maxIconWidth(), TQIconSet::iconSize(TQIconSet::Small).width()) + ITEMHMARGIN*2; } @@ -2207,7 +2205,7 @@ TQSize PhaseStyle::sizeFromContents(ContentsType contents, } default: - return KStyle::sizeFromContents(contents, widget, contentsize, + return KStyle::tqsizeFromContents(contents, widget, contentsize, option); } } @@ -2255,87 +2253,87 @@ bool PhaseStyle::eventFilter(TQObject *object, TQEvent *event) // KDE Toolbar Widget // patch by Daniel Brownlees <dbrownlees@paradise.net.nz> if (object->parent() && !qstrcmp(object->name(), KTOOLBARWIDGET)) { - if (0 == (widget = ::qt_cast<TQWidget*>(object))) return false; - TQWidget *parent = ::qt_cast<TQWidget*>(object->parent()); + if (0 == (widget = ::tqqt_cast<TQWidget*>(object))) return false; + TQWidget *parent = ::tqqt_cast<TQWidget*>(object->parent()); int px = widget->x(), py = widget->y(); // find the toolbar while (parent && parent->parent() - && !::qt_cast<TQToolBar*>(parent)) { + && !::tqqt_cast<TQToolBar*>(parent)) { px += parent->x(); py += parent->y(); - parent = ::qt_cast<TQWidget*>(parent->parent()); + parent = ::tqqt_cast<TQWidget*>(parent->parent()); } if (!parent) return false; - widget->rect().rect(&x, &y, &w, &h); + TQT_TQRECT_OBJECT(widget->rect()).rect(&x, &y, &w, &h); TQRect prect = parent->rect(); - toolbar = ::qt_cast<TQToolBar*>(parent); + toolbar = ::tqqt_cast<TQToolBar*>(parent); horiz = (toolbar) ? (toolbar->orientation() == Qt::Horizontal) : (prect.height() < prect.width()); TQPainter painter(widget); if (flatToolbar(toolbar)) { painter.fillRect(widget->rect(), - parent->colorGroup().background()); + parent->tqcolorGroup().background()); } else { drawPhaseGradient(&painter, widget->rect(), - parent->colorGroup().background(), + parent->tqcolorGroup().background(), !horiz, px, py, prect.width(), prect.height(), true); if (horiz && (h==prect.height()-2)) { - painter.setPen(parent->colorGroup().mid()); + painter.setPen(parent->tqcolorGroup().mid()); painter.drawLine(x, h-1, w-1, h-1); } else if (!horiz && (w==prect.width()-2)) { - painter.setPen(parent->colorGroup().mid()); + painter.setPen(parent->tqcolorGroup().mid()); painter.drawLine(w-1, y, w-1, h-1); } } } - // QToolBarExtensionWidget + // TQToolBarExtensionWidget else if (object && object->isWidgetType() && object->parent() && - (toolbar = ::qt_cast<TQToolBar*>(object->parent()))) { - if (0 == (widget = ::qt_cast<TQWidget*>(object))) return false; + (toolbar = ::tqqt_cast<TQToolBar*>(object->parent()))) { + if (0 == (widget = ::tqqt_cast<TQWidget*>(object))) return false; horiz = (toolbar->orientation() == Qt::Horizontal); TQPainter painter(widget); - widget->rect().rect(&x, &y, &w, &h); + TQT_TQRECT_OBJECT(widget->rect()).rect(&x, &y, &w, &h); // draw the extension drawPhaseGradient(&painter, widget->rect(), - toolbar->colorGroup().background(), + toolbar->tqcolorGroup().background(), !horiz, x, y, w-1, h-1, true); if (horiz) { - painter.setPen(toolbar->colorGroup().dark()); + painter.setPen(toolbar->tqcolorGroup().dark()); painter.drawLine(w-1, 0, w-1, h-1); - painter.setPen(toolbar->colorGroup().mid()); + painter.setPen(toolbar->tqcolorGroup().mid()); painter.drawLine(w-2, 0, w-2, h-2); painter.drawLine(x, h-1, w-2, h-1); painter.drawLine(x, y, x, h-2); - painter.setPen(toolbar->colorGroup().midlight()); + painter.setPen(toolbar->tqcolorGroup().midlight()); painter.drawLine(x+1, y, x+1, h-2); } else { - painter.setPen(toolbar->colorGroup().dark()); + painter.setPen(toolbar->tqcolorGroup().dark()); painter.drawLine(0, h-1, w-1, h-1); - painter.setPen(toolbar->colorGroup().mid()); + painter.setPen(toolbar->tqcolorGroup().mid()); painter.drawLine(0, h-2, w-2, h-2); painter.drawLine(w-1, y, w-1, h-2); painter.drawLine(x, y, w-2, y); - painter.setPen(toolbar->colorGroup().midlight()); + painter.setPen(toolbar->tqcolorGroup().midlight()); painter.drawLine(x, y+1, w-2, y+1); } } // TQFrame lines (do this guy last) - else if (0 != (frame = ::qt_cast<TQFrame*>(object))) { - TQFrame::Shape shape = frame->frameShape(); - switch (shape) { + else if (0 != (frame = ::tqqt_cast<TQFrame*>(object))) { + TQFrame::Shape tqshape = frame->frameShape(); + switch (tqshape) { case TQFrame::HLine: case TQFrame::VLine: { // NOTE: assuming lines have no content TQPainter painter(frame); - frame->rect().rect(&x, &y, &w, &h); - painter.setPen(frame->colorGroup().dark()); - if (shape == TQFrame::HLine) { + TQT_TQRECT_OBJECT(frame->rect()).rect(&x, &y, &w, &h); + painter.setPen(frame->tqcolorGroup().dark()); + if (tqshape == TQFrame::HLine) { painter.drawLine(0, h/2, w, h/2); - } else if (shape == TQFrame::VLine) { + } else if (tqshape == TQFrame::VLine) { painter.drawLine(w/2, 0, w/2, h); } return true; @@ -2346,48 +2344,48 @@ bool PhaseStyle::eventFilter(TQObject *object, TQEvent *event) } } else if (highlights_) { // "mouseover" events - if (::qt_cast<TQPushButton*>(object) || - ::qt_cast<TQComboBox*>(object) || - ::qt_cast<TQSpinWidget*>(object) || - ::qt_cast<TQCheckBox*>(object) || - ::qt_cast<TQRadioButton*>(object) || - ::qt_cast<TQSlider*>(object) || - object->inherits(QSPLITTERHANDLE)) { + if (::tqqt_cast<TQPushButton*>(object) || + ::tqqt_cast<TQComboBox*>(object) || + ::tqqt_cast<TQSpinWidget*>(object) || + ::tqqt_cast<TQCheckBox*>(object) || + ::tqqt_cast<TQRadioButton*>(object) || + ::tqqt_cast<TQSlider*>(object) || + object->inherits(TQSPLITTERHANDLE)) { if (event->type() == TQEvent::Enter) { - if (0 != (widget = ::qt_cast<TQWidget*>(object)) && + if (0 != (widget = ::tqqt_cast<TQWidget*>(object)) && widget->isEnabled()) { hover_ = widget; - widget->repaint(false); + widget->tqrepaint(false); } } else if (event->type() == TQEvent::Leave) { - if (0 != (widget = ::qt_cast<TQWidget*>(object))) { + if (0 != (widget = ::tqqt_cast<TQWidget*>(object))) { hover_ = 0; - widget->repaint(false); + widget->tqrepaint(false); } } - } else if (::qt_cast<TQTabBar*>(object)) { // special case for qtabbar + } else if (::tqqt_cast<TQTabBar*>(object)) { // special case for qtabbar if (event->type() == TQEvent::Enter) { - if (0 != (widget = ::qt_cast<TQWidget*>(object)) && + if (0 != (widget = ::tqqt_cast<TQWidget*>(object)) && widget->isEnabled()) { hover_ = widget; hovertab_ = 0;; - widget->repaint(false); + widget->tqrepaint(false); } } else if (event->type() == TQEvent::Leave) { - if (0 != (widget = ::qt_cast<TQWidget*>(object))) { + if (0 != (widget = ::tqqt_cast<TQWidget*>(object))) { hover_ = 0; hovertab_ = 0;; - widget->repaint(false); + widget->tqrepaint(false); } } else if (event->type() == TQEvent::MouseMove) { TQTabBar *tabbar; - if (0 != (tabbar = ::qt_cast<TQTabBar*>(object))) { + if (0 != (tabbar = ::tqqt_cast<TQTabBar*>(object))) { TQMouseEvent *me; if (0 != (me = dynamic_cast<TQMouseEvent*>(event))) { TQTab *tab = tabbar->selectTab(me->pos()); if (hovertab_ != tab) { hovertab_ = tab; - tabbar->repaint(false); + tabbar->tqrepaint(false); } } } @@ -2485,7 +2483,7 @@ KPixmap* GradientSet::gradient(bool horizontal, bool reverse) // Plugin Stuff // ////////////////////////////////////////////////////////////////////////////// -class PhaseStylePlugin : public QStylePlugin +class PhaseStylePlugin : public TQStylePlugin { public: PhaseStylePlugin(); diff --git a/styles/phase/phasestyle.h b/styles/phase/phasestyle.h index 5c44c742..9d81264e 100644 --- a/styles/phase/phasestyle.h +++ b/styles/phase/phasestyle.h @@ -1,7 +1,7 @@ ////////////////////////////////////////////////////////////////////////////// // phasestyle.h // ------------------- -// Qt/KDE widget style +// TQt/KDE widget style // ------------------- // Copyright (c) 2004 David Johnson <david@usermode.org> // @@ -57,6 +57,7 @@ private: class PhaseStyle : public KStyle { Q_OBJECT + TQ_OBJECT public: PhaseStyle(); virtual ~PhaseStyle(); @@ -66,7 +67,7 @@ public: void polish(TQPalette &pal); void unPolish(TQWidget *widget); - void drawPrimitive(PrimitiveElement element, + void tqdrawPrimitive(TQ_PrimitiveElement element, TQPainter *painter, const TQRect &rect, const TQColorGroup &group, @@ -81,7 +82,7 @@ public: SFlags flags = Style_Default, const TQStyleOption &option = TQStyleOption::Default) const; - void drawControl(ControlElement element, + void tqdrawControl(TQ_ControlElement element, TQPainter *painter, const TQWidget *widget, const TQRect &rect, @@ -89,13 +90,13 @@ public: SFlags flags = Style_Default, const TQStyleOption &option = TQStyleOption::Default) const; - void drawControlMask(ControlElement element, + void tqdrawControlMask(TQ_ControlElement element, TQPainter *painter, const TQWidget *widget, const TQRect &rect, const TQStyleOption &option = TQStyleOption::Default) const; - void drawComplexControl(ComplexControl control, + void tqdrawComplexControl(TQ_ComplexControl control, TQPainter *painter, const TQWidget *widget, const TQRect &rect, @@ -105,23 +106,23 @@ public: SCFlags active = SC_None, const TQStyleOption &option = TQStyleOption::Default) const; - void drawComplexControlMask(ComplexControl control, + void tqdrawComplexControlMask(TQ_ComplexControl control, TQPainter *painter, const TQWidget *widget, const TQRect &rect, const TQStyleOption &option = TQStyleOption::Default) const; - int pixelMetric(PixelMetric metric, + int tqpixelMetric(PixelMetric metric, const TQWidget *widget = 0) const; TQRect subRect(SubRect rect, const TQWidget *widget) const; - TQRect querySubControlMetrics(ComplexControl control, + TQRect querySubControlMetrics(TQ_ComplexControl control, const TQWidget *widget, SubControl subcontrol, const TQStyleOption &option = TQStyleOption::Default) const; - TQSize sizeFromContents(ContentsType contents, + TQSize tqsizeFromContents(ContentsType contents, const TQWidget *widget, const TQSize &contentsize, const TQStyleOption& option = TQStyleOption::Default) const; |