More TQt port fixes

Signed-off-by: Mavridis Philippe <[email protected]>

4 files changed, 62 insertions, 338 deletions

diff --git a/client/config/configdialog.cc b/client/config/configdialog.cc
deleted file mode 100644
index 4e6db04..0000000
--- a/client/config/configdialog.cc
+++ /dev/null
@@ -1,276 +0,0 @@
-#include <kdialog.h>
-#include <tdelocale.h>
-/****************************************************************************
-** Form implementation generated from reading ui file './configdialog.ui'
-**
-** Created: Mon Jun 23 19:18:43 2008
-**      by: The User Interface Compiler ($Id: qt/main.cpp   3.3.8   edited Jan 11 14:47 $)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
-
-#include "configdialog.h"
-
-#include <tqvariant.h>
-#include <tqpushbutton.h>
-#include <tqtabwidget.h>
-#include <tqspinbox.h>
-#include <tqcheckbox.h>
-#include <tqcombobox.h>
-#include <tqlabel.h>
-#include <tqbuttongroup.h>
-#include <tqradiobutton.h>
-#include <tqlayout.h>
-#include <tqtooltip.h>
-#include <tqwhatsthis.h>
-
-/*
- *  Constructs a ConfigDialog as a child of 'parent', with the
- *  name 'name' and widget flags set to 'f'.
- */
-ConfigDialog::ConfigDialog( TQWidget* parent, const char* name, WFlags fl )
-    : TQWidget( parent, name, fl )
-{
-    if ( !name )
-	setName( "ConfigDialog" );
-    setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) );
-    ConfigDialogLayout = new TQVBoxLayout( this, 0, 6, "ConfigDialogLayout"); 
-
-    tabWidget3 = new TQTabWidget( this, "tabWidget3" );
-
-    tab = new TQWidget( tabWidget3, "tab" );
-    tabLayout = new TQGridLayout( tab, 1, 1, 11, 6, "tabLayout"); 
-
-    titlesize = new TQSpinBox( tab, "titlesize" );
-    titlesize->setMaxValue( 64 );
-    titlesize->setMinValue( 16 );
-
-    tabLayout->addWidget( titlesize, 1, 2 );
-
-    framesize = new TQSpinBox( tab, "framesize" );
-    framesize->setMaxValue( 64 );
-    framesize->setMinValue( 1 );
-    framesize->setValue( 4 );
-
-    tabLayout->addWidget( framesize, 2, 2 );
-
-    titleshadow = new TQCheckBox( tab, "titleshadow" );
-    titleshadow->setChecked( TRUE );
-
-    tabLayout->addWidget( titleshadow, 3, 2 );
-
-    roundCorners = new TQCheckBox( tab, "roundCorners" );
-    roundCorners->setChecked( TRUE );
-
-    tabLayout->addWidget( roundCorners, 4, 2 );
-
-    titleBarStyle = new TQComboBox( FALSE, tab, "titleBarStyle" );
-
-    tabLayout->addWidget( titleBarStyle, 5, 2 );
-
-    textLabel1_4 = new TQLabel( tab, "textLabel1_4" );
-    textLabel1_4->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
-
-    tabLayout->addWidget( textLabel1_4, 5, 1 );
-
-    textLabel1_2 = new TQLabel( tab, "textLabel1_2" );
-    textLabel1_2->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
-
-    tabLayout->addWidget( textLabel1_2, 2, 1 );
-
-    textLabel1 = new TQLabel( tab, "textLabel1" );
-    textLabel1->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
-
-    tabLayout->addWidget( textLabel1, 1, 1 );
-
-    textLabel1_3 = new TQLabel( tab, "textLabel1_3" );
-    textLabel1_3->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
-
-    tabLayout->addMultiCellWidget( textLabel1_3, 0, 0, 0, 1 );
-    spacer5 = new TQSpacerItem( 71, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    tabLayout->addItem( spacer5, 2, 0 );
-    spacer4 = new TQSpacerItem( 81, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    tabLayout->addItem( spacer4, 2, 3 );
-
-    titlealign = new TQButtonGroup( tab, "titlealign" );
-    titlealign->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, titlealign->sizePolicy().hasHeightForWidth() ) );
-    titlealign->setLineWidth( 0 );
-    titlealign->setColumnLayout(0, TQt::Vertical );
-    titlealign->layout()->setSpacing( 6 );
-    titlealign->layout()->setMargin( 0 );
-    titlealignLayout = new TQHBoxLayout( titlealign->layout() );
-    titlealignLayout->setAlignment( TQt::AlignTop );
-
-    AlignLeft = new TQRadioButton( titlealign, "AlignLeft" );
-    titlealignLayout->addWidget( AlignLeft );
-
-    AlignHCenter = new TQRadioButton( titlealign, "AlignHCenter" );
-    AlignHCenter->setChecked( TRUE );
-    titlealignLayout->addWidget( AlignHCenter );
-
-    AlignRight = new TQRadioButton( titlealign, "AlignRight" );
-    titlealignLayout->addWidget( AlignRight );
-
-    tabLayout->addWidget( titlealign, 0, 2 );
-    tabWidget3->insertTab( tab, TQString::fromLatin1("") );
-
-    tab_2 = new TQWidget( tabWidget3, "tab_2" );
-    tabLayout_2 = new TQGridLayout( tab_2, 1, 1, 11, 6, "tabLayout_2"); 
-
-    textLabel1_5 = new TQLabel( tab_2, "textLabel1_5" );
-    textLabel1_5->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
-
-    tabLayout_2->addWidget( textLabel1_5, 1, 0 );
-
-    buttonStyle = new TQComboBox( FALSE, tab_2, "buttonStyle" );
-
-    tabLayout_2->addWidget( buttonStyle, 1, 1 );
-
-    textLabel4 = new TQLabel( tab_2, "textLabel4" );
-    textLabel4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)5, 0, 0, textLabel4->sizePolicy().hasHeightForWidth() ) );
-    textLabel4->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
-
-    tabLayout_2->addWidget( textLabel4, 0, 0 );
-
-    buttonsize = new TQSpinBox( tab_2, "buttonsize" );
-    buttonsize->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, buttonsize->sizePolicy().hasHeightForWidth() ) );
-    buttonsize->setButtonSymbols( TQSpinBox::UpDownArrows );
-    buttonsize->setMaxValue( 64 );
-    buttonsize->setMinValue( 1 );
-    buttonsize->setValue( 16 );
-
-    tabLayout_2->addWidget( buttonsize, 0, 1 );
-
-    animatebuttons = new TQCheckBox( tab_2, "animatebuttons" );
-    animatebuttons->setEnabled( TRUE );
-    animatebuttons->setChecked( TRUE );
-
-    tabLayout_2->addWidget( animatebuttons, 2, 1 );
-
-    layout11 = new TQHBoxLayout( 0, 0, 6, "layout11"); 
-    spacer3 = new TQSpacerItem( 30, 20, TQSizePolicy::Maximum, TQSizePolicy::Minimum );
-    layout11->addItem( spacer3 );
-
-    textLabel2 = new TQLabel( tab_2, "textLabel2" );
-    layout11->addWidget( textLabel2 );
-
-    btnComboBox = new TQComboBox( FALSE, tab_2, "btnComboBox" );
-    btnComboBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, btnComboBox->sizePolicy().hasHeightForWidth() ) );
-    layout11->addWidget( btnComboBox );
-
-    tabLayout_2->addLayout( layout11, 3, 1 );
-
-    squareButton = new TQCheckBox( tab_2, "squareButton" );
-    squareButton->setChecked( TRUE );
-
-    tabLayout_2->addMultiCellWidget( squareButton, 4, 4, 1, 2 );
-
-    lightBorder = new TQCheckBox( tab_2, "lightBorder" );
-
-    tabLayout_2->addMultiCellWidget( lightBorder, 5, 5, 1, 2 );
-
-    nomodalbuttons = new TQCheckBox( tab_2, "nomodalbuttons" );
-    nomodalbuttons->setChecked( TRUE );
-
-    tabLayout_2->addWidget( nomodalbuttons, 6, 1 );
-
-    menuClose = new TQCheckBox( tab_2, "menuClose" );
-    menuClose->setEnabled( TRUE );
-
-    tabLayout_2->addMultiCellWidget( menuClose, 7, 7, 1, 2 );
-    spacer3_3 = new TQSpacerItem( 121, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    tabLayout_2->addItem( spacer3_3, 1, 2 );
-    tabWidget3->insertTab( tab_2, TQString::fromLatin1("") );
-    ConfigDialogLayout->addWidget( tabWidget3 );
-    languageChange();
-    resize( TQSize(388, 265).expandedTo(minimumSizeHint()) );
-    clearWState( WState_Polished );
-
-    // signals and slots connections
-    connect( animatebuttons, SIGNAL( toggled(bool) ), textLabel2, SLOT( setEnabled(bool) ) );
-    connect( animatebuttons, SIGNAL( toggled(bool) ), btnComboBox, SLOT( setEnabled(bool) ) );
-
-    // tab order
-    setTabOrder( AlignLeft, AlignHCenter );
-    setTabOrder( AlignHCenter, AlignRight );
-    setTabOrder( AlignRight, titlesize );
-    setTabOrder( titlesize, framesize );
-    setTabOrder( framesize, titleshadow );
-    setTabOrder( titleshadow, roundCorners );
-    setTabOrder( roundCorners, buttonsize );
-    setTabOrder( buttonsize, animatebuttons );
-    setTabOrder( animatebuttons, btnComboBox );
-    setTabOrder( btnComboBox, menuClose );
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-ConfigDialog::~ConfigDialog()
-{
-    // no need to delete child widgets, TQt does it all for us
-}
-
-/*
- *  Sets the strings of the subwidgets using the current
- *  language.
- */
-void ConfigDialog::languageChange()
-{
-    setCaption( tr2i18n( "Config Dialog" ) );
-    titlesize->setSuffix( tr2i18n( " pixels" ) );
-    framesize->setSuffix( tr2i18n( " pixels" ) );
-    framesize->setSpecialValueText( tr2i18n( "1 pixel" ) );
-    titleshadow->setText( tr2i18n( "&Use shadowed text" ) );
-    titleshadow->setAccel( TQKeySequence( tr2i18n( "Alt+U" ) ) );
-    TQWhatsThis::add( titleshadow, tr2i18n( "Check this option if you want the titlebar text to have a 3D look with a shadow behind it." ) );
-    roundCorners->setText( tr2i18n( "R&ound top corners" ) );
-    roundCorners->setAccel( TQKeySequence( tr2i18n( "Alt+O" ) ) );
-    titleBarStyle->clear();
-    titleBarStyle->insertItem( tr2i18n( "Gradients" ) );
-    titleBarStyle->insertItem( tr2i18n( "Glass" ) );
-    textLabel1_4->setText( tr2i18n( "Titlebar style:" ) );
-    textLabel1_2->setText( tr2i18n( "Frame width:" ) );
-    textLabel1->setText( tr2i18n( "Title height:" ) );
-    textLabel1_3->setText( tr2i18n( "Text alignment:" ) );
-    titlealign->setTitle( TQString::null );
-    AlignLeft->setText( tr2i18n( "L&eft" ) );
-    AlignLeft->setAccel( TQKeySequence( tr2i18n( "Alt+E" ) ) );
-    TQToolTip::add( AlignLeft, TQString::null );
-    AlignHCenter->setText( tr2i18n( "Ce&nter" ) );
-    AlignHCenter->setAccel( TQKeySequence( tr2i18n( "Alt+N" ) ) );
-    TQToolTip::add( AlignHCenter, TQString::null );
-    AlignRight->setText( tr2i18n( "Ri&ght" ) );
-    AlignRight->setAccel( TQKeySequence( tr2i18n( "Alt+G" ) ) );
-    TQToolTip::add( AlignRight, TQString::null );
-    tabWidget3->changeTab( tab, tr2i18n( "Titleb&ar" ) );
-    textLabel1_5->setText( tr2i18n( "Button Style:" ) );
-    buttonStyle->clear();
-    buttonStyle->insertItem( tr2i18n( "Gradients" ) );
-    buttonStyle->insertItem( tr2i18n( "Glass" ) );
-    buttonStyle->insertItem( tr2i18n( "Reverse Gradients" ) );
-    buttonStyle->insertItem( tr2i18n( "Flat" ) );
-    buttonStyle->setCurrentItem( 1 );
-    textLabel4->setText( tr2i18n( "Button size:" ) );
-    buttonsize->setSuffix( tr2i18n( " pixels" ) );
-    buttonsize->setSpecialValueText( tr2i18n( "1 pixel" ) );
-    animatebuttons->setText( tr2i18n( "&Animate buttons" ) );
-    animatebuttons->setAccel( TQKeySequence( tr2i18n( "Alt+A" ) ) );
-    TQWhatsThis::add( animatebuttons, tr2i18n( "Check this option if you want to use button animations when hovering with the mouse." ) );
-    textLabel2->setText( tr2i18n( "Animation style:" ) );
-    btnComboBox->clear();
-    btnComboBox->insertItem( tr2i18n( "Colorize" ) );
-    btnComboBox->insertItem( tr2i18n( "Intensify" ) );
-    btnComboBox->insertItem( tr2i18n( "Fade" ) );
-    squareButton->setText( tr2i18n( "S&quare buttons" ) );
-    squareButton->setAccel( TQKeySequence( tr2i18n( "Alt+Q" ) ) );
-    lightBorder->setText( tr2i18n( "Li&ghter button borders" ) );
-    lightBorder->setAccel( TQKeySequence( tr2i18n( "Alt+G" ) ) );
-    nomodalbuttons->setText( tr2i18n( "&No buttons on modal windows" ) );
-    nomodalbuttons->setAccel( TQKeySequence( tr2i18n( "Alt+N" ) ) );
-    menuClose->setText( tr2i18n( "Close window when &menu double clicked" ) );
-    menuClose->setAccel( TQKeySequence( tr2i18n( "Alt+M" ) ) );
-    tabWidget3->changeTab( tab_2, tr2i18n( "&Buttons appearance" ) );
-}
-
-#include "configdialog.moc"
diff --git a/client/config/polyesterconfig.cc b/client/config/polyesterconfig.cc
index 7f322fb..c12fec5 100755
--- a/client/config/polyesterconfig.cc
+++ b/client/config/polyesterconfig.cc
@@ -43,25 +43,25 @@ polyesterConfig::polyesterConfig(TDEConfig* config, TQWidget* parent)
     load(config_);
 
     // setup the connections for title align
-    connect(dialog_->titlealign, SIGNAL(clicked(int)),this, SLOT(selectionChanged(int)));
+    connect(dialog_->titlealign, TQ_SIGNAL(clicked(int)),this, TQ_SLOT(selectionChanged(int)));
     // setup the connections for corner rounding
-    connect(dialog_->roundCorners, SIGNAL(stateChanged(int)),this,SLOT(selectionChanged(int)));
-    connect(dialog_->titleBarStyle, SIGNAL(activated(int)),this,SLOT(selectionChanged(int)));
-    connect(dialog_->buttonStyle, SIGNAL(activated(int)),this,SLOT(selectionChanged(int)));
+    connect(dialog_->roundCorners, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int)));
+    connect(dialog_->titleBarStyle, TQ_SIGNAL(activated(int)),this,TQ_SLOT(selectionChanged(int)));
+    connect(dialog_->buttonStyle, TQ_SIGNAL(activated(int)),this,TQ_SLOT(selectionChanged(int)));
     // setup title shadow
