Rename a number of old tq methods that are no longer tq specific

1 files changed, 11 insertions, 11 deletions

diff --git a/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp
index 37a28911..b807c0f1 100644
--- a/kommander/editor/styledbutton.cpp
+++ b/kommander/editor/styledbutton.cpp
@@ -23,7 +23,7 @@
 #include "formwindow.h"
 #include "pixmapchooser.h"
 #include <kcolordialog.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
 #include <tqimage.h>
@@ -35,7 +35,7 @@
 StyledButton::StyledButton(TQWidget* parent, const char* name)
     : TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( false )
 {
-    setMinimumSize( tqminimumSizeHint() );
+    setMinimumSize( minimumSizeHint() );
     setAcceptDrops( true );
 
     connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor()));
@@ -48,7 +48,7 @@ StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name
 {
     col = b.color();
     pix = b.pixmap();
-    setMinimumSize( tqminimumSizeHint() );
+    setMinimumSize( minimumSizeHint() );
 }
 
 StyledButton::~StyledButton()
@@ -111,12 +111,12 @@ void StyledButton::setScale( bool on )
     scalePixmap();
 }
 
-TQSize StyledButton::tqsizeHint() const
+TQSize StyledButton::sizeHint() const
 {
     return TQSize( 50, 25 );
 }
 
-TQSize StyledButton::tqminimumSizeHint() const
+TQSize StyledButton::minimumSizeHint() const
 {
     return TQSize( 50, 25 );
 }
@@ -145,25 +145,25 @@ void StyledButton::resizeEvent( TQResizeEvent* e )
 
 void StyledButton::drawButton( TQPainter *paint )
 {
-    tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), tqcolorGroup(),
+    tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(),
 			  isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised);
     drawButtonLabel(paint);
 
     if (hasFocus())
 	tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, paint,
 			      tqstyle().subRect(TQStyle::SR_PushButtonFocusRect, this),
-			      tqcolorGroup(), TQStyle::Style_Default);
+			      colorGroup(), TQStyle::Style_Default);
 }
 
 void StyledButton::drawButtonLabel( TQPainter *paint )
 {
     TQColor pen = isEnabled() ?
-		 hasFocus() ? tqpalette().active().buttonText() : tqpalette().inactive().buttonText()
-		 : tqpalette().disabled().buttonText();
+		 hasFocus() ? palette().active().buttonText() : palette().inactive().buttonText()
+		 : palette().disabled().buttonText();
     paint->setPen( pen );
 
     if(!isEnabled()) {
-	paint->setBrush( TQBrush( tqcolorGroup().button() ) );
+	paint->setBrush( TQBrush( colorGroup().button() ) );
     }
     else if ( edit == PixmapEditor && spix ) {
 	paint->setBrush( TQBrush( col, *spix ) );
@@ -178,7 +178,7 @@ void StyledButton::onEditor()
 {
     switch (edit) {
     case ColorEditor: {
-        TQColor c = tqpalette().active().background();
+        TQColor c = palette().active().background();
 	if ( KColorDialog::getColor( c, this ) == TQDialog::Accepted ) {
 	    setColor( c );
 	    emit changed();