More TQt port fixes

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

2 files changed, 47 insertions, 47 deletions

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(),