summaryrefslogtreecommitdiffstats
path: root/kcontrol/style
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-03 20:16:47 +0000
commit495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch)
treedaabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kcontrol/style
parent50001f1757f97510e80cb1990e2f2d5b00144c2a (diff)
downloadtdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz
tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/style')
-rw-r--r--kcontrol/style/kcmstyle.cpp32
-rw-r--r--kcontrol/style/keramik/keramikconf.cpp10
-rw-r--r--kcontrol/style/menupreview.cpp12
-rw-r--r--kcontrol/style/stylepreview.ui22
4 files changed, 38 insertions, 38 deletions
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index f351d3f2c..a9a3e00aa 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -157,11 +157,11 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
// -----------------
gbWidgetStyle = new TQGroupBox( i18n("Widget Style"), page1, "gbWidgetStyle" );
gbWidgetStyle->setColumnLayout( 0, Qt::Vertical );
- gbWidgetStyle->layout()->setMargin( KDialog::marginHint() );
- gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() );
+ gbWidgetStyle->tqlayout()->setMargin( KDialog::marginHint() );
+ gbWidgetStyle->tqlayout()->setSpacing( KDialog::spacingHint() );
- gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() );
- gbWidgetStyleLayout->setAlignment( Qt::AlignTop );
+ gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->tqlayout() );
+ gbWidgetStyleLayout->tqsetAlignment( 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->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
+ pbConfigStyle->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
pbConfigStyle->setEnabled( FALSE );
hbLayout->addWidget( pbConfigStyle );
@@ -189,11 +189,11 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 );
gbPreview->setColumnLayout( 0, Vertical );
- gbPreview->layout()->setMargin( 0 );
- gbPreview->layout()->setSpacing( KDialog::spacingHint() );
+ gbPreview->tqlayout()->setMargin( 0 );
+ gbPreview->tqlayout()->setSpacing( KDialog::spacingHint() );
gbPreview->setFlat( true );
stylePreview = new StylePreview( gbPreview );
- gbPreview->layout()->add( stylePreview );
+ gbPreview->tqlayout()->add( stylePreview );
page1Layout->addWidget( gbWidgetStyle );
page1Layout->addWidget( gbPreview );
@@ -294,16 +294,16 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
box1->setSpacing( KDialog::spacingHint() );
box1->setMargin( 0 );
TQLabel* lbl = new TQLabel( i18n("0%"), box1 );
- lbl->setAlignment( AlignLeft );
+ lbl->tqsetAlignment( AlignLeft );
lbl = new TQLabel( i18n("50%"), box1 );
- lbl->setAlignment( AlignHCenter );
+ lbl->tqsetAlignment( AlignHCenter );
lbl = new TQLabel( i18n("100%"), box1 );
- lbl->setAlignment( AlignRight );
+ lbl->tqsetAlignment( AlignRight );
lblMenuEffectType = new TQLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer );
- lblMenuEffectType->setAlignment( AlignBottom | AlignLeft );
+ lblMenuEffectType->tqsetAlignment( AlignBottom | AlignLeft );
lblMenuOpacity = new TQLabel( slOpacity, i18n("Menu &opacity:"), menuContainer );
- lblMenuOpacity->setAlignment( AlignBottom | AlignLeft );
+ lblMenuOpacity->tqsetAlignment( AlignBottom | AlignLeft );
menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 );
menuContainerLayout->addWidget( comboMenuEffectType, 1, 0 );
@@ -795,9 +795,9 @@ void KCMStyle::loadStyle( KConfig& config )
item = i;
if ( id == cfgStyle ) // ExactMatch
break;
- else if ( id.contains( cfgStyle ) )
+ else if ( id.tqcontains( cfgStyle ) )
break;
- else if ( id.contains( TQApplication::style().className() ) )
+ else if ( id.tqcontains( TQApplication::style().className() ) )
break;
item = 0;
}
@@ -837,7 +837,7 @@ void KCMStyle::switchStyle(const TQString& styleName, bool force)
setStyleRecursive( stylePreview, style );
// this flickers, but reliably draws the widgets correctly.
- stylePreview->resize( stylePreview->sizeHint() );
+ stylePreview->resize( stylePreview->tqsizeHint() );
delete appliedStyle;
appliedStyle = style;
diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp
index 0350ab969..d238efab7 100644
--- a/kcontrol/style/keramik/keramikconf.cpp
+++ b/kcontrol/style/keramik/keramikconf.cpp
@@ -41,17 +41,17 @@ extern "C"
KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
{
//Should have no margins here, the dialog provides them
- TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
+ TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 0);
KGlobal::locale()->insertCatalogue("kstyle_keramik_config");
//highlightLineEdits = new TQCheckBox(i18n("Highlight active lineedits"), this);
highlightScrollBar = new TQCheckBox(i18n("Highlight scroll bar handles"), this);
animateProgressBar = new TQCheckBox(i18n("Animate progress bars"), this);
- //layout->add(highlightLineEdits);
- layout->add(highlightScrollBar);
- layout->add(animateProgressBar);
- layout->addStretch(1);
+ //tqlayout->add(highlightLineEdits);
+ tqlayout->add(highlightScrollBar);
+ tqlayout->add(animateProgressBar);
+ tqlayout->addStretch(1);
TQSettings s;
//origHlLineEdit = s.readBoolEntry("/keramik/Settings/highlightLineEdits", false);
diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp
index 112f2c241..64ca00fff 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 = colorGroup();
+ TQColorGroup cg = tqcolorGroup();
TQColor c1 = cg.background();
TQColor c2 = cg.mid();
@@ -96,7 +96,7 @@ void MenuPreview::createPixmaps()
void MenuPreview::blendPixmaps()
{
- // Rebuild pixmaps, and repaint
+ // Rebuild pixmaps, and tqrepaint
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 = colorGroup().button();
+ TQColor clr = tqcolorGroup().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();
- repaint( false );
+ tqrepaint( false );
}
}
@@ -130,14 +130,14 @@ void MenuPreview::setPreviewMode( PreviewMode pvm )
if (mode != pvm) {
mode = pvm;
blendPixmaps();
- repaint( false );
+ tqrepaint( false );
}
}
void MenuPreview::paintEvent( TQPaintEvent* /* pe */ )
{
// Paint the frame and blended pixmap
- TQColorGroup cg = colorGroup();
+ TQColorGroup cg = tqcolorGroup();
int x2 = width()-1;
int y2 = height()-1;
diff --git a/kcontrol/style/stylepreview.ui b/kcontrol/style/stylepreview.ui
index fbb4929f2..7dcee7930 100644
--- a/kcontrol/style/stylepreview.ui
+++ b/kcontrol/style/stylepreview.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>StylePreview</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>50</height>
@@ -161,7 +161,7 @@
</widget>
<widget class="QLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
@@ -177,7 +177,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -196,13 +196,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>200</width>
<height>32767</height>
@@ -224,13 +224,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>200</width>
<height>32767</height>
@@ -250,7 +250,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -280,6 +280,6 @@
<slot>init()</slot>
<slot returnType="bool">eventFilter( QObject *, QEvent * ev )</slot>
</slots>
-<layoutdefaults spacing="6" margin="10"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="10"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>