-    connect(dialog_->titleshadow, SIGNAL(stateChanged(int)),this,SLOT(selectionChanged(int)));
+    connect(dialog_->titleshadow, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int)));
     // setup button actions
-    connect(dialog_->animatebuttons, SIGNAL(stateChanged(int)),this,SLOT(selectionChanged(int)));
-    connect(dialog_->nomodalbuttons, SIGNAL(stateChanged(int)),this,SLOT(selectionChanged(int)));
-    connect(dialog_->btnComboBox, SIGNAL(activated(int)),this,SLOT(selectionChanged(int)));
-    connect(dialog_->lightBorder, SIGNAL(stateChanged(int)),this,SLOT(selectionChanged(int)));
+    connect(dialog_->animatebuttons, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int)));
+    connect(dialog_->nomodalbuttons, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int)));
+    connect(dialog_->btnComboBox, TQ_SIGNAL(activated(int)),this,TQ_SLOT(selectionChanged(int)));
+    connect(dialog_->lightBorder, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int)));
     // setup the connections for spin boxes
-    connect(dialog_->titlesize, SIGNAL(valueChanged(int)),this,SLOT(selectionChanged(int)));
-    connect(dialog_->buttonsize, SIGNAL(valueChanged(int)),this,SLOT(selectionChanged(int)));
-    connect(dialog_->framesize, SIGNAL(valueChanged(int)),this,SLOT(selectionChanged(int)));
-    connect(dialog_->squareButton, SIGNAL(stateChanged(int)),this,SLOT(selectionChanged(int)));
+    connect(dialog_->titlesize, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(selectionChanged(int)));
+    connect(dialog_->buttonsize, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(selectionChanged(int)));
+    connect(dialog_->framesize, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(selectionChanged(int)));
+    connect(dialog_->squareButton, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int)));
     // double click the menu 
