diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:28:28 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:28:28 -0600 |
| commit | f35eb5f602bee29af07ecaffe26cda71cea62b93 (patch) | |
| tree | 1fc05bfb9117480c134ca063285ec604c07c6271 | |
| parent | 48afe4d8df11f862f7ccc60f0594991f857f81db (diff) | |
| download | tdeartwork-f35eb5f602bee29af07ecaffe26cda71cea62b93.tar.gz tdeartwork-f35eb5f602bee29af07ecaffe26cda71cea62b93.zip | |
Rename old tq methods that no longer need a unique name
47 files changed, 366 insertions, 366 deletions
diff --git a/kscreensaver/kdesavers/Euphoria.cpp b/kscreensaver/kdesavers/Euphoria.cpp index 199d339d..ea86dcb9 100644 --- a/kscreensaver/kdesavers/Euphoria.cpp +++ b/kscreensaver/kdesavers/Euphoria.cpp @@ -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( tqsizeHint() ); + setMinimumSize( sizeHint() ); } diff --git a/kscreensaver/kdesavers/banner.cpp b/kscreensaver/kdesavers/banner.cpp index e49ca556..30978cae 100644 --- a/kscreensaver/kdesavers/banner.cpp +++ b/kscreensaver/kdesavers/banner.cpp @@ -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->tqsizeHint()); + cyclingColorCb->setMinimumSize(cyclingColorCb->sizeHint()); gl->addMultiCellWidget(cyclingColorCb,5,5,0,1); connect(cyclingColorCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotCyclingColor(bool))); cyclingColorCb->setChecked(cyclingColor); @@ -155,7 +155,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name ) TQT_SLOT( slotMessage( const TQString & ) ) ); TQCheckBox *timeCb=new TQCheckBox( i18n("Show current time"), main); - timeCb->setFixedSize(timeCb->tqsizeHint()); + timeCb->setFixedSize(timeCb->sizeHint()); 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().tqpointSizes( fontFamily ); + sizes = TQFontDatabase().pointSizes( fontFamily ); sizes << 96 << 128 << 156 << 0; int current = 0; while ( sizes[i] ) diff --git a/kscreensaver/kdesavers/firesaversetup.ui b/kscreensaver/kdesavers/firesaversetup.ui index 5fbadc0c..8adcaa35 100644 --- a/kscreensaver/kdesavers/firesaversetup.ui +++ b/kscreensaver/kdesavers/firesaversetup.ui @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>201</width> <height>31</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>220</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>210</height> @@ -171,7 +171,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>43</width> <height>180</height> @@ -182,13 +182,13 @@ <property name="name"> <cstring>previewFrame</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>240</width> <height>180</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>240</width> <height>180</height> @@ -236,7 +236,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>180</height> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>260</width> <height>21</height> @@ -412,7 +412,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>125</width> <height>21</height> @@ -488,7 +488,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>125</width> <height>21</height> @@ -526,7 +526,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -562,7 +562,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>309</width> <height>21</height> @@ -605,7 +605,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -635,7 +635,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>0</height> @@ -714,7 +714,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>80</height> @@ -828,7 +828,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>80</height> @@ -903,7 +903,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -954,7 +954,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>70</height> @@ -1097,7 +1097,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>21</height> @@ -1135,7 +1135,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>50</height> @@ -1247,7 +1247,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>149</width> <height>21</height> @@ -1334,7 +1334,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -1400,7 +1400,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -1438,7 +1438,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -1504,7 +1504,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>117</width> <height>21</height> @@ -1545,7 +1545,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -1611,7 +1611,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>21</height> @@ -1655,7 +1655,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> diff --git a/kscreensaver/kdesavers/fountain.cpp b/kscreensaver/kdesavers/fountain.cpp index 2c208b4c..802bef5e 100644 --- a/kscreensaver/kdesavers/fountain.cpp +++ b/kscreensaver/kdesavers/fountain.cpp @@ -218,8 +218,8 @@ Fountain::~Fountain() /** load the particle file */ bool Fountain::loadParticle() { - /* tqStatus indicator */ - bool tqStatus = TRUE; + /* Status indicator */ + bool Status = TRUE; TQImage buf; kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl; @@ -238,7 +238,7 @@ bool Fountain::loadParticle() } /* Set the status to true */ - //tqStatus = TRUE; + //Status = 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 tqStatus; + return Status; } /** setup the GL enviroment */ void Fountain::initializeGL () diff --git a/kscreensaver/kdesavers/fountaincfg.ui b/kscreensaver/kdesavers/fountaincfg.ui index f77750aa..3b5eacd7 100644 --- a/kscreensaver/kdesavers/fountaincfg.ui +++ b/kscreensaver/kdesavers/fountaincfg.ui @@ -12,7 +12,7 @@ <height>209</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>209</height> diff --git a/kscreensaver/kdesavers/gravity.cpp b/kscreensaver/kdesavers/gravity.cpp index 93ae1660..dd9520d5 100644 --- a/kscreensaver/kdesavers/gravity.cpp +++ b/kscreensaver/kdesavers/gravity.cpp @@ -206,8 +206,8 @@ Gravity::~Gravity() /** load the particle file */ bool Gravity::loadParticle() { - /* tqStatus indicator */ - bool tqStatus = TRUE; + /* Status indicator */ + bool Status = TRUE; TQImage buf; kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl; @@ -226,7 +226,7 @@ bool Gravity::loadParticle() } /* Set the status to true */ - //tqStatus = TRUE; + //Status = 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 tqStatus; + return Status; } /** setup the GL enviroment */ void Gravity::initializeGL () diff --git a/kscreensaver/kdesavers/gravitycfg.ui b/kscreensaver/kdesavers/gravitycfg.ui index 062b6e83..2d809c1f 100644 --- a/kscreensaver/kdesavers/gravitycfg.ui +++ b/kscreensaver/kdesavers/gravitycfg.ui @@ -12,7 +12,7 @@ <height>209</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>209</height> diff --git a/kscreensaver/kdesavers/kclock.cpp b/kscreensaver/kdesavers/kclock.cpp index 5ecea27c..cffa28e3 100644 --- a/kscreensaver/kdesavers/kclock.cpp +++ b/kscreensaver/kdesavers/kclock.cpp @@ -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->tqsetAlignment(rtl ? AlignRight : AlignLeft); + label->setAlignment(rtl ? AlignRight : AlignLeft); label = new TQLabel(i18n("Medium"), qsscale); - label->tqsetAlignment(AlignHCenter); + label->setAlignment(AlignHCenter); label = new TQLabel(i18n("Big"), qsscale); - label->tqsetAlignment(rtl ? AlignLeft : AlignRight); + label->setAlignment(rtl ? AlignLeft : AlignRight); top->addWidget(qsscale); TQCheckBox *keepCentered = new TQCheckBox(i18n("&Keep clock centered"), main); diff --git a/kscreensaver/kdesavers/pendulumcfg.ui b/kscreensaver/kdesavers/pendulumcfg.ui index 0b28fc61..d25cf5e0 100644 --- a/kscreensaver/kdesavers/pendulumcfg.ui +++ b/kscreensaver/kdesavers/pendulumcfg.ui @@ -20,13 +20,13 @@ <verstretch>2</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>1200</width> <height>900</height> @@ -102,7 +102,7 @@ m<sub>1</sub>+m<sub>2</sub> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -146,7 +146,7 @@ l<sub>1</sub>+l<sub>2</sub> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -189,7 +189,7 @@ l<sub>1</sub>+l<sub>2</sub> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -232,7 +232,7 @@ l<sub>1</sub>+l<sub>2</sub> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -276,13 +276,13 @@ Change [s]</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -303,7 +303,7 @@ Change [s]</string> <property name="name"> <cstring>barColorButton</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> @@ -317,7 +317,7 @@ Change [s]</string> <property name="name"> <cstring>m1ColorButton</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> @@ -331,7 +331,7 @@ Change [s]</string> <property name="name"> <cstring>m2ColorButton</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> @@ -353,7 +353,7 @@ Change [s]</string> <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -374,7 +374,7 @@ Change [s]</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>150</height> @@ -401,7 +401,7 @@ Change [s]</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>66</width> <height>31</height> @@ -445,7 +445,7 @@ Change [s]</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>65</width> <height>31</height> diff --git a/kscreensaver/kdesavers/polygon.cpp b/kscreensaver/kdesavers/polygon.cpp index c4e8057c..d32a569b 100644 --- a/kscreensaver/kdesavers/polygon.cpp +++ b/kscreensaver/kdesavers/polygon.cpp @@ -102,7 +102,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name ) saver = new kPolygonSaver( preview->winId() ); tl->addWidget(preview); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); } kPolygonSetup::~kPolygonSetup() diff --git a/kscreensaver/kdesavers/rotationcfg.ui b/kscreensaver/kdesavers/rotationcfg.ui index 8aa3cb53..c3884b22 100644 --- a/kscreensaver/kdesavers/rotationcfg.ui +++ b/kscreensaver/kdesavers/rotationcfg.ui @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>1200</width> <height>900</height> @@ -148,7 +148,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> @@ -186,7 +186,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -240,7 +240,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -262,7 +262,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>51</height> @@ -275,7 +275,7 @@ <property name="name"> <cstring>preview</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>150</height> @@ -302,7 +302,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>31</height> @@ -356,7 +356,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>31</height> diff --git a/kscreensaver/kdesavers/slideshowcfg.ui b/kscreensaver/kdesavers/slideshowcfg.ui index 89856efe..e63dbd55 100644 --- a/kscreensaver/kdesavers/slideshowcfg.ui +++ b/kscreensaver/kdesavers/slideshowcfg.ui @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>161</width> <height>20</height> @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>19</height> diff --git a/kscreensaver/kdesavers/wave.cpp b/kscreensaver/kdesavers/wave.cpp index 7d94057f..d77a72aa 100644 --- a/kscreensaver/kdesavers/wave.cpp +++ b/kscreensaver/kdesavers/wave.cpp @@ -288,8 +288,8 @@ void Wave::paintGL () bool Wave::LoadGLTextures() { - /* tqStatus indicator */ - bool tqStatus = TRUE; + /* Status indicator */ + bool Status = TRUE; TQImage buf; // = TQPixmap::grabWindow ( 0 ).convertToImage(); kdDebug() << "Loading: " << locate("data", "kscreensaver/image.png") << endl; @@ -307,7 +307,7 @@ bool Wave::LoadGLTextures() tex = convertToGLFormat( buf ); } /* Set the status to true */ - //tqStatus = TRUE; + //Status = 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 tqStatus; + return Status; } diff --git a/kscreensaver/kdesavers/wavecfg.ui b/kscreensaver/kdesavers/wavecfg.ui index fddbdae1..9ad24416 100644 --- a/kscreensaver/kdesavers/wavecfg.ui +++ b/kscreensaver/kdesavers/wavecfg.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>209</height> diff --git a/kscreensaver/kpartsaver/configwidget.ui b/kscreensaver/kpartsaver/configwidget.ui index 816784b6..a246d8f4 100644 --- a/kscreensaver/kpartsaver/configwidget.ui +++ b/kscreensaver/kpartsaver/configwidget.ui @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/kscreensaver/kpartsaver/kpartsaver.cpp b/kscreensaver/kpartsaver/kpartsaver.cpp index 84050b3e..57caa762 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->tqsetAlignment( AlignCenter ); + m_back->setAlignment( AlignCenter ); embed( m_back ); m_back->show(); @@ -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->tqsetAlignment( AlignCenter ); + m_back->setAlignment( AlignCenter ); embed( m_back ); m_back->show(); diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/kscreensaver/kxsconfig/kxsconfig.cpp index 39da69bc..c2eaab25 100644 --- a/kscreensaver/kxsconfig/kxsconfig.cpp +++ b/kscreensaver/kxsconfig/kxsconfig.cpp @@ -118,7 +118,7 @@ bool KXSConfigDialog::create() descr.replace('\n',' '); descr = descr.simplifyWhiteSpace(); TQLabel *l = new TQLabel( i18n( descr.utf8() ), plainPage() ); - l->tqsetAlignment ( WordBreak ); + l->setAlignment ( WordBreak ); topLayout->addWidget( l ); } } else { diff --git a/kscreensaver/xsavers/helpers.cpp b/kscreensaver/xsavers/helpers.cpp index 242d2f75..ef700545 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->tqsizeHint().width()); + w->setMinimumWidth(w->sizeHint().width()); } void fixed_width(TQWidget *w) { - w->setFixedWidth(w->tqsizeHint().width()); + w->setFixedWidth(w->sizeHint().width()); } void min_height(TQWidget *w) { - w->setMinimumHeight(w->tqsizeHint().height()); + w->setMinimumHeight(w->sizeHint().height()); } void fixed_height(TQWidget *w) { - w->setFixedHeight(w->tqsizeHint().height()); + w->setFixedHeight(w->sizeHint().height()); } void min_size(TQWidget *w) { - w->setMinimumSize(w->tqsizeHint()); + w->setMinimumSize(w->sizeHint()); } void fixed_size(TQWidget *w) { - w->setFixedSize(w->tqsizeHint()); + w->setFixedSize(w->sizeHint()); } KConfig *klock_config() diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp index df40c1a5..227369cd 100644 --- a/styles/dotnet/dotnet.cpp +++ b/styles/dotnet/dotnet.cpp @@ -211,7 +211,7 @@ void dotNETstyle::renderButton(TQPainter *p, p->setBrush(TQBrush::NoBrush); p->drawConvexPolygon(outline); p->setPen(g.button().light()); - p->tqdrawPolyline(outline, 0, 3); + p->drawPolyline(outline, 0, 3); } else { p->setPen(g.button().dark()); p->setBrush(g.button()); @@ -335,13 +335,13 @@ void dotNETstyle::renderPanel(TQPainter *p, p->setPen(g.background().dark()); p->drawConvexPolygon(TQPointArray(4, corners)); p->setPen(g.background().light()); - p->tqdrawPolyline(TQPointArray(4, corners), 0, 3); + p->drawPolyline(TQPointArray(4, corners), 0, 3); } else { 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->tqdrawPolyline(TQPointArray(4, corners), 0, 3); + p->drawPolyline(TQPointArray(4, corners), 0, 3); } } @@ -353,13 +353,13 @@ void dotNETstyle::renderPanel(TQPainter *p, p->setPen(g.background().dark()); p->drawConvexPolygon(TQPointArray(4, corners)); p->setPen(g.background().light()); - p->tqdrawPolyline(TQPointArray(4, corners), 0, 3); + p->drawPolyline(TQPointArray(4, corners), 0, 3); } else { 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->tqdrawPolyline(TQPointArray(4, corners), 0, 3); + p->drawPolyline(TQPointArray(4, corners), 0, 3); } } } @@ -719,8 +719,8 @@ void dotNETstyle::tqdrawPrimitive(TQ_PrimitiveElement pe, p->save(); if (flags & Style_Down) { - p->translate(tqpixelMetric(PM_ButtonShiftHorizontal), - tqpixelMetric(PM_ButtonShiftVertical)); + p->translate(pixelMetric(PM_ButtonShiftHorizontal), + pixelMetric(PM_ButtonShiftVertical)); } if (flags & Style_Enabled) { @@ -757,7 +757,7 @@ void dotNETstyle::tqdrawPrimitive(TQ_PrimitiveElement pe, } -void dotNETstyle::tqdrawControl(TQ_ControlElement element, +void dotNETstyle::drawControl(TQ_ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -827,7 +827,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, p->setPen(cg.highlight().dark(120)); p->drawConvexPolygon(corners); p->setPen(cg.highlight().light(120)); - p->tqdrawPolyline(corners, 0, 3); + p->drawPolyline(corners, 0, 3); if (roundedCorners) { p->setPen(cg.background().dark()); p->drawPoints(corners); @@ -878,7 +878,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, p->setPen(cg.background().dark()); if (selected) { const TQCOORD oCorners[] = { x, y2, x, y, x2, y, x2, y2 }; - p->tqdrawPolyline(TQPointArray(4, oCorners)); + p->drawPolyline(TQPointArray(4, oCorners)); if (roundedCorners) { p->setPen(cg.background()); @@ -898,7 +898,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, p->fillRect(r2, TQColor(cg.mid().light(105))); const TQCOORD oCorners[] = { x, y2, x, y + 2, x2, y + 2, x2, y2 }; - p->tqdrawPolyline(TQPointArray(4, oCorners)); + p->drawPolyline(TQPointArray(4, oCorners)); p->setPen(cg.background()); @@ -952,7 +952,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, p->setPen(cg.background().dark()); if (selected) { const TQCOORD oCorners[] = { x, y + 1, x, y2, x2, y2, x2, y + 1 }; - p->tqdrawPolyline(TQPointArray(4, oCorners)); + p->drawPolyline(TQPointArray(4, oCorners)); p->setPen(cg.background().dark(115)); p->drawLine(x + 1, y + h - 2, x + w - 2, y + h - 2); @@ -967,7 +967,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, TQRect r2(x + 1, y + 2, w - 2, h - 5); p->fillRect(r2, cg.mid().light(105)); - p->tqdrawPolyline(TQPointArray(4, oCorners)); + p->drawPolyline(TQPointArray(4, oCorners)); p->setPen(cg.mid().dark(115)); /* Inner right border */ @@ -1019,7 +1019,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, } default: - winstyle->tqdrawControl(element, p, widget, r, cg, flags, opt); + winstyle->drawControl(element, p, widget, r, cg, flags, opt); } break; @@ -1039,8 +1039,8 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, p->setPen(flags & Style_Enabled ? TQColor(cg.foreground()) : TQColor(cg.mid().dark())); if (!flags & Style_Selected) { - p->translate(tqpixelMetric(PM_ButtonShiftHorizontal), - tqpixelMetric(PM_ButtonShiftVertical)); + p->translate(pixelMetric(PM_ButtonShiftHorizontal), + pixelMetric(PM_ButtonShiftVertical)); } p->drawText(r, text_flags, opt.tab()->text()); @@ -1057,7 +1057,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, TQRect br = r; bool btnDefault = button->isDefault(); - static int di = tqpixelMetric(PM_ButtonDefaultIndicator); + static int di = pixelMetric(PM_ButtonDefaultIndicator); br.addCoords(di, di, -di, -di); if (btnDefault) { @@ -1076,8 +1076,8 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, TQRect ur(r); if (flags & Style_Down) { - p->translate(tqpixelMetric(PM_ButtonShiftHorizontal), - tqpixelMetric(PM_ButtonShiftVertical)); + p->translate(pixelMetric(PM_ButtonShiftHorizontal), + pixelMetric(PM_ButtonShiftVertical)); } if (!pb->text().isEmpty() && (flags & Style_ButtonDefault)) { @@ -1126,7 +1126,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, if ( flags & Style_HasFocus ) tqdrawPrimitive( PE_FocusRect, p, - tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), + visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ), cg, flags ); break; @@ -1257,7 +1257,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, pmr.moveCenter(cr.center()); if (TQApplication::reverseLayout()) - pmr = tqvisualRect( pmr, r ); + pmr = visualRect( pmr, r ); p->setPen(cg.highlightedText()); p->drawPixmap(pmr.topLeft(), pixmap); @@ -1295,7 +1295,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, TQRect rr = TQRect(xp, y+m, tab, h-(2*m)); if (TQApplication::reverseLayout()) - rr = tqvisualRect(rr, r); + rr = visualRect(rr, r); if (useTextShadows) { TQPen op = p->pen(); @@ -1310,7 +1310,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, TQRect rr = TQRect(xpos, y+m, w-xm-tab+1, h-(2*m)); if (TQApplication::reverseLayout()) { - rr = tqvisualRect(rr, r); + rr = visualRect(rr, r); text_flags |= AlignRight; } @@ -1335,7 +1335,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, } if (mi->popup()) { - int dim = tqpixelMetric(PM_MenuButtonIndicator); + int dim = pixelMetric(PM_MenuButtonIndicator); xpos = x+w - arrowHMargin - 2*itemFrame - dim; @@ -1347,7 +1347,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, TQRect rr = TQRect(xpos, y + h/2 - dim/2, dim, dim); if (TQApplication::reverseLayout()) - rr = tqvisualRect( rr, r ); + rr = visualRect( rr, r ); tqdrawPrimitive((TQApplication::reverseLayout() ? PE_ArrowLeft : PE_ArrowRight), p, rr, cg, Style_Enabled); } @@ -1364,7 +1364,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, TQRect rr = TQRect( xp + 6, y + 6, 16, h - 6 ); if (TQApplication::reverseLayout()) - rr = tqvisualRect( rr, r ); + rr = visualRect( rr, r ); tqdrawPrimitive(PE_CheckMark, p, rr, cg, cflags); } @@ -1380,11 +1380,11 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element, p->fillRect(r, cg.button()); break; default: - winstyle->tqdrawControl(element, p, widget, r, cg, flags, opt); + winstyle->drawControl(element, p, widget, r, cg, flags, opt); } } -void dotNETstyle::tqdrawControlMask(TQ_ControlElement element, +void dotNETstyle::drawControlMask(TQ_ControlElement element, TQPainter *p, const TQWidget *w, const TQRect &r, @@ -1407,12 +1407,12 @@ void dotNETstyle::tqdrawControlMask(TQ_ControlElement element, } default: { - KStyle::tqdrawControlMask (element, p, w, r, opt); + KStyle::drawControlMask (element, p, w, r, opt); } } } -void dotNETstyle::tqdrawComplexControlMask(ComplexControl c, +void dotNETstyle::drawComplexControlMask(ComplexControl c, TQPainter *p, const TQWidget *w, const TQRect &r, @@ -1434,12 +1434,12 @@ void dotNETstyle::tqdrawComplexControlMask(ComplexControl c, break; } default: { - KStyle::tqdrawComplexControlMask (c, p, w, r, o); + KStyle::drawComplexControlMask (c, p, w, r, o); } } } -void dotNETstyle::tqdrawComplexControl(ComplexControl control, +void dotNETstyle::drawComplexControl(ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1489,13 +1489,13 @@ void dotNETstyle::tqdrawComplexControl(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 = tqvisualRect(hr, r); } + if (TQApplication::reverseLayout()) { hr = visualRect(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 = tqvisualRect( rr, r ); } + if (TQApplication::reverseLayout()) { rr = visualRect( rr, r ); } if (flags & Style_HasFocus || cg.highlight() == cg.midlight() || (cb->listBox() && cb->listBox()->isVisible())) { @@ -1516,10 +1516,10 @@ void dotNETstyle::tqdrawComplexControl(ComplexControl control, ca.setPoint(1, hr.bottomRight()); ca.setPoint(2, hr.bottomLeft()); p->setPen(test.dark(120)); - p->tqdrawPolyline(ca); + p->drawPolyline(ca); p->setPen(test.light(120)); ca.setPoint(1, hr.topLeft()); - p->tqdrawPolyline(ca); + p->drawPolyline(ca); p->restore(); } @@ -1544,7 +1544,7 @@ void dotNETstyle::tqdrawComplexControl(ComplexControl control, TQRect pmr(0, 0, 7, 4); pmr.moveCenter(cr.center()); if (TQApplication::reverseLayout()) { - pmr = tqvisualRect( pmr, r ); + pmr = visualRect( pmr, r ); } p->drawPixmap(pmr.topLeft(), downArrow); @@ -1608,7 +1608,7 @@ void dotNETstyle::tqdrawComplexControl(ComplexControl control, TQ_PrimitiveElement pe; TQRect swf = querySubControlMetrics(control, sw, SC_SpinWidgetFrame); - swf = tqvisualRect( swf, sw ); + swf = visualRect( swf, sw ); if (controls & SC_SpinWidgetFrame) { // Don't draw the WindowsStyle thick frame. @@ -1690,7 +1690,7 @@ void dotNETstyle::tqdrawComplexControl(ComplexControl control, } default: - KStyle::tqdrawComplexControl(control, p, widget, + KStyle::drawComplexControl(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 = tqpixelMetric(PM_ButtonDefaultIndicator, widget) + tqpixelMetric(PM_DefaultFrameWidth, widget) + 2; + int margin = pixelMetric(PM_ButtonDefaultIndicator, widget) + pixelMetric(PM_DefaultFrameWidth, widget) + 2; rect.addCoords(margin, margin, -margin, -margin); return rect; @@ -1749,7 +1749,7 @@ TQRect dotNETstyle::querySubControlMetrics(ComplexControl control, } case CC_SpinWidget: { - int fw = tqpixelMetric(PM_SpinBoxFrameWidth, widget); + int fw = pixelMetric(PM_SpinBoxFrameWidth, widget); TQSize bs; bs.setHeight(TQMAX(8, widget->height()/2)); bs.setWidth(TQMIN(bs.height() * 8 / 5, widget->width() / 4)); @@ -1787,7 +1787,7 @@ TQRect dotNETstyle::querySubControlMetrics(ComplexControl control, return KStyle::querySubControlMetrics(control, widget, subcontrol, opt); } -int dotNETstyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const +int dotNETstyle::pixelMetric(PixelMetric m, const TQWidget *widget) const { switch(m) { // TABS @@ -1878,7 +1878,7 @@ int dotNETstyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const } default: - return KStyle::tqpixelMetric(m, widget); + return KStyle::pixelMetric(m, widget); } } @@ -1901,8 +1901,8 @@ TQSize dotNETstyle::tqsizeFromContents(ContentsType t, bool checkable = popup->isCheckable(); if (mi->custom()) { - w = mi->custom()->tqsizeHint().width(); - h = mi->custom()->tqsizeHint().height(); + w = mi->custom()->sizeHint().width(); + h = mi->custom()->sizeHint().height(); } else if (mi->widget()) { // don't change the size in this case. } else if (mi->isSeparator()) { @@ -1945,8 +1945,8 @@ TQSize dotNETstyle::tqsizeFromContents(ContentsType t, const TQPushButton* button = (const TQPushButton*) widget; int w = s.width(); int h = s.height(); - int bm = tqpixelMetric( PM_ButtonMargin, widget ); - int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2; + int bm = pixelMetric( PM_ButtonMargin, widget ); + int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2; //We use bold font sometimes, so that make take more space than TQt allocated. TQFontMetrics origFM = button->fontMetrics(); @@ -1968,7 +1968,7 @@ TQSize dotNETstyle::tqsizeFromContents(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 = tqpixelMetric( PM_ButtonDefaultIndicator ); + int di = pixelMetric( PM_ButtonDefaultIndicator ); w += di * 2; h += di * 2; diff --git a/styles/dotnet/dotnet.h b/styles/dotnet/dotnet.h index f2dbcf8a..5e4f104a 100644 --- a/styles/dotnet/dotnet.h +++ b/styles/dotnet/dotnet.h @@ -62,7 +62,7 @@ public: SFlags flags = Style_Default, const TQStyleOption &opt = TQStyleOption::Default ) const; - void tqdrawControl( TQ_ControlElement element, + void drawControl( TQ_ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -70,9 +70,9 @@ public: SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void tqdrawControlMask( TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const; + void drawControlMask( TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const; - void tqdrawComplexControl( ComplexControl control, + void drawComplexControl( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -82,7 +82,7 @@ public: SCFlags active = SC_None, const TQStyleOption& = TQStyleOption::Default ) const; - int tqpixelMetric( PixelMetric m, + int pixelMetric( PixelMetric m, const TQWidget *widget = 0 ) const; TQRect subRect( SubRect r, @@ -93,7 +93,7 @@ public: SubControl subcontrol, const TQStyleOption &opt = TQStyleOption::Default ) const; - void tqdrawComplexControlMask(TQStyle::ComplexControl c, + void drawComplexControlMask(TQStyle::ComplexControl c, TQPainter *p, const TQWidget *w, const TQRect &r, diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp index dc9a75fb..8c5c0778 100644 --- a/styles/phase/phasestyle.cpp +++ b/styles/phase/phasestyle.cpp @@ -749,7 +749,7 @@ void PhaseStyle::tqdrawPrimitive(TQ_PrimitiveElement element, break; case PE_ExclusiveIndicator: { - // note that this requires an even size from tqpixelMetric + // note that this requires an even size from pixelMetric cx = (x + x2) / 2; cy = (y + y2) / 2; @@ -761,14 +761,14 @@ void PhaseStyle::tqdrawPrimitive(TQ_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->tqdrawConvexPolygon(parray, 0, 8); + painter->drawConvexPolygon(parray, 0, 8); painter->setPen(group.mid()); parray.putPoints(0, 4, x,cy, cx,y, cx+1,y, x2,cy); - painter->tqdrawPolyline(parray, 0, 4); + painter->drawPolyline(parray, 0, 4); painter->setPen(group.midlight()); parray.putPoints(0, 4, x2,cy+1, cx+1,y2, cx,y2, x,cy+1); - painter->tqdrawPolyline(parray, 0, 4); + painter->drawPolyline(parray, 0, 4); if (on) { painter->setBrush(group.brush(TQColorGroup::Highlight)); @@ -778,14 +778,14 @@ void PhaseStyle::tqdrawPrimitive(TQ_PrimitiveElement element, 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->tqdrawConvexPolygon(parray, 0, 8); + painter->drawConvexPolygon(parray, 0, 8); } else if (mouseover) { 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->tqdrawPolyline(parray, 0, 9); + painter->drawPolyline(parray, 0, 9); } break; } @@ -798,7 +798,7 @@ void PhaseStyle::tqdrawPrimitive(TQ_PrimitiveElement element, 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->tqdrawConvexPolygon(parray, 0, 8); + painter->drawConvexPolygon(parray, 0, 8); painter->setPen(TQt::color0); break; @@ -1127,11 +1127,11 @@ void PhaseStyle::drawKStylePrimitive(KStylePrimitive element, } ////////////////////////////////////////////////////////////////////////////// -// tqdrawControl() +// drawControl() // ------------- // Draw the control -void PhaseStyle::tqdrawControl(TQ_ControlElement element, +void PhaseStyle::drawControl(TQ_ControlElement element, TQPainter *painter, const TQWidget *widget, const TQRect &rect, @@ -1153,7 +1153,7 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, switch (element) { case CE_PushButton: { depress = flags & (Style_Down | Style_On); - int bd = tqpixelMetric(PM_ButtonDefaultIndicator, widget) + 1; + int bd = pixelMetric(PM_ButtonDefaultIndicator, widget) + 1; if ((flags & Style_ButtonDefault) && !depress) { drawPhasePanel(painter, x, y, w, h, group, true, @@ -1181,7 +1181,7 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, case CE_PushButtonLabel: { const TQPushButton* button = ::tqqt_cast<const TQPushButton*>(widget); if (!button) { - KStyle::tqdrawControl(element, painter, widget, rect, group, + KStyle::drawControl(element, painter, widget, rect, group, flags, option); return; } @@ -1193,7 +1193,7 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, } if (button->isMenuButton()) { // menu indicator - int dx = tqpixelMetric(PM_MenuButtonIndicator, widget); + int dx = pixelMetric(PM_MenuButtonIndicator, widget); tqdrawPrimitive(PE_ArrowDown, painter, TQRect(x+w-dx-2, y+2, dx, h-4), group, flags, option); @@ -1232,24 +1232,24 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, for(int n=0; n<2; n++) { drawItem(painter, TQRect(x+n, y, w, h), AlignCenter | ShowPrefix, - button->tqcolorGroup(), + button->colorGroup(), button->isEnabled(), button->pixmap(), button->text(), -1, (button->isEnabled()) ? - &button->tqcolorGroup().buttonText() : - &button->tqcolorGroup().mid()); + &button->colorGroup().buttonText() : + &button->colorGroup().mid()); } } else { // normal button drawItem(painter, TQRect(x, y, w, h), AlignCenter | ShowPrefix, - button->tqcolorGroup(), + button->colorGroup(), button->isEnabled(), button->pixmap(), button->text(), -1, (button->isEnabled()) ? - &button->tqcolorGroup().buttonText() : - &button->tqcolorGroup().mid()); + &button->colorGroup().buttonText() : + &button->colorGroup().mid()); } break; } @@ -1266,7 +1266,7 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, // only draw focus if content (forms on html won't) if ((flags & Style_HasFocus) && ((!b->text().isNull()) || b->pixmap())) { tqdrawPrimitive(PE_FocusRect, painter, - tqvisualRect(subRect(SR_RadioButtonFocusRect, + visualRect(subRect(SR_RadioButtonFocusRect, widget), widget), group, flags); } @@ -1296,7 +1296,7 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, case CE_MenuBarItem: { const TQMenuBar *mbar = ::tqqt_cast<const TQMenuBar*>(widget); if (!mbar) { - KStyle::tqdrawControl(element, painter, widget, rect, group, + KStyle::drawControl(element, painter, widget, rect, group, flags, option); return; } @@ -1327,7 +1327,7 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, case CE_PopupMenuItem: { const TQPopupMenu *popup = ::tqqt_cast<const TQPopupMenu*>(widget); if (!popup) { - KStyle::tqdrawControl(element, painter, widget, rect, group, + KStyle::drawControl(element, painter, widget, rect, group, flags, option); return; } @@ -1341,7 +1341,7 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, int tabwidth = option.tabWidth(); int checkwidth = option.maxIconWidth(); bool checkable = popup->isCheckable(); - bool etchtext = tqstyleHint(SH_EtchDisabledText); + bool etchtext = styleHint(SH_EtchDisabledText); active = flags & Style_Active; enabled = mi->isEnabled(); TQRect vrect; @@ -1380,7 +1380,7 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, pixmap = mi->iconSet()->pixmap(TQIconSet::Small, mode); TQRect pmrect(0, 0, pixmap.width(), pixmap.height()); - vrect = tqvisualRect(TQRect(x, y, checkwidth, h), rect); + vrect = visualRect(TQRect(x, y, checkwidth, h), rect); pmrect.moveCenter(vrect.center()); painter->drawPixmap(pmrect.topLeft(), pixmap); } @@ -1477,7 +1477,7 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, if (mi->popup()) { // draw submenu arrow TQ_PrimitiveElement arrow = reverse_ ? PE_ArrowLeft : PE_ArrowRight; int dim = (h-2*ITEMFRAME) / 2; - vrect = tqvisualRect(TQRect(x + w - ARROWMARGIN - ITEMFRAME - dim, + vrect = visualRect(TQRect(x + w - ARROWMARGIN - ITEMFRAME - dim, y + h / 2 - dim / 2, dim, dim), rect); tqdrawPrimitive(arrow, painter, vrect, group, enabled ? Style_Enabled : Style_Default); @@ -1495,7 +1495,7 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, drawPhaseTab(painter, x, y, w, h, group, tab, option, flags); } else { // not a tabbar - KStyle::tqdrawControl(element, painter, widget, rect, group, + KStyle::drawControl(element, painter, widget, rect, group, flags, option); return; } @@ -1511,7 +1511,7 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, case CE_ProgressBarContents: { const TQProgressBar* pbar = ::tqqt_cast<const TQProgressBar*>(widget); if (!pbar) { - KStyle::tqdrawControl(element, painter, widget, rect, group, + KStyle::drawControl(element, painter, widget, rect, group, flags, option); return; } @@ -1522,7 +1522,7 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, if (!pbar->totalSteps()) { // busy indicator - int bar = tqpixelMetric(PM_ProgressBarChunkWidth, widget) + 2; + int bar = pixelMetric(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); @@ -1540,7 +1540,7 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, case CE_ToolBoxTab: { const TQToolBox *box = ::tqqt_cast<const TQToolBox*>(widget); if (!box) { - KStyle::tqdrawControl(element, painter, widget, rect, group, + KStyle::drawControl(element, painter, widget, rect, group, flags, option); return; } @@ -1556,7 +1556,7 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, if (box->currentItem() && (flags & Style_Selected)) { painter->setPen(group.dark()); painter->setBrush(box->currentItem()->paletteBackgroundColor()); - painter->tqdrawConvexPolygon(parray, 0, 6); + painter->drawConvexPolygon(parray, 0, 6); painter->setBrush(NoBrush); } else { painter->setClipRegion(parray, TQPainter::CoordPainter); @@ -1564,28 +1564,28 @@ void PhaseStyle::tqdrawControl(TQ_ControlElement element, group.background(), false, 0, 0, 0, h*2, false); painter->setClipping(false); - painter->tqdrawPolyline(parray, 0, 4); + painter->drawPolyline(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->tqdrawPolyline(parray, 0, 4); + painter->drawPolyline(parray, 0, 4); break; } default: - KStyle::tqdrawControl(element, painter, widget, rect, group, + KStyle::drawControl(element, painter, widget, rect, group, flags, option); } } ////////////////////////////////////////////////////////////////////////////// -// tqdrawControlMask() +// drawControlMask() // ----------------- // Draw a bitmask for the element -void PhaseStyle::tqdrawControlMask(TQ_ControlElement element, +void PhaseStyle::drawControlMask(TQ_ControlElement element, TQPainter *painter, const TQWidget *widget, const TQRect &rect, @@ -1598,16 +1598,16 @@ void PhaseStyle::tqdrawControlMask(TQ_ControlElement element, break; default: - KStyle::tqdrawControlMask(element, painter, widget, rect, option); + KStyle::drawControlMask(element, painter, widget, rect, option); } } ////////////////////////////////////////////////////////////////////////////// -// tqdrawComplexControl() +// drawComplexControl() // -------------------- // Draw a complex control -void PhaseStyle::tqdrawComplexControl(TQ_ComplexControl control, +void PhaseStyle::drawComplexControl(TQ_ComplexControl control, TQPainter *painter, const TQWidget *widget, const TQRect &rect, @@ -1629,7 +1629,7 @@ void PhaseStyle::tqdrawComplexControl(TQ_ComplexControl control, case CC_ComboBox: { const TQComboBox * combo = ::tqqt_cast<const TQComboBox*>(widget); if (!combo) { - KStyle::tqdrawComplexControl(control, painter, widget, rect, group, + KStyle::drawComplexControl(control, painter, widget, rect, group, flags, controls, active, option); return; } @@ -1641,7 +1641,7 @@ void PhaseStyle::tqdrawComplexControl(TQ_ComplexControl control, : group.button(), sunken); if (controls & SC_ComboBoxArrow) { // draw arrow box - subrect = tqvisualRect(querySubControlMetrics(CC_ComboBox, widget, + subrect = visualRect(querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxArrow), widget); subrect.rect(&x, &y, &w, &h); @@ -1654,7 +1654,7 @@ void PhaseStyle::tqdrawComplexControl(TQ_ComplexControl control, if (controls & SC_ComboBoxEditField) { // draw edit box if (combo->editable()) { // editable box - subrect = tqvisualRect(querySubControlMetrics(CC_ComboBox, + subrect = visualRect(querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxEditField), widget); x2 = subrect.right(); y2 = subrect.bottom(); painter->setPen(group.dark()); @@ -1664,7 +1664,7 @@ void PhaseStyle::tqdrawComplexControl(TQ_ComplexControl control, painter->setPen(group.button()); painter->drawPoint(x2+2, y2); } else if (combo->hasFocus()) { // non editable box - subrect = tqvisualRect(subRect(SR_ComboBoxFocusRect, + subrect = visualRect(subRect(SR_ComboBoxFocusRect, combo), widget); tqdrawPrimitive(PE_FocusRect, painter, subrect, group, Style_FocusAtBorder, @@ -1680,7 +1680,7 @@ void PhaseStyle::tqdrawComplexControl(TQ_ComplexControl control, // always a three button scrollbar const TQScrollBar *sb = ::tqqt_cast<const TQScrollBar*>(widget); if (!sb) { - KStyle::tqdrawComplexControl(control, painter, widget, rect, group, + KStyle::drawComplexControl(control, painter, widget, rect, group, flags, controls, active, option); return; } @@ -1777,7 +1777,7 @@ void PhaseStyle::tqdrawComplexControl(TQ_ComplexControl control, case CC_SpinWidget: { const TQSpinWidget *spin = ::tqqt_cast<const TQSpinWidget*>(widget); if (!spin) { - KStyle::tqdrawComplexControl(control, painter, widget, rect, group, + KStyle::drawComplexControl(control, painter, widget, rect, group, flags, controls, active, option); return; } @@ -1837,7 +1837,7 @@ void PhaseStyle::tqdrawComplexControl(TQ_ComplexControl control, case CC_ToolButton: { const TQToolButton *btn = ::tqqt_cast<const TQToolButton*>(widget); if (!btn) { - KStyle::tqdrawComplexControl(control, painter, widget, rect, group, + KStyle::drawComplexControl(control, painter, widget, rect, group, flags, controls, active, option); return; } @@ -1915,18 +1915,18 @@ void PhaseStyle::tqdrawComplexControl(TQ_ComplexControl control, } default: - KStyle::tqdrawComplexControl(control, painter, widget, rect, group, + KStyle::drawComplexControl(control, painter, widget, rect, group, flags, controls, active, option); break; } } ////////////////////////////////////////////////////////////////////////////// -// tqdrawComplexControlMask() +// drawComplexControlMask() // ------------------------ // Draw a bitmask for the control -void PhaseStyle::tqdrawComplexControlMask(TQ_ComplexControl control, +void PhaseStyle::drawComplexControlMask(TQ_ComplexControl control, TQPainter *painter, const TQWidget *widget, const TQRect &rect, @@ -1941,16 +1941,16 @@ void PhaseStyle::tqdrawComplexControlMask(TQ_ComplexControl control, } default: - KStyle::tqdrawComplexControlMask(control,painter,widget,rect,option); + KStyle::drawComplexControlMask(control,painter,widget,rect,option); } } ////////////////////////////////////////////////////////////////////////////// -// tqpixelMetric() +// pixelMetric() // ------------- // Get the pixel metric for metric -int PhaseStyle::tqpixelMetric(PixelMetric metric, const TQWidget *widget) const +int PhaseStyle::pixelMetric(PixelMetric metric, const TQWidget *widget) const { // not using widget's font, so that all metrics are uniform int em = TQMAX(TQApplication::fontMetrics().strikeOutPos() * 3, 17); @@ -2000,7 +2000,7 @@ int PhaseStyle::tqpixelMetric(PixelMetric metric, const TQWidget *widget) const return em; default: - return KStyle::tqpixelMetric(metric, widget); + return KStyle::pixelMetric(metric, widget); } } @@ -2036,7 +2036,7 @@ TQRect PhaseStyle::querySubControlMetrics(TQ_ComplexControl control, { TQRect rect; - const int fw = tqpixelMetric(PM_DefaultFrameWidth, widget); + const int fw = pixelMetric(PM_DefaultFrameWidth, widget); int w = widget->width(), h = widget->height(); int xc; @@ -2143,8 +2143,8 @@ TQSize PhaseStyle::tqsizeFromContents(ContentsType contents, return KStyle::tqsizeFromContents(contents, widget, contentsize, option); } - int margin = tqpixelMetric(PM_ButtonMargin, widget) - + tqpixelMetric(PM_DefaultFrameWidth, widget) + 4; + int margin = pixelMetric(PM_ButtonMargin, widget) + + pixelMetric(PM_DefaultFrameWidth, widget) + 4; w += margin + 6; // add room for bold font h += margin; @@ -2167,8 +2167,8 @@ TQSize PhaseStyle::tqsizeFromContents(ContentsType contents, TQMenuItem *item = option.menuItem(); if (item->custom()) { - w = item->custom()->tqsizeHint().width(); - h = item->custom()->tqsizeHint().height(); + w = item->custom()->sizeHint().width(); + h = item->custom()->sizeHint().height(); if (!item->custom()->fullSpan()) h += ITEMVMARGIN*2 + ITEMFRAME*2; } else if (item->widget()) { // a menu item that is a widget @@ -2273,17 +2273,17 @@ bool PhaseStyle::eventFilter(TQObject *object, TQEvent *event) TQPainter painter(widget); if (flatToolbar(toolbar)) { painter.fillRect(widget->rect(), - parent->tqcolorGroup().background()); + parent->colorGroup().background()); } else { drawPhaseGradient(&painter, widget->rect(), - parent->tqcolorGroup().background(), + parent->colorGroup().background(), !horiz, px, py, prect.width(), prect.height(), true); if (horiz && (h==prect.height()-2)) { - painter.setPen(parent->tqcolorGroup().mid()); + painter.setPen(parent->colorGroup().mid()); painter.drawLine(x, h-1, w-1, h-1); } else if (!horiz && (w==prect.width()-2)) { - painter.setPen(parent->tqcolorGroup().mid()); + painter.setPen(parent->colorGroup().mid()); painter.drawLine(w-1, y, w-1, h-1); } } @@ -2298,25 +2298,25 @@ bool PhaseStyle::eventFilter(TQObject *object, TQEvent *event) TQT_TQRECT_OBJECT(widget->rect()).rect(&x, &y, &w, &h); // draw the extension drawPhaseGradient(&painter, widget->rect(), - toolbar->tqcolorGroup().background(), + toolbar->colorGroup().background(), !horiz, x, y, w-1, h-1, true); if (horiz) { - painter.setPen(toolbar->tqcolorGroup().dark()); + painter.setPen(toolbar->colorGroup().dark()); painter.drawLine(w-1, 0, w-1, h-1); - painter.setPen(toolbar->tqcolorGroup().mid()); + painter.setPen(toolbar->colorGroup().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->tqcolorGroup().midlight()); + painter.setPen(toolbar->colorGroup().midlight()); painter.drawLine(x+1, y, x+1, h-2); } else { - painter.setPen(toolbar->tqcolorGroup().dark()); + painter.setPen(toolbar->colorGroup().dark()); painter.drawLine(0, h-1, w-1, h-1); - painter.setPen(toolbar->tqcolorGroup().mid()); + painter.setPen(toolbar->colorGroup().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->tqcolorGroup().midlight()); + painter.setPen(toolbar->colorGroup().midlight()); painter.drawLine(x, y+1, w-2, y+1); } } @@ -2330,7 +2330,7 @@ bool PhaseStyle::eventFilter(TQObject *object, TQEvent *event) // NOTE: assuming lines have no content TQPainter painter(frame); TQT_TQRECT_OBJECT(frame->rect()).rect(&x, &y, &w, &h); - painter.setPen(frame->tqcolorGroup().dark()); + painter.setPen(frame->colorGroup().dark()); if (tqshape == TQFrame::HLine) { painter.drawLine(0, h/2, w, h/2); } else if (tqshape == TQFrame::VLine) { diff --git a/styles/phase/phasestyle.h b/styles/phase/phasestyle.h index 9d81264e..ec0f2352 100644 --- a/styles/phase/phasestyle.h +++ b/styles/phase/phasestyle.h @@ -82,7 +82,7 @@ public: SFlags flags = Style_Default, const TQStyleOption &option = TQStyleOption::Default) const; - void tqdrawControl(TQ_ControlElement element, + void drawControl(TQ_ControlElement element, TQPainter *painter, const TQWidget *widget, const TQRect &rect, @@ -90,13 +90,13 @@ public: SFlags flags = Style_Default, const TQStyleOption &option = TQStyleOption::Default) const; - void tqdrawControlMask(TQ_ControlElement element, + void drawControlMask(TQ_ControlElement element, TQPainter *painter, const TQWidget *widget, const TQRect &rect, const TQStyleOption &option = TQStyleOption::Default) const; - void tqdrawComplexControl(TQ_ComplexControl control, + void drawComplexControl(TQ_ComplexControl control, TQPainter *painter, const TQWidget *widget, const TQRect &rect, @@ -106,13 +106,13 @@ public: SCFlags active = SC_None, const TQStyleOption &option = TQStyleOption::Default) const; - void tqdrawComplexControlMask(TQ_ComplexControl control, + void drawComplexControlMask(TQ_ComplexControl control, TQPainter *painter, const TQWidget *widget, const TQRect &rect, const TQStyleOption &option = TQStyleOption::Default) const; - int tqpixelMetric(PixelMetric metric, + int pixelMetric(PixelMetric metric, const TQWidget *widget = 0) const; TQRect subRect(SubRect rect, const TQWidget *widget) const; diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp index 03eb14fa..0fb7ded7 100644 --- a/twin-styles/cde/cdeclient.cpp +++ b/twin-styles/cde/cdeclient.cpp @@ -114,9 +114,9 @@ static inline const KDecorationOptions* options() return KDecoration::options(); } -static void fixColorGroup(TQColorGroup & tqcolorGroup) +static void fixColorGroup(TQColorGroup & colorGroup) { - TQColor light = tqcolorGroup.light(); + TQColor light = colorGroup.light(); int hue, saturation, value; @@ -125,17 +125,17 @@ static void fixColorGroup(TQColorGroup & tqcolorGroup) if (value < 128) { light.setHsv(hue, saturation, 128); - tqcolorGroup.setColor(TQColorGroup::Light, light); + colorGroup.setColor(TQColorGroup::Light, light); } - TQColor dark = tqcolorGroup.dark(); + TQColor dark = colorGroup.dark(); dark.hsv(&hue, &saturation, &value); if (value < 84) { dark.setHsv(hue, saturation, 84); - tqcolorGroup.setColor(TQColorGroup::Dark, dark); + colorGroup.setColor(TQColorGroup::Dark, dark); } } @@ -420,7 +420,7 @@ void CdeClient::desktopChange() // Nothing to do yet } -TQSize CdeClient::tqminimumSize() const +TQSize CdeClient::minimumSize() const { return TQSize(2 * (s_buttonSize + s_frameWidth), 2 * s_frameWidth + s_buttonSize); @@ -503,14 +503,14 @@ void CdeClient::paintEvent( TQPaintEvent* ) { TQPainter p(widget()); - TQColorGroup tqcolorGroup; + TQColorGroup colorGroup; if ( coloredFrame ) - tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorTitleBar, isActive() ); + colorGroup = options()->colorGroup( KDecoration::ColorTitleBar, isActive() ); else - tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorFrame, isActive() ); + colorGroup = options()->colorGroup( KDecoration::ColorFrame, isActive() ); - fixColorGroup( tqcolorGroup ); + fixColorGroup( colorGroup ); TQRect trect = titlebar->tqgeometry(); TQRect mrect = widget()->rect(); @@ -523,7 +523,7 @@ void CdeClient::paintEvent( TQPaintEvent* ) } p.setPen( TQt::NoPen ); - p.setBrush( tqcolorGroup.background() ); + p.setBrush( colorGroup.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), - tqcolorGroup ); + colorGroup ); qDrawShadePanel( &p, mrect.width() - s_frameWidth - 1, longSide + 1, s_frameWidth, mrect.height() - 2 * (longSide + 1), - tqcolorGroup ); + colorGroup ); } // draw top and bottom frames: qDrawShadePanel( &p, longSide + 1, 1, mrect.width() - 2 * (longSide + 1), s_frameWidth, - tqcolorGroup ); + colorGroup ); qDrawShadePanel( &p, longSide + 1, mrect.height() - s_frameWidth - 1, mrect.width() - 2 * (longSide + 1), s_frameWidth, - tqcolorGroup ); + colorGroup ); // draw light corner parts: - p.setPen( tqcolorGroup.light() ); + p.setPen( colorGroup.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( tqcolorGroup.dark() ); + p.setPen( colorGroup.dark() ); // tl corner: if ( !shaded ) @@ -640,14 +640,14 @@ void CdeClient::paintEvent( TQPaintEvent* ) if ( !coloredFrame ) { - tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorTitleBar, isActive() ); - fixColorGroup( tqcolorGroup ); - p.setBrush( tqcolorGroup.background() ); + colorGroup = options()->colorGroup( KDecoration::ColorTitleBar, isActive() ); + fixColorGroup( colorGroup ); + p.setBrush( colorGroup.background() ); } // draw titlebar: p.drawRect( trect ); - qDrawShadePanel( &p, trect, tqcolorGroup, titlebarPressed ); + qDrawShadePanel( &p, trect, colorGroup, 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( tqcolorGroup.dark() ); + p.setPen( colorGroup.dark() ); p.drawLine(s_frameWidth + 1, mrect.height() - s_frameWidth - 2, mrect.width() - s_frameWidth - 2, mrect.height() - s_frameWidth - 2); @@ -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 tqcolorGroup = - options()->tqcolorGroup( KDecoration::ColorTitleBar, m_parent->isActive() ); + TQColorGroup colorGroup = + options()->colorGroup( KDecoration::ColorTitleBar, m_parent->isActive() ); - fixColorGroup(tqcolorGroup); + fixColorGroup(colorGroup); qDrawShadePanel( p, 0, 0, s_buttonSize, s_buttonSize, - tqcolorGroup, isDown() ); + colorGroup, isDown() ); switch ( m_btnType ) { case (BtnMenu): - qDrawShadePanel( p, s_o1, s_o2, s_w1, s_w2, tqcolorGroup ); + qDrawShadePanel( p, s_o1, s_o2, s_w1, s_w2, colorGroup ); break; case (BtnHelp): - p->setPen( tqcolorGroup.light() ); + p->setPen( colorGroup.light() ); p->drawLineSegments( TQPointArray(16, helpLLines) ); - p->setPen( tqcolorGroup.dark() ); + p->setPen( colorGroup.dark() ); p->drawLineSegments( TQPointArray(14, helpDLines) ); break; case (BtnIconify): - qDrawShadePanel( p, s_o2, s_o2, s_w2, s_w2, tqcolorGroup ); + qDrawShadePanel( p, s_o2, s_o2, s_w2, s_w2, colorGroup ); break; case (BtnMax): - qDrawShadePanel( p, s_o1, s_o1, s_w1, s_w1, tqcolorGroup, + qDrawShadePanel( p, s_o1, s_o1, s_w1, s_w1, colorGroup, m_parent->maximizeMode() == KDecoration::MaximizeFull ); break; case (BtnClose): - p->setPen( tqcolorGroup.dark() ); + p->setPen( colorGroup.dark() ); p->drawLineSegments( TQPointArray(18, closeDLines) ); - p->setPen( tqcolorGroup.light() ); + p->setPen( colorGroup.light() ); p->drawLineSegments( TQPointArray(15, closeLLines) ); break; } diff --git a/twin-styles/cde/cdeclient.h b/twin-styles/cde/cdeclient.h index e3a0e9ad..402e0b3d 100644 --- a/twin-styles/cde/cdeclient.h +++ b/twin-styles/cde/cdeclient.h @@ -78,7 +78,7 @@ protected: void activeChange(); void shadeChange(); void iconChange(); - TQSize tqminimumSize() const; + TQSize minimumSize() const; void resize(const TQSize &size); void borders(int &left, int &right, int &top, int &bottom) const; void mousePressEvent( TQMouseEvent* ); diff --git a/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp index f8ff62fd..0085edbe 100644 --- a/twin-styles/glow/config/glowconfigdialog.cpp +++ b/twin-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->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft); + main_group_boxLayout->setAlignment(TQt::AlignTop | TQt::AlignLeft); main_group_boxLayout->setSpacing(6); //------------------------------------------------------------------------- @@ -139,7 +139,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent ) _titlebarGradientTypeComboBox = new TQComboBox(_main_group_box); KConfig *c = KGlobal::config(); - KConfigGroupSaver cgs( c, TQString::tqfromLatin1("WM") ); + KConfigGroupSaver cgs( c, TQString::fromLatin1("WM") ); TQColor activeBackground = c->readColorEntry("activeBackground"); TQColor activeBlend = c->readColorEntry("activeBlend"); diff --git a/twin-styles/glow/glowbutton.cpp b/twin-styles/glow/glowbutton.cpp index 87079c2e..1b7d344b 100644 --- a/twin-styles/glow/glowbutton.cpp +++ b/twin-styles/glow/glowbutton.cpp @@ -92,7 +92,7 @@ GlowButton::GlowButton(TQWidget *parent, const char *name, m_timer = new TQTimer(this); connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); m_pos = 0; - m_timertqStatus = Stop; + m_timerStatus = Stop; setTipText (tip); setCursor(arrowCursor); @@ -160,7 +160,7 @@ void GlowButton::enterEvent( TQEvent *e ) { if( m_pos<0 ) m_pos=-m_pos; - m_timertqStatus = Run; + m_timerStatus = 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_timertqStatus = Stop; + m_timerStatus = Stop; if( ! m_timer->isActive() ) m_timer->start(m_updateTime); TQButton::leaveEvent(e); @@ -196,7 +196,7 @@ void GlowButton::mouseReleaseEvent( TQMouseEvent *e ) m_timer->start(m_updateTime); } if( ! tqgeometry().contains(p) ) { - m_timertqStatus = Stop; + m_timerStatus = Stop; } TQMouseEvent me (e->type(), e->pos(), e->globalPos(), (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state()); @@ -210,7 +210,7 @@ void GlowButton::slotTimeout() if( m_pos>=_steps-1 ) { m_pos = -m_pos; } - if( m_timertqStatus==Stop ) { + if( m_timerStatus==Stop ) { if( m_pos==0 ) { m_timer->stop(); return; diff --git a/twin-styles/glow/glowbutton.h b/twin-styles/glow/glowbutton.h index d2e83beb..e3d159dd 100644 --- a/twin-styles/glow/glowbutton.h +++ b/twin-styles/glow/glowbutton.h @@ -73,7 +73,7 @@ protected slots: void slotTimeout(); private: - enum TimertqStatus { Run, Stop }; + enum TimerStatus { Run, Stop }; int m_updateTime; int _steps; @@ -81,7 +81,7 @@ private: TQTimer *m_timer; int m_pos; - TimertqStatus m_timertqStatus; + TimerStatus m_timerStatus; int m_realizeButtons; ButtonState _last_button; diff --git a/twin-styles/glow/glowclient.cpp b/twin-styles/glow/glowclient.cpp index 98133221..aee13ef1 100644 --- a/twin-styles/glow/glowclient.cpp +++ b/twin-styles/glow/glowclient.cpp @@ -412,12 +412,12 @@ void GlowClient::paintEvent( TQPaintEvent * ) GlowClientConfig *conf = GlowClientGlobals::instance()->config(); TQRect r_this = widget()->rect(); TQRect r_title = _title_spacer->tqgeometry(); - TQColorGroup titleCg = options()->tqcolorGroup(ColorTitleBar, isActive()); - TQColorGroup titleBlendCg=options()->tqcolorGroup(ColorTitleBlend, isActive()); - TQColorGroup cg = widget()->tqcolorGroup(); + TQColorGroup titleCg = options()->colorGroup(ColorTitleBar, isActive()); + TQColorGroup titleBlendCg=options()->colorGroup(ColorTitleBlend, isActive()); + TQColorGroup cg = widget()->colorGroup(); TQColor titleColor = options()->color(ColorTitleBar, isActive()); TQColor titleBlendColor = options()->color(ColorTitleBlend, isActive()); - TQColor bgColor = widget()->tqcolorGroup().background(); + TQColor bgColor = widget()->colorGroup().background(); TQPainter p; TQPointArray pArray, pArray2, pArray3, pArray4; @@ -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()->tqcolorGroup(ColorFrame, isActive()).background()); + options()->colorGroup(ColorFrame, isActive()).background()); p.end(); // paint resize handle if necessary @@ -556,9 +556,9 @@ void GlowClient::captionChange() widget()->update(_title_spacer->tqgeometry()); } -TQSize GlowClient::tqminimumSize() const +TQSize GlowClient::minimumSize() const { - return widget()->tqminimumSize(); + return widget()->minimumSize(); } void GlowClient::resize( const TQSize& s ) diff --git a/twin-styles/glow/glowclient.h b/twin-styles/glow/glowclient.h index 9129dce0..7e0e15ee 100644 --- a/twin-styles/glow/glowclient.h +++ b/twin-styles/glow/glowclient.h @@ -152,7 +152,7 @@ public: virtual void init(); virtual void borders( int&, int&, int&, int& ) const; virtual void resize( const TQSize& ); - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() const; protected: virtual void resizeEvent( TQResizeEvent * ); diff --git a/twin-styles/icewm/icewm.cpp b/twin-styles/icewm/icewm.cpp index 4b9a064b..601fe3ca 100644 --- a/twin-styles/icewm/icewm.cpp +++ b/twin-styles/icewm/icewm.cpp @@ -772,7 +772,7 @@ IceWMButton::IceWMButton(IceWMClient *parent, const char *name, TQPixmap* (*p)[2 setBackgroundMode( TQWidget::NoBackground ); client = parent; usePixmap( p ); - setFixedSize( tqsizeHint() ); + setFixedSize( sizeHint() ); setToggleButton( isToggle ); } @@ -785,7 +785,7 @@ void IceWMButton::setTipText(const TQString &tip) { } -TQSize IceWMButton::tqsizeHint() const +TQSize IceWMButton::sizeHint() const { // Check for invalid data if ( validPixmaps( (TQPixmap**) (*pix) ) ) // Cast to avoid dumb warning @@ -1157,9 +1157,9 @@ void IceWMClient::resize( const TQSize& s ) } -TQSize IceWMClient::tqminimumSize() const +TQSize IceWMClient::minimumSize() const { - return widget()->tqminimumSize(); + return widget()->minimumSize(); } diff --git a/twin-styles/icewm/icewm.h b/twin-styles/icewm/icewm.h index f343912c..975ccfbc 100644 --- a/twin-styles/icewm/icewm.h +++ b/twin-styles/icewm/icewm.h @@ -104,7 +104,7 @@ class IceWMButton : public TQButton const TQString& tip=NULL, const int realizeBtns = Qt::LeftButton ); void setTipText(const TQString &tip); void usePixmap( TQPixmap* (*p)[2] ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void turnOn( bool isOn ); ButtonState last_button; @@ -150,7 +150,7 @@ class IceWMClient : public KDecoration void iconChange(); virtual void desktopChange( ); virtual void borders(int&, int&, int&, int&) const; - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() const; protected slots: void slotMaximize(); diff --git a/twin-styles/kde1/kde1client.cpp b/twin-styles/kde1/kde1client.cpp index c6a7db98..9b802535 100644 --- a/twin-styles/kde1/kde1client.cpp +++ b/twin-styles/kde1/kde1client.cpp @@ -55,8 +55,8 @@ void create_pixmaps() if ( pixmaps_created ) return; pixmaps_created = true; - TQColorGroup aGrp = options()->tqcolorGroup(KDecorationOptions::ColorButtonBg, true); - TQColorGroup iGrp = options()->tqcolorGroup(KDecorationOptions::ColorButtonBg, false); + TQColorGroup aGrp = options()->colorGroup(KDecorationOptions::ColorButtonBg, true); + TQColorGroup iGrp = options()->colorGroup(KDecorationOptions::ColorButtonBg, false); TQPainter aPainter, iPainter; close_pix = new TQPixmap(16, 16); @@ -465,7 +465,7 @@ void StdClient::paintEvent( TQPaintEvent* ) TQRegion r = widget()->rect(); r = r.subtract( t ); p.setClipRegion( r ); - qDrawWinPanel( &p, widget()->rect(), widget()->tqcolorGroup() ); + qDrawWinPanel( &p, widget()->rect(), widget()->colorGroup() ); // 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()->tqcolorGroup(), true, 1 ); + widget()->colorGroup(), true, 1 ); titleRect.setLeft( 4 ); titleRect.setWidth( titleRect.width() - 2 ); p2.setPen(options()->color(KDecorationOptions::ColorFont, isActive())); @@ -572,9 +572,9 @@ bool StdClient::eventFilter( TQObject* o, TQEvent* e ) } } -TQSize StdClient::tqminimumSize() const +TQSize StdClient::minimumSize() const { - return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 )); + return widget()->minimumSize().expandedTo( TQSize( 100, 50 )); } void StdClient::borders( int& left, int& right, int& top, int& bottom ) const @@ -649,9 +649,9 @@ void StdToolClient::paintEvent( TQPaintEvent* ) TQPainter p( widget() ); TQRect t = titlebar->tqgeometry(); TQRect r = widget()->rect(); - qDrawWinPanel( &p, r, widget()->tqcolorGroup() ); + qDrawWinPanel( &p, r, widget()->colorGroup() ); r.setTop( t.bottom()+1 ); - qDrawWinPanel( &p, r, widget()->tqcolorGroup() ); + qDrawWinPanel( &p, r, widget()->colorGroup() ); 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() ); @@ -721,9 +721,9 @@ bool StdToolClient::eventFilter( TQObject* o, TQEvent* e ) } } -TQSize StdToolClient::tqminimumSize() const +TQSize StdToolClient::minimumSize() const { - return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 )); + return widget()->minimumSize().expandedTo( TQSize( 100, 50 )); } void StdToolClient::borders( int& left, int& right, int& top, int& bottom ) const diff --git a/twin-styles/kde1/kde1client.h b/twin-styles/kde1/kde1client.h index adedfaaf..b52f20a7 100644 --- a/twin-styles/kde1/kde1client.h +++ b/twin-styles/kde1/kde1client.h @@ -33,7 +33,7 @@ public: StdClient( KDecorationBridge* b, KDecorationFactory* f ); ~StdClient(); void init(); - TQSize tqminimumSize() const; + TQSize minimumSize() const; void borders( int& left, int& right, int& top, int& bottom ) const; void reset( unsigned long mask ); void resize( const TQSize& s ); @@ -72,7 +72,7 @@ public: StdToolClient( KDecorationBridge* b, KDecorationFactory* f ); ~StdToolClient(); void init(); - TQSize tqminimumSize() const; + TQSize minimumSize() const; void borders( int& left, int& right, int& top, int& bottom ) const; void reset( unsigned long mask ); void resize( const TQSize& s ); diff --git a/twin-styles/kstep/nextclient.cpp b/twin-styles/kstep/nextclient.cpp index 08867a62..0a6cea49 100644 --- a/twin-styles/kstep/nextclient.cpp +++ b/twin-styles/kstep/nextclient.cpp @@ -691,7 +691,7 @@ void NextClient::paintEvent( TQPaintEvent* ) 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()->tqcolorGroup(KDecoration::ColorTitleBar, isActive())); + options()->colorGroup(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()->tqcolorGroup(KDecoration::ColorHandle, isActive()), + options()->colorGroup(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()->tqcolorGroup(KDecoration::ColorFrame, isActive()), + options()->colorGroup(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()->tqcolorGroup(KDecoration::ColorHandle, isActive()), + options()->colorGroup(KDecoration::ColorHandle, isActive()), false); p.drawTiledPixmap(fr.right() - corner + 2, fr.bottom() - handleSize + 1, corner - 3, handleSize - 2, isActive() ? *aHandlePix : *iHandlePix); @@ -854,7 +854,7 @@ void NextClient::keepBelowChange(bool below) } } -TQSize NextClient::tqminimumSize() const +TQSize NextClient::minimumSize() const { return TQSize(titleHeight * 6 + 2, titleHeight + handleSize + 2); } diff --git a/twin-styles/kstep/nextclient.h b/twin-styles/kstep/nextclient.h index b24da66d..40bd26b0 100644 --- a/twin-styles/kstep/nextclient.h +++ b/twin-styles/kstep/nextclient.h @@ -61,7 +61,7 @@ protected: void activeChange(); void shadeChange(); void iconChange(); - TQSize tqminimumSize() const; + TQSize minimumSize() 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/twin-styles/openlook/OpenLook.cpp b/twin-styles/openlook/OpenLook.cpp index 46398e30..af3e5291 100644 --- a/twin-styles/openlook/OpenLook.cpp +++ b/twin-styles/openlook/OpenLook.cpp @@ -215,7 +215,7 @@ OpenLook::shadeChange() { } -TQSize OpenLook::tqminimumSize() const +TQSize OpenLook::minimumSize() const { int left, right, top, bottom; borders(left, right, top, bottom); @@ -252,9 +252,9 @@ OpenLook::paintEvent(TQPaintEvent * pe) TQBrush titleBackground(options()->color(KDecoration::ColorTitleBar, true)); if (isActive()) - qDrawShadePanel(&p, tr, widget()->tqcolorGroup(), true, 1, &titleBackground); + qDrawShadePanel(&p, tr, widget()->colorGroup(), true, 1, &titleBackground); else - p.fillRect(tr, widget()->tqcolorGroup().brush(TQColorGroup::Background)); + p.fillRect(tr, widget()->colorGroup().brush(TQColorGroup::Background)); p.setClipRegion(clipRegion); @@ -482,7 +482,7 @@ OpenLook::paintTopLeftRect(TQPainter & p) const int x2(r.right()); int y2(r.bottom()); - p.setPen(widget()->tqcolorGroup().light()); + p.setPen(widget()->colorGroup().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()->tqcolorGroup().dark()); + p.setPen(widget()->colorGroup().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()->tqcolorGroup().light()); + p.setPen(widget()->colorGroup().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()->tqcolorGroup().dark()); + p.setPen(widget()->colorGroup().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()->tqcolorGroup().light()); + p.setPen(widget()->colorGroup().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()->tqcolorGroup().dark()); + p.setPen(widget()->colorGroup().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()->tqcolorGroup().light()); + p.setPen(widget()->colorGroup().light()); p.drawLine(x1, y2 - openLookMargin+1, x1, y2); p.drawLine(x1 + 1, y2 - openLookMargin+1, x2 - openLookMargin+1, y2 - openLookMargin+1); @@ -579,7 +579,7 @@ 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()->tqcolorGroup().dark()); + p.setPen(widget()->colorGroup().dark()); p.drawLine(x1 + 1, y2, x2, y2); p.drawLine(x2, y1 + 1, x2, y2 - 1); @@ -609,16 +609,16 @@ OpenLook::paintButton(TQPainter & p) const r.width() - 2, r.height() - 2, buttonDown_ - ? widget()->tqcolorGroup().dark() + ? widget()->colorGroup().dark() : options()->color(KDecoration::ColorButtonBg, isActive()) ); - p.setPen(buttonDown_ ? widget()->tqcolorGroup().dark() : widget()->tqcolorGroup().light()); + p.setPen(buttonDown_ ? widget()->colorGroup().dark() : widget()->colorGroup().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()->tqcolorGroup().light() : widget()->tqcolorGroup().dark()); + p.setPen(buttonDown_ ? widget()->colorGroup().light() : widget()->colorGroup().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()->tqcolorGroup().mid()); + p.setBrush(widget()->colorGroup().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()->tqcolorGroup().dark()); + p.setPen(widget()->colorGroup().dark()); p.drawLine(x, y, x + w - 1, y); p.drawLine(x, y, x + (w / 2), y + h - 1); - p.setPen(widget()->tqcolorGroup().light()); + p.setPen(widget()->colorGroup().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()->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()); + 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()); TQColor frameColour(options()->color(KDecoration::ColorFrame, isActive())); @@ -687,7 +687,7 @@ OpenLook::paintBorder(TQPainter & p) const titleRect().bottom() + 1, width() - 2 * openLookMargin, 2, - widget()->tqcolorGroup().background() + widget()->colorGroup().background() ); } diff --git a/twin-styles/openlook/OpenLook.h b/twin-styles/openlook/OpenLook.h index 98db37af..4be8ca1a 100644 --- a/twin-styles/openlook/OpenLook.h +++ b/twin-styles/openlook/OpenLook.h @@ -60,7 +60,7 @@ namespace OpenLook void iconChange(); void maximizeChange(); void borders(int &left, int &right, int &top, int &bottom) const; - TQSize tqminimumSize() const; + TQSize minimumSize() const; void resize( const TQSize& ); virtual void mouseDoubleClickEvent(TQMouseEvent *); virtual void wheelEvent(TQWheelEvent *e); diff --git a/twin-styles/riscos/Button.cpp b/twin-styles/riscos/Button.cpp index 7bf4f477..b5cec59f 100644 --- a/twin-styles/riscos/Button.cpp +++ b/twin-styles/riscos/Button.cpp @@ -48,7 +48,7 @@ Button::~Button() // Empty. } -void Button::tqsetAlignment(Alignment a) +void Button::setAlignment(Alignment a) { alignment_ = a; tqrepaint(); diff --git a/twin-styles/riscos/Button.h b/twin-styles/riscos/Button.h index 0c7c66c5..712759c8 100644 --- a/twin-styles/riscos/Button.h +++ b/twin-styles/riscos/Button.h @@ -46,7 +46,7 @@ class Button : public TQWidget const ButtonState realizeButton = Qt::LeftButton); virtual ~Button(); - void tqsetAlignment(Alignment); + void setAlignment(Alignment); Alignment tqalignment() const; diff --git a/twin-styles/riscos/Manager.cpp b/twin-styles/riscos/Manager.cpp index 837bec9c..88f3f505 100644 --- a/twin-styles/riscos/Manager.cpp +++ b/twin-styles/riscos/Manager.cpp @@ -134,9 +134,9 @@ void Manager::resize(const TQSize &s) widget()->resize(s); } -TQSize Manager::tqminimumSize() const +TQSize Manager::minimumSize() const { - return widget()->tqminimumSize(); + return widget()->minimumSize(); } void Manager::activeChange() @@ -678,7 +678,7 @@ void Manager::createTitle() for (TQPtrListIterator<Button> it(leftButtonList_); it.current(); ++it) { - it.current()->tqsetAlignment(Button::Left); + it.current()->setAlignment(Button::Left); titleLayout_->addWidget(it.current()); } @@ -689,7 +689,7 @@ void Manager::createTitle() for (TQPtrListIterator<Button> it(rightButtonList_); it.current(); ++it) { - it.current()->tqsetAlignment(Button::Right); + it.current()->setAlignment(Button::Right); titleLayout_->addWidget(it.current()); } } diff --git a/twin-styles/riscos/Manager.h b/twin-styles/riscos/Manager.h index 5668a7fc..75810c91 100644 --- a/twin-styles/riscos/Manager.h +++ b/twin-styles/riscos/Manager.h @@ -56,7 +56,7 @@ class Manager : public KDecoration void reset(unsigned long changed); void borders(int&, int&, int&, int&) const; void resize(const TQSize&); - TQSize tqminimumSize() const; + TQSize minimumSize() const; void activeChange(); void captionChange(); void iconChange(); diff --git a/twin-styles/riscos/Static.cpp b/twin-styles/riscos/Static.cpp index 7aac6f5a..92d38ff0 100644 --- a/twin-styles/riscos/Static.cpp +++ b/twin-styles/riscos/Static.cpp @@ -372,22 +372,22 @@ void Static::_drawTitleTextAreaSides() _drawBorder(temp, 4, titleHeight_ - 2); painter_.begin(&aTitleTextLeft_); - painter_.tqdrawPixmap(1, 1, temp, 0, 1); + painter_.drawPixmap(1, 1, temp, 0, 1); painter_.end(); painter_.begin(&aTitleTextRight_); - painter_.tqdrawPixmap(0, 1, temp, 2, 1); + painter_.drawPixmap(0, 1, temp, 2, 1); painter_.end(); palette_ = iTitlePal_; _drawBorder(temp, 4, titleHeight_ - 2); painter_.begin(&iTitleTextLeft_); - painter_.tqdrawPixmap(1, 1, temp, 0, 1); + painter_.drawPixmap(1, 1, temp, 0, 1); painter_.end(); painter_.begin(&iTitleTextRight_); - painter_.tqdrawPixmap(0, 1, temp, 2, 1); + painter_.drawPixmap(0, 1, temp, 2, 1); painter_.end(); } @@ -403,22 +403,22 @@ void Static::_drawResizeCentralAreaSides() _drawBorder(temp, 4, resizeHeight_ - 3); painter_.begin(&aResizeMidLeft_); - painter_.tqdrawPixmap(0, 1, temp, 0, 1); + painter_.drawPixmap(0, 1, temp, 0, 1); painter_.end(); painter_.begin(&aResizeMidRight_); - painter_.tqdrawPixmap(0, 1, temp, 2, 1); + painter_.drawPixmap(0, 1, temp, 2, 1); painter_.end(); palette_ = iResizePal_; _drawBorder(temp, 4, resizeHeight_ - 3); painter_.begin(&iResizeMidLeft_); - painter_.tqdrawPixmap(0, 1, temp, 0, 1); + painter_.drawPixmap(0, 1, temp, 0, 1); painter_.end(); painter_.begin(&iResizeMidRight_); - painter_.tqdrawPixmap(0, 1, temp, 2, 1); + painter_.drawPixmap(0, 1, temp, 2, 1); painter_.end(); } @@ -433,7 +433,7 @@ void Static::_drawTitleTextAreaBackground() _drawBorder(temp, 70, titleHeight_ - 3); painter_.begin(&aTitleTextMid_); - painter_.tqdrawPixmap(0, 1, temp, 2, 0); + painter_.drawPixmap(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_.tqdrawPixmap(0, 1, temp, 2, 0); + painter_.drawPixmap(0, 1, temp, 2, 0); if (hicolour_) painter_.drawTiledPixmap(0, 4, 64, titleHeight_ - 8, iTexture_); painter_.end(); @@ -459,7 +459,7 @@ void Static::_drawResizeCentralAreaBackground() _drawBorder(temp, 70, resizeHeight_ - 3); painter_.begin(&aResizeMid_); - painter_.tqdrawPixmap(0, 0, temp, 2, 0); + painter_.drawPixmap(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_.tqdrawPixmap(0, 0, temp, 2, 0); + painter_.drawPixmap(0, 0, temp, 2, 0); if (hicolour_) painter_.drawTiledPixmap(0, 4, 64, resizeHeight_ - 8, iTexture_); painter_.end(); diff --git a/twin-styles/smooth-blend/client/config/configdialog.ui b/twin-styles/smooth-blend/client/config/configdialog.ui index 09af45f6..89347781 100644 --- a/twin-styles/smooth-blend/client/config/configdialog.ui +++ b/twin-styles/smooth-blend/client/config/configdialog.ui @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>180</width> <height>140</height> @@ -348,7 +348,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>231</width> <height>71</height> diff --git a/twin-styles/smooth-blend/client/smoothblend.cc b/twin-styles/smooth-blend/client/smoothblend.cc index e012fbc2..8f0cf6a9 100644 --- a/twin-styles/smooth-blend/client/smoothblend.cc +++ b/twin-styles/smooth-blend/client/smoothblend.cc @@ -184,11 +184,11 @@ smoothblendButton::~smoothblendButton() { } ////////////////////////////////////////////////////////////////////////////// -// tqsizeHint() +// sizeHint() // ---------- // Return size hint -TQSize smoothblendButton::tqsizeHint() const { +TQSize smoothblendButton::sizeHint() const { return TQSize(::factory->buttonSize(), ::factory->buttonSize()); } @@ -407,7 +407,7 @@ void smoothblendButton::drawButton( TQPainter *painter ) { TQColor redColor(red); bool active = client_->isActive(); TQPixmap backgroundTile = client_->getTitleBarTile(active); - group = KDecoration::options()->tqcolorGroup(KDecoration::ColorTitleBar, active); + group = KDecoration::options()->colorGroup(KDecoration::ColorTitleBar, active); //draw the titlebar behind the buttons and app icons if ((client_->maximizeMode()==client_->MaximizeFull) && !KDecoration::options()->moveResizeMaximizedWindows()) @@ -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()->tqcolorGroup(KDecoration::ColorTitleBar, true); - widgetGroup = widget()->tqcolorGroup(); + group = options()->colorGroup(KDecoration::ColorTitleBar, true); + widgetGroup = widget()->colorGroup(); // 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()->tqcolorGroup(KDecoration::ColorTitleBar, false); + group = options()->colorGroup(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()->tqcolorGroup(KDecoration::ColorTitleBar, true); + group = options()->colorGroup(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()->tqcolorGroup(KDecoration::ColorTitleBar, false); + group = options()->colorGroup(KDecoration::ColorTitleBar, false); tempPixmap = KPixmapEffect::unbalancedGradient(tempPixmap, group.background(), widgetGroup.background(), @@ -971,12 +971,12 @@ void smoothblendClient::resize(const TQSize &size) { } ////////////////////////////////////////////////////////////////////////////// -// tqminimumSize() +// minimumSize() // ------------- // Return the minimum allowable size for this window -TQSize smoothblendClient::tqminimumSize() const { - return widget()->tqminimumSize(); +TQSize smoothblendClient::minimumSize() const { + return widget()->minimumSize(); } ////////////////////////////////////////////////////////////////////////////// @@ -1117,8 +1117,8 @@ void smoothblendClient::paintEvent(TQPaintEvent*) { TQPainter painter(widget()); bool active = isActive(); //get group information first - group = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive()); - widgetGroup = widget()->tqcolorGroup(); + group = options()->colorGroup(KDecoration::ColorTitleBar, isActive()); + widgetGroup = widget()->colorGroup(); TQRect topRect( topSpacer_->tqgeometry() ); TQRect titleRect( titleLayout_->tqgeometry() ); diff --git a/twin-styles/smooth-blend/client/smoothblend.h b/twin-styles/smooth-blend/client/smoothblend.h index 4abd32cb..bf789440 100644 --- a/twin-styles/smooth-blend/client/smoothblend.h +++ b/twin-styles/smooth-blend/client/smoothblend.h @@ -135,7 +135,7 @@ public: ~smoothblendButton(); void setBitmap(const unsigned char *bitmap); - TQSize tqsizeHint() const; + TQSize sizeHint() const; ButtonState lastMousePress() const; void reset(); TQImage getButtonImage(ButtonType type); @@ -195,7 +195,7 @@ public: virtual void borders(int &l, int &r, int &t, int &b) const; virtual void resize(const TQSize &size); - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() const; virtual Position mousePosition(const TQPoint &point) const; TQPixmap getTitleBarTile(bool active) const diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp index a676a02a..895d60d0 100644 --- a/twin-styles/system/systemclient.cpp +++ b/twin-styles/system/systemclient.cpp @@ -124,12 +124,12 @@ static void create_pixmaps() btnPix = new KPixmap; btnPix->resize(14, 14); bitBlt(TQT_TQPAINTDEVICE(btnPix), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true); - drawButtonFrame(btnPix, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, true)); + drawButtonFrame(btnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, true)); iBtnPix = new KPixmap; iBtnPix->resize(14, 14); bitBlt(TQT_TQPAINTDEVICE(iBtnPix), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true); - drawButtonFrame(iBtnPix, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, false)); + drawButtonFrame(iBtnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, false)); // pressed buttons @@ -158,13 +158,13 @@ static void create_pixmaps() btnPixDown = new KPixmap; btnPixDown->resize(14, 14); bitBlt(TQT_TQPAINTDEVICE(btnPixDown), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true); - drawButtonFrame(btnPixDown, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, + drawButtonFrame(btnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, true)); iBtnPixDown = new KPixmap; iBtnPixDown->resize(14, 14); bitBlt(TQT_TQPAINTDEVICE(iBtnPixDown), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true); - drawButtonFrame(iBtnPixDown, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, + drawButtonFrame(iBtnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, false)); } if(tqGray(KDecoration::options()->color(KDecorationOptions::ColorButtonBg, true).rgb()) > 128) @@ -211,7 +211,7 @@ void SystemButton::setTipText(const TQString &tip) } -TQSize SystemButton::tqsizeHint() const +TQSize SystemButton::sizeHint() const { return(TQSize(14, 14)); } @@ -237,7 +237,7 @@ void SystemButton::drawButton(TQPainter *p) p->drawPixmap(0, 0, isDown() ? *iBtnPixDown : *iBtnPix); } else{ - TQColorGroup g = KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, + TQColorGroup g = KDecoration::options()->colorGroup(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()->tqcolorGroup(KDecorationOptions::ColorButtonBg, client->isActive()); + g = KDecoration::options()->colorGroup(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); @@ -481,9 +481,9 @@ void SystemClient::resize( const TQSize& s ) } -TQSize SystemClient::tqminimumSize() const +TQSize SystemClient::minimumSize() const { - return widget()->tqminimumSize(); + return widget()->minimumSize(); } @@ -499,7 +499,7 @@ void SystemClient::recalcTitleBuffer() p.drawTiledPixmap(0, 0, width(), 18, *aUpperGradient); else p.fillRect(0, 0, width(), 18, - options()->tqcolorGroup(KDecorationOptions::ColorFrame, true). + options()->colorGroup(KDecorationOptions::ColorFrame, true). brush(TQColorGroup::Button)); TQRect t = titlebar->tqgeometry(); @@ -538,7 +538,7 @@ void SystemClient::captionChange() void SystemClient::drawRoundFrame(TQPainter &p, int x, int y, int w, int h) { kDrawRoundButton(&p, x, y, w, h, - options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()), false); + options()->colorGroup(KDecorationOptions::ColorFrame, isActive()), false); } @@ -547,9 +547,9 @@ void SystemClient::paintEvent( TQPaintEvent* ) TQPainter p(widget()); TQRect t = titlebar->tqgeometry(); - TQBrush fillBrush(TQBrush(widget()->tqcolorGroup().brush(TQColorGroup::Background)).pixmap() ? - widget()->tqcolorGroup().brush(TQColorGroup::Background) : - options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()). + TQBrush fillBrush(TQBrush(widget()->colorGroup().brush(TQColorGroup::Background)).pixmap() ? + widget()->colorGroup().brush(TQColorGroup::Background) : + options()->colorGroup(KDecorationOptions::ColorFrame, isActive()). brush(TQColorGroup::Button)); p.fillRect(1, 18, width()-2, height()-19, fillBrush); @@ -570,10 +570,10 @@ void SystemClient::paintEvent( TQPaintEvent* ) p.drawText(t, AlignCenter, caption() ); } - p.setPen(options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()).light()); + p.setPen(options()->colorGroup(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()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()).dark()); + p.setPen(options()->colorGroup(KDecorationOptions::ColorFrame, isActive()).dark()); p.drawLine(width()-20, height()-6, width()-10, height()-6); p.drawLine(width()-20, height()-4, width()-10, height()-4); diff --git a/twin-styles/system/systemclient.h b/twin-styles/system/systemclient.h index ecaf25ee..bb409642 100644 --- a/twin-styles/system/systemclient.h +++ b/twin-styles/system/systemclient.h @@ -45,7 +45,7 @@ class SystemClient : public KDecoration virtual void iconChange(); virtual void desktopChange(); virtual void activeChange(); - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() 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); @@ -75,7 +75,7 @@ class SystemButton : public TQButton const unsigned char *bitmap=NULL, const TQString& tip=NULL); void setBitmap(const unsigned char *bitmap); void reset(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void setTipText(const TQString &tip); ButtonState last_button; protected: |