summaryrefslogtreecommitdiffstats
path: root/kcontrol/style
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/style')
-rw-r--r--kcontrol/style/kcmstyle.cpp22
-rw-r--r--kcontrol/style/keramik/keramikconf.cpp2
-rw-r--r--kcontrol/style/menupreview.cpp12
-rw-r--r--kcontrol/style/stylepreview.ui14
4 files changed, 25 insertions, 25 deletions
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index ecfd6fea9..93af93229 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -29,7 +29,7 @@
#include <tqlistbox.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqslider.h>
#include <tqstylefactory.h>
#include <tqtabwidget.h>
@@ -160,8 +160,8 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
gbWidgetStyle->layout()->setMargin( KDialog::marginHint() );
gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() );
- gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->tqlayout() );
- gbWidgetStyleLayout->tqsetAlignment( Qt::AlignTop );
+ gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() );
+ gbWidgetStyleLayout->setAlignment( Qt::AlignTop );
hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" );
cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" );
@@ -169,7 +169,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
hbLayout->addWidget( cbStyle );
pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle );
- pbConfigStyle->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
+ pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
pbConfigStyle->setEnabled( FALSE );
hbLayout->addWidget( pbConfigStyle );
@@ -195,7 +195,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
gbPreview->layout()->setSpacing( KDialog::spacingHint() );
gbPreview->setFlat( true );
stylePreview = new StylePreview( gbPreview );
- gbPreview->tqlayout()->add( stylePreview );
+ gbPreview->layout()->add( stylePreview );
page1Layout->addWidget( gbWidgetStyle );
page1Layout->addWidget( gbPreview );
@@ -296,16 +296,16 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
box1->setSpacing( KDialog::spacingHint() );
box1->setMargin( 0 );
TQLabel* lbl = new TQLabel( i18n("0%"), box1 );
- lbl->tqsetAlignment( AlignLeft );
+ lbl->setAlignment( AlignLeft );
lbl = new TQLabel( i18n("50%"), box1 );
- lbl->tqsetAlignment( AlignHCenter );
+ lbl->setAlignment( AlignHCenter );
lbl = new TQLabel( i18n("100%"), box1 );
- lbl->tqsetAlignment( AlignRight );
+ lbl->setAlignment( AlignRight );
lblMenuEffectType = new TQLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer );
- lblMenuEffectType->tqsetAlignment( AlignBottom | AlignLeft );
+ lblMenuEffectType->setAlignment( AlignBottom | AlignLeft );
lblMenuOpacity = new TQLabel( slOpacity, i18n("Menu &opacity:"), menuContainer );
- lblMenuOpacity->tqsetAlignment( AlignBottom | AlignLeft );
+ lblMenuOpacity->setAlignment( AlignBottom | AlignLeft );
menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 );
menuContainerLayout->addWidget( comboMenuEffectType, 1, 0 );
@@ -844,7 +844,7 @@ void KCMStyle::switchStyle(const TQString& styleName, bool force)
setStyleRecursive( stylePreview, style );
// this flickers, but reliably draws the widgets correctly.
- stylePreview->resize( stylePreview->tqsizeHint() );
+ stylePreview->resize( stylePreview->sizeHint() );
delete appliedStyle;
appliedStyle = style;
diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp
index 0350ab969..a7b15ea00 100644
--- a/kcontrol/style/keramik/keramikconf.cpp
+++ b/kcontrol/style/keramik/keramikconf.cpp
@@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE.
*/
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqsettings.h>
#include <kdialog.h>
#include <kglobal.h>
diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp
index 51d5aad5f..190f0517f 100644
--- a/kcontrol/style/menupreview.cpp
+++ b/kcontrol/style/menupreview.cpp
@@ -68,7 +68,7 @@ void MenuPreview::createPixmaps()
if (pixBlended)
pixBlended->resize( w, h );
- TQColorGroup cg = tqcolorGroup();
+ TQColorGroup cg = colorGroup();
TQColor c1 = cg.background();
TQColor c2 = cg.mid();
@@ -96,7 +96,7 @@ void MenuPreview::createPixmaps()
void MenuPreview::blendPixmaps()
{
- // Rebuild pixmaps, and tqrepaint
+ // Rebuild pixmaps, and repaint
if (pixBlended && pixBackground)
{
if (mode == Blend && pixOverlay) {
@@ -105,7 +105,7 @@ void MenuPreview::blendPixmaps()
KImageEffect::blend(src, dst, menuOpacity);
pixBlended->convertFromImage( dst );
} else if (mode == Tint) {
- TQColor clr = tqcolorGroup().button();
+ TQColor clr = colorGroup().button();
TQImage dst = pixBackground->convertToImage();
KImageEffect::blend(clr, dst, menuOpacity);
pixBlended->convertFromImage( dst );
@@ -121,7 +121,7 @@ void MenuPreview::setOpacity( int opacity )
if ((int)(menuOpacity*100) != opacity) {
menuOpacity = opacity/100.0;
blendPixmaps();
- tqrepaint( false );
+ repaint( false );
}
}
@@ -130,14 +130,14 @@ void MenuPreview::setPreviewMode( PreviewMode pvm )
if (mode != pvm) {
mode = pvm;
blendPixmaps();
- tqrepaint( false );
+ repaint( false );
}
}
void MenuPreview::paintEvent( TQPaintEvent* /* pe */ )
{
// Paint the frame and blended pixmap
- TQColorGroup cg = tqcolorGroup();
+ TQColorGroup cg = colorGroup();
int x2 = width()-1;
int y2 = height()-1;
diff --git a/kcontrol/style/stylepreview.ui b/kcontrol/style/stylepreview.ui
index d438c0ad8..ed6d2e43a 100644
--- a/kcontrol/style/stylepreview.ui
+++ b/kcontrol/style/stylepreview.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
@@ -177,7 +177,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -196,13 +196,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>200</width>
<height>32767</height>
@@ -224,13 +224,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>200</width>
<height>32767</height>
@@ -250,7 +250,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>