-    connect(dialog_->menuClose, SIGNAL(stateChanged(int)),this, SLOT(selectionChanged(int)));
+    connect(dialog_->menuClose, TQ_SIGNAL(stateChanged(int)),this, TQ_SLOT(selectionChanged(int)));
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -108,7 +108,7 @@ void polyesterConfig::load(TDEConfig*) {
     config_->setGroup("General");
 
     TQString value = config_->readEntry("TitleAlignment", "AlignHCenter");
-    TQRadioButton *button = (TQRadioButton*)dialog_->titlealign->child(value);
+    TQRadioButton *button = (TQRadioButton*)dialog_->titlealign->child(value.local8Bit());
     if (button)
     {
         button->setChecked(true);
diff --git a/style/config/polyesterconf.cpp b/style/config/polyesterconf.cpp
index 3f365b6..04215dd 100755
--- a/style/config/polyesterconf.cpp
+++ b/style/config/polyesterconf.cpp
@@ -142,39 +142,39 @@ PolyesterStyleConfig::PolyesterStyleConfig(TQWidget* parent): TQWidget(parent)
 	origCheckMarkColor = s.readEntry("/polyesterstyle/Settings/checkMarkColor", "black");
 	dialog_->checkMarkColor->setColor(origCheckMarkColor);
 
-	connect(dialog_->useLowerCaseText, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->scrollBarLines, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->scrollBarStyle, SIGNAL( activated(int) ), SLOT( updateChanged() ) );
-	connect(dialog_->scrollBarSize, SIGNAL( valueChanged( int ) ), SLOT( updateChanged() ) );
-	connect(dialog_->coloredScrollBar, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->centeredTabBar, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->highLightTab, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->statusBarFrame, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->menuItemSpacing, SIGNAL( valueChanged(int) ), SLOT( updateChanged() ) );
-	connect(dialog_->buttonMenuItem, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->menuBarEmphasis, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->menuBarEmphasisBorder, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->customMenuBarEmphasisColor, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->menuBarEmphasisColor, SIGNAL( changed(const TQColor&) ), SLOT( updateChanged() ) );
-	connect(dialog_->menuStripe, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->shadowedButtonsText, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-        connect(dialog_->shadowedMenuBarText, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->animateProgressBar, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->lightBorder, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->animateButton, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->animateButtonToDark, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->drawToolBarSeparator, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->drawToolBarItemSeparator, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->drawTriangularExpander, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->inputFocusHighlight, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-        connect(dialog_->colorizeSortedHeader, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->buttonStyle, SIGNAL( activated(int) ), SLOT( updateChanged() ) );
-	connect(dialog_->customOverHighlightColor, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->overHighlightColor, SIGNAL( changed(const TQColor&) ), SLOT( updateChanged() ) );
-	connect(dialog_->customFocusHighlightColor, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->focusHighlightColor, SIGNAL( changed(const TQColor&) ), SLOT( updateChanged() ) );
-	connect(dialog_->customCheckMarkColor, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
-	connect(dialog_->checkMarkColor, SIGNAL( changed(const TQColor&) ), SLOT( updateChanged() ) );
+	connect(dialog_->useLowerCaseText, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->scrollBarLines, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->scrollBarStyle, TQ_SIGNAL( activated(int) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->scrollBarSize, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->coloredScrollBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->centeredTabBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->highLightTab, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->statusBarFrame, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->menuItemSpacing, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->buttonMenuItem, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->menuBarEmphasis, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->menuBarEmphasisBorder, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->customMenuBarEmphasisColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->menuBarEmphasisColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->menuStripe, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->shadowedButtonsText, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+        connect(dialog_->shadowedMenuBarText, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->animateProgressBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->lightBorder, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->animateButton, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->animateButtonToDark, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->drawToolBarSeparator, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->drawToolBarItemSeparator, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->drawTriangularExpander, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->inputFocusHighlight, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+        connect(dialog_->colorizeSortedHeader, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->buttonStyle, TQ_SIGNAL( activated(int) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->customOverHighlightColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->overHighlightColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->customFocusHighlightColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->focusHighlightColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->customCheckMarkColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(dialog_->checkMarkColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) );
 
 	if ( dialog_->animateButton->isChecked() )
 	 dialog_->animateButtonToDark->setEnabled(true);
diff --git a/style/polyester.cpp b/style/polyester.cpp
index 5fe43fa..4b4aad3 100755
--- a/style/polyester.cpp
+++ b/style/polyester.cpp
@@ -241,13 +241,13 @@ PolyesterStyle::PolyesterStyle() : TDEStyle( AllowMenuTransparency, ThreeButtonS
     }
 
     //Thanks, Lipstik :-)
-    else if( !strcmp(_scrollBarStyle,"ThreeButtonScrollBar" ) )
+    else if( _scrollBarStyle == "ThreeButtonScrollBar" )
         _scrollBarType = TDEStyle::ThreeButtonScrollBar;
-    else if( !strcmp(_scrollBarStyle,"WindowsStyleScrollBar" ) )
+    else if( _scrollBarStyle == "WindowsStyleScrollBar" )
         _scrollBarType = TDEStyle::WindowsStyleScrollBar;
-    else if( !strcmp(_scrollBarStyle,"PlatinumStyleScrollBar" ) )
+    else if( _scrollBarStyle == "PlatinumStyleScrollBar" )
         _scrollBarType = TDEStyle::PlatinumStyleScrollBar;
-    else if( !strcmp(_scrollBarStyle,"NextStyleScrollBar" ) )
+    else if( _scrollBarStyle == "NextStyleScrollBar" )
         _scrollBarType = TDEStyle::NextStyleScrollBar;
 
     //HACK for gtk-qt: if setScrollBarType is called wxwidgets applications will broke
@@ -262,13 +262,13 @@ PolyesterStyle::PolyesterStyle() : TDEStyle( AllowMenuTransparency, ThreeButtonS
     if ( _animateProgressBar )
     {
         animationTimer = new TQTimer( this );
-        connect( animationTimer, SIGNAL(timeout()), this, SLOT(updateProgressPos()) );
+        connect( animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateProgressPos()) );
     }
 
     if ( _animateButton )
     {
         btnAnimTimer = new TQTimer( this );
-        connect( btnAnimTimer, SIGNAL(timeout()), this, SLOT(animate()) );
+        connect( btnAnimTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(animate()) );
     }
 
     //create and empty image for the alpha blended menu stripe
@@ -365,7 +365,7 @@ void PolyesterStyle::polish(TQWidget* widget)
 {
     if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...?
         tdehtmlWidgets[widget] = true;
-        connect(widget, SIGNAL(destroyed(TQObject*)), this, SLOT(tdehtmlWidgetDestroyed(TQObject*)));
+        connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(tdehtmlWidgetDestroyed(TQObject*)));
     }
 
     // use tqt_cast where possible to check if the widget inheits one of the classes. might improve
@@ -385,14 +385,14 @@ void PolyesterStyle::polish(TQWidget* widget)
             //  btnAnimTimer->start( TIMERINTERVAL, false );
 
             animWidgets[widget].active = false;
-                connect(widget, SIGNAL(destroyed(TQObject*)), this, SLOT(animWidgetDestroyed(TQObject*)));
+                connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(animWidgetDestroyed(TQObject*)));
         }
 
         TQSlider *slider = ::tqt_cast<TQSlider*>(widget);
         if(slider)
         {
-          connect(slider, SIGNAL(sliderMoved(int)), this, SLOT(sliderThumbMoved(int)));
-          connect(slider, SIGNAL(valueChanged(int)), this, SLOT(sliderThumbMoved(int)));
+          connect(slider, TQ_SIGNAL(sliderMoved(int)), this, TQ_SLOT(sliderThumbMoved(int)));
+          connect(slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(sliderThumbMoved(int)));
         }
     } else if (::tqt_cast<TQLineEdit*>(widget)) {
         widget->installEventFilter(this);
@@ -404,7 +404,7 @@ void PolyesterStyle::polish(TQWidget* widget)
     } else if ( !qstrcmp(widget->name(), "tde toolbar widget") ) {
         widget->installEventFilter(this);
     } else if (::tqt_cast<TQHeader*>(widget)) {
-        connect(widget->parent(), SIGNAL(contentsMoving(int, int)), widget, SLOT(update()));
+        connect(widget->parent(), TQ_SIGNAL(contentsMoving(int, int)), widget, TQ_SLOT(update()));
         widget->installEventFilter(this);
     }else if (::tqt_cast<TQScrollBar*>(widget)) {
         widget->installEventFilter(this);
@@ -414,7 +414,7 @@ void PolyesterStyle::polish(TQWidget* widget)
     {
         widget->installEventFilter(this);
         progAnimWidgets[widget] = 0;
-        connect(widget, SIGNAL(destroyed(TQObject*)), this, SLOT(progressBarDestroyed(TQObject*)));
+        connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(progressBarDestroyed(TQObject*)));
         if (!animationTimer->isActive())
             animationTimer->start( 50, false );
     }
@@ -462,7 +462,7 @@ void PolyesterStyle::unPolish(TQWidget* widget)
     TDEStyle::unPolish(widget);
 }
 
-/*a bunch of slots stuff...*/
+/*a bunch of TQ_SLOTs stuff...*/
 void PolyesterStyle::tdehtmlWidgetDestroyed(TQObject* obj)
 {
     tdehtmlWidgets.remove(static_cast<TQWidget*>(obj));
@@ -3283,7 +3283,7 @@ void PolyesterStyle::drawControl(ControlElement element,
 
             // shadow on button text
 
-            if( _shadowedButtonsText && button->isEnabled() && button->text() )
+            if( _shadowedButtonsText && button->isEnabled() && !button->text().isNull() )
             {
               TQColor shadowColor = alphaBlendColors( cg.highlight(),
                                                 cg.button(),