diff options
Diffstat (limited to 'ksplashml/themeengine/standard')
-rw-r--r-- | ksplashml/themeengine/standard/themestandard.cpp | 4 | ||||
-rw-r--r-- | ksplashml/themeengine/standard/wndicon.cpp | 8 | ||||
-rw-r--r-- | ksplashml/themeengine/standard/wndicon.h | 2 | ||||
-rw-r--r-- | ksplashml/themeengine/standard/wndstatus.cpp | 2 | ||||
-rw-r--r-- | ksplashml/themeengine/standard/wndstatus.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp index c7e9220e2..b0ceff516 100644 --- a/ksplashml/themeengine/standard/themestandard.cpp +++ b/ksplashml/themeengine/standard/themestandard.cpp @@ -156,8 +156,8 @@ void ThemeStandard::_readSettings() if( mSbFontItalic ) mSbFont.setItalic( true ); - mSbFg = cfg->readColorEntry( "Statusbar Foreground", &Qt::white ); - mSbBg = cfg->readColorEntry( "Statusbar Background", &Qt::black ); + mSbFg = cfg->readColorEntry( "Statusbar Foreground", &TQt::white ); + mSbBg = cfg->readColorEntry( "Statusbar Background", &TQt::black ); mSbIcon = cfg->readEntry( "Statusbar Icon", "run" ); mIconsVisible = cfg->readBoolEntry( "Icons Visible", true); mIconsJumping = cfg->readBoolEntry( "Icons Jumping", true); diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp index ce153e461..87ac35a1a 100644 --- a/ksplashml/themeengine/standard/wndicon.cpp +++ b/ksplashml/themeengine/standard/wndicon.cpp @@ -42,7 +42,7 @@ WndIcon::WndIcon( Position icon_position, bool statusAtTop, bool iconsJumping ) - :TQHBox( 0, "wndSplash", WStyle_Customize|WX11BypassWM ), + :TQHBox( 0, "wndSplash", (WFlags)(WStyle_Customize|WX11BypassWM) ), mStatusText(text), mIconPos(icon_position), mXineramaScreen( xineramaScreen ), mPosX(0), mPosY(0), mGroundX(0), mGroundY(0), mVelocity(8.0), mInitialVelocity(8.0), mGravity(0.8), mIconNum(icon_num), mStatusHeight(status_height), mIconSize(icon_std_width), mStatusAtTop(statusAtTop), @@ -53,10 +53,10 @@ WndIcon::WndIcon( TQLabel *w = new TQLabel( this ); w->setFixedSize( pix.width(), pix.height() ); w->setPixmap( pix ); - if(pix.mask()) + if(pix.tqmask()) { - setMask(*pix.mask()); - w->setMask(*pix.mask()); + setMask(*pix.tqmask()); + w->setMask(*pix.tqmask()); } resize( pix.width(), pix.height() ); diff --git a/ksplashml/themeengine/standard/wndicon.h b/ksplashml/themeengine/standard/wndicon.h index d488f85df..5338835a4 100644 --- a/ksplashml/themeengine/standard/wndicon.h +++ b/ksplashml/themeengine/standard/wndicon.h @@ -26,7 +26,7 @@ * @short Displays an icon on the screen. */ class WndIcon: - public QHBox + public TQHBox { Q_OBJECT public: diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp index 04685d9cf..6227de9b1 100644 --- a/ksplashml/themeengine/standard/wndstatus.cpp +++ b/ksplashml/themeengine/standard/wndstatus.cpp @@ -37,7 +37,7 @@ WndStatus::WndStatus( TQPalette /*pal*/, const TQColor& fgc, const TQColor & bgc, const TQString& icon ) - :TQHBox( 0, "wndStatus", WStyle_Customize|WX11BypassWM ) + :TQHBox( 0, "wndStatus", (WFlags)(WStyle_Customize|WX11BypassWM) ) { setFrameStyle( TQFrame::NoFrame ); //setPalette( pal ); diff --git a/ksplashml/themeengine/standard/wndstatus.h b/ksplashml/themeengine/standard/wndstatus.h index 63e253d1d..bc908779d 100644 --- a/ksplashml/themeengine/standard/wndstatus.h +++ b/ksplashml/themeengine/standard/wndstatus.h @@ -25,7 +25,7 @@ class KProgress; /** @short Window displaying status and progress bar. */ class WndStatus: - public QHBox + public TQHBox { Q_OBJECT public: |